Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Mar 2005 11:51:42 +0200
From:      Alexander Leidinger <Alexander@Leidinger.net>
To:        Kirill Ponomarew <krion@voodoo.oberon.net>
Cc:        Kris Kennaway <kris@obsecurity.org>
Subject:   Re: linux-* pkg-plist errors
Message-ID:  <20050327115142.2cf6e3b3@Magellan.Leidinger.net>
In-Reply-To: <20050327092943.GA16502@voodoo.oberon.net>
References:  <20050327022418.GA92678@xor.obsecurity.org> <20050327112422.680b25a3@Magellan.Leidinger.net> <20050327092943.GA16502@voodoo.oberon.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 27 Mar 2005 11:29:43 +0200
Kirill Ponomarew <krion@voodoo.oberon.net> wrote:

> On Sun, Mar 27, 2005 at 11:24:22AM +0200, Alexander Leidinger wrote:
> > > I will be marking these ports BROKEN in 2 weeks if they still have
> > > plist errors at that time.  I hope there is an interested party who
> > > can fix them before then :)
> > 
> > Do I have approval to commit fixes (I try to get time to fix some today
> > and tomorrow)?

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
Index: UPDATING
===================================================================
RCS file: /big/FreeBSD-CVS/ports/UPDATING,v
retrieving revision 1.170
diff -u -u -r1.170 UPDATING
--- UPDATING    25 Mar 2005 17:24:12 -0000      1.170
+++ UPDATING    27 Mar 2005 09:48:53 -0000
@@ -7,8 +7,17 @@
 upgrades.
 
 
+20050328:
+  AFFECTS: users of alternate linux_base ports
+  AUTHOR: netchild@FreeBSD.org
+
+  The Ports Collection now allows to override the default linux_base port.
+  Specify e.g. OVERRIDE_DEFAULT_LINUX_BASE=rh-9 in /etc/make.conf to use
+  ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
+  ${PORTSDIR}/emulators/linux_base-${OVERRIDE_DEFAULT_LINUX_BASE}).
+
 20050324:
-  AFFECTS: users of net/mDNSResponder,
+  AFFECTS: users of net/mDNSResponder
   AUTHOR: brooks@FreeBSD.org
 
   In mDNSResponder 98_1, mdnsd is no longer started by default due to a
---snip---

I haven't changed every port yet, so I don't have patches available yet
(but since it's a backout it is known to work).

Bye,
Alexander.

-- 
                       There's no place like ~

http://www.Leidinger.net                       Alexander @ Leidinger.net
  GPG fingerprint = C518 BC70 E67F 143F BE91  3365 79E2 9C60 B006 3FE7



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050327115142.2cf6e3b3>