svn commit: r263023 - in stable/9: etc etc/mtree etc/pkg share share/keys share/keys/pkg/trusted share/man/man7
Warner Losh
imp at bsdimp.com
Tue Mar 11 21:20:08 UTC 2014
Somebody forgot to add it to the share/mk/bsd.own.mk list of options.
Warner
On Mar 11, 2014, at 2:57 PM, Mike Tancsa <mike at sentex.net> wrote:
> Hi,
> For some reason, this has broken my build on RELENG_9. If I
>
> svn update -r 263022
>
> all builds again. With svn update -r 263023, I get the failure below
>
> Other than KERNCONF=, I have nothing in make.conf and src.conf on this machine.
>
> ---Mike
>
> ===> etc (obj)
> "/usr/src/etc/Makefile", line 227: Malformed conditional (${MK_PKGBOOTSTRAP} != "no")
> "/usr/src/etc/Makefile", line 229: if-less endif
> make: fatal errors encountered -- cannot continue
> *** [etc.obj__D] Error code 1
>
> Stop in /usr/src.
> *** [_obj] Error code 1
>
> Stop in /usr/src.
> *** [buildworld] Error code 1
>
> Stop in /usr/src.
>
>
> ---Mike
>
> On 3/11/2014 10:48 AM, Baptiste Daroussin wrote:
>> Author: bapt
>> Date: Tue Mar 11 14:48:44 2014
>> New Revision: 263023
>> URL: http://svnweb.freebsd.org/changeset/base/263023
>>
>> Log:
>> MFC: r257145,r257147,r257150,r257159,r257164,r257168,r257344,r257667,r257668,
>> r258227,r260605
>>
>> Add default configuration for FreeBSD official pkg(8) repositories
>> Add fingerprint for the trusted keys
>>
>> Added:
>> stable/9/etc/pkg/
>> - copied from r257145, head/etc/pkg/
>> stable/9/share/keys/
>> - copied from r257344, head/share/keys/
>> Modified:
>> stable/9/etc/Makefile
>> stable/9/etc/mtree/BSD.root.dist
>> stable/9/etc/mtree/BSD.usr.dist
>> stable/9/etc/pkg/FreeBSD.conf
>> stable/9/share/Makefile
>> stable/9/share/keys/pkg/trusted/pkg.freebsd.org.2013102301
>> stable/9/share/man/man7/hier.7
>> Directory Properties:
>> stable/9/etc/ (props changed)
>> stable/9/etc/mtree/ (props changed)
>> stable/9/share/ (props changed)
>> stable/9/share/man/ (props changed)
>> stable/9/share/man/man7/ (props changed)
>>
>> Modified: stable/9/etc/Makefile
>> ==============================================================================
>> --- stable/9/etc/Makefile Tue Mar 11 14:33:42 2014 (r263022)
>> +++ stable/9/etc/Makefile Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -224,6 +224,9 @@ distribution:
>> ${_+_}cd ${.CURDIR}/devd; ${MAKE} install
>> ${_+_}cd ${.CURDIR}/gss; ${MAKE} install
>> ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
>> +.if ${MK_PKGBOOTSTRAP} != "no"
>> + ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
>> +.endif
>> ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
>> ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
>> ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
>>
>> Modified: stable/9/etc/mtree/BSD.root.dist
>> ==============================================================================
>> --- stable/9/etc/mtree/BSD.root.dist Tue Mar 11 14:33:42 2014 (r263022)
>> +++ stable/9/etc/mtree/BSD.root.dist Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -52,6 +52,8 @@
>> weekly
>> ..
>> ..
>> + pkg
>> + ..
>> ppp
>> ..
>> rc.d
>>
>> Modified: stable/9/etc/mtree/BSD.usr.dist
>> ==============================================================================
>> --- stable/9/etc/mtree/BSD.usr.dist Tue Mar 11 14:33:42 2014 (r263022)
>> +++ stable/9/etc/mtree/BSD.usr.dist Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -484,6 +484,14 @@
>> ..
>> info
>> ..
>> + keys
>> + pkg
>> + revoked
>> + ..
>> + trusted
>> + ..
>> + ..
>> + ..
>> locale
>> UTF-8
>> ..
>>
>> Modified: stable/9/etc/pkg/FreeBSD.conf
>> ==============================================================================
>> --- head/etc/pkg/FreeBSD.conf Sat Oct 26 03:31:05 2013 (r257145)
>> +++ stable/9/etc/pkg/FreeBSD.conf Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -1,6 +1,8 @@
>> # $FreeBSD$
>> FreeBSD: {
>> - url: "pkg+http://pkg.freebsd.org/${ABI}/latest",
>> + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
>> mirror_type: "srv",
>> - enabled: "yes"
>> + signature_type: "fingerprints",
>> + fingerprints: "/usr/share/keys/pkg",
>> + enabled: yes
>> }
>>
>> Modified: stable/9/share/Makefile
>> ==============================================================================
>> --- stable/9/share/Makefile Tue Mar 11 14:33:42 2014 (r263022)
>> +++ stable/9/share/Makefile Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -11,6 +11,7 @@ SUBDIR= ${_colldef} \
>> dtrace \
>> ${_examples} \
>> ${_i18n} \
>> + keys \
>> ${_man} \
>> ${_me} \
>> misc \
>>
>> Modified: stable/9/share/keys/pkg/trusted/pkg.freebsd.org.2013102301
>> ==============================================================================
>> --- head/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 Tue Oct 29 15:07:54 2013 (r257344)
>> +++ stable/9/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -1,5 +1,4 @@
>> # $FreeBSD$
>> -# This key is for testing purposes only and will be revoked before 10.0-RELEASE
>>
>> function: "sha256"
>> fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438"
>>
>> Modified: stable/9/share/man/man7/hier.7
>> ==============================================================================
>> --- stable/9/share/man/man7/hier.7 Tue Mar 11 14:33:42 2014 (r263022)
>> +++ stable/9/share/man/man7/hier.7 Tue Mar 11 14:48:44 2014 (r263023)
>> @@ -32,7 +32,7 @@
>> .\" @(#)hier.7 8.1 (Berkeley) 6/5/93
>> .\" $FreeBSD$
>> .\"
>> -.Dd October 23, 2013
>> +.Dd October 29, 2013
>> .Dt HIER 7
>> .Os
>> .Sh NAME
>> @@ -546,6 +546,16 @@ ASCII text files used by various games
>> device description file for device name
>> .It Pa info/
>> GNU Info hypertext system
>> +.It Pa keys/
>> +known trusted and revoked keys.
>> +.Bl -tag -width ".Pa keys/pkg/" -compact
>> +.It Pa keys/pkg/
>> +fingerprints for
>> +.Xr pkg 7
>> +and
>> +.Xr pkg 8
>> +.El
>> +.Pp
>> .It Pa locale/
>> localization files;
>> see
>> _______________________________________________
>> svn-src-stable-9 at freebsd.org mailing list
>> http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
>> To unsubscribe, send any mail to "svn-src-stable-9-unsubscribe at freebsd.org"
>>
>>
>
>
> --
> -------------------
> Mike Tancsa, tel +1 519 651 3400
> Sentex Communications, mike at sentex.net
> Providing Internet services since 1994 www.sentex.net
> Cambridge, Ontario Canada http://www.tancsa.com/
> _______________________________________________
> freebsd-stable at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
More information about the freebsd-stable
mailing list