From owner-freebsd-current@FreeBSD.ORG Mon Jun 22 14:36:09 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 CB332106566C for ; Mon, 22 Jun 2009 14:36:09 +0000 (UTC) (envelope-from a_best01@uni-muenster.de) Received: from zivm-out2.uni-muenster.de (ZIVM-OUT2.UNI-MUENSTER.DE [128.176.192.9]) by mx1.freebsd.org (Postfix) with ESMTP id EFA398FC22 for ; Mon, 22 Jun 2009 14:36:08 +0000 (UTC) (envelope-from a_best01@uni-muenster.de) X-IronPort-AV: E=Sophos;i="4.42,268,1243807200"; d="scan'208";a="216712214" Received: from zivmaildisp2.uni-muenster.de (HELO ZIVMAILUSER03.UNI-MUENSTER.DE) ([128.176.188.143]) by zivm-relay2.uni-muenster.de with ESMTP; 22 Jun 2009 16:36:07 +0200 Received: by ZIVMAILUSER03.UNI-MUENSTER.DE (Postfix, from userid 149459) id DD9E61B075E; Mon, 22 Jun 2009 16:36:06 +0200 (CEST) Date: Mon, 22 Jun 2009 16:36:06 +0200 (CEST) From: Alexander Best Sender: Organization: Westfaelische Wilhelms-Universitaet Muenster To: Giorgos Keramidas Message-ID: In-Reply-To: <87r5xepn58.fsf@kobe.laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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: Mon, 22 Jun 2009 14:36:10 -0000 thanks a bunch. i'll patch my source tree and see if i can installworld without /usr/games beeing created. would be great to have this patch in -HEAD. cheers. alex Giorgos Keramidas schrieb am 2009-06-21: > 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 > %%%