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

build-ve, build-vm: handle *_PACKAGES_REGEXP

Browse Source 
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.
This commit is contained in:
Michael Shigorin 2017-08-21 21:39:52 +03:00
parent 1b0f8e2d65
commit cf9559287b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

@ -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