package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
################################################################################
|
|
|
|
|
#
|
|
|
|
|
# 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
|
|
|
|
|
|
2017-08-02 00:52:18 +02:00
|
|
|
SKELETON_CUSTOM_PROVIDES = skeleton
|
|
|
|
|
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
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
|
2017-08-02 00:52:13 +02:00
|
|
|
endif
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
|
2017-08-02 00:52:13 +02:00
|
|
|
# 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)
|
2018-05-07 16:44:27 +02:00
|
|
|
SKELETON_CUSTOM_NOT_MERGED_USR_DIRS = \
|
|
|
|
|
$(shell support/scripts/check-merged-usr.sh $(SKELETON_CUSTOM_PATH))
|
2017-08-02 00:52:13 +02:00
|
|
|
endif # merged /usr
|
|
|
|
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy)
|
2017-08-02 00:52:14 +02:00
|
|
|
ifneq ($(SKELETON_CUSTOM_NOT_MERGED_USR_DIRS),)
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
$(error The custom skeleton in $(SKELETON_CUSTOM_PATH) is not \
|
|
|
|
|
using a merged /usr for the following directories: \
|
2017-08-02 00:52:14 +02:00
|
|
|
$(SKELETON_CUSTOM_NOT_MERGED_USR_DIRS))
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
endif
|
2017-08-02 00:52:13 +02:00
|
|
|
endif
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
|
2017-08-02 00:52:15 +02:00
|
|
|
# The target-dir-warning file and the lib{32,64} symlinks are the only
|
|
|
|
|
# things we customise in the custom skeleton.
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
define SKELETON_CUSTOM_INSTALL_TARGET_CMDS
|
|
|
|
|
$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(TARGET_DIR))
|
2018-05-07 16:44:28 +02:00
|
|
|
$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
$(call SYSTEM_LIB_SYMLINK,$(TARGET_DIR))
|
|
|
|
|
$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
|
|
|
|
|
$(TARGET_DIR_WARNING_FILE)
|
|
|
|
|
endef
|
|
|
|
|
|
2017-08-02 00:52:15 +02:00
|
|
|
# For the staging dir, we don't really care what we install, but we
|
|
|
|
|
# need the /lib and /usr/lib appropriately setup. Since we ensure,
|
|
|
|
|
# above, that they are correct in the skeleton, we can simply copy the
|
|
|
|
|
# skeleton to staging.
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
define SKELETON_CUSTOM_INSTALL_STAGING_CMDS
|
2017-08-02 00:52:15 +02:00
|
|
|
$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(STAGING_DIR))
|
2018-05-07 16:44:28 +02:00
|
|
|
$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
|
package/skeleton: split out into skeleton-custom
For the custom skeleton, we practicaly do nothing, except ensure it
contains the basic, required directories, and that those are properly
setup wrt. merged /usr.
Furthermore, our current skeleton is not fit for systemd, and we'll
have to split things out into various skeletons.
So, off-load the custom skeleton into its own package.
Thus, the existing skeleton package is now limited to:
- when using our default skeleton, install and tweak it properly;
- when using a custom skeleton, do nothing except for depending on
the skeleton-custom package.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: split off in a separate patch doing only this]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-08-02 00:52:12 +02:00
|
|
|
$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(eval $(generic-package))
|
