From eabb07f6d2fc3318fd50f05d364372a96e0b12ed Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 28 Jun 2019 14:54:12 -0400 Subject: [PATCH] openscap/scap-security-guide: use _git instead of versioned filenames In order to facilate the reuse of the recipe code via layer or distro specific bbappends rename the recipe files to use _git instead of versined filenames. Specifically this allows for minimal bbappends in additional layers which may use the upstream, non-forked, repos that can be version skewed when compared to what is present in this repo. Signed-off-by: Mark Asselstine Signed-off-by: Armin Kuster --- .../openscap/{openscap_1.2.17.bb => openscap_git.bb} | 1 + ...{scap-security-guide_0.1.33.bb => scap-security-guide_git.bb} | 1 + 2 files changed, 2 insertions(+) rename meta-security-compliance/recipes-openscap/openscap/{openscap_1.2.17.bb => openscap_git.bb} (99%) rename meta-security-compliance/recipes-openscap/scap-security-guide/{scap-security-guide_0.1.33.bb => scap-security-guide_git.bb} (98%) diff --git a/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb b/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb similarity index 99% rename from meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb rename to meta-security-compliance/recipes-openscap/openscap/openscap_git.bb index e2a4fa2..3bfa2e1 100644 --- a/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb +++ b/meta-security-compliance/recipes-openscap/openscap/openscap_git.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/akuster/openscap.git;branch=oe \ file://crypto_pkgconfig.patch \ file://run-ptest \ " +PV = "v1.2.17+git${SRCPV}" inherit autotools-brokensep pkgconfig python3native perlnative ptest diff --git a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb similarity index 98% rename from meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb rename to meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb index 27d3d86..3f76038 100644 --- a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb +++ b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_git.bb @@ -10,6 +10,7 @@ DEPENDS = "openscap-native" SRCREV = "423d9f40021a03abd018bef7818a3a9fe91a083c" SRC_URI = "git://github.com/akuster/scap-security-guide.git;branch=oe;" +PV = "v0.1.33+git${SRCPV}" inherit cmake