|
@@ -23,33 +23,11 @@ $(error No path specified for the custom skeleton)
|
|
|
endif
|
|
|
endif
|
|
|
|
|
|
-# 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_CUSTOM_LIB_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/lib/. 2>/dev/null)
|
|
|
-SKELETON_CUSTOM_BIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/bin/. 2>/dev/null)
|
|
|
-SKELETON_CUSTOM_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/sbin/. 2>/dev/null)
|
|
|
-SKELETON_CUSTOM_USR_LIB_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/lib/. 2>/dev/null)
|
|
|
-SKELETON_CUSTOM_USR_BIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/bin/. 2>/dev/null)
|
|
|
-SKELETON_CUSTOM_USR_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/sbin/. 2>/dev/null)
|
|
|
-
|
|
|
# For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
|
|
|
# counterparts are appropriately setup as symlinks ones to the others.
|
|
|
ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
|
|
-
|
|
|
-ifneq ($(SKELETON_CUSTOM_LIB_INODE),$(SKELETON_CUSTOM_USR_LIB_INODE))
|
|
|
-SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /lib
|
|
|
-endif
|
|
|
-ifneq ($(SKELETON_CUSTOM_BIN_INODE),$(SKELETON_CUSTOM_USR_BIN_INODE))
|
|
|
-SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /bin
|
|
|
-endif
|
|
|
-ifneq ($(SKELETON_CUSTOM_SBIN_INODE),$(SKELETON_CUSTOM_USR_SBIN_INODE))
|
|
|
-SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /sbin
|
|
|
-endif
|
|
|
-
|
|
|
+SKELETON_CUSTOM_NOT_MERGED_USR_DIRS = \
|
|
|
+ $(shell support/scripts/check-merged-usr.sh $(SKELETON_CUSTOM_PATH))
|
|
|
endif # merged /usr
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy)
|