svn commit: r295955 - in projects/release-pkg: . release/scripts

[Glen Barber]

Author: gjb
Date: Wed Feb 24 03:05:05 2016
New Revision: 295955
URL: https://svnweb.freebsd.org/changeset/base/295955

Log:
  Include a 'package-pkg' target, intended for use for
  architectures we do not provide upstream pkg(8) packages.
  
  This is not tied to anything as-is, and likely will break
  your system if used (based on experience with testing with
  powerpc).
  
  There is an overwhelming amount of evil happening here,
  so until the issues are fixed, it will not be tied into the
  'packages' target.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/release/scripts/make-pkg-package.sh   (contents, props changed)
Modified:
  projects/release-pkg/Makefile
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile	Wed Feb 24 03:00:06 2016	(r295954)
+++ projects/release-pkg/Makefile	Wed Feb 24 03:05:05 2016	(r295955)
@@ -128,7 +128,7 @@ TGTS=	all all-man buildenv buildenvvars 
 	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 real-packages sign-packages
+	packages installconfig real-packages sign-packages package-pkg
 
 TGTS+=	${SUBDIR_TARGETS}
 

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Feb 24 03:00:06 2016	(r295954)
+++ projects/release-pkg/Makefile.inc1	Wed Feb 24 03:05:05 2016	(r295955)
@@ -1378,6 +1378,12 @@ _pkgbootstrap:
 packages:
 	${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages
 
+package-pkg:
+	rm -rf /tmp/ports.${TARGET} || :
+	env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${REVISION} \
+		PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} WSTAGEDIR=${WSTAGEDIR} \
+		sh ${.CURDIR}/release/scripts/make-pkg-package.sh
+
 real-packages:	stage-packages create-packages sign-packages
 
 stage-packages:

Added: projects/release-pkg/release/scripts/make-pkg-package.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/release/scripts/make-pkg-package.sh	Wed Feb 24 03:05:05 2016	(r295955)
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# Simulate the build environment.
+eval $(make -C ${SRCDIR} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} buildenvvars)
+export WRKDIRPREFIX=/tmp/ports.${TARGET}
+export WSTAGEDIR=${WSTAGEDIR}
+export REPODIR=${REPODIR}
+export PKG_VERSION=${PKG_VERSION}
+export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg -V WRKDIR)
+
+make -C ${PORTSDIR}/ports-mgmt/pkg TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+	CONFIGURE_ARGS="--host=$(uname -m)-portbld-freebsd${REVISION}" \
+	stage create-manifest
+
+pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \
+	create -v -m ${WRKDIR}/.metadir/ \
+	-r ${WRKDIR}/stage \
+	-p ${WRKDIR}/.PLIST.mktmp \
+	-o ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
+mkdir -p ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/
+cd ${REPODIR}/$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}/Latest/ && \
+	ln -s ../pkg-*.txz