selftest-ed: Upgrade to version 1.21
PATCH v2 1/1 selftest-ed: Upgrade to version 1.21
Older versions do not compile with GCC 15
1.21 is licensed under GPL-2.0 which means we can remove 0.5 recipe as well
---
v2: Do not use BP in SRCREV, it does not match the archive name for ed
.../selftest-ed/selftest-ed_0.5.bb | 23 ----------- .../selftest-ed/selftest-ed_1.14.1.bb | 38 ------------------ .../selftest-ed/selftest-ed_1.21.1.bb | 39 +++++++++++++++++++ 3 files changed, 39 insertions(+), 61 deletions(-) delete mode 100644 meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb delete mode 100644 meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb create mode 100644 meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb
meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb deleted +0 -23
@@ -1,23 +0,0 @@ -SUMMARY = "Line-oriented text editor -- selftest GPL-2.0-or-later version" -HOMEPAGE = "http://www.gnu.org/software/ed/" -SECTION = "base" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ddd5335ef96fb858a138230af773710 \ - file://main.c;beginline=1;endline=17;md5=36d4b85e5ae9028e918d1cc775c2475e" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/ed/ed-${PV}.tar.bz2" - -SRC_URI[md5sum] = "4ee21e9dcc9b5b6012c23038734e1632" -SRC_URI[sha256sum] = "edef2bbde0fbf0d88232782a0eded323f483a0519d6fde9a3b1809056fd35f3e" - -inherit autotools texinfo - -S = "${WORKDIR}/ed-${PV}" - -EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'" - -CONFIGUREOPTS:remove = "--disable-dependency-tracking" -CONFIGUREOPTS:remove = "--disable-silent-rules" -EXTRA_OECONF:remove = "--disable-static" - -BBCLASSEXTEND = "native"
meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb deleted +0 -38
@@ -1,38 +0,0 @@ -SUMMARY = "Line-oriented text editor -- selftest variant" -HOMEPAGE = "http://www.gnu.org/software/ed/" - -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \ - file://ed.h;endline=20;md5=4e36b7a40e137f42aee718165590d125 \ - file://main.c;endline=17;md5=c5b8f78f115df187af76868a2aead16a" - -SECTION = "base" - -# LSB states that ed should be in /bin/ -bindir = "${base_bindir}" - -SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.lz" -RECIPE_NO_UPDATE_REASON = "This recipe is used in selftest and shouldn't be updated otherwise" - -SRC_URI[md5sum] = "7f4a54fa7f366479f03654b8af645fd0" -SRC_URI[sha256sum] = "ffb97eb8f2a2b5a71a9b97e3872adce953aa1b8958e04c5b7bf11d556f32552a" - -S = "${WORKDIR}/ed-${PV}" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -inherit texinfo - -do_configure() { - ${S}/configure -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - # Info dir listing isn't interesting at this point so remove it if it exists. - if [ -e "${D}${infodir}/dir" ]; then - rm -f ${D}${infodir}/dir - fi -} - -BBCLASSEXTEND = "native"
meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb new file +39 -0
@@ -0,0 +1,39 @@ +SUMMARY = "Line-oriented text editor" +HOMEPAGE = "http://www.gnu.org/software/ed/" +DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=cca7f74ec83b7a9ce7ccd195aad471bd \ + file://ed.h;endline=20;md5=a24e7f91c0fb83e65a746f5994762a49 \ + file://main.c;endline=17;md5=fd6ad9f1853f123f4ae7a31d59761f09 \ + " + +SECTION = "base" + +CVE_PRODUCT = "gnu:ed" + +# LSB states that ed should be in /bin/ +bindir = "${base_bindir}" + +# Upstream regularly removes previous releases from https://ftp.gnu.org/gnu/ed/ +SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.lz" +UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" + +SRC_URI[sha256sum] = "d6d0c7192b02b0519c902a93719053e865ade5a784a3b327d93d888457b23c4b" + +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +inherit texinfo + +do_configure() { + ${S}/configure +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + # Info dir listing isn't interesting at this point so remove it if it exists. + if [ -e "${D}${infodir}/dir" ]; then + rm -f ${D}${infodir}/dir + fi +} +BBCLASSEXTEND = "native"
Quoted 5 lines · Khem Raj via lists.openembedded.org
Older versions do not compile with GCC 15
1.21 is licensed under GPL-2.0 which means we can remove 0.5 recipe as wellSigned-off-by Khem Raj <[email protected]>---
Hi Khem,
Thanks for your patch.
It looks like we still have some issues.
oe-selftest:
Exception: subprocess.CalledProcessError: Command 'tar --xattrs --xattrs-include='*' -cf - -S -C /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1181225/tmp/work/x86_64-linux/selftest-ed-native/1.21.1/archiver-work//selftest-ed-1.21.1 -p . | tar --xattrs --xattrs-include='*' -xf - -C /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1181225/tmp/work/x86_64-linux/selftest-ed-native/1.21.1/archiver-work//selftest-ed-1.21.1.orig' returned non-zero exit status 2.
Subprocess output:
tar: /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1181225/tmp/work/x86_64-linux/selftest-ed-native/1.21.1/archiver-work//selftest-ed-1.21.1: Cannot open: No such file or directory
tar: Error is not recoverable: exiting now
tar: This does not look like a tar archive
tar: Exiting with failure status due to previous errors
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/1387
Also an issue on reproducible. This one is a bit strange:
2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: QA Issue: selftest-ed: LIC_FILES_CHKSUM points to an invalid file: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleA/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/selftest-ed-1.21.1/COPYING [license-checksum] 2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: QA Issue: selftest-ed: LIC_FILES_CHKSUM points to an invalid file: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleA/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/selftest-ed-1.21.1/ed.h [license-checksum] 2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: QA Issue: selftest-ed: LIC_FILES_CHKSUM points to an invalid file: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleA/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/selftest-ed-1.21.1/main.c [license-checksum] 2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: Fatal QA errors were found, failing task.
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/1517
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 25 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 5 lines · Khem Raj via lists.openembedded.org
Older versions do not compile with GCC 15
1.21 is licensed under GPL-2.0 which means we can remove 0.5 recipe as wellSigned-off-by Khem Raj <[email protected]>---
Hi Khem,
Thanks for your patch.
It looks like we still have some issues.
oe-selftest:
Exception: subprocess.CalledProcessError: Command 'tar --xattrs --xattrs-include='*' -cf - -S -C
/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1181225/tmp/work/x86_64-linux/selftest-ed-native/1.21.1/archiver-work//selftest-ed-1.21.1-p . | tar --xattrs --xattrs-include='*' -xf - -C/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1181225/tmp/work/x86_64-linux/selftest-ed-native/1.21.1/archiver-work//selftest-ed-1.21.1.orig' returned non-zero exit status 2.Subprocess output:
tar:/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-1181225/tmp/work/x86_64-linux/selftest-ed-native/1.21.1/archiver-work//selftest-ed-1.21.1: Cannot open: No such file or directory
tar: Error is not recoverable: exiting now
tar: This does not look like a tar archive
tar: Exiting with failure status due to previous errorshttps://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/1387
Quoted 9 lines
Also an issue on reproducible. This one is a bit strange:
2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: QA Issue: selftest-ed: LIC_FILES_CHKSUM points to an invalid file: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleA/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/selftest-ed-1.21.1/COPYING [license-checksum] 2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: QA Issue: selftest-ed: LIC_FILES_CHKSUM points to an invalid file: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleA/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/selftest-ed-1.21.1/ed.h [license-checksum] 2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: QA Issue: selftest-ed: LIC_FILES_CHKSUM points to an invalid file: /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleA/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/selftest-ed-1.21.1/main.c [license-checksum] 2025-04-28 09:32:48,671 - oe-selftest - INFO - ERROR: selftest-ed-1.21.1-r0 do_populate_lic: Fatal QA errors were found, failing task.https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/1517
I dug into this. I had to fix S in the recipe to work correctly due to the changed PN.
With that fixed, I needed to change the version strings in the archiver tests. The change to licensing still broke the bbtests gplv3 test though. I have fixes for both however I'm not sure my adjusted version with work with gcc 15. I'm still working on that.
Cheers,
Richard