aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Brandt <harti@FreeBSD.org>2003-11-03 09:15:31 +0000
committerHartmut Brandt <harti@FreeBSD.org>2003-11-03 09:15:31 +0000
commit5ba1bf11b625fc0f302d6f796ed43499a5534c7a (patch)
tree920c7effb9e6d33e748eef86ff1fa525fce57e18
parent29d5d9a8a796317603c3300dbaf148df83df9b0b (diff)
Notes
-rw-r--r--sys/contrib/ngatm/FREEBSD-upgrade16
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/contrib/ngatm/FREEBSD-upgrade b/sys/contrib/ngatm/FREEBSD-upgrade
index d0846ba17c5d5..cb167acca87de 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