| Message ID | 20240808081754.809770-1-changqing.li@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | 798aa15cb955f9801effbed44eba0f3f46ba8c54 |
| Headers | show |
| Series | [V2,master] libcap-ng: update SRC_URI | expand |
On Thu, 2024-08-08 at 16:17 +0800, Changqing Li via lists.openembedded.org wrote: > From: Changqing Li <changqing.li@windriver.com> > > Refer [1], people.redhat.com has certificate issue, so update SRC_URI > to fix do_fetch warning > > [1] https://github.com/stevegrubb/libcap-ng/issues/56 > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > --- > meta/recipes-support/libcap-ng/libcap-ng.inc | 6 +++--- > meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb | 4 ++++ > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc > index 85b51c4dc6..6549bce006 100644 > --- a/meta/recipes-support/libcap-ng/libcap-ng.inc > +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc > @@ -7,11 +7,11 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" > > -SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ > +SRC_URI = "git://github.com/stevegrubb/libcap-ng.git;protocol=https;branch=master \ > file://0001-Fix-python-path-when-invoking-py-compile-54.patch \ > " > - > -SRC_URI[sha256sum] = "3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff" > +SRCREV = "f5d39702622208b3ada064d7b2eaeaf1454c9bd3" > +S = "${WORKDIR}/git" > > inherit lib_package autotools > > diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb > index b482368a41..26899296e3 100644 > --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb > +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb > @@ -4,6 +4,10 @@ EXTRA_OECONF += "--without-python3" > > BBCLASSEXTEND = "native nativesdk" > > +do_configure:prepend() { > + touch ${S}/NEWS > +} > + > do_install:append() { > # Moving libcap-ng to base_libdir > if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then > This breaks libcap-ng-python: https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/9370/steps/11/logs/stdio Cheers, Richard
diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 85b51c4dc6..6549bce006 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -7,11 +7,11 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ +SRC_URI = "git://github.com/stevegrubb/libcap-ng.git;protocol=https;branch=master \ file://0001-Fix-python-path-when-invoking-py-compile-54.patch \ " - -SRC_URI[sha256sum] = "3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff" +SRCREV = "f5d39702622208b3ada064d7b2eaeaf1454c9bd3" +S = "${WORKDIR}/git" inherit lib_package autotools diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb index b482368a41..26899296e3 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb @@ -4,6 +4,10 @@ EXTRA_OECONF += "--without-python3" BBCLASSEXTEND = "native nativesdk" +do_configure:prepend() { + touch ${S}/NEWS +} + do_install:append() { # Moving libcap-ng to base_libdir if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then