catch up with the lxc (non-openvswitch) distro on this wexlxc branch

[wextoolbox.git] / check-lxc.sh

diff --git a/check-onelab.sh b/check-lxc.sh
similarity index 69%
rename from check-onelab.sh
rename to check-lxc.sh
index aa23a67..1b9629d 100755 (executable)
--- a/check-onelab.sh
+++ b/check-lxc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# this utility is to compare the current build settings with the one from onelab
+# this utility is to compare the current build settings with the one from mainstream
 
 COMMAND=$(basename $0)
 
@@ -10,7 +10,7 @@ function usage () {
     echo "Usage: $COMMAND update|body|tags"
     echo "update: performs svn up on the mainstream build dir"
     echo "body: compares the .mk file"
-    echo "tags: compares the tags (taken from k32)"
+    echo "tags: compares the tags (from lxc-tags.mk)"
     exit 1
 }
 
@@ -21,17 +21,18 @@ function update () {
 }
 
 function check_body () {
-    a=$REF/onelab.mk
+    a=$REF/lxc.mk
     b=wextoolbox.mk
     echo "Checking body $a $b"
     diff -w $a $b | egrep -v '^(<|>)( #| +$)|nozomi|comgt|planetlab-umts-tools|boost|gnuradio|bbn|crunchxml|spectools|sge|iwlwifi|kernelconfig=planetlab|umts|DistributedRateLimiting'
 }
 
 function check_tags () {
-    a=$REF/onelab-k32-tags.mk
+    a=$REF/lxc-tags.mk
     b=wextoolbox-tags.mk
+    sed -e s,onelab.eu,planet-lab.org,g $b > $b.norm
     echo "Checking tags $a $b"
-    diff -w $REF/onelab-k32-tags.mk wextoolbox-tags.mk | egrep -v '^(<|>) #|SVNBRANCH|nozomi|comgt|planetlab-umts-tools|boost|gnuradio|bbn_80211|crunchxml|spectools|ejabberd|omf|DistributedRateLimiting|openvswitch|sfa-|sface-|^[0-9,c]*$|^---$'
+    diff -w $REF/lxc-tags.mk $b.norm | egrep -v '^(<|>) #|SVNBRANCH|nozomi|comgt|planetlab-umts-tools|boost|gnuradio|bbn_80211|crunchxml|spectools|ejabberd|omf|DistributedRateLimiting|openvswitch|sfa-|sface-|^[0-9,c]*$|^---$'
 }
 
 [[ -z "$@" ]] && usage