screen: uprev to 5.0.0
PATCH 1/1 screen: uprev to 5.0.0
Drop deprecated patches.
Inherit autotools-brokensep instead of autotools, there are some generated headers in ${B} that referring to ${S}.
---
...0001-Remove-more-compatibility-stuff.patch | 31 ----------
.../screen/0001-fix-for-multijob-build.patch | 58 -------------------
.../0002-comm.h-now-depends-on-term.h.patch | 30 ----------
.../{screen_4.9.1.bb => screen_5.0.0.bb} | 11 ++--
4 files changed, 4 insertions(+), 126 deletions(-)
delete mode 100644 meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch
delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
rename meta/recipes-extended/screen/{screen_4.9.1.bb => screen_5.0.0.bb} (79%)meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch deleted +0 -31
@@ -1,31 +0,0 @@ -This fixes -../screen-4.6.2/pty.c: In function 'OpenPTY': -../screen-4.6.2/pty.c:328:7: warning: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] - if (openpty(&f, &s, TtyName, NULL, NULL) != 0) - ^~~~~~~ - -Signed-off-by: Amadeusz Sławiński <[email protected]> -Signed-off-by: Adrian Bunk <[email protected]> -Upstream-Status: Backport - ---- - pty.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/pty.c b/pty.c -index 1c0660e..502338f 100644 ---- a/pty.c -+++ b/pty.c -@@ -47,11 +47,7 @@ - # include <sys/ttold.h> - #endif - --#ifdef ISC --# include <sys/tty.h> --# include <sys/sioctl.h> --# include <sys/pty.h> --#endif -+#include <pty.h> - - #ifdef sgi - # include <sys/sysmacros.h>
meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Backport - -Backport from: - -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c - -Signed-off-by: Kai Kang <[email protected]> ---- -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz <[email protected]> -Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: [PATCH] comm.h now depends on term.h - ---- - src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: screen-4.6.1/Makefile.in -=================================================================== ---- screen-4.6.1.orig/Makefile.in -+++ screen-4.6.1/Makefile.in -@@ -133,7 +133,7 @@ kmapdef.c: term.h - tty.c: tty.sh - sh $(srcdir)/tty.sh tty.c - --comm.h: comm.c comm.sh config.h -+comm.h: comm.c comm.sh config.h term.h - AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - - osdef.h: osdef.sh config.h osdef.h.in
meta/recipes-extended/screen/screen_5.0.0.bb renamed from meta/recipes-extended/screen/screen_4.9.1.bb +4 -7
@@ -8,7 +8,7 @@ BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen" SECTION = "console/utils" LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ "
@@ -18,19 +18,16 @@ RDEPENDS:${PN} = "base-files" SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ - file://0002-comm.h-now-depends-on-term.h.patch \ - file://0001-fix-for-multijob-build.patch \ - file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" +SRC_URI[sha256sum] = "f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971" -inherit autotools texinfo +inherit autotools-brokensep texinfo PACKAGECONFIG ??= "" PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sysconfdir}/screenrc \ +EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-system_screenrc=${sysconfdir}/screenrc \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" do_install:append () {
Signature · 1 line
2.43.0
Patchtest results for [OE-core] [PATCH] screen: uprev to 5.0.0
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/screen-uprev-to-5.0.0.patch
FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
Changes in LIC_FILES_CHKSUM should be explained via License-Update: tag. (not sure why patchtest didn't tell this yet)
Alex
Quoted 206 lines · Ming Liu via lists.openembedded.org
Drop deprecated patches.
Inherit autotools-brokensep instead of autotools, there are some generated headers in ${B} that referring to ${S}.
Signed-off-by Ming Liu <[email protected]>--- ...0001-Remove-more-compatibility-stuff.patch | 31 ---------- .../screen/0001-fix-for-multijob-build.patch | 58 ------------------- .../0002-comm.h-now-depends-on-term.h.patch | 30 ---------- .../{screen_4.9.1.bb => screen_5.0.0.bb} | 11 ++-- 4 files changed, 4 insertions(+), 126 deletions(-) delete mode 100644 meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch rename meta/recipes-extended/screen/{screen_4.9.1.bb => screen_5.0.0.bb} (79%)meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch deleted +0
-31@@ -1,31 +0,0 @@ -This fixes -../screen-4.6.2/pty.c: In function 'OpenPTY': -../screen-4.6.2/pty.c:328:7: warning: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] - if (openpty(&f, &s, TtyName, NULL, NULL) != 0) - ^~~~~~~ - -Signed-off-by: Amadeusz Sławiński <[email protected]> -Signed-off-by: Adrian Bunk <[email protected]> -Upstream-Status: Backport - ---- - pty.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/pty.c b/pty.c -index 1c0660e..502338f 100644 ---- a/pty.c -+++ b/pty.c -@@ -47,11 +47,7 @@ - # include <sys/ttold.h> - #endif - --#ifdef ISC --# include <sys/tty.h> --# include <sys/sioctl.h> --# include <sys/pty.h> --#endif -+#include <pty.h> - - #ifdef sgi - # include <sys/sysmacros.h>meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0
-58@@ -1,58 +0,0 @@ -From 79ad2885e26631077dd6b8aebe17ae95b38133a6 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <[email protected]> -Date: Tue, 26 Jul 2016 14:23:59 +0800 -Subject: [PATCH] fix for multijob build - -make sure that comm.sh script generates comm.h header before doing -anything else - -Signed-off-by: Amadeusz Sawiski <[email protected]> - -Upstream-Status: Backport - -Backport patch to fix parallel build failure and update context to make patch -coulde be applied. - -http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd - -Signed-off-by: Kai Kang <[email protected]> -Signed-off-by: Jackie Huang <[email protected]> ---- - Makefile.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index aca7da3..3607711 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a - comm.h layer.h term.h image.h display.h window.h mark.h extern.h - tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ - layer.h term.h image.h display.h window.h extern.h --term.o: layout.h viewport.h canvas.h term.c term.h -+term.o: layout.h viewport.h canvas.h term.c term.h comm.h - window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \ - comm.h layer.h term.h image.h display.h window.h extern.h logfile.h - utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ -@@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a - comm.h layer.h term.h image.h display.h window.h extern.h \ - braille.h - comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h --kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h -+kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h - acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ - layer.h term.h image.h display.h window.h extern.h - braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ -@@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ - comm.h layer.h term.h image.h display.h window.h extern.h \ - braille.h --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h - list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h - --- -1.9.1 -meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch deleted +0
-30@@ -1,30 +0,0 @@ -Upstream-Status: Backport - -Backport from: - -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c - -Signed-off-by: Kai Kang <[email protected]> ---- -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz <[email protected]> -Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: [PATCH] comm.h now depends on term.h - ---- - src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: screen-4.6.1/Makefile.in -=================================================================== ---- screen-4.6.1.orig/Makefile.in -+++ screen-4.6.1/Makefile.in -@@ -133,7 +133,7 @@ kmapdef.c: term.h - tty.c: tty.sh - sh $(srcdir)/tty.sh tty.c - --comm.h: comm.c comm.sh config.h -+comm.h: comm.c comm.sh config.h term.h - AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - - osdef.h: osdef.sh config.h osdef.h.inmeta/recipes-extended/screen/screen_5.0.0.bb renamed from meta/recipes-extended/screen/screen_4.9.1.bb +4
-8@@ -8,7 +8,7 @@ BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen" SECTION = "console/utils" LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ "@@ -18,19 +18,16 @@ RDEPENDS:${PN} = "base-files" SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ - file://0002-comm.h-now-depends-on-term.h.patch \ - file://0001-fix-for-multijob-build.patch \ - file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" +SRC_URI[sha256sum] = "f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971" -inherit autotools texinfo +inherit autotools-brokensep texinfo PACKAGECONFIG ??= "" PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sysconfdir}/screenrc \ +EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-system_screenrc=${sysconfdir}/screenrc \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" do_install:append () { --2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206185): https://lists.openembedded.org/g/openembedded-core/message/206185
Mute This Topic: https://lists.openembedded.org/mt/109167182/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-