Re: [oe] [meta-oe][PATCH] nginx: Upgrade stable 1.24.0 -> 1.26.0
-Original Message- From: Khem Raj Sent: Wednesday, May 1, 2024 2:05 To: Marko, Peter (ADV D EU SK BFS1) Cc: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-oe][PATCH] nginx: Upgrade stable 1.24.0 -> 1.26.0 > On Tue, Apr 30, 2024 at 2:52 PM Peter Marko via lists.openembedded.org > wrote: > > > > Could this be taken to scarthgap, too? > > I know it's a major upgrade, but starting with EOL version is not the best > > start for 4-year LTS release. > > I will try to get it in if Armin is ok with it and it works its way through CI Hello, is there any update on this topic? Thanks, Peter > > > > > Peter > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110435): https://lists.openembedded.org/g/openembedded-devel/message/110435 Mute This Topic: https://lists.openembedded.org/mt/105830453/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v2] source-han-sans-*-fonts: fix SRC_URI
On Fri, May 17, 2024 at 3:07 PM Alexandre Truong via
lists.openembedded.org
wrote:
>
> We get fetch errors from the SRC_URI provided. See errors at [0].
> svn protocol was used but it's deprecated.
For the record the svn protocol itself isn't deprecated in bitbake
fetcher, just github no longer provides a svn access as mentioned in:
https://git.openembedded.org/bitbake/commit/?h=master&id=a735898abcf056f897c9350bb128a5637e6b4617
* github no longer provides support for subversion clients:
https://docs.github.com/en/enterprise-server@3.11/get-started/working-with-subversion-on-github/support-for-subversion-clients
it was shut down on 2024-01-08:
https://github.blog/2023-01-20-sunsetting-subversion-support/
> So, a http url will be passed instead.
>
> The sha256sum has also been changed since the previous one was
> for the 1.004 release's archive, while we are on 2.004.
>
> [0]:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/353/steps/16/logs/errors
>
> Signed-off-by: Alexandre Truong
> Reviewed-by: Yoann Congal
> ---
> .../ttf-fonts/source-han-sans-cn-fonts_2.004.bb| 7 ++-
> .../ttf-fonts/source-han-sans-jp-fonts_2.004.bb| 7 ++-
> .../ttf-fonts/source-han-sans-kr-fonts_2.004.bb| 7 ++-
> .../ttf-fonts/source-han-sans-tw-fonts_2.004.bb| 7 ++-
> 4 files changed, 8 insertions(+), 20 deletions(-)
>
> diff --git
> a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> index b4a598527..391d46557 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
> @@ -11,13 +11,10 @@ inherit allarch fontcache
> #EXCLUDE_FROM_WORLD = "1"
>
> SRC_URI = " \
> -
> svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/CN;protocol=http;rev=82
> \
> +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansCN.zip;subdir=${BP}
> \
> file://44-source-han-sans-cn.conf \
> "
> -SRC_URI[md5sum] = "d16abc21f6575bb08894efedbed484a2"
> -SRC_URI[sha256sum] =
> "0a0e1d8e52833bc352d454d8242da03b82c0efc41323fb66f7435e5b39734a4f"
> -
> -S = "${WORKDIR}/SourceHanSansCN"
> +SRC_URI[sha256sum] =
> "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6"
>
> do_install() {
> install -d ${D}${sysconfdir}/fonts/conf.d/
> diff --git
> a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> index 6a4509048..f940478a8 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
> @@ -11,13 +11,10 @@ inherit allarch fontcache
> #EXCLUDE_FROM_WORLD = "1"
>
> SRC_URI = " \
> -
> svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/JP;protocol=http;rev=82
> \
> +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansJP.zip;subdir=${BP}
> \
> file://44-source-han-sans-jp.conf \
> "
> -SRC_URI[md5sum] = "908fbf97f3df04a6838708c093f1e900"
> -SRC_URI[sha256sum] =
> "dc6dbae3fba35f220bac88ba7130b826c7efe1282f472788fae3628b79be3f54"
> -
> -S = "${WORKDIR}/SourceHanSansJP"
> +SRC_URI[sha256sum] =
> "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e"
>
> do_install() {
> install -d ${D}${sysconfdir}/fonts/conf.d/
> diff --git
> a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> index 5ab5057d8..f536d1b61 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
> @@ -11,13 +11,10 @@ inherit allarch fontcache
> #EXCLUDE_FROM_WORLD = "1"
>
> SRC_URI = " \
> -
> svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82
> \
> +
> https://github.com/adobe-fonts/source-han-sans/releases/download/2.004R/SourceHanSansKR.zip;subdir=${BP}
> \
> file://44-source-han-sans-kr.conf \
> "
> -SRC_URI[md5sum] = "f8d1bd6c87d8575afdb25e2f46bd81d4"
> -SRC_URI[sha256sum] =
> "38fd15c80f9980492faaa1af39ff873d8a38e45027023fb17d5b10d4b4b0e6af"
> -
> -S = "${WORKDIR}/SourceHanSansKR"
> +SRC_URI[sha256sum] =
> "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe"
>
> do_install() {
> install -d ${D}${sysconfdir}/fonts/conf.d/
> diff --git
> a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
> b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
> index a2b3fff07..0a4aff5e3 100644
> --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
> +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han
[oe] [meta-oe][PATCH] libndp: Fix build with gcc-14/musl
Signed-off-by: Khem Raj
---
...1-libndp-Fix-signature-of-sendto-API.patch | 40 +++
.../recipes-connectivity/libndp/libndp_1.8.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644
meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch
diff --git
a/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch
b/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch
new file mode 100644
index 00..f625416acf
--- /dev/null
+++
b/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch
@@ -0,0 +1,40 @@
+From 14e036b5daf6b72483a1a21054b5133acabceabe Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Fri, 17 May 2024 18:14:04 -0700
+Subject: [PATCH] libndp: Fix signature of sendto API
+
+This fixes build with musl/gcc-14
+
+| ../../git/libndp/libndp.c: In function 'mysendto6':
+| ../../git/libndp/libndp.c:212:50: error: passing argument 5 of 'sendto' from
incompatible pointer type [-Wincompatible-pointer-types]
+| 212 | ret = sendto(sockfd, buf, buflen, flags, &sin6,
sizeof(sin6));
+| | ^
+| | |
+| | struct sockaddr_in6
*
+| In file included from ../../git/libndp/libndp.c:27:
+|
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libndp/1.8/recipe-sysroot/usr/include/sys/socket.h:396:49:
note: expected 'const struct sockaddr *' but argument is of type 'struct
sockaddr_in6 *'
+| 396 | ssize_t sendto (int, const void *, size_t, int, const struct
sockaddr *, socklen_t);
+| |
^~~
+
+Upstream-Status: Submitted [Sent to maintainer]
+Signed-off-by: Khem Raj
+---
+ libndp/libndp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libndp/libndp.c b/libndp/libndp.c
+index 6314717..056df0f 100644
+--- a/libndp/libndp.c
b/libndp/libndp.c
+@@ -209,7 +209,7 @@ static int mysendto6(int sockfd, void *buf, size_t buflen,
int flags,
+ memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr));
+ sin6.sin6_scope_id = ifindex;
+ resend:
+- ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6));
++ ret = sendto(sockfd, buf, buflen, flags, (struct sockaddr*)&sin6,
sizeof(sin6));
+ if (ret == -1) {
+ switch(errno) {
+ case EINTR:
+--
+2.45.1
+
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb
b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb
index 4d4d3e51cd..80946317e4 100644
--- a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb
+++ b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb
@@ -4,6 +4,7 @@ LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \
+ file://0001-libndp-Fix-signature-of-sendto-API.patch \
"
# tag for v1.8
SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c"
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110433):
https://lists.openembedded.org/g/openembedded-devel/message/110433
Mute This Topic: https://lists.openembedded.org/mt/106174879/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][PATCH] openflow: Fix build build with musl/gcc14
Signed-off-by: Khem Raj
---
...-libexecinfo-if-it-has-backtrace-API.patch | 62 +++
.../openflow/openflow_git.bb | 3 +-
2 files changed, 63 insertions(+), 2 deletions(-)
create mode 100644
meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch
diff --git
a/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch
b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch
new file mode 100644
index 00..6382c2a9a6
--- /dev/null
+++
b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch
@@ -0,0 +1,62 @@
+From 2272df8407d86519d72504d6468b710e7eb56de8 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Sat, 18 May 2024 00:23:43 -0700
+Subject: [PATCH] Link in libexecinfo if it has backtrace() API
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+---
+ m4/libopenflow.m4 | 5 +
+ tests/automake.mk | 2 +-
+ utilities/automake.mk | 4 ++--
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/m4/libopenflow.m4 b/m4/libopenflow.m4
+index 58014ed..c9302b8 100644
+--- a/m4/libopenflow.m4
b/m4/libopenflow.m4
+@@ -96,6 +96,11 @@ AC_DEFUN([OFP_CHECK_FAULT_LIBS],
+ [AC_CHECK_LIB([dl], [dladdr], [FAULT_LIBS=-ldl])
+AC_SUBST([FAULT_LIBS])])
+
++dnl Checks for libraries needed by lib/fault.c.
++AC_DEFUN([OFP_CHECK_FAULT_LIBS],
++ [AC_CHECK_LIB([execinfo], [backtrace], [FAULT_LIBS=-lexecinfo])
++ AC_SUBST([FAULT_LIBS])])
++
+ dnl Checks for libraries needed by lib/socket-util.c.
+ AC_DEFUN([OFP_CHECK_SOCKET_LIBS],
+ [AC_CHECK_LIB([socket], [connect])
+diff --git a/tests/automake.mk b/tests/automake.mk
+index a4e945a..0944275 100644
+--- a/tests/automake.mk
b/tests/automake.mk
+@@ -27,7 +27,7 @@ EXTRA_DIST += tests/test-stp.sh
+ noinst_PROGRAMS += tests/test-stp
+
+ tests_test_stp_SOURCES = tests/test-stp.c
+-tests_test_stp_LDADD = lib/libopenflow.a
++tests_test_stp_LDADD = lib/libopenflow.a $(FAULT_LIBS)
+ stp_files = \
+ tests/test-stp-ieee802.1d-1998 \
+ tests/test-stp-ieee802.1d-2004-fig17.4 \
+diff --git a/utilities/automake.mk b/utilities/automake.mk
+index d6f79a8..0608655 100644
+--- a/utilities/automake.mk
b/utilities/automake.mk
+@@ -36,10 +36,10 @@ utilities_dpctl_SOURCES = utilities/dpctl.c
+ utilities_dpctl_LDADD = lib/libopenflow.a $(FAULT_LIBS) $(SSL_LIBS)
+
+ utilities_vlogconf_SOURCES = utilities/vlogconf.c
+-utilities_vlogconf_LDADD = lib/libopenflow.a
++utilities_vlogconf_LDADD = lib/libopenflow.a $(FAULT_LIBS)
+
+ utilities_ofp_discover_SOURCES = utilities/ofp-discover.c
+-utilities_ofp_discover_LDADD = lib/libopenflow.a
++utilities_ofp_discover_LDADD = lib/libopenflow.a $(FAULT_LIBS)
+
+ utilities_ofp_kill_SOURCES = utilities/ofp-kill.c
+ utilities_ofp_kill_LDADD = lib/libopenflow.a
+--
+2.45.1
+
diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb
b/meta-networking/recipes-protocols/openflow/openflow_git.bb
index 1ee8a702ff..0061565f90 100644
--- a/meta-networking/recipes-protocols/openflow/openflow_git.bb
+++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb
@@ -21,6 +21,7 @@ SRC_URI =
"git://github.com/mininet/openflow;protocol=https;branch=master \
file://0001-generate-not-static-get_dh-functions.patch \
file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \
file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \
+ file://0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch \
"
CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our
implementation of openflow"
CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our
implementation of openflow"
@@ -34,9 +35,7 @@ EXTRA_OECONF += " \
KARCH=${TARGET_ARCH} \
${@bb.utils.contains('PACKAGECONFIG', 'openssl',
'SSL_LIBS="-lssl -lcrypto"', '', d)} \
"
-
DEPENDS:append:libc-musl = " libexecinfo"
-LDFLAGS:append:libc-musl = " -lexecinfo"
S = "${WORKDIR}/git"
--
2.45.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110432):
https://lists.openembedded.org/g/openembedded-devel/message/110432
Mute This Topic: https://lists.openembedded.org/mt/106174855/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
