[SM-Commit] GIT changes to master grimoire by David Brown (862e6b0ea855c7de771afe4d677de0bc137757ab)

David Brown scm at mail.sourcemage.org
Fri Dec 22 02:13:38 EST 2006


GIT changes to master grimoire by David Brown <dmlb2000 at gmail.com>:

 kernels/linux/HISTORY                                                  |   12 ++++++++++
 kernels/linux/PRE_BUILD                                                |    5 ++--
 kernels/linux/info/patches/realtime_patches/patch-2.6.19-rt9           |    6 +++++
 kernels/linux/info/patches/realtime_patches/patch-2.6.20-rc1-rt3       |    7 +++++
 kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.18-3.patch  |    5 ++++
 kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.15.patch |    2 -
 kernels/linux/latest.defaults                                          |    2 -
 kernels/linux/liblinux                                                 |    8 ++++--
 8 files changed, 40 insertions(+), 7 deletions(-)

New commits:
commit 862e6b0ea855c7de771afe4d677de0bc137757ab
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    linux added reiser4 for 2.6.18 and smgl-logo for 2.6.19

commit 960e4f6aa6ee1812c5c1624921a2a741cec6feb9
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    linux updated realtime patches

commit 7e33f8ff6ddb175b3ce55af9452b290b8f5feb0c
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    changed if KMODE isn't set by the time prebuild happens error out instead of doing anything, also changed output of the conflicting patches to be more verbose

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index da8e426..901d8f3 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,15 @@
+2006-12-21 David Brown <dmlb2000 at gmail.com>
+	* latest.defaults: updated latest to patch-2.6.19-rt9
+	* info/patches/realtime_patches/patch-2.6.19-rt9: added
+	* info/patches/realtime_patches/patch-2.6.20-rc1-rt3: added
+	* info/patches/reiser4_patches/reiser4-for-2.6.18-3.patch: added
+	* info/patches/smgl_patches/smgl-logo-0.2-for-2.6.15.patch: updated to
+	  work with 2.6.19
+
+2006-12-21 David Brown <dmlb2000 at gmail.com>
+	* PRE_BUILD: if KMODE isn't set by this point error out
+	* liblinux: output wether there are conflicts or not
+
 2006-12-16 David Brown <dmlb2000 at gmail.com>
 	* latest.defaults: updated latest to 2.6.20-rc1-mm1
 	* info/patches/mm_patches/2.6.20-rc1-mm1: added
diff --git a/kernels/linux/PRE_BUILD b/kernels/linux/PRE_BUILD
index 14a877f..2b06dbb 100755
--- a/kernels/linux/PRE_BUILD
+++ b/kernels/linux/PRE_BUILD
@@ -44,8 +44,9 @@ case "$KMODE" in
     fi
   ;;
   *)
-    message "${PROBLEM_COLOR}Ah ${KMODE} isn't set properly going to newktree${DEFAULT_COLOR}"
-    KMODE="newktree"
+    message "${PROBLEM_COLOR}Ah (KMODE) ${KMODE} isn't set properly${DEFAULT_COLOR}"
+    message "${PROBLEM_COLOR}Fix this by editing /usr/src/linux-$(installed_version linux)/.spell-config.p${DEFAULT_COLOR}"
+    return 1
   ;;
 esac
 
diff --git a/kernels/linux/info/patches/realtime_patches/patch-2.6.19-rt9 b/kernels/linux/info/patches/realtime_patches/patch-2.6.19-rt9
new file mode 100755
index 0000000..50b9efb
--- /dev/null
+++ b/kernels/linux/info/patches/realtime_patches/patch-2.6.19-rt9
@@ -0,0 +1,6 @@
+appliedkernels="2.6.19"
+patchversion="${appliedkernels}-rt9"
+source="patch-${patchversion}.bz2"
+source_url="http://download.sourcemage.org/distro/kernel/${source}"
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="${source_url}.sig"
diff --git a/kernels/linux/info/patches/realtime_patches/patch-2.6.20-rc1-rt3 b/kernels/linux/info/patches/realtime_patches/patch-2.6.20-rc1-rt3
new file mode 100755
index 0000000..1dc295d
--- /dev/null
+++ b/kernels/linux/info/patches/realtime_patches/patch-2.6.20-rc1-rt3
@@ -0,0 +1,7 @@
+appliedkernels="2.6.19"
+depends="patch-2.6.20-rc1"
+patchversion="${depends/patch-/}-rt3"
+source="patch-${patchversion}.bz2"
+source_url="http://download.sourcemage.org/distro/kernel/${source}"
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="${source_url}.sig"
diff --git a/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.18-3.patch b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.18-3.patch
new file mode 100755
index 0000000..7257a97
--- /dev/null
+++ b/kernels/linux/info/patches/reiser4_patches/reiser4-for-2.6.18-3.patch
@@ -0,0 +1,5 @@
+appliedkernels="2.6.18"
+source="reiser4-for-${appliedkernels}-3.patch.gz"
+source_url="http://ftp.namesys.com/pub/reiser4-for-2.6/${appliedkernels}/${source}"
+source_gpg="gurus.gpg:${source}.sig"
+gpg_source_url="http://download.sourcemage.org/distro/kernel/${source}.sig"
diff --git a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.15.patch b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.15.patch
index 756afd9..f518666 100755
--- a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.15.patch
+++ b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.15.patch
@@ -1,4 +1,4 @@
-appliedkernels="2.6.18 2.6.17 2.6.16 2.6.15"
+appliedkernels="2.6.19 2.6.18 2.6.17 2.6.16 2.6.15"
 source="smgl-logo-0.2-for-2.6.15.patch.bz2"
 source_url="http://download.sourcemage.org/distro/kernel/${source}"
 source_gpg="gurus.gpg:${source}.sig"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index ae32f42..a4646c6 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -16,4 +16,4 @@ LATEST_ck_server_patches=patch-2.6.19-ck
 LATEST_cko_patches=patch-2.6.12-cko3
 LATEST_as_patches=patch-2.6.10-as7
 LATEST_love_patches=2.6.12-love1
-LATEST_realtime_patches=patch-2.6.18-rt5
+LATEST_realtime_patches=patch-2.6.19-rt9
diff --git a/kernels/linux/liblinux b/kernels/linux/liblinux
index f87ec94..63745e5 100755
--- a/kernels/linux/liblinux
+++ b/kernels/linux/liblinux
@@ -104,7 +104,7 @@ function run_conflicts()
   local patch
 	local conflicting_patch
 	local conflicting_list=""
-	message "${MESSAGE_COLOR}Generating Conflicts${DEFAULT_COLOR}"
+	message "${MESSAGE_COLOR}Generating Conflicts From:${DEFAULT_COLOR}"
 	echo $SELECTED_PATCHES
 	for patch in $SELECTED_PATCHES
 	do
@@ -134,12 +134,14 @@ function run_conflicts()
 		done
 	done
 	linux_sort_list conflicting_list "${conflicting_list}"
-	message "${MESSAGE_COLOR}Conflicting Patches${DEFAULT_COLOR}"
-	message "${PROBLEM_COLOR}${conflicting_list}${DEFAULT_COLOR}"
 	if [[ ${conflicting_list} ]]
 	then
+		message "${MESSAGE_COLOR}Conflicting Patches${DEFAULT_COLOR}"
+		message "${PROBLEM_COLOR}${conflicting_list}${DEFAULT_COLOR}"
 		fix_conflicts_dialog ${conflicting_list} &&
 		run_conflicts
+	else
+		message "${MESSAGE_COLOR}No Conflicting Patches${DEFAULT_COLOR}"
 	fi
 }
 



More information about the SM-Commit mailing list