FREEBSD-upgrade revision 272046
1243055Smarcel$FreeBSD: head/contrib/atf/FREEBSD-upgrade 272046 2014-09-23 22:20:19Z rodrigc $ 2243055Smarcel 3258286SjmmvThis document contains a collection of notes specific to the import 4258286Sjmmvof atf into head. These notes are built on the instructions in 5258286Sjmmvthe FreeBSD Subversion Primer that detail how to deal with vendor 6258286Sjmmvbranches and you are supposed to follow those: 7243055Smarcel 8258286Sjmmv http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html 9243055Smarcel 10272046SrodrigcThe ATF source code is hosted on GitHub: 11258286Sjmmv 12272046Srodrigc https://github.com/jmmv/atf 13243055Smarcel 14258286Sjmmvand is imported into the atf vendor branch (see base/vendor/atf/). 15243055Smarcel 16258286SjmmvTo merge the vendor branch into head do something like this: 17243055Smarcel 18258286Sjmmv cd .../base/head/contrib/atf 19258286Sjmmv svn merge --accept=postpone \ 20258286Sjmmv svn+ssh://svn.freebsd.org/base/vendor/atf/dist . 21258286Sjmmv svn remove --force $(cat FREEBSD-Xlist) 22243055Smarcel 23258286Sjmmvand resolve any conflicts that may arise at this point. 24243055Smarcel 25258286SjmmvOnce this is done, you must regenerate bconfig.h. The recommended way 26258286Sjmmvof doing so is by using the release files already imported into the 27258286Sjmmvvendor branch (which is a good justification for importing the verbatim 28258286Sjmmvsources in the first place so that this step is reproducible). You can 29258286Sjmmvuse a set of commands similar to the following: 30243055Smarcel 31258286Sjmmv mkdir /tmp/atf 32258286Sjmmv cd /tmp/atf 33258286Sjmmv .../vendor/atf/dist/configure \ 34258286Sjmmv --prefix=/ \ 35258286Sjmmv --exec-prefix=/usr \ 36258286Sjmmv --datarootdir=/usr/share 37258286Sjmmv cp bconfig.h .../base/head/contrib/atf/ 38243055Smarcel 39258286SjmmvPlease do NOT run './configure' straight from the 'dist' directory of 40258286Sjmmvthe vendor branch as you easily risk committing build products into the 41258286Sjmmvtree. 42243055Smarcel 43258286SjmmvLastly, with the list of old and new files in this import, make sure 44258286Sjmmvto udpate the reachover Makefiles accordingly. 45243055Smarcel 46258286SjmmvTest the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and, 47258286Sjmmvif all looks good, you are ready to commit all the changes in one go. 48