From owner-freebsd-current@FreeBSD.ORG Sat Jun 20 22:44:02 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 307B4106566C for ; Sat, 20 Jun 2009 22:44:01 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from poseidon.ceid.upatras.gr (poseidon.ceid.upatras.gr [150.140.141.169]) by mx1.freebsd.org (Postfix) with ESMTP id 9AD048FC08 for ; Sat, 20 Jun 2009 22:44:00 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 66417EB54AB; Sun, 21 Jun 2009 01:15:55 +0300 (EEST) Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 46FB44513E; Sun, 21 Jun 2009 01:15:55 +0300 (EEST) X-Virus-Scanned: amavisd-new at ceid.upatras.gr Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HlHStKWjgRn5; Sun, 21 Jun 2009 01:15:55 +0300 (EEST) Received: from kobe.laptop (ppp-94-66-2-34.home.otenet.gr [94.66.2.34]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 03A604512A; Sun, 21 Jun 2009 01:15:54 +0300 (EEST) Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id n5KMFssp002621; Sun, 21 Jun 2009 01:15:54 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id n5KMFsUr002620; Sun, 21 Jun 2009 01:15:54 +0300 (EEST) (envelope-from keramida@freebsd.org) From: Giorgos Keramidas To: Alexander Best References: Date: Sun, 21 Jun 2009 01:15:47 +0300 In-Reply-To: (Alexander Best's message of "Tue, 16 Jun 2009 15:34:42 +0200 (CEST)") Message-ID: <87r5xepn58.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Cc: freebsd-current@freebsd.org Subject: Re: WITHOUT_GAMES=true and /usr/games X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jun 2009 22:44:03 -0000 --=-=-= On Tue, 16 Jun 2009 15:34:42 +0200 (CEST), Alexander Best wrote: > hi there, > > any reason installworld creates the games dir in /usr even though > /etc/src.conf states WITHOUT_GAMES=true. if nothing get's installed into the > dir buildworld might just as well not create it. or am i wrong? I have a local patch for a few months, that splits /var/games and /usr/games in their own mtree spec file. If it looks ok, I can always ask for commit approval and push it to svn: %%% # HG changeset patch # User Giorgos Keramidas # Date 1219869421 -10800 # Branch head # Node ID 017ed6c13a5438d2bd077c0930591aa7d88f0649 # Parent 5255edc94f3b20de0b976ff13d1c65b0d6b799ed Fix `make installworld' with WITHOUT_GAMES=yes. * Split off the parts of BSD.usr.dist and BSD.var.dist that depend on the 'games' user and group to BSD.games.dist. * Update etc/Makefile to use BSD.games.dist, but hide the relevant parts behind .if ${MK_GAMES} != "no". This way when installworld runs and WITHOUT_GAMES=yes, we don't even try to create the directories that belong to the games:games user. The rest of the source tree is already set up to avoid installing anything in those directories, and installworld runs to completion without any visible issues. Inspired by: A thread in freebsd-questions, started by Redd Vinylene [reddvinylene at gmail.com] diff -r 5255edc94f3b -r 017ed6c13a54 etc/Makefile --- a/etc/Makefile Thu Aug 14 15:55:01 2008 +0300 +++ b/etc/Makefile Wed Aug 27 23:37:01 2008 +0300 @@ -100,6 +100,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" @@ -260,6 +263,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 5255edc94f3b -r 017ed6c13a54 etc/mtree/BSD.games.dist --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/mtree/BSD.games.dist Wed Aug 27 23:37:01 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 5255edc94f3b -r 017ed6c13a54 etc/mtree/BSD.usr.dist --- a/etc/mtree/BSD.usr.dist Thu Aug 14 15:55:01 2008 +0300 +++ b/etc/mtree/BSD.usr.dist Wed Aug 27 23:37:01 2008 +0300 @@ -7,8 +7,6 @@ . bin .. - games - .. include .. lib diff -r 5255edc94f3b -r 017ed6c13a54 etc/mtree/BSD.var.dist --- a/etc/mtree/BSD.var.dist Thu Aug 14 15:55:01 2008 +0300 +++ b/etc/mtree/BSD.var.dist Wed Aug 27 23:37:01 2008 +0300 @@ -45,8 +45,6 @@ .. empty mode=0555 flags=schg .. - games gname=games mode=0775 - .. heimdal mode=0700 .. log %%% --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEARECAAYFAko9X5kACgkQ1g+UGjGGA7bgRQCeICi1pvB0L5aBv6d1w0VGYmdA 0mEAn0kjM1TnP/M/OQ4HsvIgWoEb+3SP =t4VX -----END PGP SIGNATURE----- --=-=-=--