Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (88387361733e71814a1b636ca68dad76ee600ac7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (88387361733e71814a1b636ca68dad76ee600ac7)
  • Date: Wed, 4 Nov 2009 07:01:02 -0600

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

kernels/linux/FINAL | 2 ++
kernels/linux/HISTORY | 7 ++++++-
kernels/linux/UPDATE_BOOTLOADER | 8 ++++++++
kernels/linux/info/patches/PRE_2_6/patch-2.6.32-rc6 | 6 ++++++
kernels/linux/info/patches/zen_patches/2.6.32-rc6-zen1.patch | 6 ++++++
kernels/linux/latest.defaults | 4 ++--
6 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 4525d0bd6b1be04b0154e166c8eb726d41920f4d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

linux: latest PRE_2_6 and zen kernels, added grub2 bootloader update
support

diff --git a/kernels/linux/FINAL b/kernels/linux/FINAL
index 24296a9..b01faef 100755
--- a/kernels/linux/FINAL
+++ b/kernels/linux/FINAL
@@ -23,6 +23,8 @@ then
*)
if [ -f /etc/lilo.conf ] && [ ! -z
$(installed_version lilo) ] ; then
install_config_file
"$SPELL_DIRECTORY/templates/lilo.conf.tmplt" "/etc/lilo.conf.tmplt"
+ elif [ -f /boot/grub/grub.cfg ] && [ ! -z
$(installed_version grub2) ] ; then
+ message "grub2 does not use a template,
skipping check"
elif [ -f /boot/grub/menu.lst ] && [ ! -z
$(installed_version grub) ] ; then
install_config_file
"$SPELL_DIRECTORY/templates/menu.lst.tmplt" "/boot/grub/menu.lst.tmplt"
else
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 309de97..f680a9c 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,5 +1,10 @@
+2009-11-04 Arjan Bouter <abouter AT sourcemage.org>
+ * info/patches/PRE_2_6/2.6.32-rc6: latest pre_2_6
+ * info/patches/zen_patches/2.6.32-rc6-zen1.patch: latest pre zen
+ * FINAL,BOOTLOADER_UPDATE: added grub2 support
+
2009-11-02 Arjan Bouter <abouter AT sourcemage.org>
- * info/patches/zen_patches/2.6.31-zen5.patch: latest stable zen
+ * info/patches/zen_patches/2.6.31-zen5.patch: latest stable zen

2009-10-26 Arjan Bouter <abouter AT sourcemage.org>
* info/patches/PRE_2_6/2.6.32-rc5: latest pre_2_6
diff --git a/kernels/linux/UPDATE_BOOTLOADER b/kernels/linux/UPDATE_BOOTLOADER
index fa04f9b..a38b67b 100755
--- a/kernels/linux/UPDATE_BOOTLOADER
+++ b/kernels/linux/UPDATE_BOOTLOADER
@@ -168,6 +168,10 @@ update_grub() {

}

+update_grub2() {
+ grub-mkconfig > /boot/grub/grub.cfg
+}
+
# Changed from 'case $BUILD in' as $BUILD is not defined yet
root_dev
case `uname -m` in
@@ -177,6 +181,10 @@ case `uname -m` in
then
boot_loader="lilo"
update_lilo
+ elif [ -f /boot/grub/grub.cfg ]
+ then
+ boot_loader="grub2"
+ update_grub2
else [ -f /boot/grub/menu.lst ]
boot_loader="grub"
update_grub
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.32-rc6
b/kernels/linux/info/patches/PRE_2_6/patch-2.6.32-rc6
new file mode 100755
index 0000000..4b60727
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.32-rc6
@@ -0,0 +1,6 @@
+patchversion="2.6.32-rc6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/testing/${source}"
+appliedkernels="2.6.31"
+gpg_source_url="${source_url}.sign"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
diff --git a/kernels/linux/info/patches/zen_patches/2.6.32-rc6-zen1.patch
b/kernels/linux/info/patches/zen_patches/2.6.32-rc6-zen1.patch
new file mode 100644
index 0000000..98b44d5
--- /dev/null
+++ b/kernels/linux/info/patches/zen_patches/2.6.32-rc6-zen1.patch
@@ -0,0 +1,6 @@
+appliedkernels="2.6.31"
+depends="patch-2.6.32-rc6"
+patchversion="2.6.32-rc6-zen1"
+source="${patchversion}.patch.lzma"
+source_url="http://downloads.zen-kernel.org/2.6.32/${source}";
+md5="d5719a04e0fdd0bcf18f3cee0ea0bc5f"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index d3a471c..89180cf 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,5 +1,5 @@
LATEST_2_6=2.6.31
-LATEST_PRE_2_6=patch-2.6.32-rc5
+LATEST_PRE_2_6=patch-2.6.32-rc6
LATEST_maintenance_patches=patch-2.6.31.5
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
@@ -17,4 +17,4 @@ 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.25.4-rt5
-LATEST_zen_patches=2.6.31-zen5.patch
+LATEST_zen_patches=2.6.32-rc6-zen1.patch



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (88387361733e71814a1b636ca68dad76ee600ac7), Arjan Bouter, 11/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page