diff mbox series

selftest-ed: Upgrade to version 1.21

Message ID 20250427034423.336840-1-raj.khem@gmail.com
State New
Headers show
Series selftest-ed: Upgrade to version 1.21 | expand

Commit Message

Khem Raj April 27, 2025, 3:44 a.m. UTC 
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../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

Comments

Mathieu Dubois-Briand April 27, 2025, 6:28 a.m. UTC | #1 
On Sun Apr 27, 2025 at 5:44 AM CEST, Khem Raj via lists.openembedded.org wrote:
> 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
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---

Hi Khem,

Thanks for your patch.

It looks like the URL is wrong:

ERROR: selftest-ed-1.21.1-r0 do_fetch: Fetcher failure: Fetch command export PSEUDO_DISABLED=1; export PATH="/srv/pokybuild/yocto-worker/a-full/build/build/tmp/sysroots-uninative/x86_64-linux/usr/bin:/srv/pokybuild/yocto-worker/a-full/build/scripts:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/recipe-sysroot-native/usr/bin/x86_64-poky-linux:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/recipe-sysroot/bin/crossscripts:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/recipe-sysroot-native/usr/sbin:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/recipe-sysroot-native/usr/bin:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/recipe-sysroot-native/sbin:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/work/core2-64-poky-linux/selftest-ed/1.21.1/recipe-sysroot-native/bin:/srv/pokybuild/yocto-worker/a-full/build/bitbake/bin:/srv/pokybuild/yocto-worker/a-full/build/build/tmp/hosttools"; export HOME="/srv/pokybuild"; /usr/bin/env wget --tries=2 --timeout=100 --output-document=/srv/autobuilder/valkyrie.yocto.io/current_sources/selftest-ed-1.21.1.tar.lz.tmp --continue --directory-prefix=/srv/autobuilder/valkyrie.yocto.io/current_sources 'https://ftp.gnu.org/gnu/ed/selftest-ed-1.21.1.tar.lz' --progress=dot --verbose failed with exit code 8, see logfile for output
NOTE: recipe p11-kit-0.25.5-r0: task do_fetch: Started
ERROR: selftest-ed-1.21.1-r0 do_fetch: Bitbake Fetcher Error: FetchError('Unable to fetch URL from any source.', 'https://ftp.gnu.org/gnu/ed/selftest-ed-1.21.1.tar.lz')

https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1476/steps/13/logs/stdio
diff mbox series

Patch

diff --git a/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb b/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb
deleted file mode 100644
index 1a140a532f9..00000000000
--- a/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb
+++ /dev/null
@@ -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"
diff --git a/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb b/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb
deleted file mode 100644
index b92740de32a..00000000000
--- a/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb
+++ /dev/null
@@ -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"
diff --git a/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb b/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb
new file mode 100644
index 00000000000..1a5c9318a54
--- /dev/null
+++ b/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.21.1.bb
@@ -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/${BP}.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"