Author: florian Date: 2016-02-11 04:05:29 +0100 (Thu, 11 Feb 2016) New Revision: 48689
Modified: trunk/include/kernel-defaults.mk Log: kernel: Revert "kernel: set root on NFS when enabled" This reverts r48591, users needing NFS root will know how to configure their platform and kernel command-line appropriately. Reported-by: Petr ?\197?\160tetiar <[email protected]> Signed-off-by: Florian Fainelli <[email protected]> Modified: trunk/include/kernel-defaults.mk =================================================================== --- trunk/include/kernel-defaults.mk 2016-02-10 11:35:50 UTC (rev 48688) +++ trunk/include/kernel-defaults.mk 2016-02-11 03:05:29 UTC (rev 48689) @@ -104,18 +104,6 @@ echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config.set endef -ifeq ($(CONFIG_KERNEL_ROOT_NFS),y) - define Kernel/SetNfsCmdline - rm -f $(LINUX_DIR)/.config.prev - mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old - grep -v "CONFIG_CMDLINE=" $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config - grep "CONFIG_CMDLINE=" $(LINUX_DIR)/.config.old | cut -d\" -f2 | sed 's/root=\/dev\/\([a-z0-9]*\)\(.*\)/CONFIG_CMDLINE=\"root=\/dev\/nfs ip=dhcp\2\"/' >> $(LINUX_DIR)/.config - endef -else - define Kernel/SetNfsCmdline - endef -endif - define Kernel/Configure/Default $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target # copy CONFIG_KERNEL_* settings over to .config.target @@ -126,7 +114,6 @@ $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set $(call Kernel/SetNoInitramfs) - $(call Kernel/SetNfsCmdline) rm -rf $(KERNEL_BUILD_DIR)/modules cmp -s $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev || { \ cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
