Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e14e283c9cead19558c407482a26574b727ce0cc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e14e283c9cead19558c407482a26574b727ce0cc)
  • Date: Thu, 1 Jan 2009 16:52:42 -0600

GIT changes to test cauldron by Justin Boffemmyer <flux AT sourcemage.org>:

scripts/mkrelease.sh | 2 +-
scripts/spellcaster.sh | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e14e283c9cead19558c407482a26574b727ce0cc
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: create grimoire_version

Create the grimiore_version file inside of ISODIR using the information
contained in the TARGET's stable VERSION file.

commit 1f1ce329ead6c09ad6b0311f1c6d9c234434a4a2
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/mkrelease.sh: use grimoire version file

The grimoire is no longer present on the ISO itself (only in
system.tar.bz2), so the grimoire information can't be taken from the
grimoire itself in the ISO. Therefore, a new file (etc/grimoire_version)
will be used that will contain the grimoire version.

diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index be93c09..be14c01 100755
--- a/scripts/mkrelease.sh
+++ b/scripts/mkrelease.sh
@@ -62,7 +62,7 @@ fi
[[ $# -lt 2 ]] && usage

# Get the grimoire version used to generate all the spells in the ISO.
-GRIMOIRE_VER=$(< "$TARGET"/var/lib/sorcery/codex/stable/VERSION)
+GRIMOIRE_VER=$(< "$TARGET"/etc/grimoire_version)

# Replace all ISO_VERSION placeholders with the ISO version passed on the
# commandline.
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index c128fd7..4af8259 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -319,6 +319,8 @@ function setup_sys() {
}

function setup_iso() {
+ local GVERS="$TARGET/var/lib/sorcery/stable/VERSION"
+
# copy the iso caches over and unpack their contents
for cache in $(<"$TARGET"/iso-list)
do
@@ -333,6 +335,9 @@ function setup_iso() {
done

install_kernel "$TARGET" "$ISODIR"
+
+ # save the grimoire version used for building everything to ISODIR
for reference
+ cp -f $GVERS "$ISODIR"/etc/grimoire_version
}

function clean_target() {



  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e14e283c9cead19558c407482a26574b727ce0cc), Justin Boffemmyer, 01/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page