From owner-freebsd-pkgbase@freebsd.org Wed Mar 30 00:07:35 2016 Return-Path: Delivered-To: freebsd-pkgbase@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C5A1AE1FA3 for ; Wed, 30 Mar 2016 00:07:35 +0000 (UTC) (envelope-from sef@ixsystems.com) Received: from barracuda.ixsystems.com (barracuda.ixsystems.com [12.229.62.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.ixsystems.com", Issuer "Go Daddy Secure Certificate Authority - G2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2D44111DC for ; Wed, 30 Mar 2016 00:07:34 +0000 (UTC) (envelope-from sef@ixsystems.com) X-ASG-Debug-ID: 1459296453-08ca0417882928d0001-wjM0Vu Received: from zimbra.ixsystems.com ([10.246.0.20]) by barracuda.ixsystems.com with ESMTP id kwdeIFTq7sC1cNs3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 29 Mar 2016 17:07:34 -0700 (PDT) X-Barracuda-Envelope-From: sef@ixsystems.com X-Barracuda-RBL-Trusted-Forwarder: 10.246.0.20 X-ASG-Whitelist: Client Received: from localhost (localhost [127.0.0.1]) by zimbra.ixsystems.com (Postfix) with ESMTP id EDC089C4268 for ; Tue, 29 Mar 2016 17:07:33 -0700 (PDT) Received: from zimbra.ixsystems.com ([127.0.0.1]) by localhost (zimbra.ixsystems.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id j-nL3wQvjRDw for ; Tue, 29 Mar 2016 17:07:33 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.ixsystems.com (Postfix) with ESMTP id 995019C4267 for ; Tue, 29 Mar 2016 17:07:33 -0700 (PDT) X-Virus-Scanned: amavisd-new at ixsystems.com Received: from zimbra.ixsystems.com ([127.0.0.1]) by localhost (zimbra.ixsystems.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AAXC35x91dhp for ; Tue, 29 Mar 2016 17:07:33 -0700 (PDT) Received: from [192.168.0.115] (173-164-180-199-SFBA.hfc.comcastbusiness.net [173.164.180.199]) by zimbra.ixsystems.com (Postfix) with ESMTPSA id 766E09C41FF for ; Tue, 29 Mar 2016 17:07:33 -0700 (PDT) From: Sean Fagan Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Okay, got it to build Message-Id: <2515C2C2-0D7B-47B0-BD66-21B332F1B734@ixsystems.com> X-ASG-Orig-Subj: Okay, got it to build Date: Tue, 29 Mar 2016 17:07:32 -0700 To: freebsd-pkgbase@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) X-Mailer: Apple Mail (2.3124) X-Barracuda-Connect: UNKNOWN[10.246.0.20] X-Barracuda-Start-Time: 1459296454 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://10.246.0.26:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ixsystems.com X-Barracuda-BRTS-Status: 1 X-BeenThere: freebsd-pkgbase@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Packaging the FreeBSD base system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2016 00:07:35 -0000 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 ; \