deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

system: do not set hostname and issue for custom skeleton

Browse source 
We expect the custom skeleton to be fully filled with the necessary
files, now. There is definitely no reason we should handle setting the
hostname and the issue file 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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2016-07-17 10:44:28 +02:00 committed by Thomas Petazzoni
parent 65329a1024
commit 8c8b9b6ad7
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/skeleton/skeleton.mk
View file

@ -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"; \

4
system/Config.in
View file

@ -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