Date: Thu, 23 Jan 2014 00:19:22 -0600 From: Bryan Drewery <bryan@shatow.net> To: John Baldwin <jhb@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r261031 - in head: . etc usr.sbin/etcupdate usr.sbin/mergemaster Message-ID: <20140123061922.GB5421@admin.xzibition.com> In-Reply-To: <20140123055710.GA5421@admin.xzibition.com> References: <201401221659.s0MGxrc7056036@svn.freebsd.org> <20140123055710.GA5421@admin.xzibition.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--i9LlY+UWpKt15+FH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 22, 2014 at 11:57:10PM -0600, Bryan Drewery wrote: > On Wed, Jan 22, 2014 at 04:59:53PM +0000, John Baldwin wrote: > > Author: jhb > > Date: Wed Jan 22 16:59:53 2014 > > New Revision: 261031 > > URL: http://svnweb.freebsd.org/changeset/base/261031 > >=20 > > Log: > > Generate /var/db/services.db during 'make distribution' so that it is > > present during new installs. Update etcupdate and mergemaster to > > ignore the generated file. > > =20 > > Tested by: gjb (release build) > > MFC after: 1 month > >=20 > > Modified: > > head/Makefile.inc1 > > head/etc/Makefile > > head/usr.sbin/etcupdate/etcupdate.sh > > head/usr.sbin/mergemaster/mergemaster.sh > >=20 > > Modified: head/Makefile.inc1 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/Makefile.inc1 Wed Jan 22 16:50:18 2014 (r261030) > > +++ head/Makefile.inc1 Wed Jan 22 16:59:53 2014 (r261031) > > @@ -771,7 +771,7 @@ _nmtree_itools=3D nmtree > > ITOOLS=3D [ awk cap_mkdb cat chflags chmod chown \ > > date echo egrep find grep id install ${_install-info} \ > > ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ > > - rm sed sh sysctl test true uname wc ${_zoneinfo} > > + rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo} > > =20 > > # > > # distributeworld > >=20 > > Modified: head/etc/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/etc/Makefile Wed Jan 22 16:50:18 2014 (r261030) > > +++ head/etc/Makefile Wed Jan 22 16:59:53 2014 (r261031) > > @@ -198,6 +198,8 @@ distribution: > > ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ > > ${BIN1} ${DESTDIR}/etc; \ > > cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \ > > + services_mkdb ${CAP_MKDB_ENDIAN} -o ${DESTDIR}/var/db/services.db= \ > > + ${DESTDIR}/etc/services; \ >=20 > Something is not right here. Building in a jail with make distribution > fails: Correction, I am not using jails here. This is setting TARGET_ARCH for a build. It seems to be using the already installed host version (which does not have the -l support) and not the just-built version. >=20 > cd /zpoudriere/jails/head/usr/src/etc; install -o root -g wheel -m 644 = crontab devd.conf devfs.conf ddb.conf dhclient.conf disktab fbtab ft= pusers gettytab group hosts hosts.allow hosts.equiv inetd.conf libal= ias.conf libmap.conf login.access login.conf mac.conf motd netconfig = network.subr networks newsyslog.conf nsswitch.conf phones profile pr= otocols rc rc.bsdextended rc.firewall rc.initdiskless rc.sendmail rc.= shutdown rc.subr remote rpc services shells sysctl.conf syslog.conf = termcap.small libmap32.conf etc.amd64/ttys amd.map apmd.conf snmpd.config = freebsd-update.conf /zpoudriere/jails/head/usr/src/etc/../usr.bin/locate/lo= cate/locate.rc hosts.lpd printcap /zpoudriere/jails/head/usr/src/etc/../usr= =2Ebin/mail/misc/mail.rc ntp.conf nscd.conf portsnap.conf pf.os csh.cshrc c= sh.login csh.logout regdomain.xml /zpoudriere/jails/head/etc; cap_mkdb -l = /zpoudriere/jails/head/etc/login.conf; services_mkdb -l -q -o /zpoudriere/= jails/head/var/db/services.db /zpoudriere/jails/head/etc/services; instal= l -o root -g wheel -m 755 netstart pccard_ether rc.suspend rc.resume /zpou= driere/jails/head/etc; install -o root -g wheel -m 600 master.passwd nsmb= =2Econf opieaccess /zpoudriere/jails/head/etc; > services_mkdb: illegal option -- l > Usage: services_mkdb [-q] [-o <db>] [<servicefile>] > services_mkdb -u [<servicefile>] > *** Error code 1 >=20 > Stop. > make[2]: stopped in /zpoudriere/jails/head/usr/src/etc > *** Error code 1 >=20 >=20 >=20 > > ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ > > ${BIN2} ${DESTDIR}/etc; \ > > ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ > >=20 > > Modified: head/usr.sbin/etcupdate/etcupdate.sh > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/usr.sbin/etcupdate/etcupdate.sh Wed Jan 22 16:50:18 2014 (r261= 030) > > +++ head/usr.sbin/etcupdate/etcupdate.sh Wed Jan 22 16:59:53 2014 (r261= 031) > > @@ -213,7 +213,8 @@ build_tree() > > =20 > > # Purge auto-generated files. Only the source files need to > > # be updated after which these files are regenerated. > > - rm -f $1/etc/*.db $1/etc/passwd >&3 2>&1 || return 1 > > + rm -f $1/etc/*.db $1/etc/passwd $1/var/db/services.db >&3 2>&1 || \ > > + return 1 > > =20 > > # Remove empty files. These just clutter the output of 'diff'. > > find $1 -type f -size 0 -delete >&3 2>&1 || return 1 > >=20 > > Modified: head/usr.sbin/mergemaster/mergemaster.sh > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/usr.sbin/mergemaster/mergemaster.sh Wed Jan 22 16:50:18 2014 (= r261030) > > +++ head/usr.sbin/mergemaster/mergemaster.sh Wed Jan 22 16:59:53 2014 (= r261031) > > @@ -699,7 +699,8 @@ case "${RERUN}" in > > # or spwd.db. Instead, we want to compare the text versions, and ru= n *_mkdb. > > # Prompt the user to do so below, as needed. > > # > > - rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd > > + rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd \ > > + ${TEMPROOT}/var/db/services.db > > =20 > > # We only need to compare things like freebsd.cf once > > find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null > > _______________________________________________ > > svn-src-all@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/svn-src-all > > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" --i9LlY+UWpKt15+FH Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQJ8BAEBCgBmBQJS4LRqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNkZFQkU5OTJGNTI4MERGNDgxMTM2MkE2 RTc4MkFDMDNDOUIwQ0Y5AAoJEG54KsA8mwz5chUP/0ZS+Ib2cKgCFdqMtRRERXwy C7VC3sX9xsHkU5cClNApf+EZLFrec6L0dlOl8l0nrVLNsz1w7OQbyEJMrWsFk2js MfcwsBGvUapRBcoZJvIqBgwUJ6LcWqEj89pQK/8o9Ftd+otkcM2KriBOcAnmjn0p PH2hPJNl00mi4XhmkpgfcBoRrQLfz9xqZvCUV6SJJ7qizOVLLhIxovIN7c2uoN37 sm14Fm+M43fEcSIoQKLbMacfzgrqvnc8AFLoTsPx3zTTxQB5YsL9dt4SAUuFdLDu mIkMu5HA2ro0XoXwlzYz9BqlJu2nDZSmeKOCXI0A8xyE9r7cDk/3Qq8Drsf6/KRL IV6JGdfzEhr9oQSbNrUcgjH+j7uJQIQPlr/IbvlPwPY7C5+s5L2i775MzaUZPelJ GM7QaJDLdMxV3lavk++1UUjAZb1d7fsUnG24uZYwdXJV+VcnUUdJSgNt1MnjwX0+ tdgkrwe+9w3qJzPSVJaYf2Zwvh0Ot+jO+35KJxRR1enSF30gPpQYUkJDXpIdYwbO L2gVZOaAgKZvnzimyGa/CL3F7NhPUGDinOsnnDP8IDVvo00Udlb0lS6c9zagEiyo GSpp/Onrvb7fTPEFdPnGGpK6JIaTbfacs3xfEfaGl2mCKSlWkX0+5g4toVlG/oGq H8lHhsgOw3y4nPIhyZxp =35uU -----END PGP SIGNATURE----- --i9LlY+UWpKt15+FH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140123061922.GB5421>