summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2016-11-03 17:58:53 +0100
committerJonas Smedegaard <dr@jones.dk>2016-11-03 18:07:55 +0100
commit150488477df1ba5adc9ccca3a80302107fe53796 (patch)
tree9404f2cba6f465419bb9ca05719800248022fc04
parent0085e35f7af1abc5c01650e5892f19767fd23802 (diff)
Fix avoid processing multistrap hooks twice. Tidy line-wrapping.1.0b2
-rw-r--r--Makefile25
1 files changed, 18 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index fcae080..f78afcf 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,12 @@ title := $(shell grep -Pom1 '^\# \K.*[^\# ]+' README)
# * stable d-i cannot switch to U-boot builtin framebuffer
# https://wiki.debian.org/InstallingDebianOn/Allwinner#Installing_from_an_SD_card_image
-installsuite-jessie = $(if $(noscreen),,stretch)
-installsuite-jessie-reason = $(if $(noscreen),,to support HDMI output)
+installsuite-jessie = $(strip $(if $(noscreen),\
+ ,\
+ stretch))
+installsuite-jessie-reason = $(strip $(if $(noscreen),\
+ ,\
+ to support HDMI output)
# * d-i releases require an archive with same-ABI kernel.
# * d-i rejects non-stable snapshot older than 1 month: bug#771699
@@ -229,7 +233,9 @@ partition/$(1)/$(2)/armhf/$(3)/boot_200Mext2.img: \
partition/$(1)/$(2)/armhf/$(3)/boot.cmd: \
partition/$(1)/$(2)/armhf/rootfs/etc/flash-kernel/bootscript/bootscr.sunxi \
partition/$(1)/$(2)/armhf/rootfs.img.uuid
- $(if $(noscreen),,$$(eval bootargs += console=tty1))
+ $(if $(noscreen),\
+ ,\
+ $$(eval bootargs += console=tty1))
mkdir -p $$(dir $$@)
perl -p \
-e "s'@@LINUX_KERNEL_CMDLINE_DEFAULTS@@'$$(bootargs)'g;" \
@@ -320,7 +326,8 @@ partition/$(1)/$(2)/$(3)/multistrap.conf: \
-e 's!\@preseed\@!$$<!;' \
-e 's!\@packages\@!$$(packages)!;' \
-e 's!\@source\@!$$(source)!;' \
- $(if $(time-$(1)),-e 's!^hookdir=!#hookdir=!g;') \
+ $(if $(time-$(1)),\
+ -e 's!^hookdir=!#hookdir=!g;') \
skel/multistrap.conf.in > $$@
# Bootstrap system
@@ -355,8 +362,10 @@ partition/$(1)/$(2)/$(3)/rootfs: \
partition/$(1)/$(2)/$(3)/multistrap.conf
$(call this-fakeroot,$$@.state) \
$(eatmydata) $(time-$(1):%=faketime %) /usr/sbin/multistrap --no-auth -f $$< -d "$$@"
- $(call this-fakeroot,$$@.state) \
- $(eatmydata) run-parts --regex '^completion' --arg "$$@" skel/multistrap-hooks
+ $(if $(time-$(1)),\
+ ,\
+ $(call this-fakeroot,$$@.state) \
+ $(eatmydata) run-parts --regex '^completion' --arg "$$@" skel/multistrap-hooks)
# TODO: why doesn't this work?!?
#partition/$(1)/$(2)/$(3)/rootfs/%: \
# partition/$(1)/$(2)/$(3)/rootfs
@@ -402,7 +411,9 @@ $(call this-partdir,$(1))/plain/partition.img.gz: \
mirror/http/directory?=/debian)))
$(if $(proxy),$$(eval bootargs += mirror/http/proxy=$(proxy)))
$(if $(installsuite-$(1)),$$(eval bootargs += mirror/suite=$(1)))
- $(if $(noscreen),,$$(eval console = tty1))
+ $(if $(noscreen),\
+ ,\
+ $$(eval console = tty1))
$(if $$(console),$$(eval bootargs += fb=false))
mkdir -p $$(dir $$@)
cp -f $$< $$@