Commit 29193f90 authored by Anton Midyukov's avatar Anton Midyukov

Add support patches from image-paches.d/

Required mkimage 0.3.0-alt1
parent 054ea781
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
или запрашивают скрипты, которые могут быть оформлены как: или запрашивают скрипты, которые могут быть оформлены как:
* scripts.d/ или image-scripts.d/ различных стадий; * scripts.d/ или image-scripts.d/ различных стадий;
* в виде патчей в image-patches.d/ различных стадий;
* пакеты installer-feature-* * пакеты installer-feature-*
(тж. https://www.altlinux.org/Installer/beans). (тж. https://www.altlinux.org/Installer/beans).
......
...@@ -25,5 +25,5 @@ IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \ ...@@ -25,5 +25,5 @@ IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP) $(BASE_PACKAGES_REGEXP)
all: $(GLOBAL_DEBUG) \ all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \ build-image copy-subdirs copy-tree run-image-patches run-image-scripts \
postprocess $(GLOBAL_CLEAN_WORKDIR) pack-image postprocess $(GLOBAL_CLEAN_WORKDIR)
...@@ -120,5 +120,5 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES) ...@@ -120,5 +120,5 @@ run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL) pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)
all: $(GLOBAL_DEBUG) \ all: $(GLOBAL_DEBUG) \
build-image copy-subdirs copy-tree run-image-scripts pack-image \ build-image copy-subdirs copy-tree run-image-patches run-image-scripts \
convert-image postprocess $(GLOBAL_CLEAN_WORKDIR) pack-image convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
...@@ -70,8 +70,8 @@ include $(MKIMAGE_PREFIX)/targets.mk ...@@ -70,8 +70,8 @@ include $(MKIMAGE_PREFIX)/targets.mk
GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES) GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
all: | $(GLOBAL_DEBUG) \ all: | $(GLOBAL_DEBUG) \
build-image run-image-scripts copy-tree run-scripts pack-image \ build-image run-image-patches run-image-scripts copy-tree run-scripts \
$(GLOBAL_CLEAN_WORKDIR) pack-image $(GLOBAL_CLEAN_WORKDIR)
# dummy # dummy
debug:: ; debug:: ;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment