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

don't override targets for no reason

Browse Source
This commit is contained in:
Michael Shigorin 2011-08-22 18:31:45 +03:00
parent 5c54341044
commit 2b90dffa6f
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
image.in/Makefile
View File

@ -32,16 +32,18 @@ else
GLOBAL_HSH_APT_CONFIG = $(APTCONF) GLOBAL_HSH_APT_CONFIG = $(APTCONF)
endif endif
# Metadata/ needed only for installers (and not for e.g. syslinux.iso)
ifneq "$(STAGE1_KFLAVOUR)$(KFLAVOURS)" ""
METADATA = metadata
endif
include $(MKIMAGE_PREFIX)/targets.mk include $(MKIMAGE_PREFIX)/targets.mk
all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \ all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
$(GLOBAL_CLEAN_WORKDIR) $(GLOBAL_CLEAN_WORKDIR)
# Metadata/ needed only for installer (and not for e.g. syslinux.iso) prep: $(GLOBAL_DEBUG) dot-disk $(METADATA) $(IMAGEDIR)
ifeq "$(STAGE1_KFLAVOUR)$(KFLAVOURS)" ""
metadata:
@echo "** skipping metadata target, no stage1 kernel installed"
else
metadata: dot-base metadata: dot-base
@mkdir -p files/Metadata @mkdir -p files/Metadata
@rm -f files/Metadata/pkg-groups.tar @rm -f files/Metadata/pkg-groups.tar
@ -50,14 +52,11 @@ metadata: dot-base
$$(echo $(call list,$(GROUPS) .base) \ $$(echo $(call list,$(GROUPS) .base) \
$(call group,$(GROUPS)) \ $(call group,$(GROUPS)) \
| sed 's,$(PKGDIR)/*,,g') | sed 's,$(PKGDIR)/*,,g')
endif
dot-base: dot-base:
@echo -e "# auto-added in image.in/Makefile" >> $(call list,.base) @echo -e "# auto-added in image.in/Makefile" >> $(call list,.base)
@echo "$(call kpackages,$(KMODULES),$(KFLAVOURS))" >> $(call list,.base) @echo "$(call kpackages,$(KMODULES),$(KFLAVOURS))" >> $(call list,.base)
prep: $(GLOBAL_DEBUG) dot-disk metadata $(IMAGEDIR)
$(IMAGEDIR): $(IMAGEDIR):
mkdir -p "$(IMAGEDIR)" mkdir -p "$(IMAGEDIR)"

8
sub.in/stage1/Makefile
View File

@ -27,10 +27,8 @@ include $(MKIMAGE_PREFIX)/targets.mk
STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS)) STAGE1_KFLAVOUR ?= $(lastword $(KFLAVOURS))
# propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso) # propagator needed iff stage1 kernel installed (not for e.g. syslinux.iso)
ifeq "$(STAGE1_KFLAVOUR)" "" ifneq "$(STAGE1_KFLAVOUR)" ""
build-propagator: BUILD_PROPAGATOR = build-propagator
@echo "** skipping build-propagator target, no kernel installed"
else
CHROOT_PACKAGES_REGEXP := $(call kpackages,$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR)) CHROOT_PACKAGES_REGEXP := $(call kpackages,$(STAGE1_KMODULES_REGEXP),$(STAGE1_KFLAVOUR))
INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR) INFO_STAGE1_KFLAVOUR := $(STAGE1_KFLAVOUR)
endif endif
@ -40,7 +38,7 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(COMMON_PACKAGES)
# scripts prepare bootloader configuration, too # scripts prepare bootloader configuration, too
# NB: we pass tested squashfs options for ../install2/Makefile # NB: we pass tested squashfs options for ../install2/Makefile
all: | debug prepare-workdir copy-tree run-scripts build-propagator \ all: | debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR) \
copy-$(BOOTLOADER) $(COPY_SQUASHCFG) pack-image $(GLOBAL_CLEAN_WORKDIR) copy-$(BOOTLOADER) $(COPY_SQUASHCFG) pack-image $(GLOBAL_CLEAN_WORKDIR)
@if test -s $(OUTDIR)/squashcfg.mk; then \ @if test -s $(OUTDIR)/squashcfg.mk; then \
cp $(OUTDIR)/squashcfg.mk $(GLOBAL_BUILDDIR)/; \ cp $(OUTDIR)/squashcfg.mk $(GLOBAL_BUILDDIR)/; \