Date: Mon, 24 Aug 2009 23:08:39 +0200 (CEST) From: "Julian H. Stacey" <jhs@berklix.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: "Julian H. Stacey" <jhs@berklix.com>, Doug Barton <dougb@FreeBSD.org> Subject: bin/138150: fix for src/etc/Makefile mtree Message-ID: <200908242108.n7OL8d8Z063802@fire.js.berklix.net> Resent-Message-ID: <200908242140.n7OLe2TY094398@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908242108.n7OL8d8Z063802>