From 37edcea5b7285df33dbaf125f9287c46f89c43bb Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 8 Jan 2016 11:57:22 -0800 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- 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(-) (limited to 'meta-networking/recipes-protocols') 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" -- cgit 1.2.3-korg