From owner-freebsd-emulation@FreeBSD.ORG Sat Dec 17 09:16:16 2005 Return-Path: X-Original-To: freebsd-emulation@freebsd.org 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 E1E0816A41F; Sat, 17 Dec 2005 09:16:16 +0000 (GMT) (envelope-from sanewo@ba2.so-net.ne.jp) Received: from mx53.ms.so-net.ne.jp (mx53.ms.so-net.ne.jp [202.238.83.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D5B743D53; Sat, 17 Dec 2005 09:16:15 +0000 (GMT) (envelope-from sanewo@ba2.so-net.ne.jp) Received: from [127.0.0.1] (pddf34a.tkyoac00.ap.so-net.ne.jp [218.221.243.74]) by mx53.ms.so-net.ne.jp with ESMTP id jBH9G8jX012322; Sat, 17 Dec 2005 18:16:13 +0900 (JST) Message-ID: <43A3D758.1070005@ba2.so-net.ne.jp> Date: Sat, 17 Dec 2005 18:16:08 +0900 From: SANETO Takanori User-Agent: Thunderbird 1.5 (Windows/20051025) MIME-Version: 1.0 To: Alexander Leidinger , freebsd-emulation@freebsd.org, FreeBSD-gnats-submit@FreeBSD.org, SANETO Takanori References: <200512120950.jBC9o7HK058038@freefall.freebsd.org> <20051213195700.GA1196@galgenberg.net> In-Reply-To: <20051213195700.GA1196@galgenberg.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: Re: ports/90220: emulators/linux_base-8 Makefile typo cause install error X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 17 Dec 2005 09:16:17 -0000 It worked fine with me, except that when rpm4 is used, pkg-plist does not match actual files installed. >From pkg-plist, var/lib/rpm/conflictsindex.rpm var/lib/rpm/fileindex.rpm var/lib/rpm/groupindex.rpm var/lib/rpm/nameindex.rpm var/lib/rpm/packages.rpm var/lib/rpm/providesindex.rpm var/lib/rpm/requiredby.rpm var/lib/rpm/triggerindex.rpm Ulrich Spoerlein wrote: >> I try to get time this week to fix the issue for rpm-4. > > Since I made the mess, attached is a patch that fixes it for both rpm3 > and rpm4. Just did a install/deinstall with both rpms, I hope this > really fixes it. > > Ulrich Spoerlein > > Index: Makefile > =================================================================== > RCS file: /home/ncvs/ports/emulators/linux_base-8/Makefile,v > retrieving revision 1.112 > diff -u -p -r1.112 Makefile > --- Makefile 4 Dec 2005 13:12:08 -0000 1.112 > +++ Makefile 13 Dec 2005 19:55:08 -0000 > @@ -125,8 +125,8 @@ FALLBACK_ELF_MIB= kern.fallback_elf_bran > LINUX_ELF= 3 > PREVIOUS_ELF!= /sbin/sysctl -n ${FALLBACK_ELF_MIB} > > -# FIXME. This will result in a file at /compat/linux/etcnsswitch.conf.dist (sic!) > -RPMFLAGS+= --relocate /etc/nsswitch.conf=/etc/nsswitch.conf.dist --badreloc > +# FIXME: The double-// can go away, once we deprecate rpm-3 > +RPMFLAGS+= --relocate /etc/nsswitch.conf=/etc//nsswitch.conf.dist --badreloc > > do-install: > # > @@ -145,7 +145,6 @@ do-install: > ${ECHO} $$R; \ > ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ > done > - @${MV} ${PREFIX}/etcnsswitch.conf.dist ${PREFIX}/etc/nsswitch.conf.dist > @test -f ${PREFIX}/etc/nsswitch.conf || cp ${PREFIX}/etc/nsswitch.conf.dist \ > ${PREFIX}/etc/nsswitch.conf > @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \