From owner-svn-src-head@FreeBSD.ORG Wed Oct 1 19:54:13 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4ABC1C6 for ; Wed, 1 Oct 2014 19:54:13 +0000 (UTC) Received: from mail-qa0-f47.google.com (mail-qa0-f47.google.com [209.85.216.47]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5B35DD85 for ; Wed, 1 Oct 2014 19:54:12 +0000 (UTC) Received: by mail-qa0-f47.google.com with SMTP id cm18so831902qab.6 for ; Wed, 01 Oct 2014 12:54:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=mp7RO1PXcDMakIMZaQM4rXzlB5FYNM+gHMWNnUfDKW8=; b=Q1trZc0dU3UCU23sjbOpUPoLcHoZGJ5TUdepZZ0PSrE055nnmA+9Ub3CyuVYzZUZhA xoJgTMtE6+QLUeQvIouMqOFeC3L9Ft3BjNxuiIoJ26V6Jq4XhJTCXz7hbIdIxcAC2Hvo 0Q8RhM81VGawjLGqZne2khYYmeatBsd9LxQd4tV9MkWTjjyR4ydnw3ECfidon2uGRIAa MZvgrevzu8f1CxIfq0+/wbykHc+vZSbYlLpv9hILtv/fN6z9zsky9tNlRPL1zhvXtqZ6 PRNYXlih7rH6E6zlVyOfU1TL+W/0mAH4bmOthYO2C62nk3MVeuSbktFDkTmi4Ew5lxds fFIQ== X-Gm-Message-State: ALoCoQm1t28deumSrRdNvv33Cez9fJghjzS5kIfE/9uUniQsiPYCaEjZdWq3qP/cr3yaSuh6gBB7 MIME-Version: 1.0 X-Received: by 10.224.32.138 with SMTP id c10mr66581994qad.1.1412193246574; Wed, 01 Oct 2014 12:54:06 -0700 (PDT) Received: by 10.140.31.36 with HTTP; Wed, 1 Oct 2014 12:54:06 -0700 (PDT) In-Reply-To: <542C4FEC.8010800@FreeBSD.org> References: <201409291505.s8TF5Nhh066884@svn.freebsd.org> <542C14F6.7020506@FreeBSD.org> <542C4FEC.8010800@FreeBSD.org> Date: Wed, 1 Oct 2014 13:54:06 -0600 Message-ID: Subject: Re: svn commit: r272282 - head/share/mk From: Will Andrews To: Jung-uk Kim Content-Type: text/plain; charset=UTF-8 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 19:54:13 -0000 What kind of problem did this cause compared to the original version? Could you provide the details of what you saw? Thanks, --Will. On Wed, Oct 1, 2014 at 1:03 PM, Jung-uk Kim wrote: > -----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 >> 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 > > iQEcBAEBAgAGBQJULE/rAAoJEHyflib82/FGuM8IAInuaiLVvxrRG/th0Q/o8cQ2 > vFlBry7cDOVeibnYAcNzKmQBYjVD/XdwQYIJu5Hrpdwj1o6JVfUvlOQYZV++m/Yz > G5zvwhqvBqgKMi95mZCXEqPDUXN241f627jnLYX6OrTnQRDqapELtMfdcVssXDMt > jQcYK+0Q0F3CtHSQhUicwsUYIl2bff1uOS+vgGU/C/kvDwImla5XuCMf3WJHq87H > P5X9yKADc5FzqXoCyaCN++cwHKYx0Dw9p1ym4rfX1VfbZrPjaBUsswxW55lcLQ5/ > 9BWJ1sGvcuXt82M9UkcIoxstL4+uQrH3B92MAgXVI49j1iB7u2+iFU2dgZCocZs= > =Epd0 > -----END PGP SIGNATURE-----