From owner-cvs-src@FreeBSD.ORG Tue Apr 12 17:08:22 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D040516A510 for ; Tue, 12 Apr 2005 17:08:22 +0000 (GMT) Received: from mail26.sea5.speakeasy.net (mail26.sea5.speakeasy.net [69.17.117.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F2FB43D45 for ; Tue, 12 Apr 2005 17:08:22 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 9278 invoked from network); 12 Apr 2005 17:08:21 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 12 Apr 2005 17:08:21 -0000 Received: from [131.106.57.68] (p178.n-lapop01.stsn.com [12.129.240.178]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j3CH871G022095; Tue, 12 Apr 2005 13:08:15 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Matteo Riondato Date: Tue, 12 Apr 2005 12:23:38 -0400 User-Agent: KMail/1.8 References: <200504120105.j3C15qlZ043565@repoman.freebsd.org> <20050412145806.GA39557@xor.obsecurity.org> <20050412153553.GC49623@kaiser.sig11.org> In-Reply-To: <20050412153553.GC49623@kaiser.sig11.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200504121223.40429.jhb@FreeBSD.org> X-Spam-Status: No, score=-2.8 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Alexander Leidinger cc: src-committers@FreeBSD.org cc: cvs-src@FreeBSD.org cc: cvs-all@FreeBSD.org cc: Kris Kennaway Subject: Re: cvs commit: src/usr.sbin/sysinstall config.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 17:08:23 -0000 On Tuesday 12 April 2005 11:35 am, Matteo Riondato wrote: > On Tue, Apr 12, 2005 at 07:58:06AM -0700, Kris Kennaway wrote: > > On Tue, Apr 12, 2005 at 04:41:57PM +0200, Alexander Leidinger wrote: > > > John Baldwin wrote: > > > > Modified files: > > > > usr.sbin/sysinstall config.c > > > > Log: > > > > Explicitly install linux_base 8 to make sure the right version is > > > > installed. > > > > > > Any ideas how to help sysinstall to get the right one without > > > hardcoding it? Some hints in the linux_base* ports? > > > > > > I have changes in the pipeline which add DEFAULT_LINUX_BASE to > > > bsd.port.mk, it will contain a complete dependency (suitable for e.g. > > > "BUILD_DEPENDS = ${DEFAULT_LINUX_BASE}"), if sysinstall has access to > > > bsd.port.mk it could do "make -f /path/to/bsd.port.mk -V > > > DEFAULT_LINUX_BASE USE_LINUX=yes" and parse the output (when the change > > > is committet). > > > > It doesn't..this will probably just have to be tracked by hand. > > I would say that if all linux ports depend on the same linux_base port, > there wouldn't be more than one linux_base-X package in a -RELEASE CD, > so when during installation, we want to add linux_base, we'll always add > the right one (because there'll be only one in the CD). > The bug appeared on one of the last RELEASEs (see the PR, I seem to > remember that it was 5.3-RELEASE) because there were some ports > (actually _2_) that depended on linux_base-6, so linux_base-6 was > included in the CD and, when the user wanted to add "linux_base", > linux_base-6 was chosen instead of linux_base-7 because "6" comes > before "7". Installs over FTP use the full INDEX that lists all the packages, so they need this regardless of the CD contents. > Please note that the Postfix package depends on a similar hack too (see > usr.sbin/sysinstall/config.c, line 993). Yep. It had it specifically for the FTP case. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org