| Message ID | 7425c3ca03c6dbb21ba02d7a97787709cb51f8ee.1763938436.git.scott.murray@konsulko.com |
|---|---|
| State | New |
| Headers | show |
| Series | Roll up outstanding fixes | expand |
> From: Marta Rybczynska <marta.rybczynska@ygreky.com> >@ > The project does not keep releases in branches, instead they tag them. The stable branch > does not contain releases, so we use the revision only. >@ > See upstream issue [1] for details. >@ > [1] https://github.com/ComplianceAsCode/content/issues/13543 >@ > Signed-off-by: Marta Rybczynska <marta.rybczynska@ygreky.com> > --- > .../scap-security-guide/scap-security-guide_0.1.71.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >@ > diff --git a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb > index 5e45332..e277ccf 100644 > --- a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb > +++ b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9bfa86579213cb4c6adaffface6b2820" > LICENSE = "BSD-3-Clause" >@@ > SRCREV = "459f0abf2ac08d36e5fc4a2619bc75cff7000da9" > -SRC_URI = "git://github.com/ComplianceAsCode/content.git;branch=stable;protocol=https \ > +SRC_URI = "git://github.com/ComplianceAsCode/content.git;nobranch=1;protocol=https \ > file://run_eval.sh \ > file://run-ptest \ > " Hi, Scott I would suggest instead updating the SRCREV to 879672a39577a8b8c9413641c9e6b8a0bd4f12bc. See https://lists.yoctoproject.org/g/yocto-patches/topic/116289037 -- Clayton Casciato
On Mon, 24 Nov 2025, Clayton Casciato wrote: > > From: Marta Rybczynska <marta.rybczynska@ygreky.com> > >@ > > The project does not keep releases in branches, instead they tag them. The stable branch > > does not contain releases, so we use the revision only. > >@ > > See upstream issue [1] for details. > >@ > > [1] https://github.com/ComplianceAsCode/content/issues/13543 > >@ > > Signed-off-by: Marta Rybczynska <marta.rybczynska@ygreky.com> > > --- > > .../scap-security-guide/scap-security-guide_0.1.71.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >@ > > diff --git a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb > > index 5e45332..e277ccf 100644 > > --- a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb > > +++ b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb > > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9bfa86579213cb4c6adaffface6b2820" > > LICENSE = "BSD-3-Clause" > >@@ > > SRCREV = "459f0abf2ac08d36e5fc4a2619bc75cff7000da9" > > -SRC_URI = "git://github.com/ComplianceAsCode/content.git;branch=stable;protocol=https \ > > +SRC_URI = "git://github.com/ComplianceAsCode/content.git;nobranch=1;protocol=https \ > > file://run_eval.sh \ > > file://run-ptest \ > > " > Hi, Scott > > I would suggest instead updating the SRCREV to > 879672a39577a8b8c9413641c9e6b8a0bd4f12bc. > > See https://lists.yoctoproject.org/g/yocto-patches/topic/116289037 459f0abf2ac08d36e5fc4a2619bc75cff7000da9 is the commit that the v0.1.71 tag points at, so it is what should be used in order to avoid confusion. Now it is indeed the case that since this change was made upstream have reworked their stable branch by merging all the dangling release branches into it, so we can potentially drop this for scarthgap, I'll try a sanity test build. The upgrade to v0.1.78 is queued on master-next, my plan is to take it as is, then we can drop a one-liner on to change the branch, then backport to scarthgap in the next pass. Thanks, Scott
diff --git a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb index 5e45332..e277ccf 100644 --- a/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb +++ b/recipes-compliance/scap-security-guide/scap-security-guide_0.1.71.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9bfa86579213cb4c6adaffface6b2820" LICENSE = "BSD-3-Clause" SRCREV = "459f0abf2ac08d36e5fc4a2619bc75cff7000da9" -SRC_URI = "git://github.com/ComplianceAsCode/content.git;branch=stable;protocol=https \ +SRC_URI = "git://github.com/ComplianceAsCode/content.git;nobranch=1;protocol=https \ file://run_eval.sh \ file://run-ptest \ "