d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create a _pkgbootstrap target, and remove the env(1) prefix

Browse Source 
to pkg(8) commands.

Move the resulting packages outside STAGEDIR to minimize
pollution.

When invoking 'pkg create', include the ABI in the REPODIR
path so the correct hierarchy is created for cross-builds.

Move the STAGEDIR and REPODIR declarations above the targets
that use them to keep things cleaner, and move the packages
target.

Include '-o ABIFILE=DESTDIR/bin/sh' in pkg(8) invocations in
the create-kernel-packages target.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2016-01-22 18:06:09 +00:00
parent bc3f9191c7
commit f9371dca60
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.inc1
View File

@ -1357,7 +1357,19 @@ packagekernel:
.endif .endif
.endif .endif
create-world-packages: STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage
REPODIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo
_pkgbootstrap:
@env ASSUME_ALWAYS_YES=YES pkg bootstrap
packages: _pkgbootstrap
@mkdir -p ${STAGEDIR} ${REPODIR}
${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT -B stageworld ; \
${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages
create-world-packages: _pkgbootstrap
@rm -f ${DESTDIR}/*.plist 2>/dev/null || : @rm -f ${DESTDIR}/*.plist 2>/dev/null || :
@cd ${DESTDIR} ; \ @cd ${DESTDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
@ -1384,21 +1396,13 @@ create-world-packages:
/^name/ { printf("===> Creating %s-", $$2); next } \ /^name/ { printf("===> Creating %s-", $$2); next } \
/^version/ { print $$2; next } \ /^version/ { print $$2; next } \
' ${DESTDIR}/$${pkgname}.ucl ; \ ' ${DESTDIR}/$${pkgname}.ucl ; \
env ASSUME_ALWAYS_YES="YES" pkg -o ABI_FILE=${DESTDIR}/bin/sh \ pkg -o ABI_FILE=${DESTDIR}/bin/sh \
create -M ${DESTDIR}/$${pkgname}.ucl \ create -M ${DESTDIR}/$${pkgname}.ucl \
-p ${DESTDIR}/$${pkgname}.plist \ -p ${DESTDIR}/$${pkgname}.plist \
-r ${DESTDIR} -o ${DESTDIR} ; \ -r ${DESTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest ; \
done done
STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage create-kernel-packages: _pkgbootstrap
packages:
@mkdir -p ${MAKEOBJDIRPREFIX}${.CURDIR}/stage
${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT -B stageworld ; \
${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages
create-kernel-packages:
@cd ${DESTDIR}/${DISTDIR} ; \ @cd ${DESTDIR}/${DISTDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
${DESTDIR}/${DISTDIR}/kernel.meta ${DESTDIR}/${DISTDIR}/kernel.meta
@ -1415,7 +1419,7 @@ create-kernel-packages:
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
@awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
@env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ @pkg -o ABI_FILE=${DESTDIR}/bin/sh create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
-r ${DESTDIR}/${DISTDIR}/kernel \ -r ${DESTDIR}/${DISTDIR}/kernel \
-o ${DESTDIR} -o ${DESTDIR}
@ -1438,7 +1442,7 @@ create-kernel-packages:
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
@awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
@env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ @pkg -o ABI_FILE=${DESTDIR}/bin/sh create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
-r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \ -r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
-o ${DESTDIR} -o ${DESTDIR}