Changeset 926


Ignore:
Timestamp:
Jan 26, 2017, 7:57:32 PM (3 months ago)
Author:
amain
Message:

lede: fix patch 025

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/patches/lede/all/025_make_empty_rootfs

    r924 r926  
    11diff --git a/include/image.mk b/include/image.mk
    2 index 81519cd..c4021ed 100644
     2index 81519cd..a5f89ca 100644
    33--- a/include/image.mk
    44+++ b/include/image.mk
     
    99-define Image/mkfs/squashfs
    1010+ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
    11 +       define Image/mkfs/squashfs
     11+    define Image/mkfs/squashfs
    1212+       # kexec and LABEL= boot
    1313+       @mkdir -p $(call mkfs_target_dir,$(1))/overlay
     
    2121                $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
    2222-endef
    23 +       endef
     23+    endef
    2424+else
    25 +       define Image/mkfs/squashfs
     25+    define Image/mkfs/squashfs
    2626+       # boot direclty from device
    2727+       mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
     
    3333+               -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) \
    3434+               $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
    35 +       endef
     35+    endef
    3636+endif
    3737 
    3838 # $(1): board name
    3939 # $(2): rootfs type
     40@@ -552,6 +571,17 @@ define BuildImage
     41   endif
     42 
     43   kernel_prepare: image_prepare
     44+ifneq ($(CONFIG_IMAGE_CMDLINE_HACK),y)
     45+       if [ ! -e $(STAGING_DIR_HOST)/bin/patch-cmdline.bin ]; then \
     46+           mv $(STAGING_DIR_HOST)/bin/patch-cmdline $(STAGING_DIR_HOST)/bin/patch-cmdline.bin; \
     47+           echo "#!/bin/sh" > $(STAGING_DIR_HOST)/bin/patch-cmdline; \
     48+           chmod +x $(STAGING_DIR_HOST)/bin/patch-cmdline; \
     49+       fi
     50+else
     51+       if [ -e $(STAGING_DIR_HOST)/bin/patch-cmdline.bin ]; then \
     52+           mv $(STAGING_DIR_HOST)/bin/patch-cmdline.bin $(STAGING_DIR_HOST)/bin/patch-cmdline; \
     53+       fi
     54+endif
     55        $(call Image/Build/targz)
     56        $(call Image/Build/cpiogz)
     57        $(call Image/BuildKernel)
Note: See TracChangeset for help on using the changeset viewer.