Date: Wed, 24 Jun 2009 11:34:59 +0200 (CEST) From: Alexander Best <alexbestms@math.uni-muenster.de> To: <freebsd-current@freebsd.org> Subject: Re: WITHOUT_GAMES=true and /usr/games Message-ID: <permail-20090624093459f0889e84000070d0-a_best01@message-id.uni-muenster.de> In-Reply-To: <87d48ufs17.fsf@kobe.laptop>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
the problem was TAB/space related. i've attached the working patch.
cheers.
Giorgos Keramidas schrieb am 2009-06-24:
> On Wed, 24 Jun 2009 01:21:02 +0200 (CEST), Alexander Best
> <alexbestms@math.uni-muenster.de> wrote:
> > sure:
> > ***************
> > *** 265,270 ****
> > .if ${MK_SENDMAIL} != "no"
> > 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* .
> > cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
> > --- 268,276 ----
> > .if ${MK_SENDMAIL} != "no"
> > mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f
> > ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
> > .endif
> > + .if ${MK_GAMES} != "no"
> > + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f
> > ${.CURDIR}/mtree/BSD.games.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* .
> > cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
> > md5 of src/etc/makefile is 607b7b5c8e5f608abc81211bf379de1a btw.
> This seems to be an old (or somehow different) copy of
> head/etc/Makefile. Mine is revision 193635 from:
> r193635 | edwin | 2009-06-07 16:26:57 +0300 (Sun, 07 Jun 2009) | 16
> lines
> and its md5 is:
> keramida@kobe:/home/keramida/svn/head-etc$ md5 Makefile
> MD5 (Makefile) = c215b19264934bbdcd4bd19f285e10fb
> Can you check that your head/etc/Makefile is the same as this one?
> $ ident head-etc/Makefile
> head-etc/Makefile:
> $FreeBSD: head/etc/Makefile 193635 2009-06-07 13:26:57Z edwin $
[-- Attachment #2 --]
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/Makefile
--- a/etc/Makefile Tue Jun 23 22:08:55 2009 +0000
+++ b/etc/Makefile Wed Jun 24 01:21:27 2009 +0300
@@ -104,6 +104,9 @@
.if ${MK_SENDMAIL} != "no"
MTREE+= BSD.sendmail.dist
.endif
+.if ${MK_GAMES} != "no"
+MTREE+= BSD.games.dist
+.endif
.if ${MK_BIND} != "no"
MTREE+= BIND.chroot.dist
.if ${MK_BIND_LIBS} != "no"
@@ -265,6 +268,9 @@
.if ${MK_SENDMAIL} != "no"
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
.endif
+.if ${MK_GAMES} != "no"
+ mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.games.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* .
cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/mtree/BSD.games.dist
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/BSD.games.dist Wed Jun 24 01:21:27 2009 +0300
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+ usr
+ games
+ ..
+ ..
+ var
+ games gname=games mode=0775
+ ..
+ ..
+..
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist Tue Jun 23 22:08:55 2009 +0000
+++ b/etc/mtree/BSD.usr.dist Wed Jun 24 01:21:27 2009 +0300
@@ -7,8 +7,6 @@
.
bin
..
- games
- ..
include
..
lib
diff -r 34016babb0f2 -r 0f2d2f3bfba0 etc/mtree/BSD.var.dist
--- a/etc/mtree/BSD.var.dist Tue Jun 23 22:08:55 2009 +0000
+++ b/etc/mtree/BSD.var.dist Wed Jun 24 01:21:27 2009 +0300
@@ -45,8 +45,6 @@
..
empty mode=0555 flags=schg
..
- games gname=games mode=0775
- ..
heimdal mode=0700
..
log
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?permail-20090624093459f0889e84000070d0-a_best01>