2012-11-15 04:51:37 +00:00
|
|
|
$FreeBSD$
|
|
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
This document contains a collection of notes specific to the import
|
|
|
|
|
of atf into head. These notes are built on the instructions in
|
|
|
|
|
the FreeBSD Subversion Primer that detail how to deal with vendor
|
|
|
|
|
branches and you are supposed to follow those:
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html
|
|
|
|
|
|
2014-09-23 22:20:19 +00:00
|
|
|
The ATF source code is hosted on GitHub:
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2014-09-23 22:20:19 +00:00
|
|
|
https://github.com/jmmv/atf
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
and is imported into the atf vendor branch (see base/vendor/atf/).
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
To merge the vendor branch into head do something like this:
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
cd .../base/head/contrib/atf
|
|
|
|
|
svn merge --accept=postpone \
|
|
|
|
|
svn+ssh://svn.freebsd.org/base/vendor/atf/dist .
|
|
|
|
|
svn remove --force $(cat FREEBSD-Xlist)
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
and resolve any conflicts that may arise at this point.
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
Once this is done, you must regenerate bconfig.h. The recommended way
|
|
|
|
|
of doing so is by using the release files already imported into the
|
|
|
|
|
vendor branch (which is a good justification for importing the verbatim
|
|
|
|
|
sources in the first place so that this step is reproducible). You can
|
|
|
|
|
use a set of commands similar to the following:
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
mkdir /tmp/atf
|
|
|
|
|
cd /tmp/atf
|
|
|
|
|
.../vendor/atf/dist/configure \
|
|
|
|
|
--prefix=/ \
|
|
|
|
|
--exec-prefix=/usr \
|
|
|
|
|
--datarootdir=/usr/share
|
|
|
|
|
cp bconfig.h .../base/head/contrib/atf/
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
Please do NOT run './configure' straight from the 'dist' directory of
|
|
|
|
|
the vendor branch as you easily risk committing build products into the
|
|
|
|
|
tree.
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
Lastly, with the list of old and new files in this import, make sure
|
2014-09-24 06:50:14 +00:00
|
|
|
to update the reachover Makefiles accordingly.
|
2012-11-15 04:51:37 +00:00
|
|
|
|
2013-11-17 23:19:06 +00:00
|
|
|
Test the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and,
|
|
|
|
|
if all looks good, you are ready to commit all the changes in one go.
|
