[oe-commits] [meta-openembedded] 12/18: xl2tpd: modify recipes to avoid forced internet access

[git at git.openembedded.org]

joe_macdonald pushed a commit to branch master
in repository meta-openembedded.

commit 37edcea5b7285df33dbaf125f9287c46f89c43bb
Author: Joe Slater <jslater at windriver.com>
AuthorDate: Fri Jan 8 11:57:22 2016 -0800

    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 at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
 meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb | 8 +++++---
 meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb   | 5 ++++-
 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 515553f..df2ec52 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 0cce7ab..42bc398 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"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.