diff options
| author | harti <harti@FreeBSD.org> | 2003-11-03 09:15:31 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2003-11-03 09:15:31 +0000 |
| commit | ed133f5db54a71a83f22db92bd201e155364eb5b (patch) | |
| tree | 920c7effb9e6d33e748eef86ff1fa525fce57e18 /sys/contrib/ngatm | |
| parent | 664e0b71ab3fed96bbfa74f61aef9bf8749a643f (diff) | |
| download | FreeBSD-src-ed133f5db54a71a83f22db92bd201e155364eb5b.zip FreeBSD-src-ed133f5db54a71a83f22db92bd201e155364eb5b.tar.gz | |
Explain how to handle the generated files. Explain that the import
must actually be done into the netnatm sub-directory.
Diffstat (limited to 'sys/contrib/ngatm')
| -rw-r--r-- | sys/contrib/ngatm/FREEBSD-upgrade | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/contrib/ngatm/FREEBSD-upgrade b/sys/contrib/ngatm/FREEBSD-upgrade index d0846ba..cb167ac 100644 --- a/sys/contrib/ngatm/FREEBSD-upgrade +++ b/sys/contrib/ngatm/FREEBSD-upgrade @@ -7,8 +7,20 @@ FreeBSD. Import should be done by: - cvs import \ + 1. Put the distribution into a clean directory. + + 2. Remove any unneeded files. + + 3. cvs import \ -m "Virgin import of NgATM shared kernel/user part X.Y" \ - src/sys/contrib/ngatm BEGEMOT NGATM_X_Y + src/sys/contrib/ngatm/netnatm BEGEMOT NGATM_X_Y + + 4. resolve conflicts + + 5. check-out the imported stuff + + 6. Re-generate files by calling ./genfiles + + 7. If neccessary commit the re-generated files harti |
