I can't make world without the "games" group?

[Giorgos Keramidas]

On Tue, 26 Aug 2008 18:04:26 +0300, Giorgos Keramidas <keramida at ceid.upatras.gr> wrote:
> % --------------------------------------------------------------
> % >>> Making hierarchy
> % --------------------------------------------------------------
> % cd /home/build/src; make -f Makefile.inc1 hierarchy
> % cd /home/build/src/etc;         make distrib-dirs
> % mtree -eU  -f /home/build/src/etc/mtree/BSD.root.dist -p /
> % mtree -eU  -f /home/build/src/etc/mtree/BSD.var.dist -p /var
> % mtree: line 48: unknown group games
> % *** Error code 1
> %
> % Stop in /home/build/src/etc.
> % *** Error code 1
> %
> % Stop in /home/build/src.
> % *** Error code 1
> %
> % Stop in /home/build/src.
> % *** Error code 1
> %
> % Stop in /home/build/src.
> % *** Error code 1
> %
> % Stop in /home/build/src.
> % root at kobe:/home/build/src#
>
> That's because src/etc/mtree/BSD.usr.dist and BSD.var.dist include
> references to the `games' user and group.  I'll try to split the
> relevant bits in a new `BSD.games.dist' file which will be conditionally
> passed to mtree(8) depending on WITHOUT_GAMES.
>
> Is this the same error as the one you are seeing?  When I prepare a
> patch for this, would you be willing to test it for me?

Ok, think I got it...

Here's the patch I am testing now.  If this works locally, I'll post it
for review to our Makefile gurus and commit it when we get it into shape.
If things work without problems in CURRENT for a few days, I'll backport
it to the STABLE branches too.

%%%
diff -r ef7ac5c285f5 etc/Makefile
--- a/etc/Makefile	Tue Aug 26 16:37:27 2008 +0300
+++ b/etc/Makefile	Tue Aug 26 18:27:33 2008 +0300
@@ -56,6 +56,9 @@
 	BSD.var.dist BSD.x11.dist BSD.x11-4.dist
 .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
@@ -204,6 +207,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; \
diff -r ef7ac5c285f5 etc/mtree/BSD.games.dist
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/BSD.games.dist	Tue Aug 26 18:27:33 2008 +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 ef7ac5c285f5 etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist	Tue Aug 26 16:37:27 2008 +0300
+++ b/etc/mtree/BSD.usr.dist	Tue Aug 26 18:27:33 2008 +0300
@@ -6,8 +6,6 @@
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
-    ..
-    games
     ..
     include
     ..
diff -r ef7ac5c285f5 etc/mtree/BSD.var.dist
--- a/etc/mtree/BSD.var.dist	Tue Aug 26 16:37:27 2008 +0300
+++ b/etc/mtree/BSD.var.dist	Tue Aug 26 18:27:33 2008 +0300
@@ -45,8 +45,6 @@
     ..
     empty           mode=0555 flags=schg
     ..
-    games           gname=games mode=0775
-    ..
     heimdal         mode=0700
     ..
     log
%%%