Update of /cvsroot/leaf/src/bering-uclibc4/source/initrd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31778
Modified Files:
buildtool.mk
Log Message:
Fixed build error on old coreutils
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/buildtool.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.mk 10 Jun 2010 20:51:21 -0000 1.5
--- buildtool.mk 12 Jun 2010 11:13:12 -0000 1.6
***************
*** 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_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)
--- 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)
------------------------------------------------------------------------------
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
