Changeset 328 for trunk/openwrt/patches


Ignore:
Timestamp:
Feb 15, 2012, 9:16:32 PM (8 years ago)
Author:
amain
Message:

Alternate boot script

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/patches/trunk/005_make_empty_rootfs

    r322 r328  
    1 --- include/image.mk.org        2011-12-15 15:41:28.976641620 +0100
    2 +++ include/image.mk    2011-12-15 15:45:01.149693728 +0100
    3 @@ -89,7 +89,9 @@
     1--- include/image.mk.org        2012-02-15 20:30:10.713220246 +0100
     2+++ include/image.mk    2012-02-15 20:41:49.980687722 +0100
     3@@ -87,12 +87,26 @@
     4   endif
     5 
    46   ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     7+  ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
    58     define Image/mkfs/squashfs
     9+               # boot direclty from device
    610                @mkdir -p $(TARGET_DIR)/overlay
    7 -               $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
    8 +               @mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
    9 +               @touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
     11+               mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
     12+               touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
    1013+               $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TMP_DIR)/debwrt-empty-rootfs/ $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
     14+    endef
     15+  else
     16+    define Image/mkfs/squashfs
     17+               # kexec and LABEL= boot
     18+               @mkdir -p $(TARGET_DIR)/overlay
     19+               ls -l $(TARGET_DIR)
     20+               # remove /lib/modules to prevent the image from getting to big
     21+               rm -rf $(TARGET_DIR)/lib/modules
     22                $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
    1123                $(call Image/Build,squashfs)
    1224     endef
    1325   endif
     26+  endif
     27 
     28   ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
     29     define Image/mkfs/ubifs
Note: See TracChangeset for help on using the changeset viewer.