Changeset 3332

Show
Ignore:
Timestamp:
07/23/07 19:13:24 (1 year ago)
Author:
tg
Message:

• while the no-needing of instprep.sh was done for all of the

initramfs targets, I've now actually tested it with rb-2.6,
yaffs2-nand, ext2fs-cf, tarball-nfs, and it worked; thusly,
that script is superfluous IMHO
(if this introduced breakage, tell me and I'll fix it)

• use '…' or "…" or ‘…’ or “…” but *NEVER* \`…' or I'll come to you!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/fwupdate/Makefile

    r2572 r3332  
    88 
    99PKG_NAME:=              fwupdate 
    10 PKG_VERSION:=           1.0 
     10PKG_VERSION:=           20070723 
    1111PKG_RELEASE:=           1 
    1212NO_DISTFILES:=          1 

  • trunk/freewrt/package/fwupdate/files/fs-tar.sh

    r2585 r3332  
    1515 
    1616        if mount -o bind / $t; then 
    17                 tar xUzf $IMAGE_FILE $TAREXCL -C $t && \ 
    18                     sh $t/instprep.sh || allfine=false 
     17                tar xUzf $IMAGE_FILE $TAREXCL -C $t || allfine=false 
    1918                umount $t || allfine=false 
    2019        fi 

  • trunk/freewrt/target/image/brcm/Makefile

    r3331 r3332  
    1111 
    1212ifeq ($(FS),nfs) 
    13 INSTPREPSCRIPT = instprep.sh 
    1413NFS_DOC_URL = https://www.freewrt.org/trac/wiki/Documentation/Filesystems/NFS 
    15  
    16 instprep-script: 
    17         install -m 0755 $(TOPDIR)/scripts/$(INSTPREPSCRIPT) $(KDIR)/root/ 
    18         $(SED) 's/@@TARGET_FS@@/$(FS)/' $(KDIR)/root/$(INSTPREPSCRIPT) 
    1914 
    2015kernel-install: 
    2116        install -m 0755 $(KDIR)/vmlinux $(KDIR)/root/kernel 
    2217 
    23 install-prepare_DEPS=  instprep-script kernel-install 
     18install-prepare_DEPS+= kernel-install 
    2419 
    2520install-prepare-md: 
    …… 
    3126        @echo 
    3227        @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," 
    33         @echo "you will find the matching kernel inside inside it's root, named \`kernel'" 
     28        @echo "you will find the matching kernel inside inside it's root, named 'kernel'" 
    3429        @echo 
    3530        @echo "BEWARE: create a subdirectory and unpack inside, or you will be surprised!" 
    36         @echo 
    37         @echo "Due to the fact that the RootFS was created as non-root, it needs some" 
    38         @echo "preparation to be usable. Therefore all you need to do is execute the shell" 
    39         @echo "script called $(INSTPREPSCRIPT) as root." 
     31        @echo You must unpack as root due to permission issues. 
    4032        @echo 
    4133        @echo "A sample dhcpd.conf can be found inside $(TOPDIR)/docs/nfsroot." 

  • trunk/freewrt/target/image/rb/Makefile

    r3331 r3332  
    1010KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) 
    1111 
    12 INSTPREPSCRIPT = instprep.sh 
    1312NFS_DOC_URL = https://www.freewrt.org/trac/wiki/Documentation/Filesystems/NFS 
    1413CF_DOC_URL = https://www.freewrt.org/trac/wiki/Documentation/Filesystems/CompactFlash 
    …… 
    1615KSIZE = $(shell du -b $(KDIR)/vmlinux | awk '{print $1}') 
    1716 
    18 instprep-script: 
    19         install -m 0755 $(TOPDIR)/scripts/$(INSTPREPSCRIPT) $(KDIR)/root/instprep.sh 
    20         $(SED) 's/@@TARGET_FS@@/$(FS)/' $(KDIR)/root/instprep.sh 
    21  
    2217kernel-install: 
    2318        install -m 0755 $(BUILD_DIR)/linux/vmlinux $(KDIR)/root/kernel 
    2419 
    25 ifeq ($(strip ${FWRT_TARGET_NOKERNEL})$(strip ${FWRT_TARGET_ROOTFS_INITRAMFS}),) 
    26 install-prepare_DEPS+=  instprep-script 
    27 endif 
    2820install-prepare_DEPS+=  install-prepare 
    2921ifeq ($(strip ${FWRT_TARGET_NOKERNEL})$(strip ${FWRT_TARGET_ROOTFS_INITRAMFS}),) 
    …… 
    4032        @echo 
    4133        @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," 
    42         @echo "you will find the matching kernel inside inside it's root, named \`kernel'" 
     34        @echo "you will find the matching kernel inside inside it's root, named 'kernel'" 
    4335        @echo 
    4436        @echo "BEWARE: create a subdirectory and unpack inside, or you will be surprised!" 
    45         @echo 
    46         @echo "Due to the fact that the RootFS was created as non-root, it needs some" 
    47         @echo "preparation to be usable. Therefore all you need to do is execute the shell" 
    48         @echo "script called $(INSTPREPSCRIPT) as root." 
     37        @echo You must unpack as root due to permission issues. 
    4938        @echo 
    5039        @echo "A sample dhcpd.conf can be found inside $(TOPDIR)/docs/nfsroot." 
    …… 
    5948        @echo 
    6049        @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," 
    61         @echo "you will find the matching kernel inside inside it's root, named \`kernel'" 
     50        @echo "you will find the matching kernel inside inside it's root, named 'kernel'" 
    6251        @echo 
    6352        @echo "BEWARE: create a subdirectory and unpack inside, or you will be surprised!" 
    64         @echo 
    65         @echo "Due to the fact that the RootFS was created as non-root, it needs some" 
    66         @echo "preparation to be usable. Therefore all you need to do is execute the shell" 
    67         @echo "script called $(INSTPREPSCRIPT) as root." 
     53        @echo You must unpack as root due to permission issues. 
    6854        @echo 
    6955        @echo "To install everything to CompactFlash, create two partitions on it." 
    7056        @echo "First with type 0x27, second with type 0x83. Unpack the rootfs-tarball into" 
    71         @echo "partition 2, then use \`dd' to write the kernel into the (raw) first partition." 
     57        @echo "partition 2, then use 'dd' to write the kernel into the (raw) first partition." 
    7258        @echo "For more info check $(CF_DOC_URL)" 
    7359endif 
    …… 
    7763        @echo 
    7864        @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," 
    79         @echo "you will find the matching kernel inside inside it's root, named \`kernel'" 
     65        @echo "you will find the matching kernel inside inside it's root, named 'kernel'" 
    8066        @echo 
    8167        @echo "BEWARE: create a subdirectory and unpack inside, or you will be surprised!" 
    82         @echo 
    83         @echo "Due to the fact that the RootFS was created as non-root, it needs some" 
    84         @echo "preparation to be usable. Therefore all you need to do is execute the shell" 
    85         @echo "script called $(INSTPREPSCRIPT) as root." 
     68        @echo You must unpack as root due to permission issues. 
    8669        @echo 
    8770        @echo "To install everything to Flash, copy the tarball into the RootFS of an" 
    8871        @echo "already installed CompactFlash disk or RootFS for use with nfsroot." 
    8972        @echo "After booting the target system, mount the second Flash partition, and" 
    90         @echo "extract the RootFS tarball into it. Then execude $(INSTPREPSCRIPT), which" 
    91         @echo "will also copy over the kernel for you." 
     73        @echo "extract the RootFS tarball into it. Then mount the first Flash partition" 
     74        @echo "and copy over the kernel." 
    9275endif 
    9376 

  • trunk/freewrt/target/image/x86/Makefile

    r3331 r3332  
    1010KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) 
    1111 
    12 INSTPREPSCRIPT = instprep.sh 
    1312CF_DOC_URL = https://www.freewrt.org/trac/wiki/Documentation/Filesystems/CompactFlash 
    1413 
    1514KSIZE = $(shell du -b $(KDIR)/vmlinux | awk '{print $1}') 
    16  
    17 instprep-script: 
    18         install -m 0755 $(TOPDIR)/scripts/$(INSTPREPSCRIPT) $(KDIR)/root/instprep.sh 
    19         $(SED) 's/@@TARGET_FS@@/$(FS)/' $(KDIR)/root/instprep.sh 
    2015 
    2116kernel-install: 
    …… 
    3328        @echo 
    3429        @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," 
    35         @echo "you will find the matching kernel inside inside it's root, named \`kernel'" 
     30        @echo "you will find the matching kernel inside inside it's root, named 'kernel'" 
    3631        @echo 
    3732        @echo "BEWARE: create a subdirectory and unpack inside, or you will be surprised!" 
    38         @echo 
    39         @echo "Due to the fact that the RootFS was created as non-root, it needs some" 
    40         @echo "preparation to be usable. Therefore all you need to do is execute the shell" 
    41         @echo "script called $(INSTPREPSCRIPT) as root." 
     33        @echo You must unpack as root due to permission issues. 
    4234        @echo 
    4335        @echo "To install everything to CompactFlash, create a partition on it."