Date: Tue, 14 Nov 2017 15:41:25 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Craig Leres <leres@ee.lbl.gov>, freebsd-hackers@freebsd.org Subject: Re: poudriere 3.2.0 vs. "local" ports Message-ID: <ddf84d8e-3f6f-074f-4c26-0e797a8b330f@FreeBSD.org> In-Reply-To: <1243837e-bead-eabb-3e5e-237b76c612d1@ee.lbl.gov> References: <1243837e-bead-eabb-3e5e-237b76c612d1@ee.lbl.gov>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --l8gilS1VEJxbaAdRShd99cnS93njukul9 Content-Type: multipart/mixed; boundary="WSRslGLS5HL9SHxigvHnTPX8VrC9MODPV"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Craig Leres <leres@ee.lbl.gov>, freebsd-hackers@freebsd.org Message-ID: <ddf84d8e-3f6f-074f-4c26-0e797a8b330f@FreeBSD.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ddf84d8e-3f6f-074f-4c26-0e797a8b330f>