Skip to content

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

image.in/Makefile: fixed thinko regression

MKI_VERSION was tested against even before the config.mk that defines it got included. Ouch.
parent 0c97aaf8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
image.in/Makefile
View file @ 7a3ab55d
...@@ -14,6 +14,9 @@ include functions.mk ...@@ -14,6 +14,9 @@ include functions.mk
ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk)) ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk))
$(error please apt-get install mkimage and have a look at QUICKSTART as well) $(error please apt-get install mkimage and have a look at QUICKSTART as well)
endif endif
include $(MKIMAGE_PREFIX)/config.mk
ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_MINIMAL) | tr -d [0-9])) ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_MINIMAL) | tr -d [0-9]))
$(info error: mkimage-$(MKI_VERSION) is too old, please upgrade) $(info error: mkimage-$(MKI_VERSION) is too old, please upgrade)
$(error mkimage is too old, $(MKI_VER_MINIMAL) is minimal supported version) $(error mkimage is too old, $(MKI_VER_MINIMAL) is minimal supported version)
...@@ -23,8 +26,6 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading) ...@@ -23,8 +26,6 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
$(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better) $(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
endif endif
include $(MKIMAGE_PREFIX)/config.mk
# reconstruct instead of passing yet another variable # reconstruct instead of passing yet another variable
IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE) IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE)
IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE) IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
......
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