From owner-freebsd-emulation@FreeBSD.ORG Tue Dec 13 19:57:40 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 2C11616A423; Tue, 13 Dec 2005 19:57:40 +0000 (GMT) (envelope-from q@galgenberg.net) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6892B43D94; Tue, 13 Dec 2005 19:57:09 +0000 (GMT) (envelope-from q@galgenberg.net) Received: from wrzx30.rz.uni-wuerzburg.de (wrzx30.rz.uni-wuerzburg.de [132.187.1.30]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id C4C0713FAED; Tue, 13 Dec 2005 20:57:07 +0100 (CET) Received: from virusscan (localhost [127.0.0.1]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id A83209DDB2; Tue, 13 Dec 2005 20:57:07 +0100 (CET) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 93BFB9DD9F; Tue, 13 Dec 2005 20:57:07 +0100 (CET) Received: from frodo.galgenberg.net (wwsx14.win-screen.uni-wuerzburg.de [132.187.253.14]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 52A5813FAF7; Tue, 13 Dec 2005 20:57:07 +0100 (CET) Received: from coyote.q.local (gb-21-237.galgenberg.net [172.16.21.237]) by frodo.galgenberg.net (8.13.1/8.13.1) with ESMTP id jBDJv7cP025477; Tue, 13 Dec 2005 20:57:07 +0100 (CET) (envelope-from q@galgenberg.net) Received: from roadrunner.q.local (roadrunner.q.local [192.168.0.148]) by coyote.q.local (8.13.4/8.13.4) with ESMTP id jBDJv63a024921; Tue, 13 Dec 2005 20:57:06 +0100 (CET) (envelope-from q@galgenberg.net) Received: from roadrunner.q.local (localhost [127.0.0.1]) by roadrunner.q.local (8.13.4/8.13.4) with ESMTP id jBDJv6T9093159; Tue, 13 Dec 2005 20:57:06 +0100 (CET) (envelope-from q@galgenberg.net) Received: (from q@localhost) by roadrunner.q.local (8.13.4/8.13.4/Submit) id jBDJv0AC093158; Tue, 13 Dec 2005 20:57:00 +0100 (CET) (envelope-from q@galgenberg.net) Date: Tue, 13 Dec 2005 20:57:00 +0100 From: Ulrich Spoerlein To: Alexander Leidinger Message-ID: <20051213195700.GA1196@galgenberg.net> Mail-Followup-To: Alexander Leidinger , freebsd-emulation@freebsd.org, FreeBSD-gnats-submit@FreeBSD.org, SANETO Takanori References: <200512120950.jBC9o7HK058038@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200512120950.jBC9o7HK058038@freefall.freebsd.org> X-Virus-Scanned: by amavisd-new (Rechenzentrum Universitaet Wuerzburg) Cc: freebsd-emulation@freebsd.org, FreeBSD-gnats-submit@freebsd.org 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: Tue, 13 Dec 2005 19:57:40 -0000 > 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 \