Date: Wed, 01 Oct 2014 15:03:08 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: Will Andrews <will@firepipe.net>, Guido Falsi <madpilot@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "src-committers@FreeBSD.org" <src-committers@freebsd.org>, Baptiste Daroussin <bapt@freebsd.org>, Bryan Drewery <bdrewery@FreeBSD.org> Subject: Re: svn commit: r272282 - head/share/mk Message-ID: <542C4FEC.8010800@FreeBSD.org> In-Reply-To: <CADBaqmgnJzrev_cYaJyXABABp5b0y7=5cGFDc1oovgs=-jRVyg@mail.gmail.com> References: <201409291505.s8TF5Nhh066884@svn.freebsd.org> <542C14F6.7020506@FreeBSD.org> <CADBaqmgnJzrev_cYaJyXABABp5b0y7=5cGFDc1oovgs=-jRVyg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------020307090005080900090405 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2014-10-01 11:06:04 -0400, Will Andrews wrote: > If r272363 doesn't resolve the issue for you, let me know. portmaster still fails for me because: # ls -l /usr/ports lrwxr-xr-x 1 root wheel 16 10 1 14:37 /usr/ports -> /home/jkim/ports To work around the failure, I had to apply the attached patches. Jung-uk Kim > Thanks! --Will. > > On Wed, Oct 1, 2014 at 8:51 AM, Guido Falsi <madpilot@freebsd.org> > wrote: >> On 09/29/14 17:05, Will Andrews wrote: >>> Author: will Date: Mon Sep 29 15:05:23 2014 New Revision: >>> 272282 URL: http://svnweb.freebsd.org/changeset/base/272282 >>> >>> Log: Search for the nearest PORTSDIR where Mk/bsd.ports.mk >>> exists, from .CURDIR. This will only take effect if PORTSDIR >>> is not set, as previously supported. >>> >>> Use .if exists(), for four specific possibilities relative to >>> .CURDIR: ., .., ../.., and ../../.. The fourth possibility is >>> primarily in case ports ever grows a third level. If none of >>> these paths exist, fall back to the old default of /usr/ports. >>> >>> This removes the need to set PORTSDIR explicitly (or via >>> wrapper script) if one is running out of a ports tree that is >>> not in /usr/ports, but in a home directory. >>> >>> Reviewed by: bapt, bdrewery (older version) CR: D799 MFC >>> after: 1 week Sponsored by: Spectra Logic >>> >> >> Hi, >> >> I just refreshed my machines head r272349 and this change is >> creating problems to me. >> >> Maybe I've always been doing something wrong but this is what is >> happening: >> >> root@marvin:~ [0]# cd /usr/ports/x11/nvidia-driver >> root@marvin:/usr/ports/x11/nvidia-driver [0]# make -V PORTSDIR >> /usr/ports/x11/nvidia-driver/../.. >> >> this is problematic since now all dependencies are relative >> paths, this is said to be unsupported in bsd.sanity.mk, line 35 >> and following ones. >> >> It also makes poudriere builds fail: >> >> root@marvin:~ [0]# poudriere bulk -C -p mptest -t -j 11amd64 >> x11/xlogo ====>> Creating the reference jail... done ====>> >> Mounting system devices for 11amd64-mptest ====>> Mounting >> ports/packages/distfiles ====>> Mounting packages from: >> /poudriere/data/packages/11amd64-mptest ====>> Logs: >> /poudriere/data/logs/bulk/11amd64-mptest/2014-10-01_16h44m56s >> ====>> WWW: >> http://pkg.madpilot.net:8888/logs/bulk/11amd64-mptest/2014-10-01_16h44m56s >> >> >> ====>> Appending to make.conf: /usr/local/etc/poudriere.d/make.conf >> ====>> DEVELOPER=yes ignored from make.conf. Use 'bulk -t' or >> 'testport' for testing instead. /etc/resolv.conf -> >> /poudriere/data/build/11amd64-mptest/ref/etc/resolv.conf ====>> >> Starting jail 11amd64-mptest ====>> Loading MOVED ====>> >> Calculating ports order and dependencies ====>> Error: >> Duplicated origin for pkgconf-0.9.7: >> devel/xorg-macros/../../devel/pkgconf AND >> x11/xlogo/../../devel/pkgconf. Rerun with -vv to see which ports >> are depending on these. ====>> Cleaning up ====>> Umounting file >> systems >> >> (the ports nvidia-driver and xlogo in these small logs are taken >> at random) >> >> It also completely breaks portmaster. >> >> Maybe this patch is excessive and should first try to discover >> if we already are in the standard /usr/ports subtree? >> >> I have not tried but I'm quite confident I can :fix: this by >> adding PORTSTREE=/usr/ports in /etc/make.conf, but this does not >> look like a good solution. >> >> -- Guido Falsi <madpilot@FreeBSD.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJULE/rAAoJEHyflib82/FGuM8IAInuaiLVvxrRG/th0Q/o8cQ2 vFlBry7cDOVeibnYAcNzKmQBYjVD/XdwQYIJu5Hrpdwj1o6JVfUvlOQYZV++m/Yz G5zvwhqvBqgKMi95mZCXEqPDUXN241f627jnLYX6OrTnQRDqapELtMfdcVssXDMt jQcYK+0Q0F3CtHSQhUicwsUYIl2bff1uOS+vgGU/C/kvDwImla5XuCMf3WJHq87H P5X9yKADc5FzqXoCyaCN++cwHKYx0Dw9p1ym4rfX1VfbZrPjaBUsswxW55lcLQ5/ 9BWJ1sGvcuXt82M9UkcIoxstL4+uQrH3B92MAgXVI49j1iB7u2+iFU2dgZCocZs= =Epd0 -----END PGP SIGNATURE----- --------------020307090005080900090405 Content-Type: text/x-patch; name="ports.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ports.diff" Index: share/mk/bsd.port.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- share/mk/bsd.port.mk (revision 272375) +++ share/mk/bsd.port.mk (working copy) @@ -12,6 +12,8 @@ PORTSDIR!=3D realpath ${.CURDIR}/.. PORTSDIR!=3D realpath ${.CURDIR}/../.. .elif exists(${.CURDIR}/../../../Mk/bsd.port.mk) PORTSDIR!=3D realpath ${.CURDIR}/../../.. +.elif exists(/usr/ports/Mk/bsd.port.mk) +PORTSDIR!=3D realpath /usr/ports .else PORTSDIR=3D /usr/ports .endif Index: share/mk/bsd.port.subdir.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- share/mk/bsd.port.subdir.mk (revision 272375) +++ share/mk/bsd.port.subdir.mk (working copy) @@ -12,6 +12,8 @@ PORTSDIR!=3D realpath ${.CURDIR}/.. PORTSDIR!=3D realpath ${.CURDIR}/../.. .elif exists(${.CURDIR}/../../../Mk/bsd.port.mk) PORTSDIR!=3D realpath ${.CURDIR}/../../.. +.elif exists(/usr/ports/Mk/bsd.port.mk) +PORTSDIR!=3D realpath /usr/ports .else PORTSDIR=3D /usr/ports .endif --------------020307090005080900090405 Content-Type: text/x-patch; name="portmaster.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="portmaster.diff" --- portmaster.orig 2014-10-01 14:44:28.919316000 -0400 +++ portmaster 2014-10-01 14:44:28.919316000 -0400 @@ -359,7 +359,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then if [ -z "$pd" ]; then if [ -z "$PORTSDIR" ]; then - [ -d /usr/ports ] && pd=3D/usr/ports + [ -d /usr/ports ] && pd=3D`realpath /usr/ports` [ -z "$pd" ] && pd=3D`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null`= else --------------020307090005080900090405--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?542C4FEC.8010800>