1243055Smarcel$FreeBSD: releng/10.2/contrib/atf/FREEBSD-upgrade 272307 2014-09-30 16:14:02Z rodrigc $ 2243055Smarcel 3260029SjmmvThis document contains a collection of notes specific to the import 4260029Sjmmvof atf into head. These notes are built on the instructions in 5260029Sjmmvthe FreeBSD Subversion Primer that detail how to deal with vendor 6260029Sjmmvbranches and you are supposed to follow those: 7243055Smarcel 8260029Sjmmv http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html 9243055Smarcel 10272307SrodrigcThe ATF source code is hosted on GitHub: 11260029Sjmmv 12272307Srodrigc https://github.com/jmmv/atf 13243055Smarcel 14260029Sjmmvand is imported into the atf vendor branch (see base/vendor/atf/). 15243055Smarcel 16260029SjmmvTo merge the vendor branch into head do something like this: 17243055Smarcel 18260029Sjmmv cd .../base/head/contrib/atf 19260029Sjmmv svn merge --accept=postpone \ 20260029Sjmmv svn+ssh://svn.freebsd.org/base/vendor/atf/dist . 21260029Sjmmv svn remove --force $(cat FREEBSD-Xlist) 22243055Smarcel 23260029Sjmmvand resolve any conflicts that may arise at this point. 24243055Smarcel 25260029SjmmvOnce this is done, you must regenerate bconfig.h. The recommended way 26260029Sjmmvof doing so is by using the release files already imported into the 27260029Sjmmvvendor branch (which is a good justification for importing the verbatim 28260029Sjmmvsources in the first place so that this step is reproducible). You can 29260029Sjmmvuse a set of commands similar to the following: 30243055Smarcel 31260029Sjmmv mkdir /tmp/atf 32260029Sjmmv cd /tmp/atf 33260029Sjmmv .../vendor/atf/dist/configure \ 34260029Sjmmv --prefix=/ \ 35260029Sjmmv --exec-prefix=/usr \ 36260029Sjmmv --datarootdir=/usr/share 37260029Sjmmv cp bconfig.h .../base/head/contrib/atf/ 38243055Smarcel 39260029SjmmvPlease do NOT run './configure' straight from the 'dist' directory of 40260029Sjmmvthe vendor branch as you easily risk committing build products into the 41260029Sjmmvtree. 42243055Smarcel 43260029SjmmvLastly, with the list of old and new files in this import, make sure 44272307Srodrigcto update the reachover Makefiles accordingly. 45243055Smarcel 46260029SjmmvTest the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and, 47260029Sjmmvif all looks good, you are ready to commit all the changes in one go. 48