aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-01-29 21:42:27 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-01-29 21:42:27 +0000
commit1793d3395d16e19373568d81d77adad14a2fd158 (patch)
tree9af5935ad2d69dba29fe2b845a77950152e288f8 /Makefile.inc1
parent35854cea8b504672998430c4ed717b766b6f4a92 (diff)
downloadsrc-1793d3395d16e19373568d81d77adad14a2fd158.tar.gz
src-1793d3395d16e19373568d81d77adad14a2fd158.zip
Wrap long lines after recent commits.
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=295054
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc116
1 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 36af1ace48c9..5650ef2134d5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1380,8 +1380,11 @@ packages: _pkgbootstrap
${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \
${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel ; \
- ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} PKG_VERSION=${PKG_VERSION} create-world-packages ; \
- ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} PKG_VERSION=${PKG_VERSION} DISTDIR=kernel create-kernel-packages
+ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} \
+ PKG_VERSION=${PKG_VERSION} create-world-packages ; \
+ ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \
+ PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
+ create-kernel-packages
create-world-packages: _pkgbootstrap
@rm -f ${DESTDIR}/*.plist 2>/dev/null || :
@@ -1413,7 +1416,8 @@ create-world-packages: _pkgbootstrap
pkg -o ABI_FILE=${DESTDIR}/bin/sh \
create -M ${DESTDIR}/$${pkgname}.ucl \
-p ${DESTDIR}/$${pkgname}.plist \
- -r ${DESTDIR} -o ${REPODIR}/$$(pkg -o ABI_FILE=${DESTDIR}/bin/sh config ABI)/latest ; \
+ -r ${DESTDIR} \
+ -o ${REPODIR}/$$(pkg -o ABI_FILE=${DESTDIR}/bin/sh config ABI)/latest ; \
done
create-kernel-packages: _pkgbootstrap
@@ -1440,7 +1444,8 @@ create-kernel-packages: _pkgbootstrap
pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \
create -M ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl \
-p ${DESTDIR}/${DISTDIR}/kernel-${flavor}.plist \
- -r ${DESTDIR}/${DISTDIR} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
+ -r ${DESTDIR}/${DISTDIR} \
+ -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
.endfor
.endif
.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
@@ -1468,7 +1473,8 @@ create-kernel-packages: _pkgbootstrap
pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \
create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl \
-p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.plist \
- -r ${DESTDIR}/kernel.${_kernel} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
+ -r ${DESTDIR}/kernel.${_kernel} \
+ -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
.endfor
.endif
.endfor