1$FreeBSD: head/contrib/atf/FREEBSD-upgrade 243055 2012-11-15 04:51:37Z marcel $
| 1$FreeBSD: head/contrib/atf/FREEBSD-upgrade 258286 2013-11-17 23:19:06Z jmmv $
|
2
| 2
|
3atf
| 3This document contains a collection of notes specific to the import
4of atf into head. These notes are built on the instructions in
5the FreeBSD Subversion Primer that detail how to deal with vendor
6branches and you are supposed to follow those:
|
4
| 7
|
5The source code is hosted on GoogleCode as a subcomponent of the Kyua project:
| 8 http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
|
6
| 9
|
| 10The ATF source code is hosted on Google Code as a subcomponent of the
11Kyua project:
12
|
7 http://code.google.com/p/kyua/downloads/list
8
| 13 http://code.google.com/p/kyua/downloads/list
14
|
9For the contrib directory, the sources were initially prepared like so:
| 15and is imported into the atf vendor branch (see base/vendor/atf/).
|
10
| 16
|
11 ./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share
| 17To merge the vendor branch into head do something like this:
|
12
| 18
|
13For the contrib directory, files and directories were pruned by:
| 19 cd .../base/head/contrib/atf
20 svn merge --accept=postpone \
21 svn+ssh://svn.freebsd.org/base/vendor/atf/dist .
22 svn remove --force $(cat FREEBSD-Xlist)
|
14
| 23
|
15sh -c 'for F in `cat FREEBSD-Xlist`; do rm -rf ./$F ; done'
| 24and resolve any conflicts that may arise at this point.
|
16
| 25
|
17You may check if there are any new files that we don't need.
| 26Once this is done, you must regenerate bconfig.h. The recommended way
27of doing so is by using the release files already imported into the
28vendor branch (which is a good justification for importing the verbatim
29sources in the first place so that this step is reproducible). You can
30use a set of commands similar to the following:
|
18
| 31
|
19The instructions for importing new release and merging to HEAD can be found
20at FreeBSD wiki:
| 32 mkdir /tmp/atf
33 cd /tmp/atf
34 .../vendor/atf/dist/configure \
35 --prefix=/ \
36 --exec-prefix=/usr \
37 --datarootdir=/usr/share
38 cp bconfig.h .../base/head/contrib/atf/
|
21
| 39
|
22 http://wiki.freebsd.org/SubversionPrimer/VendorImports
| 40Please do NOT run './configure' straight from the 'dist' directory of
41the vendor branch as you easily risk committing build products into the
42tree.
|
23
| 43
|
24To make local changes to atf, simply patch and commit to the trunk
25branch (aka HEAD). Never make local changes on the vendor branch.
| 44Lastly, with the list of old and new files in this import, make sure
45to udpate the reachover Makefiles accordingly.
|
26
| 46
|
27gcooper@FreeBSD.org
285-August-2012
| 47Test the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and,
48if all looks good, you are ready to commit all the changes in one go.
|
| |