summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2016-11-06 11:17:01 +0100
committerJonas Smedegaard <dr@jones.dk>2016-11-06 18:38:28 +0100
commit9e770e871a851dd72178acfe6fb16bcf23f2f503 (patch)
tree13f4d79331ceb4e978249c3f5357e54d58a80791
parentfc272fc1fddab435d469b5c49f7125098083c048 (diff)
Tidy: Use rootfs as stem for multistrap.conf and preseed.cfg targets.1.0b3
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e14134b..9aef937 100644
--- a/Makefile
+++ b/Makefile
@@ -333,7 +333,7 @@ $(foreach suite,$(suites),\
define ARCH_template =
# Copy preseed file, and strip templating parts if from skeleton
-partition/$(1)/$(2)/$(3)/preseed.cfg: \
+partition/$(1)/$(2)/$(3)/rootfs.preseed.cfg: \
$(if $(filter plain,$(2)),skel/preseed.cfg.in,content/$(2)-$(1)/preseed.cfg)
mkdir -p "$$(dir $$@)"
cp -f $$< $$@
@@ -345,8 +345,8 @@ partition/$(1)/$(2)/$(3)/preseed.cfg: \
# Configure multistrap
# TODO: install libfakeroot only on alien arch
# TODO: Stop uncomment hooks when faketime supports chroot: bug#778462
-partition/$(1)/$(2)/$(3)/multistrap.conf: \
- partition/$(1)/$(2)/$(3)/preseed.cfg \
+partition/$(1)/$(2)/$(3)/rootfs.multistrap.conf: \
+ partition/$(1)/$(2)/$(3)/rootfs.preseed.cfg \
skel/multistrap.conf.in
$$(eval packages = $$(strip \
$(if $(fakeroot),libfakeroot) \
@@ -411,7 +411,7 @@ partition/$(1)/$(2)/$(3)/rootfs.size: \
> $$@~
mv -f $$@~ $$@
partition/$(1)/$(2)/$(3)/rootfs: \
- partition/$(1)/$(2)/$(3)/multistrap.conf
+ partition/$(1)/$(2)/$(3)/rootfs.multistrap.conf
$(call this-fakeroot,$$@.state) \
$(eatmydata) \
$(if $(time-$(1)),\