From 65329a102485c7a760a0129643b128f44c73c0f4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 10:44:27 +0200 Subject: [PATCH] system: do not handle network settings for custom skeleton We expect the custom skeleton to be fully filled with the necessary files, now. There is definitely no reason we should handle network settings in there. A user using a custom skeleton should be fully responsible for providing a functional skeleton. Signed-off-by: "Yann E. MORIN" Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/skeleton/skeleton.mk | 8 ++++---- system/Config.in | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index d580fcbfff..43496202c3 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -141,6 +141,10 @@ endef TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE endif +# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the +# default skeleton. +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) + define SKELETON_SET_NETWORK_LOCALHOST ( \ echo "# interface file auto-generated by buildroot"; \ @@ -174,10 +178,6 @@ endef TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK -# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the -# default skeleton. -ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) - ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y) ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),) SKELETON_ROOT_PASSWORD = diff --git a/system/Config.in b/system/Config.in index 5549318bcb..d9a9dfb06a 100644 --- a/system/Config.in +++ b/system/Config.in @@ -357,9 +357,6 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW read-only. If unsure, say Y. -endif # BR2_ROOTFS_SKELETON_DEFAULT - - config BR2_SYSTEM_DHCP string "Network interface to configure through DHCP" default "" @@ -379,6 +376,8 @@ comment "automatic network configuration via DHCP is not compatible with network comment "automatic network configuration via DHCP needs ifupdown or busybox" depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN) +endif # BR2_ROOTFS_SKELETON_DEFAULT + config BR2_TARGET_TZ_INFO bool "Install timezone info" # No timezone for musl; only for uClibc or glibc. -- 2.30.2