Message ID | 934ad5f4e633993781ba459bfda8183d95749e00.1701758555.git.liezhi.yang@windriver.com |
---|---|
State | New |
Headers | show |
Series | [1/2] gettext: Upgrade 0.22.3 -> 0.22.4 | expand |
Hello, This fail for musl: https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/8237/steps/11/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/8267/steps/12/logs/stdio On 04/12/2023 22:44:10-0800, Robert Yang via lists.openembedded.org wrote: > From: Robert Yang <liezhi.yang@windriver.com> > > Remove backported patch 0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch. > > Signed-off-by: Robert Yang <liezhi.yang@windriver.com> > --- > ...event-and-libsqlite3-checked-when-nf.patch | 80 ------------------- > ...{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} | 3 +- > 2 files changed, 1 insertion(+), 82 deletions(-) > delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch > rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.3.bb => nfs-utils_2.6.4.bb} (97%) > > diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch > deleted file mode 100644 > index 5afc714f190..00000000000 > --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch > +++ /dev/null > @@ -1,80 +0,0 @@ > -From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 > -From: Wiktor Jaskulski <wjaskulski@adva.com> > -Date: Thu, 11 May 2023 15:28:23 -0400 > -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is > - disabled > - > -Upstream-Status: Backport > -(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) > - > -Signed-off-by: Steve Dickson <steved@redhat.com> > -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> > ---- > - configure.ac | 38 +++++++++++++++----------------------- > - 1 file changed, 15 insertions(+), 23 deletions(-) > - > -diff --git a/configure.ac b/configure.ac > -index 4ade528d..519cacbf 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , > - AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) > - CPPFLAGS="${nfsutils_save_CPPFLAGS}" > - > -+dnl check for libevent libraries and headers > -+AC_LIBEVENT > -+ > -+dnl Check for sqlite3 > -+AC_SQLITE3_VERS > -+ > -+case $libsqlite3_cv_is_recent in > -+yes) ;; > -+unknown) > -+ dnl do not fail when cross-compiling > -+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; > -+*) > -+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; > -+esac > -+ > - if test "$enable_nfsv4" = yes; then > -- dnl check for libevent libraries and headers > -- AC_LIBEVENT > - > - dnl check for the keyutils libraries and headers > - AC_KEYUTILS > - > -- dnl Check for sqlite3 > -- AC_SQLITE3_VERS > -- > - if test "$enable_nfsdcld" = "yes"; then > - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , > - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) > -- > -- case $libsqlite3_cv_is_recent in > -- yes) ;; > -- unknown) > -- dnl do not fail when cross-compiling > -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; > -- *) > -- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; > -- esac > - fi > - > - if test "$enable_nfsdcltrack" = "yes"; then > - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , > - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) > -- > -- case $libsqlite3_cv_is_recent in > -- yes) ;; > -- unknown) > -- dnl do not fail when cross-compiling > -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; > -- *) > -- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; > -- esac > - fi > - > - else > --- > -2.41.0 > - > diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb > similarity index 97% > rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb > rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb > index 35cf6af6d46..31290f6d44c 100644 > --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb > +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb > @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x > file://bugfix-adjust-statd-service-name.patch \ > file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ > file://clang-warnings.patch \ > - file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \ > file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ > file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ > " > -SRC_URI[sha256sum] = "38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1" > +SRC_URI[sha256sum] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d" > > # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will > # pull in the remainder of the dependencies. > -- > 2.42.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#191800): https://lists.openembedded.org/g/openembedded-core/message/191800 > Mute This Topic: https://lists.openembedded.org/mt/102987610/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch deleted file mode 100644 index 5afc714f190..00000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch +++ /dev/null @@ -1,80 +0,0 @@ -From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 -From: Wiktor Jaskulski <wjaskulski@adva.com> -Date: Thu, 11 May 2023 15:28:23 -0400 -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is - disabled - -Upstream-Status: Backport -(http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) - -Signed-off-by: Steve Dickson <steved@redhat.com> -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> ---- - configure.ac | 38 +++++++++++++++----------------------- - 1 file changed, 15 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4ade528d..519cacbf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , - AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) - CPPFLAGS="${nfsutils_save_CPPFLAGS}" - -+dnl check for libevent libraries and headers -+AC_LIBEVENT -+ -+dnl Check for sqlite3 -+AC_SQLITE3_VERS -+ -+case $libsqlite3_cv_is_recent in -+yes) ;; -+unknown) -+ dnl do not fail when cross-compiling -+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -+*) -+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -+esac -+ - if test "$enable_nfsv4" = yes; then -- dnl check for libevent libraries and headers -- AC_LIBEVENT - - dnl check for the keyutils libraries and headers - AC_KEYUTILS - -- dnl Check for sqlite3 -- AC_SQLITE3_VERS -- - if test "$enable_nfsdcld" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) -- -- case $libsqlite3_cv_is_recent in -- yes) ;; -- unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -- *) -- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -- esac - fi - - if test "$enable_nfsdcltrack" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) -- -- case $libsqlite3_cv_is_recent in -- yes) ;; -- unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -- *) -- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; -- esac - fi - - else --- -2.41.0 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb similarity index 97% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 35cf6af6d46..31290f6d44c 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb @@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://bugfix-adjust-statd-service-name.patch \ file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ file://clang-warnings.patch \ - file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \ file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ " -SRC_URI[sha256sum] = "38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1" +SRC_URI[sha256sum] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.