Update of /cvsroot/leaf/src/bering-uclibc4/source/initrd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26857/initrd
Modified Files:
buildtool.cfg buildtool.mk common.cfg root.linuxrc
Log Message:
initrd uses initramfs (.cpio.gz) instead of minix gzipped image
Index: root.linuxrc
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/root.linuxrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** root.linuxrc 5 Jun 2010 23:34:27 -0000 1.2
--- root.linuxrc 12 Jun 2010 16:31:51 -0000 1.3
***************
*** 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
--- 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
***************
*** 130,134 ****
# Set config variables, falling back to defaults
! for i in LRP PKGPATH CONFIGDB MODDB syst_size tmp_size log_size ; do
eval $i=\"\${$i:-\${KCMD_$i:-\$DEF_$i}}\"
done
--- 130,134 ----
# Set config variables, falling back to defaults
! for i in LRP PKGPATH CONFIGDB MODDB tmp_size log_size ; do
eval $i=\"\${$i:-\${KCMD_$i:-\$DEF_$i}}\"
done
***************
*** 136,158 ****
# Added by J. Nilo: Create a dynamic TMPFS
# Initialize tmpfs_size with default
! qt mkdir /tmpfs
! Lecho "Mounting a $syst_size TMPFS filesystem..."
! qt mount -t tmpfs root /tmpfs -o size=$syst_size
! qt umount /proc
! qt umount /sys
! for ii in /*
! do
! case $ii in
! /tmpfs) ;;
! *) qt cp -dpR $ii /tmpfs ;;
! esac
! done
! cd /tmpfs
! mkdir initrd
! [ "$VERBOSE" ] && Lecho "Pivoting..."
! pivot_root . initrd
! mount -t proc procfs /proc
! mount -t sysfs sysfs /sys
! cd /
[ "$VERBOSE" ] && Lecho "Generating default dirs..."
--- 136,161 ----
# Added by J. Nilo: Create a dynamic TMPFS
# Initialize tmpfs_size with default
! #qt mkdir /tmpfs
! #Lecho "Mounting a $syst_size TMPFS filesystem..."
! #qt mount -t tmpfs root /tmpfs -o size=$syst_size
! #qt umount /proc
! #qt umount /sys
! #for ii in /*
! #do
! # case $ii in
! # /tmpfs) ;;
! # *) qt cp -dpR $ii /tmpfs ;;
! # esac
! #done
! #cd /tmpfs
! #mkdir initrd
!
! #pivot: unneeded
! #[ "$VERBOSE" ] && Lecho "Pivoting..."
! #pivot_root . initrd
!
! #mount -t proc procfs /proc
! #mount -t sysfs sysfs /sys
! #cd /tmpfs
[ "$VERBOSE" ] && Lecho "Generating default dirs..."
***************
*** 174,179 ****
qt mount -t tmpfs tmpfs /var/log -o size=$log_size
! [ "$VERBOSE" ] && Lecho "Populating /dev..."
! source $PFX/root.dev.mk
#Set some permissions
--- 177,182 ----
qt mount -t tmpfs tmpfs /var/log -o size=$log_size
! #[ "$VERBOSE" ] && Lecho "Populating /dev..."
! #source $PFX/root.dev.mk
#Set some permissions
***************
*** 308,312 ****
Lecho "Loaded Packages"
! exec /usr/sbin/chroot . sh -c 'umount /initrd; freeramdisk /dev/ram0; exec
/sbin/init' <dev/console >dev/console 2>&1
exit 0
--- 311,316 ----
Lecho "Loaded Packages"
! #exec /usr/sbin/chroot . sh -c 'umount /initrd; freeramdisk /dev/ram0; exec
/sbin/init' <dev/console >dev/console 2>&1
! exec /usr/sbin/chroot . /sbin/init
exit 0
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg 6 Jun 2010 19:15:19 -0000 1.4
--- buildtool.cfg 12 Jun 2010 16:31:51 -0000 1.5
***************
*** 23,26 ****
--- 23,32 ----
</File>
+ #<File root2.linuxrc>
+ # Server = cvs4-sourceforge
+ # Revision = HEAD
+ # Directory = initrd
+ #</File>
+
<File README>
Server = cvs4-sourceforge
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/buildtool.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildtool.mk 12 Jun 2010 11:13:12 -0000 1.6
--- buildtool.mk 12 Jun 2010 16:31:51 -0000 1.7
***************
*** 4,8 ****
INITRD_DIR=.
INITRD_TARGET_DIR:=$(BT_BUILD_DIR)/config
! #BT_KERNEL_VER=`ls $(BT_STAGING_DIR)/lib/modules/|grep
$(BT_KERNEL_RELEASE)|sort -r -V|head -n 1`
$(INITRD_DIR)/.source:
--- 4,8 ----
INITRD_DIR=.
INITRD_TARGET_DIR:=$(BT_BUILD_DIR)/config
! BT_KERNEL_VER=`ls $(BT_STAGING_DIR)/lib/modules/|grep
$(BT_KERNEL_RELEASE)|sort -r -V|head -n 1`
$(INITRD_DIR)/.source:
***************
*** 18,50 ****
mkdir -p $(INITRD_TARGET_DIR)/var/lib/lrpkg
mkdir -p $(INITRD_TARGET_DIR)/boot/etc
! BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE)
\
sh $(BT_TOOLS_DIR)/getdep.sh floppy fat>mod.floppy
cat mod.floppy|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.floppy
-rm -f files.floppy
! (BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE); 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_RELEASE)
\
sh $(BT_TOOLS_DIR)/getdep.sh "ata_.*" ahci sd_mod
vfat>mod.ide
cat mod.ide|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.ide
-rm -f files.ide
! (BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE); 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_RELEASE)
\
sh $(BT_TOOLS_DIR)/getdep.sh "ata_.*" ahci sd_mod sr_mod
isofs vfat floppy>mod.cd
cat mod.cd|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.cd
-rm -f files.cd
! (BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE); 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_RELEASE)
\
sh $(BT_TOOLS_DIR)/getdep.sh ehci-hcd uhci-hcd ohci-hcd
usb-storage sd_mod vfat>mod.usb
cat mod.cd|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.usb
-rm -f files.usb
! (BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE); 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)
--- 18,50 ----
mkdir -p $(INITRD_TARGET_DIR)/var/lib/lrpkg
mkdir -p $(INITRD_TARGET_DIR)/boot/etc
! BT_STAGING_DIR=$(BT_STAGING_DIR) BT_KERNEL_RELEASE=$(BT_KERNEL_VER) \
sh $(BT_TOOLS_DIR)/getdep.sh floppy fat>mod.floppy
cat mod.floppy|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.floppy
-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) \
sh $(BT_TOOLS_DIR)/getdep.sh "ata_.*" ahci sd_mod
vfat>mod.ide
cat mod.ide|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.ide
-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) \
sh $(BT_TOOLS_DIR)/getdep.sh "ata_.*" ahci sd_mod sr_mod
isofs vfat floppy>mod.cd
cat mod.cd|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.cd
-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) \
sh $(BT_TOOLS_DIR)/getdep.sh ehci-hcd uhci-hcd ohci-hcd
usb-storage sd_mod vfat>mod.usb
cat mod.cd|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules.usb
-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)
***************
*** 54,57 ****
--- 54,58 ----
cp -a root.dev.mk $(INITRD_TARGET_DIR)/var/lib/lrpkg
cp -a root.linuxrc $(INITRD_TARGET_DIR)/var/lib/lrpkg
+ # cp -a root2.linuxrc $(INITRD_TARGET_DIR)/var/lib/lrpkg
cp -a $(INITRD_TARGET_DIR)/* $(BT_STAGING_DIR)
touch $(INITRD_DIR)/.build
Index: common.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/common.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** common.cfg 5 Jun 2010 23:34:27 -0000 1.2
--- common.cfg 12 Jun 2010 16:31:51 -0000 1.3
***************
*** 102,106 ****
</File>
<File>
! Filename = linuxrc
Target = var/lib/lrpkg/root.linuxrc
Type = link
--- 102,106 ----
</File>
<File>
! Filename = init
Target = var/lib/lrpkg/root.linuxrc
Type = link
------------------------------------------------------------------------------
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
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
