Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (ba789d0791e8dd5863e2ee56cec7edf4f361f84b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (ba789d0791e8dd5863e2ee56cec7edf4f361f84b)
  • Date: Sun, 28 Jan 2007 02:42:58 -0600

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

kernels/linux-initramfs/HISTORY | 1 +
kernels/linux-initramfs/mkinitrd | 3 ++-
kernels/linux/HISTORY | 2 ++
kernels/linux/INSTALL | 4 ++--
4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2b659fc5924c5f0da7541fbe5e56ef0df1fc1c99
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux-initramfs fixed some usage of find vs. grep then added a depmod to
the file

commit 899c69d02b93feefb11b9bf0afac18ba0cac3581
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux when calling mkinitrd ignore missing modules so things will be less
likely to break

commit 9cbbeb5ce94eceb7a5cc8283594786c30d097c04
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux fixed is_depends_enabled on linux spell

diff --git a/kernels/linux-initramfs/HISTORY b/kernels/linux-initramfs/HISTORY
index 6ce95ef..765db3c 100644
--- a/kernels/linux-initramfs/HISTORY
+++ b/kernels/linux-initramfs/HISTORY
@@ -1,5 +1,6 @@
2007-01-27 David Brown <dmlb2000 AT gmail.com>
* mkinitrd: added from linux spell
+ make it depmod before so it can find the modules properly
* installkernel: added from linux spell
* INSTALL: installed files from linux spell and fixed syntax install
flags
diff --git a/kernels/linux-initramfs/mkinitrd
b/kernels/linux-initramfs/mkinitrd
index 6df5416..24a8a47 100755
--- a/kernels/linux-initramfs/mkinitrd
+++ b/kernels/linux-initramfs/mkinitrd
@@ -464,7 +464,7 @@ function module_parts()
echo "file /modules.lst /tmp/modules.lst 0644 0 0"
for module in $MODULES
do
- full_path_module=$(find /lib/modules/${KVERSION}/kernel |
grep "/$module.ko\|/${module//-/_}.ko\|/${module//_/-}.ko")
+ full_path_module=$(grep
"/$module.ko\|/${module//-/_}.ko\|/${module//_/-}.ko"
/lib/modules/$KVERSION/modules.dep | cut -d: -f1 | head -n 1)
echo /modules/$(basename $full_path_module) >>
/tmp/modules.lst
cat <<-EOF
file /modules/$(basename $full_path_module) $full_path_module
0644 0 0
@@ -656,6 +656,7 @@ do
shift
done

+depmod -a $KVERSION
check_raid
check_lvm
fill_modules
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 393f338..9b6a612 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -3,6 +3,8 @@
* installkernel: moved to linux-initramfs spell
* INSTALL: removed install of mkinitrd and installkernel added
generating mkinitrd image using the mkinitrd script
+ fixed checking if linux-initramfs is enabled...
+ ignore missing modules if they happen to not be there
* DEPENDS: added optional depends linux-initramfs

2007-01-27 David Brown <dmlb2000 AT gmail.com>
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index 17ca96b..26518c2 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -60,9 +60,9 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
# for people with boot partitions so grub can still find the kernel
# if they reference /boot/vmlinuz in their menu.lst
ln -sfn . ${INSTALL_ROOT}/boot/boot &&
- if is_depends_enabled linux-initramfs
+ if is_depends_enabled $SPELL linux-initramfs
then
- mkinitrd -o ${INSTALL_ROOT}/boot/initrd.img-${VERSION}
${VERSION}
+ mkinitrd --ignore-missing -o
${INSTALL_ROOT}/boot/initrd.img-${VERSION} ${VERSION}
fi
fi &&
ln -sfn `basename ${LINUX_SOURCE_DIRECTORY}` ${BUILD_DIRECTORY}/linux



  • [SM-Commit] GIT changes to master grimoire by David Brown (ba789d0791e8dd5863e2ee56cec7edf4f361f84b), David Brown, 01/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page