From owner-svn-src-head@FreeBSD.ORG Wed Jul 23 16:53:44 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8162DF4C; Wed, 23 Jul 2014 16:53:44 +0000 (UTC) Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F20521F2; Wed, 23 Jul 2014 16:53:44 +0000 (UTC) Received: from zeppelin.tachypleus.net (polaris.tachypleus.net [75.101.50.44]) (authenticated bits=0) by d.mail.sonic.net (8.14.9/8.14.9) with ESMTP id s6NGe2Of010982 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 23 Jul 2014 09:40:02 -0700 Message-ID: <53CFE562.1060501@freebsd.org> Date: Wed, 23 Jul 2014 09:40:02 -0700 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: "Bjoern A. Zeeb" Subject: Re: svn commit: r219177 - in head: . games release release/scripts References: <201103021439.p22EdQsU015424@svn.freebsd.org> <51E8489E-E93D-4415-8AAA-8D2BB4E4E33E@lists.zabbadoz.net> In-Reply-To: <51E8489E-E93D-4415-8AAA-8D2BB4E4E33E@lists.zabbadoz.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-Sonic-CAuth: UmFuZG9tSVb5zpU+DFAGc+6nDqNbvM87diJvl4TTgzL2lobXi9GqBfoOEH/qBY1yi8+FahM1NGVp9Yk6sPDl/FO7XSR4cloHmOyYvEu5vzk= X-Sonic-ID: C;UEVf/ocS5BGdfefV54E5FQ== M;BI6U/ocS5BGdfefV54E5FQ== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2014 16:53:44 -0000 On 07/23/14 09:34, Bjoern A. Zeeb wrote: > On 02 Mar 2011, at 14:39 , Nathan Whitehorn wrote: > >> Author: nwhitehorn >> Date: Wed Mar 2 14:39:26 2011 >> New Revision: 219177 >> URL: http://svn.freebsd.org/changeset/base/219177 >> >> Log: >> Improve the distributeworld target in Makefile.inc1 and update the release >> infrastructure to use it. make distributeworld can now be used without >> preparing its environment first and installs games into its distribution >> using the regular make distribute logic instead of post-processing with >> a script. >> >> Also add two new targets, packageworld and packagekernel, that tar up the >> results of distributeworld and distributekernel (also new), respectively. >> >> Deleted: >> head/release/scripts/games-make.sh >> head/release/scripts/lib32-make.sh >> Modified: >> head/Makefile >> head/Makefile.inc1 >> head/games/Makefile.inc >> head/release/Makefile > .. > >> Modified: head/Makefile.inc1 >> ============================================================================== >> --- head/Makefile.inc1 Wed Mar 2 13:06:47 2011 (r219176) >> +++ head/Makefile.inc1 Wed Mar 2 14:39:26 2011 (r219177) >> @@ -631,6 +631,13 @@ ITOOLS= [ awk cap_mkdb cat chflags chmod >> … > >> @@ -653,8 +660,33 @@ distributeworld installworld: installche >> done); \ >> cp $$libs $$progs ${INSTALLTMP} >> cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale >> +.if make(distributeworld) >> +.for dist in ${EXTRA_DISTRIBUTIONS} >> + -mkdir ${DESTDIR}/${DISTDIR}/${dist} >> + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ >> + -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null >> + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ >> + -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null >> + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ >> + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null >> +.endfor >> + -mkdir ${DESTDIR}/${DISTDIR}/base >> + ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \ >> + DESTDIR=${DESTDIR}/${DISTDIR}/base >> +.endif >> ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ >> ${IMAKEENV} rm -rf ${INSTALLTMP} >> +.if make(distributeworld) >> +.for dist in ${EXTRA_DISTRIBUTIONS} >> + find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete >> +.endfor >> +.endif >> + >> +packageworld: >> +.for dist in base ${EXTRA_DISTRIBUTIONS} >> + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ >> + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . >> +.endfor >> >> # >> # reinstall >> @@ -840,6 +872,20 @@ reinstallkernel reinstallkernel.debug: i >> ${CROSSENV} PATH=${TMPPATH} \ >> ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} >> >> +distributekernel distributekernel.debug: >> +.if empty(INSTALLKERNEL) >> + @echo "ERROR: No kernel \"${KERNCONF}\" to install."; \ >> + false >> +.endif >> + cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ >> + ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \ >> + DESTDIR=${DESTDIR}/${DISTDIR}/kernel \ >> + ${.TARGET:S/distributekernel/install/} >> + >> +packagekernel: >> + ${_+_}cd ${DESTDIR}/${DISTDIR}/kernel; \ >> + tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz . >> + >> # >> # doxygen >> # > This is where DISTDIR was introduced it seems. I guess it only became a real issue for me with NO_ROOT changes I use. In addition it probably doesn’t help that (not on the currently observed system) I also build world images from ports. > > Unfortunately this collides with: > > /usr/ports/Mk/bsd.port.mk:# DISTDIR - Where to search for and store copies of original sources > /usr/ports/Mk/bsd.port.mk:DISTDIR?= ${PORTSDIR}/distfiles > > That a lot of people I know have set in their environment, and done so in a decade. > > Just wondering if it’s worth avoiding the obvious by renaming it in base? > Yes, I think you're right. Could you rename it? It's used only in the scripts in this commit, so far as I know. -Nathan