-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 06/25/15 02:13, Slawa Olhovchenkov wrote:
> On Wed, Jun 24, 2015 at 01:05:58PM -0700, Xin Li wrote:
> 
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512
>> 
>> On 06/23/15 04:36, Reko Turja wrote:
>>> -----Original Message----- From: Willem Jan Withagen Sent:
>>> Monday, June 22, 2015 11:48 PM To: Daniel Genis ; 
>>> freebsd-stable@freebsd.org Subject: Re: can the l2arc memory
>>> leak fix be pulled into 10.1-RELEASE ?
>>> 
>>>>> We are kind of new to FreeBSD, so we're wondering what are
>>>>> the plans to merge these fixes into the 10.1-RELEASE branch
>>>>> ?
>>>>> 
>>>>> We'd love to get these fixes without having to rebuild the 
>>>>> kernel. Is there any chance for the merge to happen in the
>>>>> near future, or should we compile the kernel to get the
>>>>> fixes?
>>> 
>>>> The RELEASE branch is exactly what it says, RELEASE. And is
>>>> only done once per version when the actual official RELEASE
>>>> is. So the next one will be the upcoming 10.2-RELEASE. Which
>>>> is schedules for August 2015 according to:
>>> 
>>> There are actually 2 branches tracking release: RELEASE which
>>> is the original release itself and RELENG which is the 
>>> release+security and some errata fixes. In practice one should 
>>> always track and compile RELENG sources with production
>>> servers, unless there's a bugfix or added driver that's only
>>> available in STABLE.
>> 
>> The release/X.Y.Z are actually "tags" and not branches (i.e. read
>> only copy of whatever state is in the release engineering/errata
>> branch, releng/X.Y, is at the time it's released), but
>> technically in svn a tag is also a branch.  We do all efforts to
>> avoid making any changes once a tag is laid, because it's a
>> historical and reference point.
>> 
>> Users who use -RELEASE should track releng/X.Y branch, or use 
>> freebsd-update(1) to keep their system up-to-date.
>> 
>> Our goal is to allow a majority of users to use binary releases 
>> without having to compile and build themselves.  If you know
>> some specific reasons that forces you to compile yourself, please
>> consider sending re@ an email so we will see what we can improve
>> this.
> 
> You are some wrong. Tracking releng/X.Y for -RELEASE don't allow
> reproductable build of -RELEASE image: after existing errata `svn
> export releng/X.Y` give different result compared to original
> release build. This is wrong. Building release image must be also
> from `svn export release/X.Y.Z`. Last release (10.1) will be build
> from releng/10.1 and I can't find easy way to get source of
> releases form svn.

releng/* is a _branch_ and it's not intended for reproducible builds.
 In order to do so one will have to use a tag.

However, svn tag is different from CVS or other SCM's tag as they are
also a branch.  To make things worse, we are using $FreeBSD$ expansion
and that would result in different contents in the files, and these
strings would end up going into some binaries, and speaking for binary
update, you would never want an update to refresh all binaries just
because there is difference because one copy is built from tag and
another is from branch.

To solve this issue we (re@, although it's mostly Glen doing the hard
work for the last few releases) always build on releng/* branch, and
then lay down tag once the build is considered "gold".  To reproduce
that build, what I can possibly think of would be something like this:

Assuming we have:

SVN_RELEASE_VERSION=10.1
FSVN=svn://svn.freebsd.org/base

Then one can reliably checkout the branch by doing:

svn export -r $(svn info ${FSVN}/release/${SVN_RELEASE_VERSION}.0 |
grep 'Last Changed Rev:' | cut -f2 -d:)
${FSVN}/releng/${SVN_RELEASE_VERSION} src

Cheers,
- -- 
Xin LI <delp...@delphij.net>    https://www.delphij.net/
FreeBSD - The Power to Serve!           Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1.5 (FreeBSD)

iQIcBAEBCgAGBQJVjDmlAAoJEJW2GBstM+ns/Q8P/jvLJvSWvO9HENkUSF0hqKCd
cz8k53g9tCusNHGmN9j5FEERp1RiEEBLnIBd2yO2TnU6cgZUhq2IpA2+RMz2/RhE
XgVp8yrJRebTjstZzFMrYVEnQPKmYFQs8lrsC7sh6tQML2jRGXIDc1jL/rjD73+s
a+WoDQdcyqVZaeiLrpCB3Q5HZGDTk0mmHHlvo6kiKFcnGYe4FZ4Gqbt6jF0uj0qm
KXita7Ix23IiB0LBr9csV79AfuEe7ZqObj9vQxocHlrPQiwFCfwnDX2edpE2Slmz
4KIHRR4Ogv3KVdrdmopZDNiRcA3/DfC8wyNkOc5rCBtFrDUT4hKTZ2K48YSqKEbZ
TbRJutOf9lYpILEOOFS6ZE3QN1Dd2fZeSofoI1Xqt4vHEjxmYtK/pAWf2J44k8SR
bMkswHBEpBoqrp5+df6eQsV/mIKHPHYgamzHJHowRMCALOyLjLAtEIYnsRMrL9Je
jaHWrrlbrJ0F4yqW7Pm4BhYWZsu8lM5yHhmSQabHv0vUH22k9gAu2ohHGiTYmSu6
oANaYtv1ErIPWICckPQoI1LYTa9mKzLWmsLycTRk2UPDToQUjkzB4RG8l75d8/1n
pUxgmN+tn+A2/o/2/L/JHAiXf6dMxrdimOv71D8XgYzNR3WD1RJlciURMt8i1VMM
chfd7G6j1ey68TtD2PSD
=Ymad
-----END PGP SIGNATURE-----
_______________________________________________
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"

Reply via email to