build-{ve,vm}: handle THE_* and DOT_BASE too

Classic VEs don't carry any kernel since these are running under a single OpenVZ (or potentially LXC) kernel image; ARM Multiboot (TWRP in this particular case) allows to boot off a chroot via kexec, and we need a kernel in it for that, obviously. No bootloader required inside such VE though.

build-{ve,vm}: handle THE_* and DOT_BASE too
ee5dd31a · Michael Shigorin · 67adab49 · ee5dd31a · ee5dd31a · ee5dd31a
Commit ee5dd31a authored May 17, 2013 by Michael Shigorin
Showing with 12 additions and 7 deletions

README features.in/build-ve/README +2 -1

90-build-ve.mk features.in/build-ve/lib/90-build-ve.mk +6 -2

config.mk features.in/build-vm/config.mk +1 -1

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

No files found.
--- a/features.in/build-ve/README
+++ b/features.in/build-ve/README
-Эта фича конфигурирует создание образа виртуального окружения (VE).
+Эта фича конфигурирует создание образа виртуального окружения (VE),
+что используется для сборки шаблонов OpenVZ и ARM-чрутов для TWRP.

 Дополняет финальную стадию сборки (lib/, image-scripts.d/)
 и тесно с ней связана.
--- a/features.in/build-ve/lib/90-build-ve.mk
+++ b/features.in/build-ve/lib/90-build-ve.mk
@@ -8,10 +8,14 @@ ifeq (cpio,$(IMAGE_PACKTYPE))
 MKI_CPIO_COMPRESS = $(IMAGE_COMPRESS)
 endif

-IMAGE_PACKAGES = $(call list,$(BASE_LISTS)) \
+# some VEs _can_ contain kernels (think ARM multiboot
+# but this can also help VE/VM hybrid images)
+IMAGE_PACKAGES = $(DOT_BASE) \
 		 $(SYSTEM_PACKAGES) \
 		 $(COMMON_PACKAGES) \
-		 $(BASE_PACKAGES)
+		 $(BASE_PACKAGES) \
+		 $(THE_PACKAGES) \
+		 $(call list,$(BASE_LISTS) $(THE_LISTS))

 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
--- a/features.in/build-vm/config.mk
+++ b/features.in/build-vm/config.mk
 # hooked from ../../lib/sugar.mk
-use/build-vm: sub/rootfs@/
+use/build-vm: sub/rootfs@/ use/kernel
 	@$(call add_feature)
 	@$(call xport,ROOTPW)
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
 # step 4: build the virtual machine image

-IMAGE_PACKAGES = $(SYSTEM_PACKAGES) \
+IMAGE_PACKAGES = $(DOT_BASE) \
+		 $(SYSTEM_PACKAGES) \
 		 $(COMMON_PACKAGES) \
 		 $(BASE_PACKAGES) \
 		 $(THE_PACKAGES) \
-		 $(call list,$(BASE_LISTS) $(THE_LISTS)) \
-		 $(call kpackages,$(THE_KMODULES) $(BASE_KMODULES),$(KFLAVOURS))
+		 $(call list,$(BASE_LISTS) $(THE_LISTS))

 # intermediate chroot archive
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar