Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (8c4a241bf6875bde30f77946eed012a4552641d0)

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 devel-andrew cauldron by Justin Boffemmyer (8c4a241bf6875bde30f77946eed012a4552641d0)
  • Date: Tue, 13 Jan 2009 15:48:23 -0600

GIT changes to devel-andrew cauldron by Justin Boffemmyer
<flux AT sourcemage.org>:

scripts/cleaniso.sh | 2 +-
scripts/mkinitrd.sh | 6 +++---
scripts/spellcaster.sh | 36 +++++++++++++++++++++++++++---------
scripts/twelve-step-program.sh | 5 -----
4 files changed, 31 insertions(+), 18 deletions(-)

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

scripts/twelve-step-program.sh: no kern src on iso

Don't install the kernel sources onto the ISO (especially not unpacked).
There was never a need for the unpacked sources on the ISO filesystem
itself (ISODIR), and this will just make the ISO unnecessarily large.

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

scripts/spellcaster.sh: need msg inside subscript

The script that is created inside the build chroot by spellcaster.sh
employs msg, like spellcaster itself does, but didn't have the function
defined internal to the subscript. The definition has been added, and
the QUIET variable exported so subshells can see it.

commit 416164c54caec5b6d4e07fce8e52a65ee19a7ed2
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/mkinitrd.sh: fix udev cache finding

Fixed the method of finding the udev cache inside ISODIR.

commit 6c4f444f430888487896329a248ab7ca458b8ad2
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: only download when needed

Don't download sorcery or grimoire tarballs if they are already present
in the build directory.

commit 00ed735f26ef654ca92465a1b99736a54706d474
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/cleaniso.sh: missing '!'

Added a missing '!' so the script could be called directly without
needing "bash $script".

diff --git a/scripts/cleaniso.sh b/scripts/cleaniso.sh
index 71dc6b3..b660394 100755
--- a/scripts/cleaniso.sh
+++ b/scripts/cleaniso.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash

function usage() {
cat <<EndUsage
diff --git a/scripts/mkinitrd.sh b/scripts/mkinitrd.sh
index 72eb988..ea01cb2 100755
--- a/scripts/mkinitrd.sh
+++ b/scripts/mkinitrd.sh
@@ -99,7 +99,8 @@ then
exit 2
fi >&2

-if [[ ! -f "$ISODIR"/var/cache/sorcery/udev* ]]
+udev="$(find "$ISODIR"/var/cache/sorcery -name udev-*)"
+if [[ ! -f "$udev" ]]
then
echo "Chroot failed sanity check:"
echo "Chroot is missing the udev cache file!"
@@ -211,10 +212,9 @@ function mk_initrd_file() {
}

function install_udev() {
- local udev="$ISODIR/var/cache/udev*"
local exclude=(init.d doc man var)

- if ! tar xf $udev "${exclude[@]/#/--exclude=}" -C "$INITRDROOT"
+ if ! tar xf "$udev" "${exclude[@]/#/--exclude=}" -C "$INITRDROOT"
then
echo "error: could not extract $udev to $INITRDROOT"
exit 2
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 8481748..897c06b 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -187,6 +187,13 @@ function prepare_target() {
# generate basesystem casting script inside of TARGET
cat > "$TARGET"/build_spells.sh <<-'SPELLS'

+ function msg() {
+ if [[ -z $QUIET ]]
+ then
+ echo $1 >&2
+ fi
+ }
+
if [[ -n $CAULDRON_CHROOT && $# -eq 0 ]]
then

@@ -243,6 +250,9 @@ function prepare_target() {
SPELLS

chmod a+x "$TARGET"/build_spells.sh
+ # export the QUIET variable so subshells (like build_spells) can make
+ # use of it
+ export QUIET
}

function install_kernel() {
@@ -372,11 +382,14 @@ function setup_sys() {
msg "Running add-sauce.sh on SYSDIR"
"$MYDIR"/add-sauce.sh -o -s "$SYSDIR"

- # download sorcery source
- (
- cd "$SPOOL"
- wget http://download.sourcemage.org/sorcery/$SORCERY
- )
+ # download sorcery source if we don't already have it
+ if [[ ! -f "$SPOOL"/$SORCERY ]]
+ then
+ (
+ cd "$SPOOL"
+ wget http://download.sourcemage.org/sorcery/$SORCERY
+ )
+ fi

# unpack sorcery into TARGET
msg "Installing sorcery in SYSDIR"
@@ -391,11 +404,16 @@ function setup_sys() {
./install "$installdir"
popd &> /dev/null

+ # download grimoire source if we don't already have it
+ if [[ ! -f "$SPOOL"/$stable ]]
+ then
+ (
+ cd "$SPOOL"
+ wget http://download.sourcemage.org/codex/$stable
+ )
+ fi
+
# install the stable grimoire used for build into SYSDIR
- (
- cd "$SPOOL"
- wget http://download.sourcemage.org/codex/$stable
- )
msg "Installing grimoire ${stable%.tar.bz2} into SYSDIR"
[[ -d "$syscodex" ]] || mkdir -p $syscodex &&
tar jxf "$SPOOL"/$stable -C "$syscodex"/ &&
diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
index 169a803..e0db6e2 100755
--- a/scripts/twelve-step-program.sh
+++ b/scripts/twelve-step-program.sh
@@ -65,11 +65,6 @@ KERNEL_VERSION=2.6.27.10
echo "listing $SYSBUILD tree"
find "$SYSBUILD" -maxdepth 3

- echo step 3.5 copy kernel sources to iso and sys tree
- # may be handled by step 3 later on
- cp -fa /usr/src/linux-$KERNEL_VERSION "$ISOBUILD"/usr/src ||
- echo 'step 3.5 failed' >> /var/log/sorcery/activity
-
echo step 4 adjust system tree
bash "$CAULDRON_SRC"/scripts/add-sauce.sh -o -s "$SYSBUILD" &&
cp /usr/src/linux-$KERNEL_VERSION.tar.gz "$SYSBUILD"/var/spool/sorcery &&



  • [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (8c4a241bf6875bde30f77946eed012a4552641d0), Justin Boffemmyer, 01/13/2009

Archive powered by MHonArc 2.6.24.

Top of Page