From 5ba1bf11b625fc0f302d6f796ed43499a5534c7a Mon Sep 17 00:00:00 2001 From: Hartmut Brandt Date: Mon, 3 Nov 2003 09:15:31 +0000 Subject: [PATCH] Explain how to handle the generated files. Explain that the import must actually be done into the netnatm sub-directory. --- sys/contrib/ngatm/FREEBSD-upgrade | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/contrib/ngatm/FREEBSD-upgrade b/sys/contrib/ngatm/FREEBSD-upgrade index d0846ba17c5..cb167acca87 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