source: branches/contrib/openwrt/patches/trunk/026_disable_openwrt_kernel_cmdline_hack @ 707

Last change on this file since 707 was 707, checked in by ehem, 5 years ago

Drag in changes to trunk

Coordination is interesting to deal with. Drag in changes that were done
on trunk.

File size: 992 bytes
Line 
1Index: openwrt-octeon-generic-trunk-HEAD/include/image.mk
2===================================================================
3--- openwrt-octeon-generic-trunk-HEAD/include/image.mk  (revision 47046)
4+++ openwrt-octeon-generic-trunk-HEAD/include/image.mk  (working copy)
5@@ -554,6 +554,17 @@
6        $(call Image/mkfs/prepare)
7 
8   kernel_prepare: mkfs_prepare
9+ifneq ($(CONFIG_IMAGE_CMDLINE_HACK),y)
10+       if [ ! -e $(STAGING_DIR_HOST)/bin/patch-cmdline.bin ]; then \
11+          mv $(STAGING_DIR_HOST)/bin/patch-cmdline $(STAGING_DIR_HOST)/bin/patch-cmdline.bin; \
12+          echo "#!/bin/sh" > $(STAGING_DIR_HOST)/bin/patch-cmdline; \
13+          chmod +x $(STAGING_DIR_HOST)/bin/patch-cmdline; \
14+       fi
15+else
16+       if [ -e $(STAGING_DIR_HOST)/bin/patch-cmdline.bin ]; then \
17+          mv $(STAGING_DIR_HOST)/bin/patch-cmdline.bin $(STAGING_DIR_HOST)/bin/patch-cmdline; \
18+       fi
19+endif
20        $(call Image/BuildKernel)
21        $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(if $(IB),,$(call Image/BuildKernel/Initramfs)))
22        $(call Image/InstallKernel)
Note: See TracBrowser for help on using the repository browser.