From owner-freebsd-bugs@FreeBSD.ORG Mon Aug 24 21:40:02 2009 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C936106568D for ; Mon, 24 Aug 2009 21:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 40EFC8FC18 for ; Mon, 24 Aug 2009 21:40:02 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7OLe2Bi094399 for ; Mon, 24 Aug 2009 21:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7OLe2TY094398; Mon, 24 Aug 2009 21:40:02 GMT (envelope-from gnats) Resent-Date: Mon, 24 Aug 2009 21:40:02 GMT Resent-Message-Id: <200908242140.n7OLe2TY094398@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Julian H. Stacey" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26C6F106568D for ; Mon, 24 Aug 2009 21:36:02 +0000 (UTC) (envelope-from jhs@berklix.com) Received: from tower.berklix.org (tower.berklix.org [83.236.223.114]) by mx1.freebsd.org (Postfix) with ESMTP id 9F84D8FC08 for ; Mon, 24 Aug 2009 21:36:01 +0000 (UTC) Received: from park.js.berklix.net (p549A7BD1.dip.t-dialin.net [84.154.123.209]) (authenticated bits=0) by tower.berklix.org (8.14.2/8.14.2) with ESMTP id n7OL7Mkq071990; Mon, 24 Aug 2009 21:07:23 GMT (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (fire.js.berklix.net [192.168.91.41]) by park.js.berklix.net (8.13.8/8.13.8) with ESMTP id n7OL7TsO096328; Mon, 24 Aug 2009 23:07:29 +0200 (CEST) (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (localhost [127.0.0.1]) by fire.js.berklix.net (8.14.3/8.14.3) with ESMTP id n7OL8nDg063803; Mon, 24 Aug 2009 23:08:54 +0200 (CEST) (envelope-from jhs@fire.js.berklix.net) Received: (from jhs@localhost) by fire.js.berklix.net (8.14.3/8.14.3/Submit) id n7OL8d8Z063802; Mon, 24 Aug 2009 23:08:39 +0200 (CEST) (envelope-from jhs) Message-Id: <200908242108.n7OL8d8Z063802@fire.js.berklix.net> Date: Mon, 24 Aug 2009 23:08:39 +0200 (CEST) From: "Julian H. Stacey" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: "Julian H. Stacey" , Doug Barton Subject: bin/138150: fix for src/etc/Makefile mtree X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Julian H. Stacey" List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2009 21:40:02 -0000 >Number: 138150 >Category: bin >Synopsis: fix for src/etc/Makefile mtree >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 24 21:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Julian H. Stacey >Release: FreeBSD 7.2-RELEASE i386 >Organization: http://berklix.com BSD Linux Unix Consultancy, Munich/Muenchen. >Environment: System: FreeBSD wind.js.berklix.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Sun Aug 23 19:02:54 CEST 2009 jhs@laps.js.berklix.net:/usr/src/sys/i386/compile/WIND.small i386 >Description: If one has an old file named /etc/security instead of a directory of same name, then cd /usr/src/etc ; make distrib-dirs fails to detect & fix it. (Well, it bleats an error, but make rolls on.) >How-To-Repeat: mv /etc/security /etc/security.MOVED cp /etc/motd /etc/security cd /usr/src/etc ; make distrib-dirs ls -l /etc/security rm /etc/security mv /etc/security.MOVED /etc/security >Fix: Apply this unified diff --- 7.2-RELEASE/src/etc/Makefile.orig 2009-08-24 22:11:05.000000000 +0200 +++ new/src/etc/Makefile 2009-08-24 22:16:39.000000000 +0200 @@ -243,21 +243,21 @@ .endif distrib-dirs: - mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ - mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var - mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr - mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \ + mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/ + mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var + mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr + mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \ -p ${DESTDIR}/usr/include .if ${MK_BIND_LIBS} != "no" - mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \ + mtree -deu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \ -p ${DESTDIR}/usr/include .endif .if ${MK_BIND_MTREE} != "no" - mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ + mtree -deu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named .endif .if ${MK_SENDMAIL} != "no" - mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ + mtree -deu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ .endif cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* . >Release-Note: >Audit-Trail: >Unformatted: