From d0618b728394795e487a612459c0dc5c1a473155 Mon Sep 17 00:00:00 2001 From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Date: Thu, 26 Feb 2015 23:36:19 +0100 Subject: [PATCH] Added IMAGE_DIR to config options --- Makefile | 2 +- config/Makefile.conf.defaults | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index edd3d9b..22dbc0f 100644 --- a/Makefile +++ b/Makefile @@ -332,7 +332,7 @@ image_skel_file: | $(WORKSPACE) xz -d --keep --stdout "$(CURDIR)/contrib/image/multiboot.skel.img.xz" > "$(if $(IMAGE_FILE),$(IMAGE_FILE),$(WORKSPACE)/image.img)" @echo @echo "Image skeleton is ready: $(if $(IMAGE_FILE),$(IMAGE_FILE),$(WORKSPACE)/image.img)" - @echo "You may want to mount appropriately (e.g. with kpartx) and execute \"make IMAGE_DIR=/your/mountpoint image\"" + @echo "You may want to mount appropriately (e.g. with kpartx) to $(IMAGE_DIR) and execute \"make image\"" image_grub_lipinfo : $(IMAGE_DIR)/grub/lipinfo.cfg $(IMAGE_DIR)/grub/lipinfo.cfg : | $(WORKSPACE) diff --git a/config/Makefile.conf.defaults b/config/Makefile.conf.defaults index 0ba1bed..42cf939 100644 --- a/config/Makefile.conf.defaults +++ b/config/Makefile.conf.defaults @@ -27,6 +27,7 @@ ISO_VERSION=14.04.1 ISO_FLAVOR=kubuntu ISO_PATTERN_FLAGS= +IMAGE_DIR=$(WORKSPACE)/image_files/ IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick IMAGE_GIT_BRANCH=ws14 IMAGE_EXTRA_INFO= -- GitLab