Missing changes from update install-p4-tools.sh to use P4Runtime v1.0
Change-Id: I89aca8b081bd05f10c6a8ad88322fd132316b581
diff --git a/apps/p4-tutorial/pipeconf/src/main/resources/mytunnel.json b/apps/p4-tutorial/pipeconf/src/main/resources/mytunnel.json
index 90d34d7..b394608 100644
--- a/apps/p4-tutorial/pipeconf/src/main/resources/mytunnel.json
+++ b/apps/p4-tutorial/pipeconf/src/main/resources/mytunnel.json
@@ -1568,4 +1568,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/apps/p4-tutorial/pipeconf/src/main/resources/mytunnel.txt b/apps/p4-tutorial/pipeconf/src/main/resources/mytunnel_p4info.txt
similarity index 100%
rename from apps/p4-tutorial/pipeconf/src/main/resources/mytunnel.txt
rename to apps/p4-tutorial/pipeconf/src/main/resources/mytunnel_p4info.txt
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
index 548612a..b6df5b6 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/basic.json
@@ -1780,4 +1780,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
index b426273..ee0c37f 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
@@ -11936,4 +11936,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index b2ff159..99384fe 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -17224,4 +17224,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index ba1a5d2..bae36b5 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -12814,4 +12814,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index e5a54ce..385b6bf 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -15070,4 +15070,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index f0a6139..8ad8e1e 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -6734,4 +6734,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index f52d3b4..1a129f9 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -4491,4 +4491,4 @@
"version" : [2, 18],
"compiler" : "https://github.com/p4lang/p4c"
}
-}
+}
\ No newline at end of file
diff --git a/tools/dev/p4vm/user-bootstrap.sh b/tools/dev/p4vm/user-bootstrap.sh
index 5620506..fd1b3c3 100755
--- a/tools/dev/p4vm/user-bootstrap.sh
+++ b/tools/dev/p4vm/user-bootstrap.sh
@@ -8,7 +8,7 @@
cp /etc/skel/.bash_logout ~/
# ONOS
-git clone https://github.com/opennetworkinglab/onos.git --depth 1 -b ${ONOS_BRANCH}
+git clone https://github.com/opennetworkinglab/onos.git -b ${ONOS_BRANCH}
tee -a ~/.bashrc <<EOF
# ONOS