Skip to content

M
mkimage-profiles
Commit c400ba59 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

build-distro.mk, pkg.in/lists/Makefile: fixups

Actually there's an added duplication in the form of the test that was previously missing in pkg.in/lists/Makefile -- that has to be done properly when it's clear how. This fully omits pkg/lists/.base generation in environments that won't make use of it.
parent ed0842b7
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
features.in/build-distro/lib/build-distro.mk
View file @ c400ba59
...@@ -8,6 +8,7 @@ BOOT_TYPE = isolinux ...@@ -8,6 +8,7 @@ BOOT_TYPE = isolinux
# Metadata/ needed only for installers (and not for e.g. syslinux.iso) # Metadata/ needed only for installers (and not for e.g. syslinux.iso)
# FIXME: installable live needs it too, don't move to install2 feature # FIXME: installable live needs it too, don't move to install2 feature
### see also .../pkg.in/lists/Makefile
ifneq (,$(findstring install2,$(FEATURES))) ifneq (,$(findstring install2,$(FEATURES)))
METADATA = metadata METADATA = metadata
endif endif
...@@ -28,7 +29,7 @@ metadata: dot-base ...@@ -28,7 +29,7 @@ metadata: dot-base
dot-base: dot-base:
@{ \ @{ \
echo -e "\n## added by image.in/Makefile"; \ echo -e "\n## added by build-distro.mk"; \
echo "$(call kpackages,$(KMODULES),$(KFLAVOURS))"; \ echo "$(call kpackages,$(KMODULES),$(KFLAVOURS))"; \
} >> $(call list,.base) } >> $(call list,.base)
......
pkg.in/lists/Makefile
View file @ c400ba59
...@@ -9,13 +9,22 @@ include $(BUILDDIR)/distcfg.mk ...@@ -9,13 +9,22 @@ include $(BUILDDIR)/distcfg.mk
SUFFIX := pkg/lists SUFFIX := pkg/lists
TARGET := $(BUILDDIR)/$(SUFFIX) TARGET := $(BUILDDIR)/$(SUFFIX)
all: $(TARGET) $(GLOBAL_DEBUG) # Metadata/ needed only for installers (and not for e.g. syslinux.iso)
# FIXME: installable live needs it too, don't move to install2 feature
### see also .../features.in/build-distro/lib/build-distro.mk
ifneq (,$(findstring install2,$(FEATURES)))
DOTBASE := dot-base
endif
all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE)
@# env | sort -u | grep _LISTS | xargs cp @# env | sort -u | grep _LISTS | xargs cp
@$(foreach V, \ @$(foreach V, \
$(filter %_LISTS,$(sort $(.VARIABLES))), \ $(filter %_LISTS,$(sort $(.VARIABLES))), \
$(if $(filter environment% file,$(origin $V)),\ $(if $(filter environment% file,$(origin $V)),\
$(shell cp --parents -at $(TARGET) \ $(shell cp --parents -at $(TARGET) \
-- $(value $V)))) -- $(value $V))))
dot-base:
@# construct .base packagelist for alterator-pkg @# construct .base packagelist for alterator-pkg
@{ \ @{ \
echo "## generated by pkg.in/lists/Makefile"; \ echo "## generated by pkg.in/lists/Makefile"; \
......
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