Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (69637facd1fa87ffd42bdf921998a9ba922949b4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (69637facd1fa87ffd42bdf921998a9ba922949b4)
  • Date: Mon, 21 Nov 2011 07:17:30 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

kernels/linux/HISTORY | 1 +
kernels/linux/PRE_BUILD | 16 +++++++++++++++-
kernels/linux/liblinux | 10 ++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 69637facd1fa87ffd42bdf921998a9ba922949b4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux: updated to work with 3.1, tar is signed instead of tar.bz2

http://www.sourcemage.org/issues/331

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9ef0001..0e7a45c 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -2,6 +2,7 @@
* latest.defaults: LATEST_3=3.1,
LATEST_maintenance_patches_3=patch-3.1
* info/kernels/3.1: added
* info/patches/maintenance_patches_3/patch-3.1: added
+ * PRE_BUILD, liblinux: updated to work with linux 3.1

2011-11-12 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=3.0.9
diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 3a194cf..052c8ed 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -59,7 +59,21 @@ case "${KMODE}" in
newktree)
mk_source_dir $LINUX_SOURCE_DIRECTORY &&
cd $LINUX_SOURCE_DIRECTORY &&
- unpack_file '' || return 1
+ case $VERSION in
+ 3.[1-9]*)
+ message "${MESSAGE_COLOR}bunzip2
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+ bunzip2 -k $SOURCE_CACHE/$SOURCE
+ SOURCE_ORI=$SOURCE
+ SOURCE=${SOURCE/.bz2}
+ unpack_file '' || return 1
+ message "${MESSAGE_COLOR}rm
$SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+ rm $SOURCE_CACHE/$SOURCE
+ SOURCE=$SOURCE_ORI
+ ;;
+ *)
+ unpack_file '' || return 1
+ ;;
+ esac
mv ./*/* ./*/.[a-z]* ./ &&
. ${SPELL_DIRECTORY}/latest.defaults &&
local count=3
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index b6d40aa..358dfa0 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -362,6 +362,16 @@ function create_details()
BASE_KVER="$basekver"
fi
case "$BASE_KVER" in
+ 3.[1-9]*)
+ . $KERNELS_DIRECTORY/${BASE_KVER}
+ echo ".
\${SPELL_DIRECTORY}/info/kernels/${BASE_KVER}"
+ echo "SOURCE=\$source"
+ echo "SOURCE_URL=\$source_url"
+ echo "SOURCE2=\$source2"
+ echo
"SOURCE_GPG=kernel.gpg:\${SOURCE2}:ESTABLISHED_UPSTREAM_KEY"
+ echo "SOURCE2_URL=\$source2_url"
+ echo "SOURCE2_IGNORE=signature"
+ ;;
3*|2.[0-9]*)
. $KERNELS_DIRECTORY/${BASE_KVER}
echo ".
\${SPELL_DIRECTORY}/info/kernels/${BASE_KVER}"



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (69637facd1fa87ffd42bdf921998a9ba922949b4), Ladislav Hagara, 11/21/2011

Archive powered by MHonArc 2.6.24.

Top of Page