Changeset 3504

Show
Ignore:
Timestamp:
08/15/07 19:58:40 (1 year ago)
Author:
tg
Message:

fix initramfs-into-kernel-copying

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/kernel-build.mk

    r3503 r3504  
    3535        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-configure 
    3636        $(CP) $(BUILD_DIR)/.fwrtkernelconfig $(LINUX_DIR)/.config 
     37ifneq ($(strip ${FWRT_INITRAMFS_SOURCE}),) 
     38        cd ${TOPDIR} && zcat -f $(strip ${FWRT_INITRAMFS_SOURCE}) \ 
     39            >${LINUX_DIR}/fwrt-initramfs.cpio 
     40        echo 'CONFIG_INITRAMFS_SOURCE="${LINUX_DIR}/fwrt-initramfs.cpio"' >>$@ 
     41endif 
    3742ifeq ($(KERNEL),2.4) 
    3843        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ 
    …… 
    4853 
    4954$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config 
    50 ifneq ($(strip ${FWRT_INITRAMFS_SOURCE}),) 
    51         cd ${TOPDIR} && cp $(strip ${FWRT_INITRAMFS_SOURCE}) \ 
    52             ${LINUX_DIR}/usr/initramfs_data.cpio.gz && \ 
    53             touch ${LINUX_DIR}/usr/initramfs_data.cpio.gz 
    54 endif 
    5555        $(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-compile 
    5656        env GCC_HONOUR_COPTS=s $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) CC="$(TARGET_CC)" $(MAKE_TRACE) HOSTCFLAGS='-O2 -idirafter ${TOPDIR}/scripts' 

  • trunk/freewrt/target/linux/brcm-2.6/kernelconfig

    r3420 r3504  
    168168# CONFIG_RELAY is not set 
    169169CONFIG_BLK_DEV_INITRD=y 
    170 CONFIG_INITRAMFS_SOURCE="" 
    171170CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    172171CONFIG_SYSCTL=y 

  • trunk/freewrt/target/linux/pkgmips-2.6/kernelconfig

    r3335 r3504  
    176176# CONFIG_IKCONFIG is not set 
    177177# CONFIG_RELAY is not set 
    178 CONFIG_INITRAMFS_SOURCE="" 
    179178CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    180179CONFIG_SYSCTL=y 

  • trunk/freewrt/target/linux/rb-2.6/kernelconfig

    r3049 r3504  
    174174# CONFIG_IKCONFIG is not set 
    175175# CONFIG_RELAY is not set 
    176 CONFIG_INITRAMFS_SOURCE="" 
    177176CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    178177CONFIG_SYSCTL=y 

  • trunk/freewrt/target/linux/x86-2.4/ext2-cf/kernelconfig

    r2360 r3504  
    4141# CONFIG_IKCONFIG is not set 
    4242# CONFIG_RELAY is not set 
    43 CONFIG_INITRAMFS_SOURCE="" 
    4443CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    4544CONFIG_SYSCTL=y 

  • trunk/freewrt/target/linux/x86-2.6/ext2-cf/kernelconfig

    r2322 r3504  
    4141# CONFIG_IKCONFIG is not set 
    4242# CONFIG_RELAY is not set 
    43 CONFIG_INITRAMFS_SOURCE="" 
    4443CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    4544CONFIG_SYSCTL=y 

  • trunk/freewrt/target/linux/x86-2.6/initramfs/kernelconfig

    r2364 r3504  
    4141# CONFIG_IKCONFIG is not set 
    4242# CONFIG_RELAY is not set 
    43 CONFIG_INITRAMFS_SOURCE="" 
    4443CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    4544CONFIG_SYSCTL=y 

  • trunk/freewrt/target/linux/x86-2.6/kernelconfig

    r3048 r3504  
    4040# CONFIG_IKCONFIG is not set 
    4141# CONFIG_RELAY is not set 
    42 CONFIG_INITRAMFS_SOURCE="" 
    4342CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    4443CONFIG_SYSCTL=y