Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel cauldron by Karsten Behrmann (53a946773f595c0d37dfcd614d3ce61db414f715)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Karsten Behrmann <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel cauldron by Karsten Behrmann (53a946773f595c0d37dfcd614d3ce61db414f715)
  • Date: Sun, 18 Jun 2006 16:35:16 -0500

GIT changes to devel cauldron by Karsten Behrmann <BearPerson AT sourcemage.org>:

ChangeLog | 5 +++++
iso/generation-scripts/config | 20 ++++++++++++++++----
iso/generation-scripts/mkprep | 3 +--
iso/generation-scripts/mkroot | 29 +++++++++++++++++++++++++++++
4 files changed, 51 insertions(+), 6 deletions(-)

New commits:
commit 53a946773f595c0d37dfcd614d3ce61db414f715
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

Add stuff to automate chroot generation.
Not much, but I hope it's a start...

diff --git a/ChangeLog b/ChangeLog
index f401ddb..273ea0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-18 Karsten Behrmann <BearPerson AT gmx.net>
+ * gen-scripts/config: "automate" config to autodetect
+ kernel version and arch
+ * gen-scripts/mkroot: start a "create chroot" wrapper/script
+
2006-06-06 Karsten Behrmann <BearPerson AT gmx.net>
* skeleton/etc/init.d/runlevels/mountroot.sh: rename our bootstrap
script to an existing one that we don't want,
diff --git a/iso/generation-scripts/config b/iso/generation-scripts/config
index ca236e6..1b6f7bd 100755
--- a/iso/generation-scripts/config
+++ b/iso/generation-scripts/config
@@ -1,4 +1,7 @@
#!/bin/bash
+
+[ -e /etc/smgl-isogen.conf ] && . /etc/smgl-isogen.conf
+
SCRIPTDIR=${0%/*}
if [[ "${SCRIPTDIR:0:1}" != "/" ]] ;then
SCRIPTDIR=$(pwd)/$SCRIPTDIR # turn into absolute path
@@ -9,13 +12,22 @@ STATE_DIR=$SCRIPTDIR/../data
SKELETON=$SCRIPTDIR/../skeleton

ISO_BRANCH=${ISO_BRANCH:-devel}
-ARCH=${ARCH:-i486-pc-linux-gnu}
-ISO_ARCH=${ISO_ARCH:-x86}
- # generic i386 and family
+# Don't worry, that echo runs in a subshell
+ARCH=${ARCH:-$(. /etc/sorcery/config ; echo $HOST)}
+ISO_ARCH=${ISO_ARCH:-$(uname -m)}
+# FIXME: this is a brutal hack, but the best I could come up with
+# on short notice...
+[[ $ISO_ARCH == ppc ]] || [[ $ISO_ARCH == x86_64 ]] || ISO_ARCH=i486
SVERSION=${SVERSION:-test}
GVERSION=${GVERSION:-test}
KVERSION=${KVERSION:-"2.6"}
-KERNEL_VERSION=${KERNEL_VERSION:-2.6.14.2}
+
+# "local" helper variables
+kconf=../data/config-$KVERSION.$ISO_ARCH
+[[ -e $kconf ]] || kconf=../data/config-$KVERSION
+def_kv=$(sed -n 's/^# Linux kernel version: //p' $kconf)
+
+KERNEL_VERSION=${KERNEL_VERSION:-$def_kv}
if [[ $KERNEL_VERSION == *.*.*.* ]] ;then
KERNEL_MVERSION=${KERNEL_MVERSION:-${KERNEL_VERSION%.*}}
KERNEL_PATCHES=${KERNEL_PATCHES:-"patch-$KERNEL_VERSION"}
diff --git a/iso/generation-scripts/mkprep b/iso/generation-scripts/mkprep
index 20b7a7d..cc09240 100755
--- a/iso/generation-scripts/mkprep
+++ b/iso/generation-scripts/mkprep
@@ -1,6 +1,5 @@
#!/bin/bash
SCRIPTDIR=${0%/*}
-[ -e /etc/smgl-isogen.conf ] && . /etc/smgl-isogen.conf
. $SCRIPTDIR/config

if [ $# -lt 1 ] || [[ "$1" == "/" ]] ;then
@@ -75,8 +74,8 @@ SKELETON=$1/skeleton
SCRIPTS=$1/generation-scripts

cp -a --no-preserve=ownership $SCRIPTDIR/../../ChangeLog $SKELETON
+[[ -e /etc/smgl-isogen.conf ]] && cp /etc/smgl-isogen.conf $1/../../etc/
{
- cat /etc/smgl-isogen.conf 2>/dev/null
echo "ISO_VERSION=$ISO_VERSION"
# Set ISO version to version of copy
# (avoiding different $(date)'s for templates->files and the .iso file)
diff --git a/iso/generation-scripts/mkroot b/iso/generation-scripts/mkroot
new file mode 100755
index 0000000..5b77e31
--- /dev/null
+++ b/iso/generation-scripts/mkroot
@@ -0,0 +1,29 @@
+#!/bin/bash
+SCRIPTDIR=${0%/*}
+. $SCRIPTDIR/config
+CHROOTGEN=$SCRIPTDIR/../../chroot
+
+if [[ -z $2 ]] ;then
+ echo "Syntax: $0 <path to root to generate from> <path to put new root>"
+ exit 2
+fi
+
+cp $CHROOTGEN/chrootgen.sh $1/
+rm -r $1/chroot-configset $1/new-root $1/tmp/backup_configs
+cp -a $CHROOTGEN/$ISO_ARCH $1/chroot-configset
+
+#FIXME: Force specific grimoire to be updated and used (preferrably without
+# leaving a lasting trace (e.g. grimoire update) on the host)
+
+chroot $1 /chrootgen.sh --chroot_dir /new-root --config_dir
/chroot-configset \
+ --backup_dir /tmp/backup_configs recreate
+
+pushd $1/new-root
+mkdir -p proc dev sys tmp var/spool/sorcery
+cd dev
+$1/var/lib/sorcery/codex/*/smgl/init.d/MAKEDEV generic
+
+popd
+mkdir -p $2
+rmdir $2 &&
+mv $1/new-root $2



  • [SM-Commit] GIT changes to devel cauldron by Karsten Behrmann (53a946773f595c0d37dfcd614d3ce61db414f715), Karsten Behrmann, 06/18/2006

Archive powered by MHonArc 2.6.24.

Top of Page