mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
428ac6fcc4
Starting with version 256 [0], systemd warns when /usr/bin and /usr/sbin are different directories; in the future, it may even refuse to boot in such a situation. Add support for merged-bin, not unlike the support we have for merged-usr; we also make merged-bin a sub-case of merged-usr (i.e. it is not possible to do merged-bin without merged-usr). [0] https://github.com/systemd/systemd/blob/v256/NEWS#L265 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Acked-by: Arnout Vandecappelle <arnout@mind.be> Acked-by: TIAN Yuanhao <tianyuanhao3@163.com> Cc: Edgar Bonet <bonet@grenoble.cnrs.fr> Signed-off-by: Romain Naour <romain.naour@smile.fr>
53 lines
1.8 KiB
Makefile
53 lines
1.8 KiB
Makefile
################################################################################
|
|
#
|
|
# skeleton-custom
|
|
#
|
|
################################################################################
|
|
|
|
# The skeleton can't depend on the toolchain, since all packages depends on the
|
|
# skeleton and the toolchain is a target package, as is skeleton.
|
|
# Hence, skeleton would depends on the toolchain and the toolchain would depend
|
|
# on skeleton.
|
|
SKELETON_CUSTOM_ADD_TOOLCHAIN_DEPENDENCY = NO
|
|
SKELETON_CUSTOM_ADD_SKELETON_DEPENDENCY = NO
|
|
|
|
SKELETON_CUSTOM_PROVIDES = skeleton
|
|
|
|
SKELETON_CUSTOM_INSTALL_STAGING = YES
|
|
|
|
SKELETON_CUSTOM_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
|
|
|
|
ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy)
|
|
ifeq ($(SKELETON_CUSTOM_PATH),)
|
|
$(error No path specified for the custom skeleton)
|
|
endif
|
|
endif
|
|
|
|
define SKELETON_CUSTOM_CONFIGURE_CMDS
|
|
support/scripts/check-merged \
|
|
--type skeleton \
|
|
$(if $(BR2_ROOTFS_MERGED_USR),--merged-usr) \
|
|
$(if $(BR2_ROOTFS_MERGED_BIN),--merged-bin) \
|
|
$(SKELETON_CUSTOM_PATH)
|
|
endef
|
|
|
|
# The target-dir-warning file and the lib{32,64} symlinks are the only
|
|
# things we customise in the custom skeleton.
|
|
define SKELETON_CUSTOM_INSTALL_TARGET_CMDS
|
|
$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(TARGET_DIR))
|
|
$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
|
|
$(call SYSTEM_LIB_SYMLINK,$(TARGET_DIR))
|
|
$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
|
|
$(TARGET_DIR_WARNING_FILE)
|
|
endef
|
|
|
|
# For the staging dir, we don't really care what we install, but we
|
|
# need the /lib and /usr/lib appropriately setup.
|
|
define SKELETON_CUSTOM_INSTALL_STAGING_CMDS
|
|
$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(STAGING_DIR))
|
|
$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
|
|
$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
|
|
endef
|
|
|
|
$(eval $(generic-package))
|