svn commit: r295054 - projects/release-pkg
Glen Barber
gjb at FreeBSD.org
Fri Jan 29 21:42:29 UTC 2016
Author: gjb
Date: Fri Jan 29 21:42:27 2016
New Revision: 295054
URL: https://svnweb.freebsd.org/changeset/base/295054
Log:
Wrap long lines after recent commits.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Fri Jan 29 21:39:44 2016 (r295053)
+++ projects/release-pkg/Makefile.inc1 Fri Jan 29 21:42:27 2016 (r295054)
@@ -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
More information about the svn-src-projects
mailing list