[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (e3dfaf2e07bb1e25b789f1fe44d71bc1ef675be4)

Ladislav Hagara scm at sourcemage.org
Mon Jul 25 12:14:20 EDT 2011


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

 kernels/linux/CONFIGURE                                    |    2 +-
 kernels/linux/HISTORY                                      |    6 ++++++
 kernels/linux/INSTALL                                      |    4 ++--
 kernels/linux/PREPARE                                      |    4 ++--
 kernels/linux/info/kernels/3.0                             |    3 +++
 kernels/linux/info/patches/maintenance_patches_3/.info     |    2 ++
 kernels/linux/info/patches/maintenance_patches_3/patch-3.0 |    5 +++++
 kernels/linux/latest.defaults                              |    2 ++
 kernels/linux/liblinux                                     |    2 +-
 9 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit e3dfaf2e07bb1e25b789f1fe44d71bc1ef675be4
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    linux 3.0
    
    It is linux 3.0 with source linux-3.0.tar.bz2 but config and uname -a
    shows 3.0.0 so I had to create maintenance_patches_3/patch-3.0 with
    patchversion="3.0.0", seems works like a charm.
    
    Default is still 2.6.39.3.

diff --git a/kernels/linux/CONFIGURE b/kernels/linux/CONFIGURE
index 2ecfd31..364f38c 100755
--- a/kernels/linux/CONFIGURE
+++ b/kernels/linux/CONFIGURE
@@ -1,5 +1,5 @@
 case ${KERNEL_VERSION} in
-	2.6*)
+	3*|2.6*)
 		config_query_list MAKEMODE "What make configuration tool would you like to use?" \
 					"menuconfig" \
 					"oldconfig" \
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9afe2f4..f65e2af 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2011-07-25 Ladislav Hagara <hgr at vabo.cz>
+	* latest.defaults: LATEST_3 and LATEST_maintenance_patches_3 added
+	* PREPARE, CONFIGURE, liblinux, INSTALL: linux 3 support added
+	* info/kernels/3.0: added
+	* info/patches/maintenance_patches_3/patch-3.0: added
+
 2011-07-13 Ladislav Hagara <hgr at vabo.cz>
 	* info/patches/maintenance_patches/patch-2.6.33.16: added
 	* info/patches/maintenance_patches/patch-2.6.32.43: added
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index 403459b..0b0a291 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -4,8 +4,8 @@ mkdir -p ${INSTALL_ROOT}/boot &&
 if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
 	if grep 'CONFIG_MODULES=y' ./.config ; then
 		case "$VERSION" in
-			2.[0246]*)
-				message "${MESSAGE_COLOR}installing for a 2.x kernel${DEFAULT_COLOR}" &&
+			3*|2.[0246]*)
+				message "${MESSAGE_COLOR}installing for a $VERSION kernel${DEFAULT_COLOR}" &&
 				local strip_modules
 				if list_find "$OPTIMIZATIONS" strip; then
 					# makes make run strip --strip-debug over the modules
diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index 82c5106..4b3cc17 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -299,7 +299,7 @@ function new_tree_menu()
 	do
 		menu="${menu}${version} Linux_Kernel Select_one "
 	done
-	menu="$( awk -F= '$1 ~ /LATEST_2/ {print $1 " Linux_Kernel " $2 }' $LATEST_KDEFAULTS ) ${menu}"
+	menu="$( awk -F= '$1 ~ /LATEST_2|LATEST_3/ {print $1 " Linux_Kernel " $2 }' $LATEST_KDEFAULTS ) ${menu}"
 	command=$( "${dialog[@]}" --title "Select Kernel Version" \
 	--item-help --cancel-label "Exit" --default-item "$BASE_KVER" --menu \
 	"Select a kernel version to use" 0 0 0 \
@@ -308,7 +308,7 @@ function new_tree_menu()
 	if [ "$retval" == "0" ]
 	then
 		case "$command" in
-			2.[0-9].[0-9]*) 
+			3*|2.[0-9].[0-9]*) 
 				BASE_KVER=$command
 				;;
 			LATEST*)
diff --git a/kernels/linux/info/kernels/3.0 b/kernels/linux/info/kernels/3.0
new file mode 100755
index 0000000..1989f18
--- /dev/null
+++ b/kernels/linux/info/kernels/3.0
@@ -0,0 +1,3 @@
+version="3.0"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/.info b/kernels/linux/info/patches/maintenance_patches_3/.info
new file mode 100755
index 0000000..177632a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/.info
@@ -0,0 +1,2 @@
+short=""
+help="Maintenance patches for the stable 3 kernel mostly security updates"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0
new file mode 100755
index 0000000..b843b0d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0
@@ -0,0 +1,5 @@
+patchversion="3.0.0"
+source=""
+source_url=""
+appliedkernels="3.0"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 066c272..1120540 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,8 @@
+LATEST_3=3.0
 LATEST_2_6=2.6.39
 LATEST_PRE_2_6=patch-2.6.39
 LATEST_maintenance_patches=patch-2.6.39.3
+LATEST_maintenance_patches_3=patch-3.0
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index 7306b1a..b6d40aa 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -362,7 +362,7 @@ function create_details()
 				BASE_KVER="$basekver"
 			fi
                         case "$BASE_KVER" in
-				2.[0-9]*)
+				3*|2.[0-9]*)
 					. $KERNELS_DIRECTORY/${BASE_KVER}
 					echo ". \${SPELL_DIRECTORY}/info/kernels/${BASE_KVER}"
 					echo "SOURCE=\$source"


More information about the SM-Commit mailing list