keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

image.in, build-*: generalize SUBDIRS

Browse Source 
This is a fix to previous failures of
ve/vm + use/repo/main build attempts
(in fact, any non-distro/ targets).

SUBDIRS were just optimized away...
This commit is contained in:
Michael Shigorin 2018-02-15 16:57:50 +03:00
parent 9441c1ce70
commit d5f71b3716
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features.in/build-distro/lib/90-build-distro.mk
View File

@ -1,9 +1,5 @@
# step 4: build the distribution image # step 4: build the distribution image
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
# proxy over the ISO metadata collected; see also genisoimagerc(5) # proxy over the ISO metadata collected; see also genisoimagerc(5)
BOOT_SYSI := $(META_SYSTEM_ID) BOOT_SYSI := $(META_SYSTEM_ID)
BOOT_PUBL := $(META_PUBLISHER) BOOT_PUBL := $(META_PUBLISHER)

3
features.in/build-ve/lib/90-build-ve.mk
View File

@ -20,5 +20,6 @@ IMAGE_PACKAGES = $(DOT_BASE) \
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \ IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP) $(BASE_PACKAGES_REGEXP)
all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \ all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
postprocess $(GLOBAL_CLEAN_WORKDIR) postprocess $(GLOBAL_CLEAN_WORKDIR)

3
features.in/build-vm/lib/90-build-vm.mk
View File

@ -55,5 +55,6 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
# override # override
pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL) pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \ all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \
convert-image postprocess $(GLOBAL_CLEAN_WORKDIR) convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)

4
image.in/Makefile
View File

@ -56,6 +56,10 @@ CLEANUP_OUTDIR ?=
GLOBAL_TARGET := $(ARCH) GLOBAL_TARGET := $(ARCH)
GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF)) GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))
# take the latter part for complex-specified subprofiles like stage2@live;
# care to exclude non-directories holding no makefiles like rootfs
SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))
# the lib/build-*.mk comes from features.in/build-*/lib # the lib/build-*.mk comes from features.in/build-*/lib
include $(sort $(wildcard lib/*.mk)) include $(sort $(wildcard lib/*.mk))
include $(MKIMAGE_PREFIX)/targets.mk include $(MKIMAGE_PREFIX)/targets.mk