From owner-svn-src-head@FreeBSD.ORG Wed Oct 1 20:14:00 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from hammer.pct.niksun.com (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by hub.freebsd.org (Postfix) with ESMTP id 06CB973E; Wed, 1 Oct 2014 20:13:59 +0000 (UTC) Message-ID: <542C6087.2060909@FreeBSD.org> Date: Wed, 01 Oct 2014 16:13:59 -0400 From: Jung-uk Kim User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.2 MIME-Version: 1.0 To: Will Andrews Subject: Re: svn commit: r272282 - head/share/mk References: <201409291505.s8TF5Nhh066884@svn.freebsd.org> <542C14F6.7020506@FreeBSD.org> <542C4FEC.8010800@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: Baptiste Daroussin , "src-committers@FreeBSD.org" , "svn-src-all@freebsd.org" , Bryan Drewery , "svn-src-head@freebsd.org" , Guido Falsi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Oct 2014 20:14:00 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2014-10-01 15:54:06 -0400, Will Andrews wrote: > What kind of problem did this cause compared to the original > version? Could you provide the details of what you saw? # portmaster devel/autoconf devel/autoconf-wrapper ===>>> Working on: devel/autoconf devel/autoconf-wrapper ===>>> devel/autoconf 1/2 ===>>> Gathering distinfo list for installed ports ===>>> Currently installed version: autoconf-2.69 ===>>> Port directory: /usr/ports/devel/autoconf ===>>> Launching 'make checksum' for devel/autoconf in background ===>>> Gathering dependency list for devel/autoconf from ports ===>>> Launching child to install /usr/home/jkim/ports/devel/autoconf-wrapper ===>>> devel/autoconf 1/2 >> /usr/home/jkim/ports/devel/autoconf-wrapper (1/1) ===>>> No valid installed port, or port directory given ===>>> Try portmaster --help ===>>> Update for /usr/home/jkim/ports/devel/autoconf-wrapper failed ===>>> Aborting update ===>>> Update for devel/autoconf failed ===>>> Aborting update Actually, portmaster.diff is just enough to fix portmaster problem. ports.diff is for consistency. Jung-uk Kim > Thanks, --Will. > > On Wed, Oct 1, 2014 at 1:03 PM, Jung-uk Kim > wrote:> 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 >>>> 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJULGCHAAoJEHyflib82/FGFoMH/1BARQu10hK1avJl3W6lYl3y HeiKU7IvC0+DtfXZvA0Ixn9eGfCzmLi0TqPQTUQRQniIWBNggUTG41mD1Ar6a1nv 3e7AF8vquCwKXYpm9LS/vc4I4U4k7PguUcE2DrX2NaRdkOrNWN09b/NKO8uZndMS sFhzUcp2euCY0X9aV+hBiy7JWmZ5KF5JOA0wXWx33glduuHDHqARJeDzmGKS3ufH RNTRR4rJlWpgALGwjYwAPlS1z7EQgJ4mJBYjMmy1Q10i7sX9oFB7oQc7w/qnUndX q9RtNEgtkgZzKY5JgdUWqIitwr0wl4YCjkpGiylEp+54b7hn+n/qfhXde9G5wyA= =pH7W -----END PGP SIGNATURE-----