Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-andrew cauldron by Andrew Stitt (4d13f927b1c5f160678e956e9f853a43bd8efae7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andrew Stitt <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-andrew cauldron by Andrew Stitt (4d13f927b1c5f160678e956e9f853a43bd8efae7)
  • Date: Mon, 12 Jan 2009 21:26:10 -0600

GIT changes to devel-andrew cauldron by Andrew Stitt <acedit AT armory.com>:

data/initrd.files | 44
-----------------------------------------
scripts/mkinitrd.sh | 21 +++++++++++++++++++
scripts/spellcaster.sh | 16 +++++++-------
scripts/twelve-step-program.sh | 4 +++
4 files changed, 33 insertions(+), 52 deletions(-)

New commits:
commit 405894481e6cbd08ac9a2c11092da5adbc44e867
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

disable grimoire updates until stable becomes stable again

commit 23ac6b9cc82dddf4814a57113982f6cd89975caf
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

check for failures

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

install udev into initrd using cache, not manually

Removed references to udev files from initrd.files, and added logic to
minitrd.sh to unpack the udev cache file found inside ISODIR into the
initrd. The unpacking excludes dirs and files not needed in the initrd,
like documentation, logs, etc.

diff --git a/data/initrd.files b/data/initrd.files
index 6764446..2c04e52 100644
--- a/data/initrd.files
+++ b/data/initrd.files
@@ -20,47 +20,3 @@ rmmod
/bin/sh
pidof
killall5
-udevadm
-udevd
-udevinfo
-/etc/modprobe.d/udev
-/etc/scsi_id.config
-/etc/udev/rules.d/40-alsa.rules
-/etc/udev/rules.d/51-udev-default.rules
-/etc/udev/rules.d/52-modules.rules
-/etc/udev/rules.d/76-cdrom_perms.rules
-/etc/udev/rules.d/README
-/etc/udev/rules.d/rules.examples
-/etc/udev/udev.conf
-/etc/udev/udev.missing
-/lib/libudev.so.0
-/lib/libudev.so.0.0.2
-/lib/libvolume_id.so.1
-/lib/libvolume_id.so.1.0.2
-/lib/udev/ata_id
-/lib/udev/cdrom_id
-/lib/udev/create_floppy_devices
-/lib/udev/edd_id
-/lib/udev/firmware.sh
-/lib/udev/fstab_import
-/lib/udev/path_id
-/lib/udev/rule_generator.functions
-/lib/udev/rules.d/50-udev-default.rules
-/lib/udev/rules.d/60-cdrom_id.rules
-/lib/udev/rules.d/60-persistent-input.rules
-/lib/udev/rules.d/60-persistent-storage-tape.rules
-/lib/udev/rules.d/60-persistent-storage.rules
-/lib/udev/rules.d/60-persistent-v4l.rules
-/lib/udev/rules.d/61-persistent-storage-edd.rules
-/lib/udev/rules.d/75-cd-aliases-generator.rules
-/lib/udev/rules.d/75-persistent-net-generator.rules
-/lib/udev/rules.d/79-fstab_import.rules
-/lib/udev/rules.d/80-drivers.rules
-/lib/udev/rules.d/95-udev-late.rules
-/lib/udev/scsi_id
-/lib/udev/usb_id
-/lib/udev/vol_id
-/lib/udev/write_cd_rules
-/lib/udev/write_net_rules
-/usr/lib/libudev.so
-/usr/lib/libvolume_id.so
diff --git a/scripts/mkinitrd.sh b/scripts/mkinitrd.sh
index b3412c6..72eb988 100755
--- a/scripts/mkinitrd.sh
+++ b/scripts/mkinitrd.sh
@@ -99,6 +99,13 @@ then
exit 2
fi >&2

+if [[ ! -f "$ISODIR"/var/cache/sorcery/udev* ]]
+then
+ echo "Chroot failed sanity check:"
+ echo "Chroot is missing the udev cache file!"
+ exit 2
+fi >&2
+
# The temporary dir I'll use to put the initrd files
INITRDROOT=/tmp/initrd-dir

@@ -203,6 +210,16 @@ function mk_initrd_file() {
fi
}

+function install_udev() {
+ local udev="$ISODIR/var/cache/udev*"
+ local exclude=(init.d doc man var)
+
+ if ! tar xf $udev "${exclude[@]/#/--exclude=}" -C "$INITRDROOT"
+ then
+ echo "error: could not extract $udev to $INITRDROOT"
+ exit 2
+ fi
+}

# Find my stuff
MYDIR=$(readlink -f ${0%/*}/..)
@@ -280,6 +297,10 @@ cp sbin/depmod ${INITRDROOT}
chroot ${INITRDROOT} /depmod ${KERNEL_VERSION}
rm -f ${INITRDROOT}/depmod

+# install udev
+echo "installing udev into the initrd"
+install_udev
+
# The initrd is complete now.
echo "Make the initrd"
popd >/dev/null
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index c3d2761..8481748 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -197,14 +197,14 @@ function prepare_target() {
index="$SYSDIR/etc/sorcery/local/grimoire"

# update to latest stable grimoire
- (
- cd "$SPOOL"
- wget http://download.sourcemage.org/codex/$stable
- )
- msg "Updating build grimoire"
- [[ -d "$codex" ]] || mkdir -p $codex &&
- tar jxf "$SPOOL"/$stable -C "$codex"/ &&
- echo "$grimoire" > "$index"
+ #(
+ # cd "$SPOOL"
+ # wget http://download.sourcemage.org/codex/$stable
+ #)
+ #msg "Updating build grimoire"
+ #[[ -d "$codex" ]] || mkdir -p $codex &&
+ #tar jxf "$SPOOL"/$stable -C "$codex"/ &&
+ #echo "$grimoire" > "$index"

# If console-tools is found in TARGET, get rid of it to make
# way for kbd
diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
index 2f0326e..169a803 100755
--- a/scripts/twelve-step-program.sh
+++ b/scripts/twelve-step-program.sh
@@ -53,6 +53,10 @@ KERNEL_VERSION=2.6.27.10
echo 'step 3 failed' >> /var/log/sorcery/activity
exit
}
+ grep -q failure "$ROOTBUILD"/var/log/sorcery/activity && {
+ echo 'step 3 failed: NO EXIT STATUS' >> /var/log/sorcery/activity
+ exit
+ }

echo "LISTING TREES (depth 3)"
echo "listing $ISOBUILD tree"



  • [SM-Commit] GIT changes to devel-andrew cauldron by Andrew Stitt (4d13f927b1c5f160678e956e9f853a43bd8efae7), Andrew Stitt, 01/12/2009

Archive powered by MHonArc 2.6.24.

Top of Page