From owner-freebsd-emulation@FreeBSD.ORG Fri Jan 27 16:33:16 2006 Return-Path: X-Original-To: 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 99BE716A42F for ; Fri, 27 Jan 2006 16:33:16 +0000 (GMT) (envelope-from jhein@timing.com) Received: from Daffy.timing.com (mx1.timing.com [206.168.13.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE01343EFD for ; Fri, 27 Jan 2006 16:33:15 +0000 (GMT) (envelope-from jhein@timing.com) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by Daffy.timing.com (8.13.1/8.12.8) with ESMTP id k0RGXEoA070729 for ; Fri, 27 Jan 2006 09:33:14 -0700 (MST) (envelope-from jhein@timing.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.13.4/8.13.4) with ESMTP id k0RGXD8i061825; Fri, 27 Jan 2006 09:33:13 -0700 (MST) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.13.4/8.13.4/Submit) id k0RGXCCq061822; Fri, 27 Jan 2006 09:33:12 -0700 (MST) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <17370.19272.894628.650315@gromit.timing.com> Date: Fri, 27 Jan 2006 09:33:12 -0700 From: John E Hein To: emulation@freebsd.org In-Reply-To: <20060127071644.GB34398@xor.obsecurity.org> References: <20060127071644.GB34398@xor.obsecurity.org> X-Mailer: VM 7.19 under Emacs 21.3.1 X-Virus-Scanned: ClamAV version 0.87.1, clamav-milter version 0.87 on Daffy.timing.com X-Virus-Status: Clean Cc: Subject: Re: [ports-i386@pointyhat.freebsd.org: linux_base-8-8.0_12 failed on i386 6] 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: Fri, 27 Jan 2006 16:33:16 -0000 Kris Kennaway wrote at 02:16 -0500 on Jan 27, 2006: [snip] > === Checking filesystem state > list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) > 401931 16 drwxr-xr-x 3 root wheel 512 Jan 27 06:41 compat/linux/usr > 89818 16 drwxr-xr-x 12 root wheel 512 Jan 27 06:24 compat/linux/usr/local [snip] The following patch will help with this. It avoids whacking usr/local if someone adds something to it in their compat tree after install and then upgrades their linux-base port. It only removes empty dirs. A test install/deinstall shows that it solves the problem pointyhat found... clean /compat/linux before and after. Index: Makefile =================================================================== RCS file: /base/FreeBSD-CVS/ports/emulators/linux_base-8/Makefile,v retrieving revision 1.117 diff -u -p -r1.117 Makefile --- Makefile 25 Jan 2006 18:57:36 -0000 1.117 +++ Makefile 27 Jan 2006 16:25:49 -0000 @@ -109,7 +109,7 @@ RPMFLAGS= --root ${PREFIX} --dbpath ${D --replacepkgs --ignoreos --ignorearch RPMDIR= ${DISTDIR}/${DIST_SUBDIR} -REMOVE_DIRS= boot dev home initrd root tmp var/run var/tmp usr/tmp +REMOVE_DIRS= boot dev home initrd root tmp var/run var/tmp usr/local usr/tmp REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \ etc/motd etc/passwd etc/printcap etc/services \ etc/protocols @@ -176,7 +176,7 @@ do-install: # Finish # @for D in ${REMOVE_DIRS}; do \ - ${RM} -rf ${PREFIX}/$$D; \ + ${FIND} ${PREFIX}/$$D -depth -type d -exec ${RMDIR} {} \; || true ; \ done @for F in ${REMOVE_FILES}; do \ ${RM} -f ${PREFIX}/$$F; \