diff options
| -rw-r--r-- | package/skeleton/skeleton.mk | 8 | ||||
| -rw-r--r-- | system/Config.in | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 43496202c..1000161c3 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -113,6 +113,10 @@ define SKELETON_INSTALL_STAGING_CMDS ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK) endef +# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the +# default skeleton. +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) + SKELETON_TARGET_GENERIC_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) SKELETON_TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE)) SKELETON_TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD)) @@ -141,10 +145,6 @@ 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"; \ diff --git a/system/Config.in b/system/Config.in index d9a9dfb06..4c05186fc 100644 --- a/system/Config.in +++ b/system/Config.in @@ -28,6 +28,8 @@ config BR2_ROOTFS_MERGED_USR endif +if BR2_ROOTFS_SKELETON_DEFAULT + config BR2_TARGET_GENERIC_HOSTNAME string "System hostname" default "buildroot" @@ -46,6 +48,8 @@ config BR2_TARGET_GENERIC_ISSUE Leave empty to not create /etc/issue, or to keep the one from a custom skeleton. +endif + choice bool "Passwords encoding" default BR2_TARGET_GENERIC_PASSWD_MD5 |