aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-protocols
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2016-01-08 11:57:22 -0800
committerJoe MacDonald <joe_macdonald@mentor.com>2016-01-20 21:41:46 -0500
commit37edcea5b7285df33dbaf125f9287c46f89c43bb (patch)
treec96ba701a813056300fdc414ad94c9d09011cf8c /meta-networking/recipes-protocols
parent21583b8ec4d9d46720b83099dd894bbdfc29dfcb (diff)
downloadmeta-openembedded-contrib-37edcea5b7285df33dbaf125f9287c46f89c43bb.tar.gz
xl2tpd: modify recipes to avoid forced internet access
We should always specify a commit id for git SRCREV or we will try to access the upstream repo when fetching. In addition, if our PV is just "git" we will access upstream when doing archiver functions, so we should specify PV for xyz_git.bb recipes. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
-rw-r--r--meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb8
-rw-r--r--meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb5
2 files changed, 9 insertions, 4 deletions
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb
index 515553f00d..df2ec52c65 100644
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb
@@ -1,5 +1,7 @@
require xl2tpd.inc
-SRC_URI = "git://github.com/xelerance/xl2tpd.git;protocol=git;tag=v${PV} \
- file://fix-inline-functions-errors-with-gcc-5.x.patch \
-"
+# The SRCREV corresponds to v1.3.6.
+# Adding tag=v1.3.6 to the SRC_URI will force access to the upstream repo.
+#
+SRCREV = "5619e1771048e74b729804e8602f409af0f3faea"
+
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
index 0cce7ab80b..42bc398a19 100644
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
@@ -1,5 +1,8 @@
require xl2tpd.inc
-PR = "${INC_PR}.0"
+
+# This is v1.3.6 plus some commits. There is no tag for this commit.
+#
+PV = "1.3.6+git${SRCPV}"
SRCREV = "a96b345962622ea58490924130675df6db062d11"