From owner-freebsd-hackers@freebsd.org Tue Nov 14 23:41:30 2017 Return-Path: Delivered-To: freebsd-hackers@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 E2BA0DB941B for ; Tue, 14 Nov 2017 23:41:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3015750F5; Tue, 14 Nov 2017 23:41:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id CE6F86AA9; Tue, 14 Nov 2017 23:41:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 151678458; Tue, 14 Nov 2017 23:41:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id pJUZFvFsKgYV; Tue, 14 Nov 2017 23:41:25 +0000 (UTC) Subject: Re: poudriere 3.2.0 vs. "local" ports DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com EF4EE8452 To: Craig Leres , freebsd-hackers@freebsd.org References: <1243837e-bead-eabb-3e5e-237b76c612d1@ee.lbl.gov> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Tue, 14 Nov 2017 15:41:25 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <1243837e-bead-eabb-3e5e-237b76c612d1@ee.lbl.gov> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="l8gilS1VEJxbaAdRShd99cnS93njukul9" X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2017 23:41:31 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --l8gilS1VEJxbaAdRShd99cnS93njukul9 Content-Type: multipart/mixed; boundary="WSRslGLS5HL9SHxigvHnTPX8VrC9MODPV"; protected-headers="v1" From: Bryan Drewery To: Craig Leres , freebsd-hackers@freebsd.org Message-ID: Subject: Re: poudriere 3.2.0 vs. "local" ports References: <1243837e-bead-eabb-3e5e-237b76c612d1@ee.lbl.gov> In-Reply-To: <1243837e-bead-eabb-3e5e-237b76c612d1@ee.lbl.gov> --WSRslGLS5HL9SHxigvHnTPX8VrC9MODPV Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/13/2017 1:32 PM, Craig Leres wrote: > I have a number of "local" ports I use for various purposes. For exampl= e > one use is to build packages locally written software. Another is to > keep a private copy of ports I maintain under source control. > Historically I've put these in /usr/ports/lbl, e.g. lbl/lbl-acld which > might start out with: >=20 > =C2=A0=C2=A0=C2=A0 PORTNAME=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 acld= > =C2=A0=C2=A0=C2=A0 PORTVERSION=3D=C2=A0=C2=A0=C2=A0 2.1 > =C2=A0=C2=A0=C2=A0 CATEGORIES=3D=C2=A0=C2=A0=C2=A0=C2=A0 lbl > =C2=A0=C2=A0=C2=A0 [...] > =C2=A0=C2=A0=C2=A0 VALID_CATEGORIES+=3D lbl >=20 > This has worked well for years. That should continue to work. I do this as well. >=20 > The other common case is a port that I maintain such as security/bro. I= > keep my local dev version in /usr/ports/lbl/lbl-bro. This allows a > private log history and testing without modifying normal > /usr/ports/security/bro version until I'm ready to file a PR or commit > changes. >=20 > poudriere 3.2.0 breaks this practice: >=20 > =C2=A0=C2=A0=C2=A0 [00:00:01] Warning: (lbl/lbl-bro): [00:00:01] Error:= lbl/lbl-bro has > incorrect CATEGORIES, first should be 'lbl'.=C2=A0 Please contact maint= ainer > of the port to fix this. >=20 > I assume it's picking up "lbl" from the directory path. If you are building 'lbl/lbl-bro' then it picks it up from that. The reason this assertion was added is that the package will end up with an improper origin of security/bro even though it was built from lbl/lbl-bro if using a MASTERDIR. This would cause incremental rebuild issues since they package wouldn't match the origin you built with. >=20 > I don't want to/can't put "lbl" in the individual Makefile CATEGORIES. > Otherwise I can't do things like: >=20 > =C2=A0=C2=A0=C2=A0 diff --exclude=3D.svn /usr/ports/lbl/lbl-bro /usr/po= rts/security/bro I don't understand what you're doing. What exactly is lbl/lbl-bro/Makefile? Is it a full copy of security/bro/Makefile or is it using security/bro as a MASTERDIR? What is the CATEGORIES value for lbl/lbl-bro/Makefile? >=20 > and I definitely can't just copy Makefiles from lbl/lbl-bro to > security/bro. >=20 > I tried to find a way to insert lbl at the front of CATEGORIES in > ../Makefile.inc: >=20 > =C2=A0=C2=A0=C2=A0 .if "$(CATEGORIES:Mlbl)" =3D=3D "" > =C2=A0=C2=A0=C2=A0=C2=A0 CATEGORIES=3D=C2=A0=C2=A0=C2=A0 lbl $(CATEGORI= ES) > =C2=A0=C2=A0=C2=A0 .endif >=20 > but I'm not sure it's possible; make appears to considers it recursive > even when it's protected by a conditional. >=20 > Is there a solution to or a better way of doing this? >=20 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Craig >=20 By the way a better place for ports questions is ports@. For Poudriere there is #poudriere on freenode, https://github.com/freebsd/poudriere/issues, or you can mail me. --=20 Regards, Bryan Drewery --WSRslGLS5HL9SHxigvHnTPX8VrC9MODPV-- --l8gilS1VEJxbaAdRShd99cnS93njukul9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJaC38lAAoJEDXXcbtuRpfPG50H/20XtBV9O9DLmdQT/gB0MQUA uue1XZzDfeicLHLN0SUSnsFdqMmzzstd6Q63IE2d0uBs9Jdxf4YW93qygAwIRcEA sJoam+gIibKB5F5AwtaSmgTSYKq97uLlTSKn2UJg1EY98tn6EXkPorcD6idJCZLf kj4PUJdxz4DETmgRR74ugOb7l5qxgXBJrXkQ/WiXZlhhp26SCN7cJnuD7rA1MkHg iFj0utPZzi+nhriklDrBaP9O1nMZSpHMk5Z2Ny3BZ4AqP6YwCyTEIVj3AiXTmZdr kldvkN14pUNM3XTfaB7SD7oIrVKf2ZJzndRW5zH1SxbjZB5lzHG8CUFvgt+eSK0= =ei5r -----END PGP SIGNATURE----- --l8gilS1VEJxbaAdRShd99cnS93njukul9--