Drop the no-longer-needed 0001-Fix-parallel-build-problems.patch, 0002-fix-reproducibility.patch and 0001-Fix-a-lot-of-Werror-format-security.patch.
Signed-off-by: Khem Raj <[email protected]> --- ...ror-format-security-errors-with-mvwp.patch | 31 ------------------ ...rallel-build-problems-by-Adrian-Bunk.patch | 28 ---------------- ...fix-reproducibility-of-build-process.patch | 32 ------------------- .../{tiptop_2.3.1.bb => tiptop_2.3.2.bb} | 5 +-- 4 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch delete mode 100644 meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch delete mode 100644 meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch rename meta-oe/recipes-extended/tiptop/{tiptop_2.3.1.bb => tiptop_2.3.2.bb} (78%) diff --git a/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch b/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch deleted file mode 100644 index 6d5e293c7f..0000000000 --- a/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 42e99eb6c727df7c9d49586803a4bf9933a9796b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 30 Oct 2021 10:52:42 -0700 -Subject: [PATCH] Fix a lot of -Werror=format-security errors with mvwprintw - -In all these places a non-constant is used as a format string which -compiler complains about. Fix by using "%s" as format. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - src/helpwin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/helpwin.c b/src/helpwin.c -index 0d660f9..1623d9c 100644 ---- a/src/helpwin.c -+++ b/src/helpwin.c -@@ -61,7 +61,7 @@ void show_help_win(WINDOW* win, screen_t* screen) - wattroff(win, A_REVERSE); - - /* screen description */ -- mvwprintw(win, 2, 1, screen->desc); -+ mvwprintw(win, 2, 1, "%s", screen->desc); - - /* max size of column headers */ - for(i = 0; i < n; i++) { --- -2.33.1 - diff --git a/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch b/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch deleted file mode 100644 index ae676ae449..0000000000 --- a/meta-oe/recipes-extended/tiptop/tiptop/0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 848983a30dc99248ec45632bfc31718716a86e9d Mon Sep 17 00:00:00 2001 -From: Tomasz Buchert <[email protected]> -Date: Fri, 7 Jul 2017 21:15:58 +0200 -Subject: [PATCH] Fix parallel build problems (by Adrian Bunk) - -Taken from debian -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - src/Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 32ab563..1993c9b 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -59,8 +59,9 @@ lex.yy.c: calc.lex - lex.yy.o: lex.yy.c - $(CC) $(CFLAGS) -I$(srcdir) -c lex.yy.c - -+y.tab.c: y.tab.h - --y.tab.c y.tab.h: calc.y -+y.tab.h: calc.y - $(YACC) -d $(srcdir)/calc.y - - y.tab.o: y.tab.c diff --git a/meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch b/meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch deleted file mode 100644 index cecb70bc99..0000000000 --- a/meta-oe/recipes-extended/tiptop/tiptop/0002-fix-reproducibility-of-build-process.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 89dd9d8705408dccd5c5e47d22eba6fd6ec22b50 Mon Sep 17 00:00:00 2001 -From: Tomasz Buchert <[email protected]> -Date: Thu, 9 Jul 2015 16:07:23 +0200 -Subject: [PATCH] fix reproducibility of build process - -The upstream Makefile sets macros that depend on -a particular platform where the package is built. -We don't set them which fixes the problem. - -Taken from debian -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - src/Makefile.in | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 1993c9b..4392c06 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -48,9 +48,7 @@ Makefile: Makefile.in ../config.status - - - version.o: version.c -- $(CC) $(CFLAGS) -DCOMPILE_HOST="\""`hostname`"\"" \ -- -DCOMPILE_DATE="\"`date`\"" \ -- -c $(srcdir)/version.c -+ $(CC) $(CFLAGS) -c $(srcdir)/version.c - - - lex.yy.c: calc.lex diff --git a/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb b/meta-oe/recipes-extended/tiptop/tiptop_2.3.2.bb similarity index 78% rename from meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb rename to meta-oe/recipes-extended/tiptop/tiptop_2.3.2.bb index 8dca2940b5..fe703c7e95 100644 --- a/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb +++ b/meta-oe/recipes-extended/tiptop/tiptop_2.3.2.bb @@ -5,12 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses libxml2 bison-native flex-native" SRC_URI = "http://files.inria.fr/pacap/${BPN}/${BP}.tar.gz \ - file://0001-Fix-parallel-build-problems-by-Adrian-Bunk.patch \ - file://0002-fix-reproducibility-of-build-process.patch \ file://0001-Fix-build-when-S-B.patch \ - file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvwp.patch \ " -SRC_URI[sha256sum] = "51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182" +SRC_URI[sha256sum] = "a14b1b59ea4856844e27bc4e22129b7906b8815afaf50a25ac60998dafcc93a7" UPSTREAM_CHECK_URI = "https://team.inria.fr/pacap/software/tiptop/";
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127855): https://lists.openembedded.org/g/openembedded-devel/message/127855 Mute This Topic: https://lists.openembedded.org/mt/120013652/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
