[SM-Commit] GIT changes to master grimoire by David Brown (119d63adc22c135603c6ca402656c7bd0a5344b7)

David Brown scm at mail.sourcemage.org
Sun Jun 25 21:43:27 EDT 2006


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

 kernels/linux/HISTORY                                          |    9 ++++++++
 kernels/linux/info/patches/maintenance_patches/patch-2.6.16.21 |    6 +++++
 kernels/linux/info/patches/maintenance_patches/patch-2.6.16.22 |    6 +++++
 kernels/linux/info/patches/mm_patches/2.6.17-mm1               |    6 +++++
 kernels/linux/info/patches/mm_patches/2.6.17-mm2               |    6 +++++
 kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm1           |    7 ++++++
 kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm2           |    7 ++++++
 kernels/linux/info/updatepatch                                 |   11 +++++-----
 kernels/linux/latest.defaults                                  |    2 -
 9 files changed, 54 insertions(+), 6 deletions(-)

New commits:
commit 119d63adc22c135603c6ca402656c7bd0a5344b7
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    cumulative update for mm and maintenance patches

commit 6b1cfaab433dc2db008c7d32156ec08e50b2b0e2
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    updated updatepatch script to work with git

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index e1350c6..5a4de58 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,4 +1,13 @@
 2006-06-25 David Brown <dmlb2000 at gmail.com>
+	* latest.defaults: updated latest to 2.6.17-mm2
+	* info/patches/mm_patches/2.6.17-mm2: added
+	* info/patches/mm_patches/2.6.17-mm1: added
+	* info/patches/mm_patches/2.6.17-rc6-mm2: added
+	* info/patches/mm_patches/2.6.17-rc6-mm1: added
+	* info/patches/maintenance_patches/patch-2.6.16.21: added
+	* info/patches/maintenance_patches/patch-2.6.16.22: added
+
+2006-06-25 David Brown <dmlb2000 at gmail.com>
 	* PREPARE: make global and persistent vars all uppercase, put
 	  function before all functions, add function to convert the
 		old persistent vars to the new set of persistent vars,
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.21 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.21
new file mode 100755
index 0000000..fd6ba28
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.21
@@ -0,0 +1,6 @@
+appliedkernels="2.6.16"
+patchversion="${appliedkernels}.21"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.22 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.22
new file mode 100755
index 0000000..9b27260
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.16.22
@@ -0,0 +1,6 @@
+appliedkernels="2.6.16"
+patchversion="${appliedkernels}.22"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.17-mm1 b/kernels/linux/info/patches/mm_patches/2.6.17-mm1
new file mode 100755
index 0000000..3a5f78c
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.17-mm1
@@ -0,0 +1,6 @@
+appliedkernels="2.6.17"
+patchversion="${appliedkernels}-mm1"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${appliedkernels}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.17-mm2 b/kernels/linux/info/patches/mm_patches/2.6.17-mm2
new file mode 100755
index 0000000..50e7949
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.17-mm2
@@ -0,0 +1,6 @@
+appliedkernels="2.6.17"
+patchversion="${appliedkernels}-mm2"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${appliedkernels}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm1 b/kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm1
new file mode 100755
index 0000000..a4e832b
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm1
@@ -0,0 +1,7 @@
+appliedkernels="2.6.16"
+depends="patch-2.6.17-rc6"
+patchversion="${depends/patch-/}-mm1"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${depends/patch-/}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm2 b/kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm2
new file mode 100755
index 0000000..185cfac
--- /dev/null
+++ b/kernels/linux/info/patches/mm_patches/2.6.17-rc6-mm2
@@ -0,0 +1,7 @@
+appliedkernels="2.6.16"
+depends="patch-2.6.17-rc6"
+patchversion="${depends/patch-/}-mm2"
+source="${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/people/akpm/patches/2.6/${depends/patch-/}/${patchversion}/${source}"
+source_gpg="kernel.gpg:${source}.sign"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/updatepatch b/kernels/linux/info/updatepatch
index 7f3614d..a6513b1 100755
--- a/kernels/linux/info/updatepatch
+++ b/kernels/linux/info/updatepatch
@@ -28,16 +28,16 @@ Usage: # NAME=<your name> EMAIL=<email a
 EOF
 exit 1
 fi
-p4 edit latest.defaults
-p4 edit HISTORY
 sed -i "s/=$2 *$/=$3/g" latest.defaults 
-p4 integ info/patches/$1/$2 info/patches/$1/$3
-p4 edit info/patches/$1/$3
+git-update-index latest.defaults
+cp info/patches/$1/$2 info/patches/$1/$3
 if [ "$4" != "" ]
 then
-	p4 delete info/patches/$1/$4
+	rm info/patches/$1/$4
+	git-update-index --remove info/patches/$1/$4
 fi
 $EDITOR info/patches/$1/$3
+git-add info/patches/$1/$3
 (
 echo "`date +%Y-%m-%d` $NAME <$EMAIL>"
 echo "	* latest.defaults: updated latest to $3"
@@ -50,3 +50,4 @@ echo ""
 ) > HISTORY.new
 cat HISTORY >> HISTORY.new
 mv -v HISTORY.new HISTORY
+git-update-index HISTORY
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 9171ab6..9829f67 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -4,7 +4,7 @@ LATEST_maintenance_patches=patch-2.6.17.
 LATEST_git_patches=patch-2.6.12-rc5-git8
 LATEST_2_4=2.4.32
 LATEST_PRE_2_4=patch-2.4.33-pre1
-LATEST_mm_patches=2.6.17-rc5-mm3
+LATEST_mm_patches=2.6.17-mm2
 LATEST_ac_patches=patch-2.6.11-ac7
 LATEST_grsecurity_2_4=grsecurity-2.1.8-2.4.32-200601211647.patch
 LATEST_grsec_secfix_2_4=linux-2.4.28-secfix-200501071141.patch



More information about the SM-Commit mailing list