From owner-freebsd-emulation@FreeBSD.ORG Sun Mar 27 09:55:49 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 574AA16A4CE; Sun, 27 Mar 2005 09:55:49 +0000 (GMT) Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC8E943D5C; Sun, 27 Mar 2005 09:55:48 +0000 (GMT) (envelope-from krion@voodoo.oberon.net) Received: from krion by voodoo.oberon.net with local (Exim 4.50 (FreeBSD)) id 1DFUUf-0007Cq-It; Sun, 27 Mar 2005 11:55:41 +0200 Date: Sun, 27 Mar 2005 11:55:41 +0200 From: Kirill Ponomarew To: Alexander Leidinger Message-ID: <20050327095541.GB16502@voodoo.oberon.net> Mail-Followup-To: Kirill Ponomarew , Alexander Leidinger , Kris Kennaway , emulation@freebsd.org, portmgr@freebsd.org References: <20050327022418.GA92678@xor.obsecurity.org> <20050327112422.680b25a3@Magellan.Leidinger.net> <20050327092943.GA16502@voodoo.oberon.net> <20050327115142.2cf6e3b3@Magellan.Leidinger.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050327115142.2cf6e3b3@Magellan.Leidinger.net> X-NCC-Regid: de.oberon X-NIC-HDL: KP869-RIPE cc: emulation@freebsd.org cc: portmgr@freebsd.org cc: Kris Kennaway Subject: Re: linux-* pkg-plist errors X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Mar 2005 09:55:49 -0000 On Sun, Mar 27, 2005 at 11:51:42AM +0200, Alexander Leidinger wrote: > Those fixes are independent from the USE_LINUX issues. Do you want to > see patches for those too? > > > > On a related issue: There was a commit which removed USE_LINUX=yes from > > > a lot of ports (>100) to be able to use alternative linux_base ports. > > > This results in the possibility to use e.g. linux_base-rh-9, but it also > > > discards dependency information. I like to backout this commit and solve > > > the feature request by checking for a OVERRIDE_DEFAULT_LINUX_BASE knob > > > in the USE_LINUX case in bsd.port.mk. Do I get the approval for this too? > > > > Please show us the patches first. > > Here's the bsd.port.mk part. I've tested it with "make -V USE_LINUX > -V RUN_DEPENDS OVERRIDE_DEFAULT_LINUX_BASE=rh-9" in lang/icc (cut&paste, > discards tabs): > ---snip--- > Index: Mk/bsd.port.mk > =================================================================== > RCS file: /big/FreeBSD-CVS/ports/Mk/bsd.port.mk,v > retrieving revision 1.511 > diff -u -u -r1.511 bsd.port.mk > --- Mk/bsd.port.mk 17 Mar 2005 23:22:07 -0000 1.511 > +++ Mk/bsd.port.mk 27 Mar 2005 09:36:48 -0000 > @@ -1500,6 +1500,11 @@ > .endif > > .if defined(USE_LINUX) > +. if defined(OVERRIDE_DEFAULT_LINUX_BASE) > +. if ${USE_LINUX} == yes > +USE_LINUX= ${OVERRIDE_DEFAULT_LINUX_BASE} > +. endif > +. endif > . if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX}) > RUN_DEPENDS+= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} > . else Uuuh, I think you know that we don't commit bsd.port.mk without running it on cluster first. I think it can be delayed and tested after the freeze. -Kirill