sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (c1376339bcc7b606b782b8b20622a82809b4f4ad)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c1376339bcc7b606b782b8b20622a82809b4f4ad)
- Date: Sun, 16 Mar 2008 03:48:31 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
kernels/linux/FINAL | 5 +++--
kernels/linux/HISTORY | 3 ---
kernels/linux/UPDATE_BOOTLOADER | 3 ++-
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit c1376339bcc7b606b782b8b20622a82809b4f4ad
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "linux: use persistent_add instead of export"
This reverts commit 83d395e2754cd0270688750b0272c3083e8dcf29.
Conflicts:
kernels/linux/HISTORY
diff --git a/kernels/linux/FINAL b/kernels/linux/FINAL
index b8a10ee..24296a9 100755
--- a/kernels/linux/FINAL
+++ b/kernels/linux/FINAL
@@ -31,8 +31,9 @@ then
;;
esac
if [ "$NO_CONFIG" == "false" ] ; then
- persistent_add VERSION SPELL_DIRECTORY &&
- $SPELL_DIRECTORY/UPDATE_BOOTLOADER
+ export VERSION &&
+ export SPELL_DIRECTORY &&
+ $SPELL_DIRECTORY/UPDATE_BOOTLOADER
else
message "${PROBLEM_COLOR}AH! No bootloader config file for
your system${DEFAULT_COLOR}"
message "${PROBLEM_COLOR}Abandoning update bootloader
script${DEFAULT_COLOR}"
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8475945..aa4403f 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -2,9 +2,6 @@
* latest.defaults: Latest mm_patch is 2.6.25-rc5-mm1
* info/patches/mm_patches/2.6.25-rc5-mm1: Added
-2008-03-11 Ismael Luceno <ismael AT sourcemage.org>
- * UPDATE_BOOTLOADER, FINAL: use persistent_add instead of export
-
2008-03-10 Eric Sandall <sandalle AT sourcemage.org>
* latest.defaults: Latest PRE_2_6 is 2.6.25-rc5
* info/patches/PRE_2_6/patch-2.6.25-rc5: Added
diff --git a/kernels/linux/UPDATE_BOOTLOADER b/kernels/linux/UPDATE_BOOTLOADER
index a35347d..12d8689 100755
--- a/kernels/linux/UPDATE_BOOTLOADER
+++ b/kernels/linux/UPDATE_BOOTLOADER
@@ -24,7 +24,8 @@ template_entry() {
;;
esac
- persistent_add ROOT_DEV BOOT_DEV
+ export ROOT_DEV
+ export BOOT_DEV
eval $template_file
}
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (c1376339bcc7b606b782b8b20622a82809b4f4ad), Eric Sandall, 03/16/2008
Archive powered by MHonArc 2.6.24.