* [PATCH 1/6] time: Add missing include for memset
@ 2022-08-16 3:30 Khem Raj
2022-08-16 3:30 ` [PATCH 2/6] screen: Add missing include files in configure checks Khem Raj
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Khem Raj @ 2022-08-16 3:30 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-include-string.h-for-memset.patch | 27 +++++++++++++++++++
meta/recipes-extended/time/time_1.9.bb | 4 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch
diff --git a/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch b/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch
new file mode 100644
index 00000000000..f6ea212667e
--- /dev/null
+++ b/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch
@@ -0,0 +1,27 @@
+From c8deae54f92d636878097063b411af9fb5262ad3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 15 Aug 2022 07:24:24 -0700
+Subject: [PATCH] include string.h for memset()
+
+Fixes implicit function declaration warning e.g.
+
+resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)'
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/resuse.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/resuse.c b/src/resuse.c
+index cf5a08c..9d3d18a 100644
+--- a/src/resuse.c
++++ b/src/resuse.c
+@@ -22,6 +22,7 @@
+ */
+
+ #include "config.h"
++#include <string.h>
+ #include <sys/time.h>
+ #include <sys/wait.h>
+ #include <sys/resource.h>
diff --git a/meta/recipes-extended/time/time_1.9.bb b/meta/recipes-extended/time/time_1.9.bb
index 706605fe065..8364210e61c 100644
--- a/meta/recipes-extended/time/time_1.9.bb
+++ b/meta/recipes-extended/time/time_1.9.bb
@@ -13,7 +13,9 @@ ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
+ file://0001-include-string.h-for-memset.patch \
+ "
SRC_URI[md5sum] = "d2356e0fe1c0b85285d83c6b2ad51b5f"
SRC_URI[sha256sum] = "fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e"
--
2.37.2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/6] screen: Add missing include files in configure checks 2022-08-16 3:30 [PATCH 1/6] time: Add missing include for memset Khem Raj @ 2022-08-16 3:30 ` Khem Raj 2022-08-16 3:30 ` [PATCH 3/6] setserial: Fix build with clang Khem Raj ` (3 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2022-08-16 3:30 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj Fixes builds with -Werror Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...-Add-needed-system-headers-in-checks.patch | 151 ++++++++++++++++++ meta/recipes-extended/screen/screen_4.9.0.bb | 3 +- 2 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch diff --git a/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch b/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch new file mode 100644 index 00000000000..80659942c73 --- /dev/null +++ b/meta/recipes-extended/screen/screen/0001-configure-Add-needed-system-headers-in-checks.patch @@ -0,0 +1,151 @@ +From 4e102de2e6204c1d8e8be00bb5ffd4587e70350c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 15 Aug 2022 10:35:53 -0700 +Subject: [PATCH] configure: Add needed system headers in checks + +Newer compilers throw warnings when a funciton is used with implicit +declaration and enabling -Werror can silently fail these tests and +result in wrong configure results. Therefore add the needed headers in +the AC_TRY_LINK macros + + * configure.ac: Add missing system headers in AC_TRY_LINK. + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/screen-devel/2022-08/msg00000.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 57 +++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 43 insertions(+), 14 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c0f02df..d308079 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -233,6 +233,7 @@ AC_CHECKING(BSD job jontrol) + AC_TRY_LINK( + [#include <sys/types.h> + #include <sys/ioctl.h> ++#include <unistd.h> + ], [ + #ifdef POSIX + tcsetpgrp(0, 0); +@@ -250,12 +251,16 @@ dnl + dnl **** setresuid(), setreuid(), seteuid() **** + dnl + AC_CHECKING(setresuid) +-AC_TRY_LINK(,[ +-setresuid(0, 0, 0); ++AC_TRY_LINK([ ++#include <unistd.h> ++],[ ++return setresuid(0, 0, 0); + ], AC_DEFINE(HAVE_SETRESUID)) + AC_CHECKING(setreuid) +-AC_TRY_LINK(,[ +-setreuid(0, 0); ++AC_TRY_LINK([ ++#include <unistd.h> ++],[ ++return setreuid(0, 0); + ], AC_DEFINE(HAVE_SETREUID)) + dnl + dnl seteuid() check: +@@ -274,7 +279,9 @@ seteuid(0); + + dnl execvpe + AC_CHECKING(execvpe) +-AC_TRY_LINK(,[ ++AC_TRY_LINK([ ++ #include <unistd.h> ++],[ + execvpe(0, 0, 0); + ], AC_DEFINE(HAVE_EXECVPE) + CFLAGS="$CFLAGS -D_GNU_SOURCE") +@@ -284,10 +291,18 @@ dnl **** select() **** + dnl + + AC_CHECKING(select) +-AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, ++AC_TRY_LINK([ ++ #include <sys/select.h> ++],[ ++ select(0, 0, 0, 0, 0); ++],, + LIBS="$LIBS -lnet -lnsl" + AC_CHECKING(select with $LIBS) +-AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, ++AC_TRY_LINK([ ++ #include <sys/select.h> ++],[ ++ select(0, 0, 0, 0, 0); ++],, + AC_MSG_ERROR(!!! no select - no screen)) + ) + dnl +@@ -624,11 +639,19 @@ dnl + dnl **** termcap or terminfo **** + dnl + AC_CHECKING(for tgetent) +-AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, ++AC_TRY_LINK([ ++ #include <curses.h> ++ #include <term.h> ++],[ ++ tgetent((char *)0, (char *)0); ++],, + olibs="$LIBS" + LIBS="-lcurses $olibs" + AC_CHECKING(libcurses) +-AC_TRY_LINK(,[ ++AC_TRY_LINK([ ++ #include <curses.h> ++ #include <term.h> ++],[ + #ifdef __hpux + __sorry_hpux_libcurses_is_totally_broken_in_10_10(); + #else +@@ -871,7 +894,7 @@ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" + fi + + AC_CHECKING(getloadavg) +-AC_TRY_LINK(,[getloadavg((double *)0, 0);], ++AC_TRY_LINK([#include <stdlib.h>],[getloadavg((double *)0, 0);], + AC_DEFINE(LOADAV_GETLOADAVG) load=1, + if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then + olibs="$LIBS" +@@ -1109,10 +1132,10 @@ AC_CHECKING(IRIX sun library) + AC_TRY_LINK(,,,LIBS="$oldlibs") + + AC_CHECKING(syslog) +-AC_TRY_LINK(,[closelog();], , [oldlibs="$LIBS" ++AC_TRY_LINK([#include <syslog.h>],[closelog();], , [oldlibs="$LIBS" + LIBS="$LIBS -lbsd" + AC_CHECKING(syslog in libbsd.a) +-AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" ++AC_TRY_LINK([#include <syslog.h>], [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" + AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])]) + + AC_EGREP_CPP(YES_IS_DEFINED, +@@ -1149,7 +1172,7 @@ AC_CHECKING(getspnam) + AC_TRY_LINK([#include <shadow.h>], [getspnam("x");],AC_DEFINE(SHADOWPW)) + + AC_CHECKING(getttyent) +-AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) ++AC_TRY_LINK([#include <ttyent.h>],[getttyent();], AC_DEFINE(GETTTYENT)) + + AC_CHECKING(fdwalk) + AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) +@@ -1204,7 +1227,13 @@ main() { + AC_SYS_LONG_FILE_NAMES + + AC_MSG_CHECKING(for vsprintf) +-AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) ++AC_TRY_LINK([ ++ #include <stdarg.h> ++ #include <stdio.h> ++],[ ++ va_list valist; ++ vsprintf(0,0,valist); ++], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no)) + + AC_HEADER_DIRENT + diff --git a/meta/recipes-extended/screen/screen_4.9.0.bb b/meta/recipes-extended/screen/screen_4.9.0.bb index b36173b8dee..77e8000bf3b 100644 --- a/meta/recipes-extended/screen/screen_4.9.0.bb +++ b/meta/recipes-extended/screen/screen_4.9.0.bb @@ -21,7 +21,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0002-comm.h-now-depends-on-term.h.patch \ file://0001-fix-for-multijob-build.patch \ file://0001-Remove-more-compatibility-stuff.patch \ - " + file://0001-configure-Add-needed-system-headers-in-checks.patch \ + " SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" -- 2.37.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/6] setserial: Fix build with clang 2022-08-16 3:30 [PATCH 1/6] time: Add missing include for memset Khem Raj 2022-08-16 3:30 ` [PATCH 2/6] screen: Add missing include files in configure checks Khem Raj @ 2022-08-16 3:30 ` Khem Raj 2022-08-16 3:30 ` [PATCH 4/6] expect: Fix implicit-function-declaration warnings Khem Raj ` (2 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2022-08-16 3:30 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...needed-system-headers-for-ioctl-and-.patch | 41 +++++++++++++++++++ meta/recipes-bsp/setserial/setserial_2.17.bb | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-bsp/setserial/setserial/0001-setserial.c-Add-needed-system-headers-for-ioctl-and-.patch diff --git a/meta/recipes-bsp/setserial/setserial/0001-setserial.c-Add-needed-system-headers-for-ioctl-and-.patch b/meta/recipes-bsp/setserial/setserial/0001-setserial.c-Add-needed-system-headers-for-ioctl-and-.patch new file mode 100644 index 00000000000..10c6ae881be --- /dev/null +++ b/meta/recipes-bsp/setserial/setserial/0001-setserial.c-Add-needed-system-headers-for-ioctl-and-.patch @@ -0,0 +1,41 @@ +From 9bbb342f5d9ad5dc75486fd35ada8e287ba19299 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 15 Aug 2022 13:03:17 -0700 +Subject: [PATCH] setserial.c: Add needed system headers for ioctl() and + close() calls + +Add int return type for main() function + +Fixes +error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +error: call to undeclared function 'close'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declarat +ion] + +Upstream-Status: Submitted [https://sourceforge.net/p/setserial/discussion/7060/thread/95d874c12c/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + setserial.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/setserial.c b/setserial.c +index bfda8fd..6a95513 100644 +--- a/setserial.c ++++ b/setserial.c +@@ -16,6 +16,8 @@ + #include <termios.h> + #include <string.h> + #include <errno.h> ++#include <unistd.h> ++#include <sys/ioctl.h> + + #ifdef HAVE_ASM_IOCTLS_H + #include <asm/ioctls.h> +@@ -715,7 +717,7 @@ fprintf(stderr, "\t* port\t\tset the I/O port\n"); + exit(1); + } + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { + int get_flag = 0, wild_intr_flag = 0; + int c; diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb index 5b31cd183b5..e46aeb90cb7 100644 --- a/meta/recipes-bsp/setserial/setserial_2.17.bb +++ b/meta/recipes-bsp/setserial/setserial_2.17.bb @@ -15,7 +15,8 @@ inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${BPN}-${PV}.tar.gz \ file://add_stdlib.patch \ file://ldflags.patch \ - " + file://0001-setserial.c-Add-needed-system-headers-for-ioctl-and-.patch \ + " SRC_URI[md5sum] = "c4867d72c41564318e0107745eb7a0f2" SRC_URI[sha256sum] = "7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a" -- 2.37.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/6] expect: Fix implicit-function-declaration warnings 2022-08-16 3:30 [PATCH 1/6] time: Add missing include for memset Khem Raj 2022-08-16 3:30 ` [PATCH 2/6] screen: Add missing include files in configure checks Khem Raj 2022-08-16 3:30 ` [PATCH 3/6] setserial: Fix build with clang Khem Raj @ 2022-08-16 3:30 ` Khem Raj 2022-08-16 3:30 ` [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 Khem Raj 2022-08-16 3:30 ` [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk Khem Raj 4 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2022-08-16 3:30 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...dd-prototype-to-function-definitions.patch | 113 ++++++++++++++++++ meta/recipes-devtools/expect/expect_5.45.4.bb | 3 +- 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/expect/expect/0001-Add-prototype-to-function-definitions.patch diff --git a/meta/recipes-devtools/expect/expect/0001-Add-prototype-to-function-definitions.patch b/meta/recipes-devtools/expect/expect/0001-Add-prototype-to-function-definitions.patch new file mode 100644 index 00000000000..7d211b3dff6 --- /dev/null +++ b/meta/recipes-devtools/expect/expect/0001-Add-prototype-to-function-definitions.patch @@ -0,0 +1,113 @@ +From 904c7cf6647594939ce1e398468bca3c885f0622 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 15 Aug 2022 18:25:23 -0700 +Subject: [PATCH] Add prototype to function definitions + +Compilers like clang has started erroring out on implicit-function-declaration +therefore arrange the relevant include files where needed. + +Upstream-Status: Submitted [https://sourceforge.net/p/expect/patches/24/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + exp_chan.c | 5 +++-- + exp_clib.c | 4 +++- + exp_main_sub.c | 5 +++++ + pty_termios.c | 4 ++++ + 4 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/exp_chan.c b/exp_chan.c +index 79f486c..50375d3 100644 +--- a/exp_chan.c ++++ b/exp_chan.c +@@ -35,6 +35,7 @@ + #include "exp_prog.h" + #include "exp_command.h" + #include "exp_log.h" ++#include "exp_event.h" /* exp_background_channelhandler */ + #include "tcldbg.h" /* Dbg_StdinMode */ + + extern int expSetBlockModeProc _ANSI_ARGS_((int fd, int mode)); +@@ -631,7 +632,7 @@ expWaitOnOne() { + } + + void +-exp_background_channelhandlers_run_all() ++exp_background_channelhandlers_run_all(void) + { + ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); + ExpState *esPtr; +@@ -760,7 +761,7 @@ expCreateChannel(interp,fdin,fdout,pid) + } + + void +-expChannelInit() { ++expChannelInit(void) { + ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); + + tsdPtr->channelCount = 0; +diff --git a/exp_clib.c b/exp_clib.c +index b21fb5d..8f31fc3 100644 +--- a/exp_clib.c ++++ b/exp_clib.c +@@ -9,13 +9,14 @@ would appreciate credit if this program or parts of it are used. + + #include "expect_cf.h" + #include <stdio.h> ++#include <unistd.h> + #include <setjmp.h> + #ifdef HAVE_INTTYPES_H + # include <inttypes.h> + #endif + #include <sys/types.h> + #include <sys/ioctl.h> +- ++#include <sys/wait.h> + #ifdef TIME_WITH_SYS_TIME + # include <sys/time.h> + # include <time.h> +@@ -1738,6 +1739,7 @@ int exp_getptyslave(); + #define sysreturn(x) return(errno = x, -1) + + void exp_init_pty(); ++void exp_init_tty(); + + /* + The following functions are linked from the Tcl library. They +diff --git a/exp_main_sub.c b/exp_main_sub.c +index bf6c4be..f53b89e 100644 +--- a/exp_main_sub.c ++++ b/exp_main_sub.c +@@ -61,6 +61,11 @@ int exp_cmdlinecmds = FALSE; + int exp_interactive = FALSE; + int exp_buffer_command_input = FALSE;/* read in entire cmdfile at once */ + int exp_fgets(); ++int exp_tty_cooked_echo( ++ Tcl_Interp *interp, ++ exp_tty *tty_old, ++ int *was_raw, ++ int *was_echo); + + Tcl_Interp *exp_interp; /* for use by signal handlers who can't figure out */ + /* the interpreter directly */ +diff --git a/pty_termios.c b/pty_termios.c +index c605b23..80ed5e7 100644 +--- a/pty_termios.c ++++ b/pty_termios.c +@@ -7,6 +7,7 @@ would appreciate credit if you use this file or parts of it. + + */ + ++#include <pty.h> /* openpty */ + #include <stdio.h> + #include <signal.h> + +@@ -15,6 +16,9 @@ would appreciate credit if you use this file or parts of it. + #endif + + #include "expect_cf.h" ++#include "tclInt.h" ++ ++extern char * expErrnoMsg _ANSI_ARGS_((int)); + + /* + The following functions are linked from the Tcl library. They diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index e22fa140d52..6cb46f334cf 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb @@ -26,7 +26,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \ file://0001-fixline1-fix-line-1.patch \ - " + file://0001-Add-prototype-to-function-definitions.patch \ + " SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34" -- 2.37.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 2022-08-16 3:30 [PATCH 1/6] time: Add missing include for memset Khem Raj ` (2 preceding siblings ...) 2022-08-16 3:30 ` [PATCH 4/6] expect: Fix implicit-function-declaration warnings Khem Raj @ 2022-08-16 3:30 ` Khem Raj 2022-08-16 7:39 ` [OE-core] " Alexander Kanavin 2022-08-16 3:30 ` [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk Khem Raj 4 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2022-08-16 3:30 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} | 0 .../spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/spir/{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} (100%) rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} (96%) diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb similarity index 100% rename from meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb rename to meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb similarity index 96% rename from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb rename to meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb index eb907326c43..cfea28a6efe 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb @@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" -- 2.37.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 2022-08-16 3:30 ` [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 Khem Raj @ 2022-08-16 7:39 ` Alexander Kanavin 2022-08-16 14:59 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Alexander Kanavin @ 2022-08-16 7:39 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core This version isn't tagged, so where does 1.3.224 come from? Maybe it's better to leave at 1.3.216+SRCPV? Akex On Tue, 16 Aug 2022 at 05:30, Khem Raj <raj.khem@gmail.com> wrote: > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} | 0 > .../spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} | 2 +- > 2 files changed, 1 insertion(+), 1 deletion(-) > rename meta/recipes-graphics/spir/{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} (100%) > rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} (96%) > > diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb > similarity index 100% > rename from meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb > rename to meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb > diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > similarity index 96% > rename from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb > rename to meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > index eb907326c43..cfea28a6efe 100644 > --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb > +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > @@ -7,7 +7,7 @@ SECTION = "graphics" > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > > -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" > +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" > SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" > PE = "1" > UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" > -- > 2.37.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#169419): https://lists.openembedded.org/g/openembedded-core/message/169419 > Mute This Topic: https://lists.openembedded.org/mt/93052351/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 2022-08-16 7:39 ` [OE-core] " Alexander Kanavin @ 2022-08-16 14:59 ` Khem Raj 2022-08-16 15:04 ` Alexander Kanavin 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2022-08-16 14:59 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core On Tue, Aug 16, 2022 at 12:39 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > This version isn't tagged, so where does 1.3.224 come from? Maybe it's > better to leave at 1.3.216+SRCPV? its not tagged but there is branch https://github.com/KhronosGroup/SPIRV-Headers/tree/sdk-1.3.224 I am not sure if they mean folks to use this branch or perhaps there will be a tag eventually. same is true for spirv-tools - https://github.com/KhronosGroup/SPIRV-Tools/tree/sdk-1.3.224, its not clear what to use. but for now I guess I will leave spirv-headers as it is. Since there is no SRCREV bump perhaps no need to rename it. > > Akex > > On Tue, 16 Aug 2022 at 05:30, Khem Raj <raj.khem@gmail.com> wrote: > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > .../{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} | 0 > > .../spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} | 2 +- > > 2 files changed, 1 insertion(+), 1 deletion(-) > > rename meta/recipes-graphics/spir/{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} (100%) > > rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} (96%) > > > > diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb > > similarity index 100% > > rename from meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb > > rename to meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb > > diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > > similarity index 96% > > rename from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb > > rename to meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > > index eb907326c43..cfea28a6efe 100644 > > --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb > > +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > > @@ -7,7 +7,7 @@ SECTION = "graphics" > > LICENSE = "Apache-2.0" > > LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > > > > -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" > > +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" > > SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" > > PE = "1" > > UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" > > -- > > 2.37.2 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#169419): https://lists.openembedded.org/g/openembedded-core/message/169419 > > Mute This Topic: https://lists.openembedded.org/mt/93052351/1686489 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 2022-08-16 14:59 ` Khem Raj @ 2022-08-16 15:04 ` Alexander Kanavin 0 siblings, 0 replies; 11+ messages in thread From: Alexander Kanavin @ 2022-08-16 15:04 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core sdk-x.y.z versions are released in lockstep across all vulkan components, so I believe there will be a tag eventually. Until then we need to use a smaller version, or just cherry-pick the needed fixes. Alex On Tue, 16 Aug 2022 at 16:59, Khem Raj <raj.khem@gmail.com> wrote: > > On Tue, Aug 16, 2022 at 12:39 AM Alexander Kanavin > <alex.kanavin@gmail.com> wrote: > > > > This version isn't tagged, so where does 1.3.224 come from? Maybe it's > > better to leave at 1.3.216+SRCPV? > > its not tagged but there is branch > https://github.com/KhronosGroup/SPIRV-Headers/tree/sdk-1.3.224 > I am not sure if they mean folks to use this branch or perhaps there > will be a tag eventually. same is true for > spirv-tools - https://github.com/KhronosGroup/SPIRV-Tools/tree/sdk-1.3.224, > its not clear what to use. > > but for now I guess I will leave spirv-headers as it is. Since there > is no SRCREV bump perhaps no need to > rename it. > > > > > Akex > > > > On Tue, 16 Aug 2022 at 05:30, Khem Raj <raj.khem@gmail.com> wrote: > > > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > --- > > > .../{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} | 0 > > > .../spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} | 2 +- > > > 2 files changed, 1 insertion(+), 1 deletion(-) > > > rename meta/recipes-graphics/spir/{spirv-headers_1.3.216.0.bb => spirv-headers_1.3.224.0.bb} (100%) > > > rename meta/recipes-graphics/spir/{spirv-tools_1.3.216.0.bb => spirv-tools_1.3.224.0.bb} (96%) > > > > > > diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb > > > similarity index 100% > > > rename from meta/recipes-graphics/spir/spirv-headers_1.3.216.0.bb > > > rename to meta/recipes-graphics/spir/spirv-headers_1.3.224.0.bb > > > diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > > > similarity index 96% > > > rename from meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb > > > rename to meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > > > index eb907326c43..cfea28a6efe 100644 > > > --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb > > > +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.224.0.bb > > > @@ -7,7 +7,7 @@ SECTION = "graphics" > > > LICENSE = "Apache-2.0" > > > LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > > > > > > -SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" > > > +SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" > > > SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" > > > PE = "1" > > > UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" > > > -- > > > 2.37.2 > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > > Links: You receive all messages sent to this group. > > > View/Reply Online (#169419): https://lists.openembedded.org/g/openembedded-core/message/169419 > > > Mute This Topic: https://lists.openembedded.org/mt/93052351/1686489 > > > Group Owner: openembedded-core+owner@lists.openembedded.org > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > > > -=-=-=-=-=-=-=-=-=-=-=- > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk 2022-08-16 3:30 [PATCH 1/6] time: Add missing include for memset Khem Raj ` (3 preceding siblings ...) 2022-08-16 3:30 ` [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 Khem Raj @ 2022-08-16 3:30 ` Khem Raj 2022-08-17 14:31 ` [OE-core] " Richard Purdie [not found] ` <170C2857622947BA.6839@lists.openembedded.org> 4 siblings, 2 replies; 11+ messages in thread From: Khem Raj @ 2022-08-16 3:30 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj There are several fixes which are done to fix builds with newer compilers after 0.0.28 was releases in 2015 a long time ago. Add a patch to fix manpages builds not trying to access network during build Regenerate xmlif from lex files, before configuring the build Add UPSTREAM_CHECK_COMMITS = "1" Signed-off-by: Khem Raj <raj.khem@gmail.com> --- v2: - Update patch status - Add UPSTREAM_CHECK_COMMITS .../0001-Skip-validating-xmlto-output.patch | 29 +++++++++++++++++++ ...rop-the-test-of-xmllint-and-xsltproc.patch | 6 ++-- meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 16 +++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch rename meta/recipes-devtools/xmlto/{xmlto-0.0.28 => xmlto}/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (91%) diff --git a/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch new file mode 100644 index 00000000000..c6857a9da51 --- /dev/null +++ b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch @@ -0,0 +1,29 @@ +From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 14 Aug 2022 00:23:29 -0700 +Subject: [PATCH] Skip validating xmlto output + +Avoids network access + +Upstream-Status: Submitted [https://pagure.io/xmlto/pull-request/11] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 50fa279..6a2da62 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -68,7 +68,7 @@ EXTRA_DIST = xmlto.spec \ + doc/xmlif.xml \ + xmlto.mak + +-GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $< ++GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto --skip-validation -o $(@D) man $< + man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE) + man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE) + +-- +2.37.2 + diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch similarity index 91% rename from meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch rename to meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch index 6d547a6c994..7cc3cbe0fb2 100644 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch +++ b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch @@ -9,9 +9,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) AC_PATH_PROG([LOCALE], [locale], [locale]) diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index 5cb9a4c57be..1913dd2833d 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -6,17 +6,21 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ +SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" +UPSTREAM_CHECK_COMMITS = "1" +SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \ file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ + file://0001-Skip-validating-xmlto-output.patch \ " -SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" -SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" +S = "${WORKDIR}/git" + +PV .= "+0.0.29+git${SRCPV}" inherit autotools CLEANBROKEN = "1" -DEPENDS = "libxml2-native" +DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" RDEPENDS:${PN} = "docbook-xml-dtd4 \ docbook-xsl-stylesheets \ @@ -36,6 +40,10 @@ BBCLASSEXTEND = "native" EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" +do_configure:prepend() { + flex -o ${S}/xmlif/xmlif.c ${S}/xmlif/xmlif.l +} + do_install:append:class-native() { create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog } -- 2.37.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [OE-core] [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk 2022-08-16 3:30 ` [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk Khem Raj @ 2022-08-17 14:31 ` Richard Purdie [not found] ` <170C2857622947BA.6839@lists.openembedded.org> 1 sibling, 0 replies; 11+ messages in thread From: Richard Purdie @ 2022-08-17 14:31 UTC (permalink / raw) To: Khem Raj, openembedded-core On Mon, 2022-08-15 at 20:30 -0700, Khem Raj wrote: > There are several fixes which are done to fix builds with newer > compilers after 0.0.28 was releases in 2015 a long time ago. > > Add a patch to fix manpages builds not trying to access network during > build > > Regenerate xmlif from lex files, before configuring the build > > Add UPSTREAM_CHECK_COMMITS = "1" > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > v2: > - Update patch status > - Add UPSTREAM_CHECK_COMMITS > > .../0001-Skip-validating-xmlto-output.patch | 29 +++++++++++++++++++ > ...rop-the-test-of-xmllint-and-xsltproc.patch | 6 ++-- > meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 16 +++++++--- > 3 files changed, 44 insertions(+), 7 deletions(-) > create mode 100644 meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch > rename meta/recipes-devtools/xmlto/{xmlto-0.0.28 => xmlto}/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (91%) > > diff --git a/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch > new file mode 100644 > index 00000000000..c6857a9da51 > --- /dev/null > +++ b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch > @@ -0,0 +1,29 @@ > +From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.khem@gmail.com> > +Date: Sun, 14 Aug 2022 00:23:29 -0700 > +Subject: [PATCH] Skip validating xmlto output > + > +Avoids network access > + > +Upstream-Status: Submitted [https://pagure.io/xmlto/pull-request/11] > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > +--- > + Makefile.am | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/Makefile.am b/Makefile.am > +index 50fa279..6a2da62 100644 > +--- a/Makefile.am > ++++ b/Makefile.am > +@@ -68,7 +68,7 @@ EXTRA_DIST = xmlto.spec \ > + doc/xmlif.xml \ > + xmlto.mak > + > +-GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $< > ++GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto --skip-validation -o $(@D) man $< > + man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE) > + man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE) > + > +-- > +2.37.2 > + > diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > similarity index 91% > rename from meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > rename to meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > index 6d547a6c994..7cc3cbe0fb2 100644 > --- a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > +++ b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > @@ -9,9 +9,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > configure.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > -diff --git a/configure.in b/configure.in > ---- a/configure.in > -+++ b/configure.in > +diff --git a/configure.ac b/configure.ac > +--- a/configure.ac > ++++ b/configure.ac > @@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) > AC_PATH_PROG([LOCALE], [locale], [locale]) > > diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb > index 5cb9a4c57be..1913dd2833d 100644 > --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb > +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb > @@ -6,17 +6,21 @@ LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" > > -SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ > +SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" > +UPSTREAM_CHECK_COMMITS = "1" > +SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \ > file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ > + file://0001-Skip-validating-xmlto-output.patch \ > " > -SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" > -SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" > +S = "${WORKDIR}/git" > + > +PV .= "+0.0.29+git${SRCPV}" > > inherit autotools > > CLEANBROKEN = "1" > > -DEPENDS = "libxml2-native" > +DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" > > RDEPENDS:${PN} = "docbook-xml-dtd4 \ > docbook-xsl-stylesheets \ > @@ -36,6 +40,10 @@ BBCLASSEXTEND = "native" > > EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" > > +do_configure:prepend() { > + flex -o ${S}/xmlif/xmlif.c ${S}/xmlif/xmlif.l > +} > + > do_install:append:class-native() { > create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog > } > Seems to have a reproducibility problem: https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/1401 Cheers, Richard ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <170C2857622947BA.6839@lists.openembedded.org>]
* Re: [OE-core] [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk [not found] ` <170C2857622947BA.6839@lists.openembedded.org> @ 2022-08-17 14:38 ` Richard Purdie 0 siblings, 0 replies; 11+ messages in thread From: Richard Purdie @ 2022-08-17 14:38 UTC (permalink / raw) To: Khem Raj, openembedded-core On Wed, 2022-08-17 at 15:31 +0100, Richard Purdie via lists.openembedded.org wrote: > On Mon, 2022-08-15 at 20:30 -0700, Khem Raj wrote: > > There are several fixes which are done to fix builds with newer > > compilers after 0.0.28 was releases in 2015 a long time ago. > > > > Add a patch to fix manpages builds not trying to access network during > > build > > > > Regenerate xmlif from lex files, before configuring the build > > > > Add UPSTREAM_CHECK_COMMITS = "1" > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > v2: > > - Update patch status > > - Add UPSTREAM_CHECK_COMMITS > > > > .../0001-Skip-validating-xmlto-output.patch | 29 +++++++++++++++++++ > > ...rop-the-test-of-xmllint-and-xsltproc.patch | 6 ++-- > > meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 16 +++++++--- > > 3 files changed, 44 insertions(+), 7 deletions(-) > > create mode 100644 meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch > > rename meta/recipes-devtools/xmlto/{xmlto-0.0.28 => xmlto}/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (91%) > > > > diff --git a/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch > > new file mode 100644 > > index 00000000000..c6857a9da51 > > --- /dev/null > > +++ b/meta/recipes-devtools/xmlto/xmlto/0001-Skip-validating-xmlto-output.patch > > @@ -0,0 +1,29 @@ > > +From 3deb7a0eded04ab08a9cb2d88526cb1c7b440061 Mon Sep 17 00:00:00 2001 > > +From: Khem Raj <raj.khem@gmail.com> > > +Date: Sun, 14 Aug 2022 00:23:29 -0700 > > +Subject: [PATCH] Skip validating xmlto output > > + > > +Avoids network access > > + > > +Upstream-Status: Submitted [https://pagure.io/xmlto/pull-request/11] > > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > > +--- > > + Makefile.am | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/Makefile.am b/Makefile.am > > +index 50fa279..6a2da62 100644 > > +--- a/Makefile.am > > ++++ b/Makefile.am > > +@@ -68,7 +68,7 @@ EXTRA_DIST = xmlto.spec \ > > + doc/xmlif.xml \ > > + xmlto.mak > > + > > +-GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $< > > ++GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto --skip-validation -o $(@D) man $< > > + man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE) > > + man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE) > > + > > +-- > > +2.37.2 > > + > > diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > > similarity index 91% > > rename from meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > > rename to meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > > index 6d547a6c994..7cc3cbe0fb2 100644 > > --- a/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > > +++ b/meta/recipes-devtools/xmlto/xmlto/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch > > @@ -9,9 +9,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > > configure.in | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > -diff --git a/configure.in b/configure.in > > ---- a/configure.in > > -+++ b/configure.in > > +diff --git a/configure.ac b/configure.ac > > +--- a/configure.ac > > ++++ b/configure.ac > > @@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) > > AC_PATH_PROG([LOCALE], [locale], [locale]) > > > > diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb > > index 5cb9a4c57be..1913dd2833d 100644 > > --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb > > +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb > > @@ -6,17 +6,21 @@ LICENSE = "GPL-2.0-only" > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" > > > > -SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ > > +SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe" > > +UPSTREAM_CHECK_COMMITS = "1" > > +SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master \ > > file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ > > + file://0001-Skip-validating-xmlto-output.patch \ > > " > > -SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" > > -SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" > > +S = "${WORKDIR}/git" > > + > > +PV .= "+0.0.29+git${SRCPV}" > > > > inherit autotools > > > > CLEANBROKEN = "1" > > > > -DEPENDS = "libxml2-native" > > +DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" > > > > RDEPENDS:${PN} = "docbook-xml-dtd4 \ > > docbook-xsl-stylesheets \ > > @@ -36,6 +40,10 @@ BBCLASSEXTEND = "native" > > > > EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" > > > > +do_configure:prepend() { > > + flex -o ${S}/xmlif/xmlif.c ${S}/xmlif/xmlif.l > > +} > > + > > do_install:append:class-native() { > > create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog > > } > > > > Seems to have a reproducibility problem: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/1401 > and a packaging warning: https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/5723 https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/3390 Cheers, Richard ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-08-17 14:38 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-16 3:30 [PATCH 1/6] time: Add missing include for memset Khem Raj
2022-08-16 3:30 ` [PATCH 2/6] screen: Add missing include files in configure checks Khem Raj
2022-08-16 3:30 ` [PATCH 3/6] setserial: Fix build with clang Khem Raj
2022-08-16 3:30 ` [PATCH 4/6] expect: Fix implicit-function-declaration warnings Khem Raj
2022-08-16 3:30 ` [PATCH 5/6] spirv-tools,spirv-headers: Update to 1.3.224.0 Khem Raj
2022-08-16 7:39 ` [OE-core] " Alexander Kanavin
2022-08-16 14:59 ` Khem Raj
2022-08-16 15:04 ` Alexander Kanavin
2022-08-16 3:30 ` [PATCH v2 6/6] xmlto: Update to use upstream tip of trunk Khem Raj
2022-08-17 14:31 ` [OE-core] " Richard Purdie
[not found] ` <170C2857622947BA.6839@lists.openembedded.org>
2022-08-17 14:38 ` Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.