Show pageOld revisionsBacklinksBack to top This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong. ====== Merging tzcode2008h to FreeBSD/head ====== The last snapshot of //tzcode// we have imported from ftp://elsie.nci.nih.gov/pub/ is from 2004. There have been numerous fixes in the vendor source since then, but our version of the code includes customizations, extra locking code, and various fixes. This page is tracking the progress of merging tzcode2008h with %%FreeBSD%% in a way that preserves the good parts of our local changes, but also reduces diffs from the vendor as much as possible. ====== TODO ====== ^ Task ^ Status ^ CH ^ | Create a Perforce branch with the original tzcode2004 vendor import | done | [[http://perforce.freebsd.org/changeView.cgi?CH=153292|153292]] | | Create a Perforce branch with the current ''%%src/%%'' code of %%FreeBSD%% | done | [[http://perforce.freebsd.org/changeView.cgi?CH=153296|153296]] | | Bootstrap merge info in the p4 depot | done | [[http://perforce.freebsd.org/changeView.cgi?CH=153297|153297]] | | Import tzcode2008h in the p4 ''%%dist%%'' area | done | [[http://perforce.freebsd.org/changeView.cgi?CH=153294|153294]] | | IFC before the merge into ''%%keramida/tzcode%%'' | done | [[http://perforce.freebsd.org/changeView.cgi?CH=153299|153299]] | | Run a test build with the tzcode2008h code | | | | Prepare regression tests for tzcode2004a | partial | | | Commit the 2004a test suite into svn | | | | Run the tzcode2004 tests with the tzcode2008h-merged libc & zic | | | | Commit the new tzcode2008h code to svn | | | ====== Perforce paths ====== The following depot paths are relevant to the tzcode2008h merge: ^ Path ^ Description ^ | ''%%/depot/user/keramida/vendor/tzcode/...%%'' | Perforce copy of svn ''%%base/vendor/tzcode%%'' | | ''%%/depot/user/keramida/vendor/tzcode/dist/...%%'' | Clean copies of the tzcode distribution. | | ''%%/depot/user/keramida/vendor/tzcode/tzcode2008h/...%%'' | Tagged copy of the ''%%dist/%%'' area after the import of tzcode2008h. | | ''%%/depot/user/keramida/tzcode/...%%'' | Merge area. Most of the resync work happens here. | | ''%%/depot/user/keramida/tzcode/lib/libc/...%%'' | %%FreeBSD%% libc changes for tzcode2008h. | | ''%%/depot/user/keramida/tzcode/usr.sbin/zic/...%%'' | %%FreeBSD%% zic(8) changes for tzcode2008h. | | ''%%/depot/user/keramida/tools/regression/lib/libc/stdtime/...%%'' | A set of regression tests for libc/stdtime code. Ideally these should all pass before we can merge tzcode2008h into the %%FreeBSD%% ''%%/head%%'' branch. | giorgoskeramidas/tzcode.txt Last modified: 2008/11/22 14:51by GiorgosKeramidas