diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2021-11-05 14:11:43 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2021-11-22 12:23:16 -0500 |
commit | 87d3c3dd74b5d25f9a103025286c27a3b14db679 (patch) | |
tree | 62e7f16efda1581000e62bfebdc960580c97636a | |
parent | 4d2bb085d29c4d6f2ccb62fec53da23ff541183e (diff) | |
download | meta-selinux-87d3c3dd74b5d25f9a103025286c27a3b14db679.tar.gz |
recipes: update SRC_URI branch and protocols
Update SRC_URIs using git to include branch=master if no branch is set
and also to use protocol=https for github urls.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/refpolicy/refpolicy_git.inc | 2 | ||||
-rw-r--r-- | recipes-security/selinux/selinux_common.inc | 2 | ||||
-rw-r--r-- | recipes-security/setools/setools_4.4.0.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-security/refpolicy/refpolicy_git.inc b/recipes-security/refpolicy/refpolicy_git.inc index ccf1bde..1d56403 100644 --- a/recipes-security/refpolicy/refpolicy_git.inc +++ b/recipes-security/refpolicy/refpolicy_git.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | PV = "2.20210203+git${SRCPV}" | 1 | PV = "2.20210203+git${SRCPV}" |
2 | 2 | ||
3 | SRC_URI = "git://github.com/SELinuxProject/refpolicy.git;protocol=git;branch=master;name=refpolicy;destsuffix=refpolicy" | 3 | SRC_URI = "git://github.com/SELinuxProject/refpolicy.git;protocol=https;branch=master;name=refpolicy;destsuffix=refpolicy" |
4 | 4 | ||
5 | SRCREV_refpolicy ?= "1167739da1882f9c89281095d2595da5ea2d9d6b" | 5 | SRCREV_refpolicy ?= "1167739da1882f9c89281095d2595da5ea2d9d6b" |
6 | 6 | ||
diff --git a/recipes-security/selinux/selinux_common.inc b/recipes-security/selinux/selinux_common.inc index f2e180f..dc4ccd5 100644 --- a/recipes-security/selinux/selinux_common.inc +++ b/recipes-security/selinux/selinux_common.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | HOMEPAGE = "https://github.com/SELinuxProject" | 1 | HOMEPAGE = "https://github.com/SELinuxProject" |
2 | 2 | ||
3 | SRC_URI = "git://github.com/SELinuxProject/selinux.git" | 3 | SRC_URI = "git://github.com/SELinuxProject/selinux.git;branch=master;protocol=https" |
4 | SRCREV = "cf853c1a0c2328ad6c62fb2b2cc55d4926301d6b" | 4 | SRCREV = "cf853c1a0c2328ad6c62fb2b2cc55d4926301d6b" |
5 | 5 | ||
6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 6 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/recipes-security/setools/setools_4.4.0.bb b/recipes-security/setools/setools_4.4.0.bb index 2b10993..b78af36 100644 --- a/recipes-security/setools/setools_4.4.0.bb +++ b/recipes-security/setools/setools_4.4.0.bb | |||
@@ -9,7 +9,7 @@ SECTION = "base" | |||
9 | LICENSE = "GPLv2 & LGPLv2.1" | 9 | LICENSE = "GPLv2 & LGPLv2.1" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.4 \ | 12 | SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.4;protocol=https \ |
13 | file://setools4-fixes-for-cross-compiling.patch \ | 13 | file://setools4-fixes-for-cross-compiling.patch \ |
14 | " | 14 | " |
15 | 15 | ||