From mboxrd@z Thu Jan  1 00:00:00 1970
From: Romain Naour <romain.naour@gmail.com>
Date: Sun, 3 Jul 2016 11:00:40 +0200
Subject: [Buildroot] [PATCH 09/24 v2] system: do not handle network
 settings for custom skeleton
In-Reply-To: <91080561a294c3adafc8ea5fb4d05cd205ecd413.1466622379.git.yann.morin.1998@free.fr>
References: <cover.1466622379.git.yann.morin.1998@free.fr>
 <91080561a294c3adafc8ea5fb4d05cd205ecd413.1466622379.git.yann.morin.1998@free.fr>
Message-ID: <46868cfc-7776-4b12-eef7-692c5287643c@gmail.com>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Hi Yann,

Le 22/06/2016 ? 21:07, Yann E. MORIN a ?crit :
> 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" <yann.morin.1998@free.fr>

Reviewed-by: Romain Naour <romain.naour@gmail.com>

Best regards,
Romain


> ---
>  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 3852448..144b759 100644
> --- a/package/skeleton/skeleton.mk
> +++ b/package/skeleton/skeleton.mk
> @@ -138,6 +138,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"; \
> @@ -171,10 +175,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 662443b..c02f394 100644
> --- a/system/Config.in
> +++ b/system/Config.in
> @@ -352,9 +352,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 ""
> @@ -374,6 +371,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 (e)glibc.
>