From owner-freebsd-questions@freebsd.org Sun Sep 18 00:55:08 2016 Return-Path: Delivered-To: freebsd-questions@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED721BD65E4 for ; Sun, 18 Sep 2016 00:55:08 +0000 (UTC) (envelope-from freebsd@edvax.de) Received: from mx02.qsc.de (mx02.qsc.de [213.148.130.14]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D2F8CC1 for ; Sun, 18 Sep 2016 00:55:08 +0000 (UTC) (envelope-from freebsd@edvax.de) Received: from r56.edvax.de (port-92-195-180-184.dynamic.qsc.de [92.195.180.184]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx02.qsc.de (Postfix) with ESMTPS id 5397F27803; Sun, 18 Sep 2016 02:54:59 +0200 (CEST) Received: from r56.edvax.de (localhost [127.0.0.1]) by r56.edvax.de (8.14.5/8.14.5) with SMTP id u8I0sxIg002462; Sun, 18 Sep 2016 02:54:59 +0200 (CEST) (envelope-from freebsd@edvax.de) Date: Sun, 18 Sep 2016 02:54:59 +0200 From: Polytropon To: Baho Utot Cc: "freebsd-questions@freebsd.org" Subject: Re: base source: release vs releng Message-Id: <20160918025459.9b1318f3.freebsd@edvax.de> In-Reply-To: References: <46503065-0829-9481-0ec2-e41ae71e3756@columbus.rr.com> <20160918015028.5616cf0c.freebsd@edvax.de> Reply-To: Polytropon Organization: EDVAX X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.5; i386-portbld-freebsd8.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Sep 2016 00:55:09 -0000 On Sat, 17 Sep 2016 20:12:22 -0400, Baho Utot wrote: > On 09/17/16 19:50, Polytropon wrote: > > On Sat, 17 Sep 2016 18:45:44 -0400, Baho Utot wrote: > >> As I understand this: > >> > >> The difference between release and releng is that releng gets security > >> fixes and "back ports/fixes" and release does not? > >> > >> Or have I completely missed the boat and I am all wet? > > The term "releng" means "release engineering" and is something like > > a word for "the whole release process", the task of creating a release > > of the OS, in which there are basically three levels: > > > > RELEASE - this is the release which gets published electronically > > and on optical media > > > > RELEASE-pX - this is a RELEASE where security updates have been > > added to, indicated by patchlevel X > > > > STABLE - this is the stable development branch, i. e. the branch > > in which ABIs and APIs are stable, and which usually does > > compile and run; typcally from this branch, security updates > > are provided for RELEASE > > > > CURRENT or HEAD - this is the experimental development branch, the > > place where testing happens, so it isn't _guaranteed_ to > > compile and run properly; it's often in a "state of flow", > > i. e. doesn't compile now, wait 2 hours, update sources, > > recompile, works; from this branch, features are put into > > production development (appearing in STABLE) or discarded > > (which also _may_ happen) > > > > You can find more information here: > > > > https://www.freebsd.org/releng/ > > > > > Ok I am still confused > > svn.freebsd.org has for example ( if I got this correct ) > > base/head - CURRENT-12 > base/stable/11 - STABLE-11 > base/releng/10.1 - ? > base/release/10.1.0 - ? > > Which one would have FreeBSD 10.1-RELEASE-p35 or later? base/release/10.1.0 refers to FreeBSD 10.1-RELEASE (the release itself), base/releng/10.1 will then have FreeBSD 10.1-RELEASE-p35. > I got the part on how to use svnlite to fetch the source, I just don't > know which one is what > > I want to update > > uname -a FreeBSD 10.1-RELEASE-p35 #0 net:/usr/obj/usr/src/sys/GENERIC > amd64 As you're following the "-RELEASE-pX branch" anyway, you could use freebsd-update to update your src/ subtree and compile from that. (You could even update your system without compiling with freebsd-update if you wanted.) You do not _need_ to use SVN for this task - you'd _have to_ use it if you wanted to follow -STABLE or -CURRENT. But if you wish to obtain the sources with SVN, it's possible. According to the handbook, you'd typically do something like this: # svn checkout https://svn.FreeBSD.org/releng/10.1 /usr/src with an empty /usr/src "entry point". If you wanted to follow -STABLE, you'd just use a different branch, like # svn checkout https://svn.FreeBSD.org/stable/10 /usr/src and then use "svn update" to update your local copy. Note that this particular task currently cannot be performed with freebsd-update. (Same applies for following -CURRENT.) Similarly, using # svn checkout https://svn.FreeBSD.org/release/10.1.0 /usr/src would "reset" your local copy to 10.1-RELEASE without any patches. More information here: https://www.freebsd.org/doc/handbook/svn.html -- Polytropon Magdeburg, Germany Happy FreeBSD user since 4.0 Andra moi ennepe, Mousa, ...