* [Buildroot] [PATCH 2/4] package/fluent-bit: fix luajit support
2023-03-27 14:10 [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Thomas Devoogdt
@ 2023-03-27 14:10 ` Thomas Devoogdt
2023-05-12 18:58 ` Peter Korsgaard
2023-03-27 14:10 ` [Buildroot] [PATCH 3/4] package/fluent-bit: fix wasm uClibc support Thomas Devoogdt
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Thomas Devoogdt @ 2023-03-27 14:10 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt
Fluent-bit doesn't link against any libraries,
it just compiles everything as static sources,
meaning that our buildroot BR2_PACKAGE_LUAJIT isn't
the right check.
The same -m32 fix as in the luajit package can't be done,
since fluent-bit uses a custom cmake wrapper. So just check if the
host and the target have the same number of bits.
My intention here is to fix upstream build errors,
not perse to have luajit support in fluent-bit.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
package/fluent-bit/Config.in | 17 +++++++++++++++++
package/fluent-bit/fluent-bit.mk | 8 ++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in
index bfdea895b0..91fdf02134 100644
--- a/package/fluent-bit/Config.in
+++ b/package/fluent-bit/Config.in
@@ -13,6 +13,23 @@ config BR2_PACKAGE_FLUENT_BIT
if BR2_PACKAGE_FLUENT_BIT
+config BR2_PACKAGE_FLUENT_BIT_LUAJIT_ARCH_SUPPORTS
+ bool
+ default y if BR2_arm || BR2_aarch64 || BR2_aarch64_be
+ default y if BR2_i386 || BR2_x86_64
+ default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT \
+ && !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
+ default y if BR2_powerpc
+ # Building for 64-bit target requires a 64-bit host, the same for 32-bit.
+ depends on (BR2_ARCH_IS_64 && BR2_HOSTARCH = "x86_64") \
+ || (!BR2_ARCH_IS_64 && BR2_HOSTARCH = "x86")
+
+config BR2_PACKAGE_FLUENT_BIT_LUAJIT
+ bool "lua scripting support"
+ depends on BR2_PACKAGE_FLUENT_BIT_LUAJIT_ARCH_SUPPORTS
+ help
+ Support for Lua Scripting.
+
config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS
bool
# see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms
diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk
index 319815f056..335c16a295 100644
--- a/package/fluent-bit/fluent-bit.mk
+++ b/package/fluent-bit/fluent-bit.mk
@@ -28,9 +28,13 @@ else
FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No
endif
-ifeq ($(BR2_PACKAGE_LUAJIT),y)
+ifeq ($(BR2_PACKAGE_FLUENT_BIT_LUAJIT),y)
FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes
-FLUENT_BIT_DEPENDENCIES += luajit
+ifeq ($(BR2_ARCH_IS_64),y)
+FLUENT_BIT_CONF_OPTS += -DLUAJIT_DISABLE_GC64=No
+else
+FLUENT_BIT_CONF_OPTS += -DLUAJIT_DISABLE_GC64=Yes
+endif
else
FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No
endif
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH 2/4] package/fluent-bit: fix luajit support
2023-03-27 14:10 ` [Buildroot] [PATCH 2/4] package/fluent-bit: fix luajit support Thomas Devoogdt
@ 2023-05-12 18:58 ` Peter Korsgaard
2023-05-13 5:49 ` Thomas Devoogdt
0 siblings, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2023-05-12 18:58 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Thomas Devoogdt, buildroot
>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
> Fluent-bit doesn't link against any libraries,
> it just compiles everything as static sources,
> meaning that our buildroot BR2_PACKAGE_LUAJIT isn't
> the right check.
> The same -m32 fix as in the luajit package can't be done,
> since fluent-bit uses a custom cmake wrapper. So just check if the
> host and the target have the same number of bits.
> My intention here is to fix upstream build errors,
> not perse to have luajit support in fluent-bit.
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Hmm, would it instead be possible to use an external luajit so we
wouldn't have this problem in the first place?
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 2/4] package/fluent-bit: fix luajit support
2023-05-12 18:58 ` Peter Korsgaard
@ 2023-05-13 5:49 ` Thomas Devoogdt
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Devoogdt @ 2023-05-13 5:49 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: Thomas Devoogdt, eduardo, Thomas Devoogdt, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 999 bytes --]
Hi Peter,
Yes, I have a patch for it which is pending:
https://github.com/fluent/fluent-bit/pull/7286
Will re-open this patch series soon.
Kr,
Thomas
Op vr 12 mei 2023 20:58 schreef Peter Korsgaard <peter@korsgaard.com>:
> >>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
>
> > Fluent-bit doesn't link against any libraries,
> > it just compiles everything as static sources,
> > meaning that our buildroot BR2_PACKAGE_LUAJIT isn't
> > the right check.
>
> > The same -m32 fix as in the luajit package can't be done,
> > since fluent-bit uses a custom cmake wrapper. So just check if the
> > host and the target have the same number of bits.
>
> > My intention here is to fix upstream build errors,
> > not perse to have luajit support in fluent-bit.
>
> > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
>
> Hmm, would it instead be possible to use an external luajit so we
> wouldn't have this problem in the first place?
>
> --
> Bye, Peter Korsgaard
>
>
[-- Attachment #1.2: Type: text/html, Size: 1936 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 3/4] package/fluent-bit: fix wasm uClibc support
2023-03-27 14:10 [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Thomas Devoogdt
2023-03-27 14:10 ` [Buildroot] [PATCH 2/4] package/fluent-bit: fix luajit support Thomas Devoogdt
@ 2023-03-27 14:10 ` Thomas Devoogdt
2023-03-27 14:10 ` [Buildroot] [PATCH 4/4] package/fluent-bit: drop xtensa from wasm-micro-runtime Thomas Devoogdt
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Thomas Devoogdt @ 2023-03-27 14:10 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt
Upstream:
https://github.com/bytecodealliance/wasm-micro-runtime/pull/2069
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
...b-wasm-fix-POLL-RD-WR-NORM-in-uClibc.patch | 47 +++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 package/fluent-bit/0004-lib-wasm-fix-POLL-RD-WR-NORM-in-uClibc.patch
diff --git a/package/fluent-bit/0004-lib-wasm-fix-POLL-RD-WR-NORM-in-uClibc.patch b/package/fluent-bit/0004-lib-wasm-fix-POLL-RD-WR-NORM-in-uClibc.patch
new file mode 100644
index 0000000000..91a6b8adc2
--- /dev/null
+++ b/package/fluent-bit/0004-lib-wasm-fix-POLL-RD-WR-NORM-in-uClibc.patch
@@ -0,0 +1,47 @@
+From 286a59000d05969d00d908f187bc311a4f5b2a52 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Mon, 27 Mar 2023 15:01:49 +0200
+Subject: [PATCH] lib: wasm: fix POLL{RD,WR}NORM in uClibc
+
+Not defined in uClibc, so replace them with the equivalent POLL{OUT,IN}.
+
+https://www.man7.org/linux/man-pages/man2/poll.2.html
+
+ POLLWRNORM
+ Equivalent to POLLOUT.
+
+ POLLRDNORM
+ Equivalent to POLLIN.
+
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+---
+ .../libc-wasi/sandboxed-system-primitives/src/posix.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/wasm-micro-runtime-WAMR-1.1.1/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c b/lib/wasm-micro-runtime-WAMR-1.1.1/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
+index e43ba8ce0..b0e92c3a8 100644
+--- a/lib/wasm-micro-runtime-WAMR-1.1.1/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
++++ b/lib/wasm-micro-runtime-WAMR-1.1.1/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
+@@ -2644,8 +2644,8 @@ wasmtime_ssp_poll_oneoff(
+ pfds[i] = (struct pollfd){
+ .fd = fd_number(fos[i]),
+ .events = s->u.type == __WASI_EVENTTYPE_FD_READ
+- ? POLLRDNORM
+- : POLLWRNORM,
++ ? POLLIN
++ : POLLOUT,
+ };
+ }
+ else {
+@@ -2756,7 +2756,7 @@ wasmtime_ssp_poll_oneoff(
+ __WASI_EVENT_FD_READWRITE_HANGUP,
+ };
+ }
+- else if ((pfds[i].revents & (POLLRDNORM | POLLWRNORM)) != 0) {
++ else if ((pfds[i].revents & (POLLIN | POLLOUT)) != 0) {
+ // Read or write possible.
+ out[(*nevents)++] = (__wasi_event_t){
+ .userdata = in[i].userdata,
+--
+2.34.1
+
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 4/4] package/fluent-bit: drop xtensa from wasm-micro-runtime
2023-03-27 14:10 [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Thomas Devoogdt
2023-03-27 14:10 ` [Buildroot] [PATCH 2/4] package/fluent-bit: fix luajit support Thomas Devoogdt
2023-03-27 14:10 ` [Buildroot] [PATCH 3/4] package/fluent-bit: fix wasm uClibc support Thomas Devoogdt
@ 2023-03-27 14:10 ` Thomas Devoogdt
2023-05-12 18:56 ` [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Peter Korsgaard
2023-06-13 6:37 ` Peter Korsgaard
4 siblings, 0 replies; 8+ messages in thread
From: Thomas Devoogdt @ 2023-03-27 14:10 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt
According lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms,
it should be supported, but I saw multiple build errors,
so drop it until someone is able to properly build it.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
package/fluent-bit/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in
index 91fdf02134..2fc74a6446 100644
--- a/package/fluent-bit/Config.in
+++ b/package/fluent-bit/Config.in
@@ -38,7 +38,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS
default y if BR2_aarch64 || BR2_aarch64_be
default y if BR2_i386 || BR2_x86_64
default y if BR2_RISCV_64
- default y if BR2_xtensa
config BR2_PACKAGE_FLUENT_BIT_WASM
bool "wasm runtime support"
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10
2023-03-27 14:10 [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Thomas Devoogdt
` (2 preceding siblings ...)
2023-03-27 14:10 ` [Buildroot] [PATCH 4/4] package/fluent-bit: drop xtensa from wasm-micro-runtime Thomas Devoogdt
@ 2023-05-12 18:56 ` Peter Korsgaard
2023-06-13 6:37 ` Peter Korsgaard
4 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2023-05-12 18:56 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Thomas Devoogdt, buildroot
>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
> - Release Notes:
> https://fluentbit.io/announcements/v2.0.10/
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10
2023-03-27 14:10 [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Thomas Devoogdt
` (3 preceding siblings ...)
2023-05-12 18:56 ` [Buildroot] [PATCH 1/4] package/fluent-bit: bump to version 2.0.10 Peter Korsgaard
@ 2023-06-13 6:37 ` Peter Korsgaard
4 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2023-06-13 6:37 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Thomas Devoogdt, buildroot
>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
> - Release Notes:
> https://fluentbit.io/announcements/v2.0.10/
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Committed to 2023.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread