[leaf-commits] src/bering-uclibc4/source/initrd buildtool.cfg, 1.1.1.1, 1.2 buildtool.mk, 1.1.1.1, 1.2 common.cfg, 1.1.1.1, 1.2 root.linuxrc, 1.1.1.1, 1.2 files.cd, 1.1.1.1, NONE files.floppy, 1.1.1.1, NONE files.ide, 1.1.1.1, NONE files.usb, 1.1.1.1, NONE
Andrew <[email protected]>
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/initrd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28937
Modified Files:
buildtool.cfg buildtool.mk common.cfg root.linuxrc
Removed Files:
files.cd files.floppy files.ide files.usb
Log Message:
Modules moved from /boot/lib/modules to /lib/modules; some debug added.
--- files.ide DELETED ---
Index: common.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/common.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** common.cfg 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- common.cfg 5 Jun 2010 23:34:27 -0000 1.2
***************
*** 76,79 ****
--- 76,84 ----
</File>
<File>
+ Filename = lib/modules
+ Type = directory
+ Permissions = 755
+ </File>
+ <File>
Filename = usr/bin
Type = directory
--- files.cd DELETED ---
Index: root.linuxrc
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/root.linuxrc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** root.linuxrc 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- root.linuxrc 5 Jun 2010 23:34:27 -0000 1.2
***************
*** 24,28 ****
# **** Adjust if needed ****
! DEF_syst_size=8M # Size of root partition
DEF_log_size=3M # Size of /var/log partition
usb_wait=1 # Wait time in sec. for USB drive
--- 24,28 ----
# **** Adjust if needed ****
! DEF_syst_size=16M # Size of root partition
DEF_log_size=3M # Size of /var/log partition
usb_wait=1 # Wait time in sec. for USB drive
***************
*** 58,61 ****
--- 58,64 ----
# Load any modules required to boot
+ ln -s /lib/modules /lib/modules/`uname -r`
+ depmod
+
if [ -r $BPFX/etc/modules ] ; then
# Loop over every line in modules
***************
*** 68,72 ****
\#*|"") continue;;
esac
! /sbin/insmod $BPFX/lib/modules/"$module".ko $args
done
fi
--- 71,75 ----
\#*|"") continue;;
esac
! /sbin/modprobe "$module" $args
done
fi
***************
*** 84,87 ****
--- 87,92 ----
done
+ [ "$VERBOSE2" ] && (echo "Modules loaded:"; lsmod)
+
# Skip remaining LRP stuff if we're not booting into a ramdisk
[ "$VERBOSE" ] && Lecho "Root: $KCMD_root"
***************
*** 199,203 ****
IFS="$OIFS"
for t in $2 ${FILESYSTEMS}; do
! [ "$VERBOSE" ] && Lecho "Mounting $dev on /mnt$devcount"
if qt mount -rt $t $dev /mnt$devcount ; then
[ "$VERBOSE" ] && Lecho "Mounted $dev as $t"
--- 204,208 ----
IFS="$OIFS"
for t in $2 ${FILESYSTEMS}; do
! [ "$VERBOSE" ] && Lecho "Mounting $dev on /mnt$devcount as $t"
if qt mount -rt $t $dev /mnt$devcount ; then
[ "$VERBOSE" ] && Lecho "Mounted $dev as $t"
***************
*** 243,246 ****
--- 248,252 ----
t="${devtype#*:-}"
[ "$VERBOSE" ] && echo -n " dev: $dev mnt: $mnt t: $t f: $mnt/$f.lrp"
+ [ "$VERBOSE2" ] && ls -l $dev
if [ $fnd -ne 1 ]; then
if [ -f $mnt/$f.lrp ]; then
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/buildtool.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.mk 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- buildtool.mk 5 Jun 2010 23:34:27 -0000 1.2
***************
*** 27,32 ****
-rm -f files.floppy
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.floppy`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= boot/lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tPermissions\t= 644\n</File>">>files.floppy; done)
BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
--- 27,32 ----
-rm -f files.floppy
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.floppy`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tType\t= module\n\tPermissions\t= 644\n</File>">>files.floppy; done)
BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
***************
*** 35,40 ****
-rm -f files.ide
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.ide`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= boot/lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tPermissions\t= 644\n</File>">>files.ide; done)
BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
--- 35,40 ----
-rm -f files.ide
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.ide`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tType\t= module\n\tPermissions\t= 644\n</File>">>files.ide; done)
BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
***************
*** 43,48 ****
-rm -f files.cd
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.cd`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= boot/lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tPermissions\t= 644\n</File>">>files.cd; done)
BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
--- 43,48 ----
-rm -f files.cd
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.cd`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tType\t= module\n\tPermissions\t= 644\n</File>">>files.cd; done)
BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
***************
*** 51,56 ****
-rm -f files.usb
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.usb`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= boot/lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tPermissions\t= 644\n</File>">>files.usb; done)
cp -a README $(INITRD_TARGET_DIR)/boot/etc
--- 51,56 ----
-rm -f files.usb
(BT_KERNEL_RELEASE=$(BT_KERNEL_VER); for i in `cat mod.usb`; do echo -e "<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
! Filename\t= lib/modules/$$(echo $$i|sed 's/[a-z]*\/[a-z_/-]*\///g')\n\t\
! Type\t= binary\n\tType\t= module\n\tPermissions\t= 644\n</File>">>files.usb; done)
cp -a README $(INITRD_TARGET_DIR)/boot/etc
--- files.floppy DELETED ---
--- files.usb DELETED ---
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/buildtool.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.cfg 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- buildtool.cfg 5 Jun 2010 23:34:27 -0000 1.2
***************
*** 66,70 ****
Version = 4.0.0
! Revision = 5
Help <<EOF
--- 66,70 ----
Version = 4.0.0
! Revision = 6
Help <<EOF
***************
*** 104,108 ****
Version = 4.0.0
! Revision = 5
Help <<EOF
--- 104,108 ----
Version = 4.0.0
! Revision = 6
Help <<EOF
***************
*** 142,146 ****
Version = 4.0.0
! Revision = 5
Help <<EOF
--- 142,146 ----
Version = 4.0.0
! Revision = 6
Help <<EOF
***************
*** 180,184 ****
Version = 4.0.0
! Revision = 5
Help <<EOF
--- 180,184 ----
Version = 4.0.0
! Revision = 6
Help <<EOF
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo