From: Randy MacLeod <[email protected]> Commits (aside from typo fixes):
4e9b31fe Release: 2.8.5 00e2e62b nfsdctl: add support for min-threads parameter 4c275442 systemd: drop Wants=network-online.target for rpc-statd-notify 03b9c540 nfsiostat: normalize the mountpoints passed in from the command line 59e85671 Rename CONFIG_NFSV41 to CONFIG_BLKMAPD and disable by default 3b7de50f nfsdctl: ignore ipv6 listener creation error 0e71be58 locktest: use correct build flags 077b70fe sm-notify: Do not drop privileges if running as non-root user 8600bbb7 gssd: protect kerberos ticket cache access CONFIG_NFSV41 was renamed to CONFIG_BLKMAPD so update the associated PACKAGEONFIG option. Drop: 0001-locktest-Makefile.am-Do-not-use-build-flags.patch which as merged in: 0e71be58 locktest: use correct build flags Signed-off-by: Randy MacLeod <[email protected]> --- ...t-Makefile.am-Do-not-use-build-flags.patch | 36 ------------------- ...{nfs-utils_2.8.4.bb => nfs-utils_2.8.5.bb} | 7 ++-- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.4.bb => nfs-utils_2.8.5.bb} (95%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch deleted file mode 100644 index 351407ddcd..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9efa7a0d37665d9bb0f46d2407883a5ab42c2b84 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 24 Jul 2023 20:39:16 -0700 -Subject: [PATCH] locktest: Makefile.am: Do not use build flags - -Using CFLAGS_FOR_BUILD etc. here means it is using wrong flags -when thse flags are speficied different than target flags which -is common when cross-building. It can pass wrong paths to linker -and it would find incompatible libraries during link since they -are from host system and target maybe not same as build host. - -Fixes subtle errors like -| aarch64-yoe-linux-ld.lld: error: /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/nfs-utils/2.6.3-r0/recipe-sysroot-native/usr/lib/libsqlite3.so is incompatible with elf64-littleaarch64 - -Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=169025681008001&w=2] -Signed-off-by: Khem Raj <[email protected]> ---- - tools/locktest/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index e8914655..2fd36971 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -2,8 +2,5 @@ - - noinst_PROGRAMS = testlk - testlk_SOURCES = testlk.c --testlk_CFLAGS=$(CFLAGS_FOR_BUILD) --testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) --testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in --- -2.41.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.5.bb similarity index 95% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.5.bb index 65970f58e8..119e49e2a2 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.5.bb @@ -21,12 +21,11 @@ USERADD_PARAM:${PN}-client = "--system --home-dir /var/lib/nfs \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ file://nfsserver \ file://nfscommon \ - file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ file://0004-Use-nogroup-for-nobody-group.patch \ file://0005-find-OE-provided-Kerberos.patch \ " -SRC_URI[sha256sum] = "11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5" +SRC_URI[sha256sum] = "b13ca4a9df44186bdbe107514b22732d4243f785f95daf2fb86afc1edba15bbb" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. @@ -61,8 +60,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ #krb5 is available in meta-oe PACKAGECONFIG[gssapi] = "--with-krb5=${STAGING_EXECPREFIXDIR} --enable-gss --enable-svcgss,--disable-gss --disable-svcgss,krb5" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -# libdevmapper is available in meta-oe -PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmapper" +# libdevmapper is available in meta-oe (PC name was nfsv41) +PACKAGECONFIG[blkmapd] = "--enable-blkmapd,--disable-blkmapd,libdevmapper,libdevmapper" # keyutils is available in meta-oe PACKAGECONFIG[nfsv4] = "--enable-nfsv4 --enable-nfsdcltrack,--disable-nfsv4 --disable-nfsdcltrack,keyutils,python3-core" PACKAGECONFIG[nfsdctl] = "--enable-nfsdctl,--disable-nfsdctl,libnl readline," -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231908): https://lists.openembedded.org/g/openembedded-core/message/231908 Mute This Topic: https://lists.openembedded.org/mt/117984402/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
