kronosnet: Upgrade to 1.24
PATCH 1/5 kronosnet: Upgrade to 1.24
Remove upstreamed patches
Signed-off-by Khem Raj <[email protected]>
---
...ests-Correct-include-path-for-poll.h.patch | 29 -------------------
.../{kronosnet_1.22.bb => kronosnet_1.24.bb} | 3 +-
2 files changed, 1 insertion(+), 31 deletions(-)
delete mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch
rename meta-networking/recipes-extended/kronosnet/{kronosnet_1.22.bb => kronosnet_1.24.bb} (92%)meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From cae68083fda5d4ca832ff3cc8a533454df2efe23 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Oct 2021 20:35:53 -0700 -Subject: [PATCH] libknet/tests: Correct include path for poll.h - -Fixes -/usr/include/sys/poll.h:1:2: error: redirec -ting incorrect #include <sys/poll.h> to <poll.h> [-Werror,-W#warnings] -| #warning redirecting incorrect #include <sys/poll.h> to <poll.h> - -Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/363] -Signed-off-by: Khem Raj <[email protected]> ---- - libknet/tests/test-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libknet/tests/test-common.c b/libknet/tests/test-common.c -index 86b76b0..8f8b6ca 100644 ---- a/libknet/tests/test-common.c -+++ b/libknet/tests/test-common.c -@@ -20,7 +20,7 @@ - #include <pthread.h> - #include <dirent.h> - #include <sys/select.h> --#include <sys/poll.h> -+#include <poll.h> - - #include "libknet.h" - #include "test-common.h"
meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb renamed from meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb +1 -2
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa88 SECTION = "libs" DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" -SRCREV = "0123ecebce0ad6aba3cdb320027192e15fd71e23" +SRCREV = "f8f80fd7f9b85f2626d2c6452612962ad8efca9e" SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \ - file://0001-libknet-tests-Correct-include-path-for-poll.h.patch \ file://0001-links.c-Fix-build-with-gcc-12.patch \ "
Signature · 1 line
2.37.1
PATCH 2/5 ostree: Upgrade to 2022.5 release
Backport a fix for building with glibc 2.36+ while here
Signed-off-by Khem Raj <[email protected]>
---
...01-Remove-unused-linux-fs.h-includes.patch | 42 +++++++++++++++++++
...bostree-Remove-including-sys-mount.h.patch | 29 +++++++++++++
...-se-luks-gencpio-There-is-no-bashism.patch | 25 +++++++++++
.../{ostree_2022.2.bb => ostree_2022.5.bb} | 5 ++-
4 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch
create mode 100644 meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch
rename meta-oe/recipes-extended/ostree/{ostree_2022.2.bb => ostree_2022.5.bb} (96%)meta-oe/recipes-extended/ostree/ostree/0001-Remove-unused-linux-fs.h-includes.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001 +From: Colin Walters <[email protected]> +Date: Wed, 3 Aug 2022 10:37:40 -0400 +Subject: [PATCH] Remove unused `linux/fs.h` includes + +Prep for fixing conflicts introduced by newer glibc. +cc https://github.com/ostreedev/ostree/issues/2685 + +Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76] +Signed-off-by: Khem Raj <[email protected]> +--- + src/libostree/ostree-repo-commit.c | 1 - + src/ostree/ot-main.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c +index afab3fdf..35b16c71 100644 +--- a/src/libostree/ostree-repo-commit.c ++++ b/src/libostree/ostree-repo-commit.c +@@ -30,7 +30,6 @@ + #include <sys/xattr.h> + #include <glib/gprintf.h> + #include <sys/ioctl.h> +-#include <linux/fs.h> + #include <ext2fs/ext2_fs.h> + + #include "otutil.h" +diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c +index b7b50d67..7a4405a5 100644 +--- a/src/ostree/ot-main.c ++++ b/src/ostree/ot-main.c +@@ -28,7 +28,6 @@ + #include <string.h> + #include <sys/statvfs.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #include "ot-main.h" + #include "ostree.h" +-- +2.37.1 +
meta-oe/recipes-extended/ostree/ostree/0001-libostree-Remove-including-sys-mount.h.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 7ff956e4088e0bdc6bfd429f99124a8a9256c181 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 6 Aug 2022 21:44:11 -0700 +Subject: [PATCH] libostree: Remove including sys/mount.h + +This conflicts with linux/mount.h which is included by linux/fs.h +with glibc 2.36+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/libostree/ostree-sysroot-deploy.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c +index 2dc9f58b..61b19e42 100644 +--- a/src/libostree/ostree-sysroot-deploy.c ++++ b/src/libostree/ostree-sysroot-deploy.c +@@ -23,7 +23,6 @@ + #include <gio/gunixoutputstream.h> + #include <glib-unix.h> + #include <stdint.h> +-#include <sys/mount.h> + #include <sys/statvfs.h> + #include <sys/socket.h> + #include <sys/ioctl.h> +-- +2.37.1 +
meta-oe/recipes-extended/ostree/ostree/0001-s390x-se-luks-gencpio-There-is-no-bashism.patch new file +25 -0
@@ -0,0 +1,25 @@ +From dd55633e49aa43dede3c8e1770ae8761487f050e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 6 Aug 2022 21:52:31 -0700 +Subject: [PATCH] s390x-se-luks-gencpio: There is no bashism + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + src/libostree/s390x-se-luks-gencpio | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio +index e821e2fe..96c1d123 100755 +--- a/src/libostree/s390x-se-luks-gencpio ++++ b/src/libostree/s390x-se-luks-gencpio +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # This script creates new initramdisk with LUKS config within + set -euo pipefail + +-- +2.37.1 +
meta-oe/recipes-extended/ostree/ostree_2022.5.bb renamed from meta-oe/recipes-extended/ostree/ostree_2022.2.bb +4 -1
@@ -19,9 +19,12 @@ DEPENDS = " \ SRC_URI = " \ gitsm://github.com/ostreedev/ostree;branch=main;protocol=https \ + file://0001-Remove-unused-linux-fs.h-includes.patch \ + file://0001-libostree-Remove-including-sys-mount.h.patch \ + file://0001-s390x-se-luks-gencpio-There-is-no-bashism.patch \ file://run-ptest \ " -SRCREV = "fbc6d21c2f71099fbab44cbdd74222b91f61c667" +SRCREV = "15740d042c9c5258a1c082b5e228cf6f115edbb0" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)"
Signature · 1 line
2.37.1
PATCH v2 3/5 sdbus-c++-libsystemd: Fix build with glibc 2.36
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...lude-linux-fs.h-to-resolve-fsconfig_.patch | 74 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_250.3.bb | 1 + 2 files changed, 75 insertions(+) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch new file +74 -0
@@ -0,0 +1,74 @@ +From b0933e76c6f0594c10cf8a9a70b34e15b68066d1 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <[email protected]> +Date: Sat, 23 Jul 2022 10:38:49 +0000 +Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 + +Upstream-Status: Backport [https://github.com/systemd/systemd/pull/23992/commits/21c03ad5e9d8d0350e30dae92a5e15da318a1539] +Signed-off-by: Khem Raj <[email protected]> +--- + meson.build | 13 ++++++++++++- + src/basic/fd-util.c | 2 ++ + src/core/namespace.c | 2 ++ + src/shared/mount-util.c | 2 ++ + 4 files changed, 18 insertions(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -474,7 +474,6 @@ decl_headers = ''' + #include <uchar.h> + #include <sys/mount.h> + #include <sys/stat.h> +-#include <linux/fs.h> + ''' + + foreach decl : ['char16_t', +@@ -486,6 +485,17 @@ foreach decl : ['char16_t', + # We get -1 if the size cannot be determined + have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 + ++ if decl == 'struct mount_attr' ++ if have ++ want_linux_fs_h = false ++ else ++ have = cc.sizeof(decl, ++ prefix : decl_headers + '#include <linux/fs.h>', ++ args : '-D_GNU_SOURCE') > 0 ++ want_linux_fs_h = have ++ endif ++ endif ++ + if decl == 'struct statx' + if have + want_linux_stat_h = false +@@ -501,6 +511,7 @@ foreach decl : ['char16_t', + endforeach + + conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) ++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h) + + foreach ident : ['secure_getenv', '__secure_getenv'] + conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident)) +--- a/src/core/namespace.c ++++ b/src/core/namespace.c +@@ -6,7 +6,9 @@ + #include <stdio.h> + #include <sys/mount.h> + #include <unistd.h> ++#if WANT_LINUX_FS_H + #include <linux/fs.h> ++#endif + + #include "alloc-util.h" + #include "base-filesystem.h" +--- a/src/shared/mount-util.c ++++ b/src/shared/mount-util.c +@@ -7,7 +7,9 @@ + #include <sys/statvfs.h> + #include <unistd.h> + #include <linux/loop.h> ++#if WANT_LINUX_FS_H + #include <linux/fs.h> ++#endif + + #include "alloc-util.h" + #include "chase-symlinks.h"
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb +1 -0
@@ -14,6 +14,7 @@ SRCREV = "73be9643910c3f7f3ff84765d63060846c110016" SRCBRANCH = "v250-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ + file://0001-glibc-Remove-include-linux-fs.h-to-resolve-fsconfig_.patch \ " # patches needed by musl
Signature · 1 line
2.37.1
PATCH 4/5 xfstests: Upgrade to v2022.07.10
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-filesystems/recipes-utils/xfstests/xfstests_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-filesystems/recipes-utils/xfstests/xfstests_git.bb +2 -2
@@ -9,8 +9,8 @@ SRC_URI = "\ git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ " -SRCREV_xfstests = "37881397f1aa62df3c63468049c80b301b0e89eb" -SRCREV_unionmount = "cec4c51a3bf8ba80bb99fc74b302749d4e3d2f1d" +SRCREV_xfstests = "47ed066309716c73a97fff9b7f557f72d90bffb4" +SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" S = "${WORKDIR}/git"
Signature · 1 line
2.37.1
PATCH 5/5 autofs: Fix build with glibc 2.36
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- .../autofs/autofs/mount_conflict.patch | 30 +++++++++++++++++++ .../recipes-daemons/autofs/autofs_5.1.8.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch
meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch new file +30 -0
@@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h"
meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb +1 -0
@@ -26,6 +26,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ file://0001-Define-__SWORD_TYPE-if-undefined.patch \ + file://mount_conflict.patch \ " SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c"
Signature · 1 line
2.37.1