jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: set per-rootfs variable name

Browse Source 
Like we do for packages with the PKG variable, set ROOTFS to contain the
upper-case name of the rootfs currently being generated.

This will be useful in later patches, when we need more per-rootfs
variables, like a per-rootfs TARGET_DIR for example.

In Makefiles, per-rule variables trickle down the dependency chain, to
all dependencies of that rule, so we have to stop ROOTFS as soon as
we're not in a rootfs. This means we have to stop it at target-finalize
(which is a dependency of all filesystems), and for each package
individually, since some packages (host or target) can be direct
dependencies of filesystems as well.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2018-03-31 11:05:51 +02:00 committed by Peter Korsgaard
parent 7e9870ce32
commit 2765973e01
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -677,6 +677,9 @@ endif
$(TARGETS_ROOTFS): target-finalize $(TARGETS_ROOTFS): target-finalize
# Avoid the rootfs name leaking down the dependency chain
target-finalize: ROOTFS=
.PHONY: target-finalize .PHONY: target-finalize
target-finalize: $(PACKAGES) target-finalize: $(PACKAGES)
@$(call MESSAGE,"Finalizing target directory") @$(call MESSAGE,"Finalizing target directory")

1
fs/common.mk
View File

@ -72,6 +72,7 @@ ROOTFS_$(2)_COMPRESS_EXT = .xz
ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c
endif endif
$$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2)
$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
rm -rf $(FS_DIR) rm -rf $(FS_DIR)

4
package/pkg-generic.mk
View File

@ -384,6 +384,10 @@ endef
define inner-generic-package define inner-generic-package
# When doing a package, we're definitely not doing a rootfs, but we
# may inherit it via the dependency chain, so we reset it.
$(1): ROOTFS=
# Ensure the package is only declared once, i.e. do not accept that a # Ensure the package is only declared once, i.e. do not accept that a
# package be re-defined by a br2-external tree # package be re-defined by a br2-external tree
ifneq ($(call strip,$(filter $(1),$(PACKAGES_ALL))),) ifneq ($(call strip,$(filter $(1),$(PACKAGES_ALL))),)