173cdac78SJulio MerinoThis document contains a collection of notes specific to the import 273cdac78SJulio Merinoof atf into head. These notes are built on the instructions in 373cdac78SJulio Merinothe FreeBSD Subversion Primer that detail how to deal with vendor 473cdac78SJulio Merinobranches and you are supposed to follow those: 5701791c7SMarcel Moolenaar 673cdac78SJulio Merino http://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html 773cdac78SJulio Merino 84c998508SCraig RodriguesThe ATF source code is hosted on GitHub: 9701791c7SMarcel Moolenaar 104c998508SCraig Rodrigues https://github.com/jmmv/atf 11701791c7SMarcel Moolenaar 1273cdac78SJulio Merinoand is imported into the atf vendor branch (see base/vendor/atf/). 13701791c7SMarcel Moolenaar 1473cdac78SJulio MerinoTo merge the vendor branch into head do something like this: 15701791c7SMarcel Moolenaar 1673cdac78SJulio Merino cd .../base/head/contrib/atf 1773cdac78SJulio Merino svn merge --accept=postpone \ 1873cdac78SJulio Merino svn+ssh://svn.freebsd.org/base/vendor/atf/dist . 1973cdac78SJulio Merino svn remove --force $(cat FREEBSD-Xlist) 20701791c7SMarcel Moolenaar 2173cdac78SJulio Merinoand resolve any conflicts that may arise at this point. 22701791c7SMarcel Moolenaar 2373cdac78SJulio MerinoOnce this is done, you must regenerate bconfig.h. The recommended way 2473cdac78SJulio Merinoof doing so is by using the release files already imported into the 2573cdac78SJulio Merinovendor branch (which is a good justification for importing the verbatim 2673cdac78SJulio Merinosources in the first place so that this step is reproducible). You can 2773cdac78SJulio Merinouse a set of commands similar to the following: 28701791c7SMarcel Moolenaar 2973cdac78SJulio Merino mkdir /tmp/atf 3073cdac78SJulio Merino cd /tmp/atf 3173cdac78SJulio Merino .../vendor/atf/dist/configure \ 3273cdac78SJulio Merino --prefix=/ \ 3373cdac78SJulio Merino --exec-prefix=/usr \ 3473cdac78SJulio Merino --datarootdir=/usr/share 3573cdac78SJulio Merino cp bconfig.h .../base/head/contrib/atf/ 36701791c7SMarcel Moolenaar 3773cdac78SJulio MerinoPlease do NOT run './configure' straight from the 'dist' directory of 3873cdac78SJulio Merinothe vendor branch as you easily risk committing build products into the 3973cdac78SJulio Merinotree. 40701791c7SMarcel Moolenaar 4173cdac78SJulio MerinoLastly, with the list of old and new files in this import, make sure 42*abe0c558SEnji Cooperto update the reachover Makefiles accordingly. 43701791c7SMarcel Moolenaar 4473cdac78SJulio MerinoTest the build (keeping in mind the WITH_TESTS/WITHOUT_TESTS knobs) and, 4573cdac78SJulio Merinoif all looks good, you are ready to commit all the changes in one go. 46