Skip to Content.
Sympa Menu

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

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 (8c9ea3b434f66addca5fb7ecda4ebdc61a25fe10)
  • Date: Thu, 1 Jan 2009 17:04:27 -0600

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

scripts/spellcaster.sh | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)

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

scripts/spellcaster.sh: kernel version searching

The means of (possibly) obtaining the kernel version used in the build
have been improved. The kernel version can be passed as an optional
argument to the function. The function will scan the lib/modules
directory for different kernel versions before attemtping to get the
kernel version from the kernel config.

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

scripts/spellcaster.sh: fix up cleanup_target

Fixed the use of the $config variable, and formatted better.

diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 4af8259..c6b6da7 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -194,7 +194,7 @@ function install_kernel() {
local SRC=$1
local DST=$2
local kconfig=$3
- local version=
+ local version=$4
local kernel=

# Exit if DST undefined, otherwise we could damage the host system
@@ -226,7 +226,14 @@ function install_kernel() {
# kernel config
if [[ -z $version ]]
then
- if [[ -h "$SRC"/usr/src/linux ]]
+ local modules="$SRC/lib/modules"
+ modules="$(find "$modules" -mindepth 1 -maxdepth 1 -type d)"
+ modules="$(echo "$modules" | sed 's#.*/##')"
+
+ if [[ $(echo "$modules" | wc -l) -eq 1 ]]
+ then
+ version="$modules"
+ elif [[ -h "$SRC"/usr/src/linux ]]
then
if readlink "$SRC"/usr/src/linux
then
@@ -334,6 +341,7 @@ function setup_iso() {
cp "$TARGET"/var/cache/sorcery/$cache*.tar.bz2
"$ISODIR"/var/cache/sorcery/
done

+ # install the kernel into ISODIR
install_kernel "$TARGET" "$ISODIR"

# save the grimoire version used for building everything to ISODIR
for reference
@@ -341,13 +349,13 @@ function setup_iso() {
}

function clean_target() {
- local config="$TARGET/etc/sorcery/local/kernel.config"
+ local config="etc/sorcery/local/kernel.config"

# Restore resolv.conf, the first rm is needed in case something
# installs a hardlink (like ppp)
rm -f "$TARGET/etc/resolv.conf" &&
cp -f "$TARGET/tmp/resolv.conf" "$TARGET/etc/resolv.conf" &&
- rm -f "$TARGET/tmp/resolv.conf"
+ rm -f "$TARGET/tmp/resolv.conf"

# Clean up the target
rm -f "$TARGET/rspells" \



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

Archive powered by MHonArc 2.6.24.

Top of Page