|
@@ -14,57 +14,14 @@ SKELETON_ADD_SKELETON_DEPENDENCY = NO
|
|
# The skeleton also handles the merged /usr case in the sysroot
|
|
# The skeleton also handles the merged /usr case in the sysroot
|
|
SKELETON_INSTALL_STAGING = YES
|
|
SKELETON_INSTALL_STAGING = YES
|
|
|
|
|
|
-ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
|
|
|
|
|
|
+ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM),y)
|
|
|
|
|
|
-SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
|
|
|
|
-
|
|
|
|
-ifeq ($(BR_BUILDING),y)
|
|
|
|
-ifeq ($(SKELETON_PATH),)
|
|
|
|
-$(error No path specified for the custom skeleton)
|
|
|
|
-endif
|
|
|
|
-endif
|
|
|
|
-
|
|
|
|
-ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
|
|
|
-
|
|
|
|
-# Ensure the user has prepared a merged /usr.
|
|
|
|
-#
|
|
|
|
-# Extract the inode numbers for all of those directories. In case any is
|
|
|
|
-# a symlink, we want to get the inode of the pointed-to directory, so we
|
|
|
|
-# append '/.' to be sure we get the target directory. Since the symlinks
|
|
|
|
-# can be anyway (/bin -> /usr/bin or /usr/bin -> /bin), we do that for
|
|
|
|
-# all of them.
|
|
|
|
-#
|
|
|
|
-SKELETON_LIB_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/lib/.)
|
|
|
|
-SKELETON_BIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/bin/.)
|
|
|
|
-SKELETON_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/sbin/.)
|
|
|
|
-SKELETON_USR_LIB_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/lib/.)
|
|
|
|
-SKELETON_USR_BIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/bin/.)
|
|
|
|
-SKELETON_USR_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/sbin/.)
|
|
|
|
-
|
|
|
|
-ifneq ($(SKELETON_LIB_INODE),$(SKELETON_USR_LIB_INODE))
|
|
|
|
-SKELETON_CUSTOM_NOT_MERGED_USR += /lib
|
|
|
|
-endif
|
|
|
|
-ifneq ($(SKELETON_BIN_INODE),$(SKELETON_USR_BIN_INODE))
|
|
|
|
-SKELETON_CUSTOM_NOT_MERGED_USR += /bin
|
|
|
|
-endif
|
|
|
|
-ifneq ($(SKELETON_SBIN_INODE),$(SKELETON_USR_SBIN_INODE))
|
|
|
|
-SKELETON_CUSTOM_NOT_MERGED_USR += /sbin
|
|
|
|
-endif
|
|
|
|
-
|
|
|
|
-ifneq ($(SKELETON_CUSTOM_NOT_MERGED_USR),)
|
|
|
|
-$(error The custom skeleton in $(SKELETON_PATH) is not \
|
|
|
|
- using a merged /usr for the following directories: \
|
|
|
|
- $(SKELETON_CUSTOM_NOT_MERGED_USR))
|
|
|
|
-endif
|
|
|
|
-
|
|
|
|
-endif # merged /usr
|
|
|
|
|
|
+SKELETON_DEPENDENCIES = skeleton-custom
|
|
|
|
|
|
else # ! custom skeleton
|
|
else # ! custom skeleton
|
|
|
|
|
|
SKELETON_PATH = system/skeleton
|
|
SKELETON_PATH = system/skeleton
|
|
|
|
|
|
-endif # ! custom skeleton
|
|
|
|
-
|
|
|
|
define SKELETON_INSTALL_TARGET_CMDS
|
|
define SKELETON_INSTALL_TARGET_CMDS
|
|
$(call SYSTEM_RSYNC,$(SKELETON_PATH),$(TARGET_DIR))
|
|
$(call SYSTEM_RSYNC,$(SKELETON_PATH),$(TARGET_DIR))
|
|
$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
|
|
$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
|
|
@@ -86,10 +43,6 @@ define SKELETON_INSTALL_STAGING_CMDS
|
|
$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
|
|
$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
|
|
endef
|
|
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_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
|
|
SKELETON_TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
|
|
SKELETON_TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
|
|
SKELETON_TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
|
|
SKELETON_TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
|