build-ve, build-vm: handle *_PACKAGES_REGEXP

BASE_PACKAGES_REGEXP and THE_PACKAGES_REGEXP, to be exact; the lack of handling these appears to have been the culprit of firefox missing in vm images which use/browser/firefox.

build-ve, build-vm: handle *_PACKAGES_REGEXP
cf955928 · Michael Shigorin · 1b0f8e2d · cf955928 · cf955928
Commit cf955928 authored Aug 21, 2017 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

90-build-ve.mk features.in/build-ve/lib/90-build-ve.mk +3 -0

90-build-vm.mk features.in/build-vm/lib/90-build-vm.mk +3 -0

No files found.
--- a/features.in/build-ve/lib/90-build-ve.mk
+++ b/features.in/build-ve/lib/90-build-ve.mk
@@ -17,5 +17,8 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(THE_PACKAGES) \
 		 $(call list,$(BASE_LISTS) $(THE_LISTS))

+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+                        $(BASE_PACKAGES_REGEXP)
+
 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -7,6 +7,9 @@ IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(THE_PACKAGES) \
 		 $(call list,$(BASE_LISTS) $(THE_LISTS))

+IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
+			$(BASE_PACKAGES_REGEXP)
+
 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
 VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw