From: Ben Pfaff <blp@nicira.com>
Date: Tue, 31 Mar 2009 23:52:57 +0000 (-0700)
Subject: boot.sh: Avoid the need for Git repository information
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61538212;p=openvswitch

boot.sh: Avoid the need for Git repository information

It should not be necessary to have a Git repository to run boot.sh; a
checked-out tree should be sufficient.  This makes it so.

Some corresponding changes to ext are necessary also.
---

diff --git a/boot.sh b/boot.sh
index ae2b3665..aa15e184 100755
--- a/boot.sh
+++ b/boot.sh
@@ -9,7 +9,7 @@ do
         (--enable-ext) have_ext=yes ;;
         (--disable-ext) have_ext=no ;;
         (--help) cat <<EOF
-$0: bootstrap OpenFlow from a Git repository
+$0: bootstrap OpenFlow from a checked-out VCS tree
 usage: $0 [OPTIONS]
 The recognized options are:
   --enable-ext      include openflowext
@@ -22,27 +22,14 @@ EOF
     esac
 done
 
-# Generate list of files in debian/ to distribute.
-(echo '# Automatically generated by boot.sh (from Git tree).' &&
- printf 'EXTRA_DIST += \\\n' &&
- git ls-files debian | grep -v '^debian/\.gitignore$' | 
- sed -e 's/\(.*\)/	\1 \\/' -e '$s/ \\//') > debian/automake.mk
-
 # Enable or disable ext.
 if test "$have_ext" = yes; then
     echo 'Enabling openflowext...'
     echo 'include ext/automake.mk' > ext.mk
     echo 'm4_include([ext/configure.m4])' > ext.m4
     cat debian/control.in ext/debian/control.in > debian/control
-    for d in $(cd ext/debian && git ls-files --exclude-from=debian/dontlink)
-    do
+    for d in $(cat ext/debian/LINKS); do
         test -e debian/$d || ln -s ../ext/debian/$d debian/$d
-        if ! fgrep -q $d debian/.gitignore; then
-            echo "Adding $d to debian/.gitignore"
-            (cat debian/.gitignore && printf '/%s' "$d") \
-		| LC_ALL=C sort > tmp$$ \
-                && mv tmp$$ debian/.gitignore
-        fi
     done
 else
     echo 'Disabling openflowext...'