package/skeleton: respect variables namespace
In makefiles, variables have global scope. We traditionally ensure that we get no name clashing by prefixing all variables with the package name. Currently, this is not the case in the skeleton package, for historical reasons (code snippets copied over from the common Makefiles). We currently have a mix of naming for the variables: - some are indeed prefixed with SKELETON_ - some are prefixed with SYSTEM_ - some are prefixed with both - some are not prefixed Clean up these discrepancies, and prefix all variables with just SKELETON_ and drop the SYSTEM_ prefix. Also include SET_ in all variables that do set something (getty) for consistency across all the variables. 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
Thomas Petazzoni
parent
de4b45d5e7
commit
faece0a425
@ -118,24 +118,24 @@ SKELETON_TARGET_GENERIC_GETTY_TERM = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TE
|
||||
SKELETON_TARGET_GENERIC_GETTY_OPTIONS = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_OPTIONS))
|
||||
|
||||
ifneq ($(SKELETON_TARGET_GENERIC_HOSTNAME),)
|
||||
define SYSTEM_HOSTNAME
|
||||
define SKELETON_SET_HOSTNAME
|
||||
mkdir -p $(TARGET_DIR)/etc
|
||||
echo "$(SKELETON_TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
|
||||
$(SED) '$$a \127.0.1.1\t$(SKELETON_TARGET_GENERIC_HOSTNAME)' \
|
||||
-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts
|
||||
endef
|
||||
TARGET_FINALIZE_HOOKS += SYSTEM_HOSTNAME
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SET_HOSTNAME
|
||||
endif
|
||||
|
||||
ifneq ($(SKELETON_TARGET_GENERIC_ISSUE),)
|
||||
define SYSTEM_ISSUE
|
||||
define SKELETON_SET_ISSUE
|
||||
mkdir -p $(TARGET_DIR)/etc
|
||||
echo "$(SKELETON_TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue
|
||||
endef
|
||||
TARGET_FINALIZE_HOOKS += SYSTEM_ISSUE
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE
|
||||
endif
|
||||
|
||||
define SET_NETWORK_LOCALHOST
|
||||
define SKELETON_SET_NETWORK_LOCALHOST
|
||||
( \
|
||||
echo "# interface file auto-generated by buildroot"; \
|
||||
echo ; \
|
||||
@ -144,14 +144,14 @@ define SET_NETWORK_LOCALHOST
|
||||
) > $(TARGET_DIR)/etc/network/interfaces
|
||||
endef
|
||||
|
||||
NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
|
||||
SKELETON_NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
|
||||
|
||||
ifneq ($(NETWORK_DHCP_IFACE),)
|
||||
define SET_NETWORK_DHCP
|
||||
ifneq ($(SKELETON_NETWORK_DHCP_IFACE),)
|
||||
define SKELETON_SET_NETWORK_DHCP
|
||||
( \
|
||||
echo ; \
|
||||
echo "auto $(NETWORK_DHCP_IFACE)"; \
|
||||
echo "iface $(NETWORK_DHCP_IFACE) inet dhcp"; \
|
||||
echo "auto $(SKELETON_NETWORK_DHCP_IFACE)"; \
|
||||
echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp"; \
|
||||
echo " pre-up /etc/network/nfs_check"; \
|
||||
echo " wait-delay 15"; \
|
||||
) >> $(TARGET_DIR)/etc/network/interfaces
|
||||
@ -160,13 +160,13 @@ define SET_NETWORK_DHCP
|
||||
endef
|
||||
endif
|
||||
|
||||
define SET_NETWORK
|
||||
define SKELETON_SET_NETWORK
|
||||
mkdir -p $(TARGET_DIR)/etc/network/
|
||||
$(SET_NETWORK_LOCALHOST)
|
||||
$(SET_NETWORK_DHCP)
|
||||
$(SKELETON_SET_NETWORK_LOCALHOST)
|
||||
$(SKELETON_SET_NETWORK_DHCP)
|
||||
endef
|
||||
|
||||
TARGET_FINALIZE_HOOKS += SET_NETWORK
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK
|
||||
|
||||
# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the
|
||||
# default skeleton.
|
||||
@ -174,66 +174,66 @@ ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
|
||||
|
||||
ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y)
|
||||
ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),)
|
||||
SYSTEM_ROOT_PASSWORD =
|
||||
SKELETON_ROOT_PASSWORD =
|
||||
else ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)),)
|
||||
SYSTEM_ROOT_PASSWORD = '$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)'
|
||||
SKELETON_ROOT_PASSWORD = '$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)'
|
||||
else
|
||||
SKELETON_DEPENDENCIES += host-mkpasswd
|
||||
# This variable will only be evaluated in the finalize stage, so we can
|
||||
# be sure that host-mkpasswd will have already been built by that time.
|
||||
SYSTEM_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_TARGET_GENERIC_PASSWD_METHOD)" "$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)"`"
|
||||
SKELETON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_TARGET_GENERIC_PASSWD_METHOD)" "$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)"`"
|
||||
endif
|
||||
else # !BR2_TARGET_ENABLE_ROOT_LOGIN
|
||||
SYSTEM_ROOT_PASSWORD = "*"
|
||||
SKELETON_ROOT_PASSWORD = "*"
|
||||
endif
|
||||
|
||||
define SKELETON_SYSTEM_SET_ROOT_PASSWD
|
||||
$(SED) s,^root:[^:]*:,root:$(SYSTEM_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow
|
||||
define SKELETON_SET_ROOT_PASSWD
|
||||
$(SED) s,^root:[^:]*:,root:$(SKELETON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow
|
||||
endef
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SYSTEM_SET_ROOT_PASSWD
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SET_ROOT_PASSWD
|
||||
|
||||
ifeq ($(BR2_SYSTEM_BIN_SH_NONE),y)
|
||||
define SKELETON_SYSTEM_BIN_SH
|
||||
define SKELETON_BIN_SH
|
||||
rm -f $(TARGET_DIR)/bin/sh
|
||||
endef
|
||||
else
|
||||
define SKELETON_SYSTEM_BIN_SH
|
||||
define SKELETON_BIN_SH
|
||||
ln -sf $(SKELETON_TARGET_GENERIC_BIN_SH) $(TARGET_DIR)/bin/sh
|
||||
endef
|
||||
endif
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SYSTEM_BIN_SH
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_BIN_SH
|
||||
|
||||
ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
|
||||
ifeq ($(BR2_INIT_SYSV),y)
|
||||
# In sysvinit inittab, the "id" must not be longer than 4 bytes, so we
|
||||
# skip the "tty" part and keep only the remaining.
|
||||
define SKELETON_SYSTEM_GETTY
|
||||
define SKELETON_SET_GETTY
|
||||
$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(SKELETON_TARGET_GENERIC_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(SKELETON_TARGET_GENERIC_GETTY_OPTIONS) $(SKELETON_TARGET_GENERIC_GETTY_PORT) $(SKELETON_TARGET_GENERIC_GETTY_BAUDRATE) $(SKELETON_TARGET_GENERIC_GETTY_TERM) #~' \
|
||||
$(TARGET_DIR)/etc/inittab
|
||||
endef
|
||||
else ifeq ($(BR2_INIT_BUSYBOX),y)
|
||||
# Add getty to busybox inittab
|
||||
define SKELETON_SYSTEM_GETTY
|
||||
define SKELETON_SET_GETTY
|
||||
$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(SKELETON_TARGET_GENERIC_GETTY_PORT)::respawn:/sbin/getty -L $(SKELETON_TARGET_GENERIC_GETTY_OPTIONS) $(SKELETON_TARGET_GENERIC_GETTY_PORT) $(SKELETON_TARGET_GENERIC_GETTY_BAUDRATE) $(SKELETON_TARGET_GENERIC_GETTY_TERM) #~' \
|
||||
$(TARGET_DIR)/etc/inittab
|
||||
endef
|
||||
endif
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SYSTEM_GETTY
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SET_GETTY
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_INIT_BUSYBOX)$(BR2_INIT_SYSV),y)
|
||||
ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
|
||||
# Find commented line, if any, and remove leading '#'s
|
||||
define SKELETON_SYSTEM_REMOUNT_RW
|
||||
define SKELETON_REMOUNT_RW
|
||||
$(SED) '/^#.*-o remount,rw \/$$/s~^#\+~~' $(TARGET_DIR)/etc/inittab
|
||||
endef
|
||||
else
|
||||
# Find uncommented line, if any, and add a leading '#'
|
||||
define SKELETON_SYSTEM_REMOUNT_RW
|
||||
define SKELETON_REMOUNT_RW
|
||||
$(SED) '/^[^#].*-o remount,rw \/$$/s~^~#~' $(TARGET_DIR)/etc/inittab
|
||||
endef
|
||||
endif
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_SYSTEM_REMOUNT_RW
|
||||
TARGET_FINALIZE_HOOKS += SKELETON_REMOUNT_RW
|
||||
endif # BR2_INIT_BUSYBOX || BR2_INIT_SYSV
|
||||
|
||||
endif # BR2_ROOTFS_SKELETON_DEFAULT
|
||||
|
||||
Loading…
Reference in New Issue
Block a user