aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-05-07 13:21:45 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 04:28:12 +0200
commit73d116b62c228ce58e39f6723e35ebba3e582149 (patch)
treec6cd2394a03063e0105fd21d67bcdeae520b2509 /Makefile
parent10ba380dfc6564f7a18d80acc3f4153bb0cc005f (diff)
Upgrade the preseed script to make it work with Debian Jessie.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 42dee1a..d3fbdee 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CC += -m$(shell dpkg-architecture -qDEB_HOST_ARCH_BITS $(patsubst %,-a%, ${ARCH}
DEB_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH $(patsubst %,-a%, ${ARCH}))
# Multiarch: apt-get install gcc-multilib libc6-dev-x32
-VERSION = 7.7.0
+VERSION = 8.0.0
IMAGE_TYPE ?= iso
ISOIMG = debian-${VERSION}-${DEB_ARCH}-netinst.iso
@@ -15,10 +15,10 @@ CHECKSUMS = MD5 SHA1 SHA256 SHA512
preseed:
make dist/${DEB_ARCH}/${PRESEEDED}
dist/${DEB_ARCH}/${PRESEEDED}: preseed.cfg $(wildcard ./include/*) dist/${DEB_ARCH}/${ISOIMG} ${UDEBS}
- ./preseed.sh $@ dist/${DEB_ARCH}/${ISOIMG} ${UDEBS}
+ DEB_ARCH=${DEB_ARCH} ./preseed.sh $@ dist/${DEB_ARCH}/${ISOIMG} ${UDEBS}
sig: dist/${DEB_ARCH}/${PRESEEDED}
- gpg --detach-sign $^
+ gpg2 --detach-sign $^
# Get, verify
iso-get: dist/${DEB_ARCH}/${ISOIMG}
@@ -28,7 +28,7 @@ iso-checksum: $(patsubst %,iso-checksum-%, ${CHECKSUMS})
iso-checksum-%: dist/${DEB_ARCH}/${ISOIMG} dist/${DEB_ARCH}/%SUMS dist/${DEB_ARCH}/%SUMS.sign
@echo Checking $* sum
@cd dist/${DEB_ARCH}; grep "\s${ISOIMG}$$" $*SUMS | $$(echo $* | sed 's@.*@/usr/bin/\L&sum@') --strict -c
- gpg --verify dist/${DEB_ARCH}/$*SUMS.sign dist/${DEB_ARCH}/$*SUMS
+ gpg2 --verify dist/${DEB_ARCH}/$*SUMS.sign dist/${DEB_ARCH}/$*SUMS
# Download
.PRECIOUS: dist/${DEB_ARCH}/%