Date: Tue, 29 Mar 2016 17:07:32 -0700 From: Sean Fagan <sef@ixsystems.com> To: freebsd-pkgbase@freebsd.org Subject: Okay, got it to build Message-ID: <2515C2C2-0D7B-47B0-BD66-21B332F1B734@ixsystems.com>
next in thread | raw e-mail | index | archive | help
Using
env MAKEOBJDIRPREFIX=3D${HOME}/obj make -DNO_ROOT -DNO_CLEAN =
DESTDIR=3D${HOME}/packages REPODIR=3D${HOME}/packages/repo -dl -j1 =
packages
(Normal buildworld & buildkernel were fine, obviously.)
When doing "make packages", which then did "make real-packags", the =
sign-packages target was being built before create-packages (I ended up =
verifying this by putting echos in each of the targets), so I broke it =
into three separate invocations of make. I=E2=80=99m sure there=E2=80=99s=
a better way.
As I had asked before, I couldn=E2=80=99t figure out where =
${REPODIR}/${ABI}/${PKG_VERISON} was being created, so I put that into =
the _pkgbootstrap rule.
Diffs below; I=E2=80=99m not entirely sure how many of them are =
necessary. But=E2=80=A6 this did create 413 package files. No root =
needed, either, which is kinda sweet.
Sean.
diff --git a/Makefile.inc1 b/Makefile.inc1
index 890ee64..7430d7e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1260,9 +1260,14 @@ _pkgbootstrap:
.if !exists(${LOCALBASE}/sbin/pkg)
@env ASSUME_ALWAYS_YES=3DYES pkg bootstrap
.endif
+.if defined(PKG_VERSION)
+ @mkdir -p ${REPODIR}/$$(pkg -o ABI_FILE=3D${DESTDIR}/bin/sh =
config ABI)/${PKG_VERSION}
+.endif
=20
packages:
- ${MAKE} -C ${.CURDIR} PKG_VERSION=3D${PKG_VERSION} real-packages
+ env ${MAKEENV:Q} ${MAKE} -C ${.CURDIR} =
PKG_VERSION=3D${PKG_VERSION} \
+ WSTAGEDIR=3D${DESTDIR:U${WSTAGEDIR}} =
KSTAGEDIR=3D${DESTDIR:U${KSTAGEDIR}} \
+ real-packages
=20
package-pkg:
rm -rf /tmp/ports.${TARGET} || :
@@ -1270,7 +1275,17 @@ package-pkg:
PKG_VERSION=3D${PKG_VERSION} REPODIR=3D${REPODIR} =
WSTAGEDIR=3D${WSTAGEDIR} \
sh ${.CURDIR}/release/scripts/make-pkg-package.sh
=20
-real-packages: stage-packages create-packages sign-packages
+#real-packages: stage-packages create-packages sign-packages
+real-packages:
+ env ${MAKEENV:Q} ${MAKE} -C ${.CURDIR} =
PKG_VERSION=3D${PKG_VERSION} \
+ WSTAGEDIR=3D${DESTDIR:U${WSTAGEDIR}} =
KSTAGEDIR=3D${DESTDIR:U${KSTAGEDIR}} \
+ stage-packages
+ env ${MAKEENV:Q} ${MAKE} -C ${.CURDIR} =
PKG_VERSION=3D${PKG_VERSION} \
+ WSTAGEDIR=3D${DESTDIR:U${WSTAGEDIR}} =
KSTAGEDIR=3D${DESTDIR:U${KSTAGEDIR}} \
+ create-packages
+ env ${MAKEENV:Q} ${MAKE} -C ${.CURDIR} =
PKG_VERSION=3D${PKG_VERSION} \
+ WSTAGEDIR=3D${DESTDIR:U${WSTAGEDIR}} =
KSTAGEDIR=3D${DESTDIR:U${KSTAGEDIR}} \
+ sign-packages
=20
stage-packages:
@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR}
@@ -1279,7 +1294,7 @@ stage-packages:
${MAKE} DESTDIR=3D${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B =
stagekernel
=20
create-packages: _pkgbootstrap
- @mkdir -p ${REPODIR}
+ @mkdir -p ${REPODIR}/$$(pkg -o ABI_FILE=3D${DESTDIR}/bin/sh =
config ABI)/${PKG_VERSION}
${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=3D${DESTDIR:U${WSTAGEDIR}} \
PKG_VERSION=3D${PKG_VERSION} =
create-world-packages ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2515C2C2-0D7B-47B0-BD66-21B332F1B734>