package/skeleton: add macro to rsync skeleton directory
The rsync command is currently called from a single location. In follow-up patches, it will be called from various places then. It will be easier to update and fix this command if it is defined in a single location, rather than if duplicated in many places. Define a macro that skeleton packages can call to install their skeleton directories. Since at least one occurrence of it will want to install in staging, the macro must accept a destination path, rather than hard-code target as the destination. Since it is to be used by other skeleton packages, define it early, outside of any conditional block. 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:
parent
3e5eb71067
commit
cabba017d3
@ -14,6 +14,18 @@ SKELETON_ADD_SKELETON_DEPENDENCY = NO
|
||||
# The skeleton also handles the merged /usr case in the sysroot
|
||||
SKELETON_INSTALL_STAGING = YES
|
||||
|
||||
############
|
||||
# Macros available for use by any skeleton package:
|
||||
# - SKELETON_RSYNC
|
||||
|
||||
# This function rsyncs the skeleton directory in $(1) to the destination
|
||||
# in $(2), which should be either $(TARTGET_DIR) or $(STAGING_DIR)
|
||||
define SKELETON_RSYNC
|
||||
rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
|
||||
--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
|
||||
$(1)/ $(2)/
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
|
||||
|
||||
SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
|
||||
@ -89,9 +101,7 @@ SKELETON_LIB_SYMLINK = lib32
|
||||
endif
|
||||
|
||||
define SKELETON_INSTALL_TARGET_CMDS
|
||||
rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
|
||||
--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
|
||||
$(SKELETON_PATH)/ $(TARGET_DIR)/
|
||||
$(call SKELETON_RSYNC,$(SKELETON_PATH),$(TARGET_DIR))
|
||||
$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
|
||||
ln -snf lib $(TARGET_DIR)/$(SKELETON_LIB_SYMLINK)
|
||||
ln -snf lib $(TARGET_DIR)/usr/$(SKELETON_LIB_SYMLINK)
|
||||
|
Loading…
Reference in New Issue
Block a user