summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2016-02-08 16:34:13 +0000
committerdes <des@FreeBSD.org>2016-02-08 16:34:13 +0000
commit769bb0eeec4aeacc42ae6c3059ef8bfe83547286 (patch)
tree1702cc87a89aec2c6e1bd88132993559291ca626
parent234fc137b1865aa62fef7ab1a95c628ab2fec6ff (diff)
downloadFreeBSD-src-769bb0eeec4aeacc42ae6c3059ef8bfe83547286.zip
FreeBSD-src-769bb0eeec4aeacc42ae6c3059ef8bfe83547286.tar.gz
Rename the signpackages target to sign-packages, and include it in the
packages meta-target so 'make packages' now does everything.
-rw-r--r--Makefile2
-rw-r--r--Makefile.inc14
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 320f259..1b0ee63 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
xdev-links native-xtools stageworld stagekernel stage-packages \
create-world-packages create-kernel-packages create-packages \
- packages installconfig signpackages
+ packages installconfig sign-packages
TGTS+= ${SUBDIR_TARGETS}
diff --git a/Makefile.inc1 b/Makefile.inc1
index 40285dd..88be22c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1374,7 +1374,7 @@ _pkgbootstrap:
@env ASSUME_ALWAYS_YES=YES pkg bootstrap
.endif
-packages: stage-packages create-packages
+packages: stage-packages create-packages sign-packages
stage-packages:
@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR}
@@ -1476,7 +1476,7 @@ create-kernel-packages: _pkgbootstrap
.endfor
.endif
-signpackages: _pkgbootstrap
+sign-packages: _pkgbootstrap
@pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) ${PKGSIGNKEY}
#
OpenPOWER on IntegriCloud