Changeset 926 for trunk/openwrt/patches/lede/all/025_make_empty_rootfs

Timestamp:

Jan 26, 2017, 7:57:32 PM (5 years ago)

Author:

amain

Message:

lede: fix patch 025

File:

• trunk/openwrt/patches/lede/all/025_make_empty_rootfs (modified) (4 diffs)

trunk/openwrt/patches/lede/all/025_make_empty_rootfs

@@ -1 +1 @@
 diff --git a/include/image.mk b/include/image.mk
-index 81519cd..c4021ed 100644
+index 81519cd..a5f89ca 100644
 --- a/include/image.mk
 +++ b/include/image.mk
@@ -9 +9 @@
 -define Image/mkfs/squashfs
 +ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),)
-+       define Image/mkfs/squashfs
++    define Image/mkfs/squashfs
 +       # kexec and LABEL= boot
 +       @mkdir -p $(call mkfs_target_dir,$(1))/overlay
@@ -21 +21 @@
                 $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
 -endef
-+       endef
++    endef
 +else
-+       define Image/mkfs/squashfs
++    define Image/mkfs/squashfs
 +       # boot direclty from device
 +       mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
@@ -33 +33 @@
 +               -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) \
 +               $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
-+       endef
++    endef
 +endif
  
  # $(1): board name
  # $(2): rootfs type
+@@ -552,6 +571,17 @@ define BuildImage
+   endif
+ 
+   kernel_prepare: image_prepare
++ifneq ($(CONFIG_IMAGE_CMDLINE_HACK),y)
++       if [ ! -e $(STAGING_DIR_HOST)/bin/patch-cmdline.bin ]; then \
++           mv $(STAGING_DIR_HOST)/bin/patch-cmdline $(STAGING_DIR_HOST)/bin/patch-cmdline.bin; \
++           echo "#!/bin/sh" > $(STAGING_DIR_HOST)/bin/patch-cmdline; \
++           chmod +x $(STAGING_DIR_HOST)/bin/patch-cmdline; \
++       fi
++else
++       if [ -e $(STAGING_DIR_HOST)/bin/patch-cmdline.bin ]; then \
++           mv $(STAGING_DIR_HOST)/bin/patch-cmdline.bin $(STAGING_DIR_HOST)/bin/patch-cmdline; \
++       fi
++endif
+        $(call Image/Build/targz)
+        $(call Image/Build/cpiogz)
+        $(call Image/BuildKernel)