From owner-freebsd-emulation@FreeBSD.ORG Tue Dec 13 20:00:26 2005 Return-Path: X-Original-To: freebsd-emulation@hub.freebsd.org Delivered-To: freebsd-emulation@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A1F916A41F for ; Tue, 13 Dec 2005 20:00:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E510343D76 for ; Tue, 13 Dec 2005 20:00:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBDK0ND1001018 for ; Tue, 13 Dec 2005 20:00:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBDK0NX1001017; Tue, 13 Dec 2005 20:00:23 GMT (envelope-from gnats) Date: Tue, 13 Dec 2005 20:00:23 GMT Message-Id: <200512132000.jBDK0NX1001017@freefall.freebsd.org> To: freebsd-emulation@FreeBSD.org From: Ulrich Spoerlein 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 Reply-To: Ulrich Spoerlein 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 20:00:26 -0000 The following reply was made to PR ports/90220; it has been noted by GNATS. From: Ulrich Spoerlein To: Alexander Leidinger Cc: freebsd-emulation@freebsd.org, FreeBSD-gnats-submit@freebsd.org, SANETO Takanori Subject: Re: ports/90220: emulators/linux_base-8 Makefile typo cause install error Date: Tue, 13 Dec 2005 20:57:00 +0100 > 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 \