| Message ID | 20220114013941.229837-5-yi.zhao@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-networking,1/6] nftables: upgrade 1.0.0 -> 1.0.1 | expand |
it fails to build on musl see https://errors.yoctoproject.org/Errors/Details/622607/ On Thu, Jan 13, 2022 at 5:40 PM Yi Zhao <yi.zhao@windriver.com> wrote: > > * License-Update: Update copyright years > * Drop tnftp-autotools.patch as the issue had been fixed upstream > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > --- > .../tnftp/tnftp/tnftp-autotools.patch | 42 ------------------- > .../{tnftp_20151004.bb => tnftp_20210827.bb} | 7 ++-- > 2 files changed, 3 insertions(+), 46 deletions(-) > delete mode 100644 meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch > rename meta-networking/recipes-support/tnftp/{tnftp_20151004.bb => tnftp_20210827.bb} (83%) > > diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch > deleted file mode 100644 > index 1bda576bc..000000000 > --- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors > - > -Upstream-Status: Pending > - > -Signed-off-by: Roy Li <rongqing.li@windriver.com> > ---- > - configure.ac | 2 ++ > - libnetbsd/Makefile.am | 2 +- > - 2 files changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/configure.ac b/configure.ac > -index a96d2ab..b3b3069 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL], > - # > - # Checks for programs. > - # > -+AM_PROG_AR() > - AC_PROG_CC() > - AC_PROG_AWK() > - AC_PROG_LIBTOOL() > -+AM_PROG_CC_C_O() > - > - # > - # Checks for tool features. > -diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am > -index 3e5c3ce..39bb12d 100644 > ---- a/libnetbsd/Makefile.am > -+++ b/libnetbsd/Makefile.am > -@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la > - libnetbsd_la_SOURCES = > - > - > --CPPFLAGS = \ > -+AM_CPPFLAGS = \ > - -I$(srcdir) \ > - -I$(top_srcdir) \ > - -I$(top_builddir) > --- > -1.7.10.4 > - > diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb > similarity index 83% > rename from meta-networking/recipes-support/tnftp/tnftp_20151004.bb > rename to meta-networking/recipes-support/tnftp/tnftp_20210827.bb > index 8e03f1bdb..111a63d29 100644 > --- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb > +++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb > @@ -15,7 +15,6 @@ LICENSE = "BSD-4-Clause" > DEPENDS = "ncurses" > > SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ > - file://tnftp-autotools.patch \ > " > > inherit autotools update-alternatives pkgconfig > @@ -28,9 +27,9 @@ ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" > > FILES:${PN} = "${bindir}/tnftp" > > -LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" > -SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" > -SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" > +LIC_FILES_CHKSUM = "file://COPYING;md5=b4248c6fb8ecff27f256ba97b25f1a21" > +SRC_URI[md5sum] = "fdb6dd1b53dca79148c395b77c6dba5a" > +SRC_URI[sha256sum] = "101901e90b656c223ec8106370dd0d783fb63d26aa6f0b2a75f40e86a9f06ea2" > > PACKAGECONFIG ?= "openssl \ > ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#94818): https://lists.openembedded.org/g/openembedded-devel/message/94818 > Mute This Topic: https://lists.openembedded.org/mt/88412164/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch deleted file mode 100644 index 1bda576bc..000000000 --- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch +++ /dev/null @@ -1,42 +0,0 @@ -[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - configure.ac | 2 ++ - libnetbsd/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a96d2ab..b3b3069 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL], - # - # Checks for programs. - # -+AM_PROG_AR() - AC_PROG_CC() - AC_PROG_AWK() - AC_PROG_LIBTOOL() -+AM_PROG_CC_C_O() - - # - # Checks for tool features. -diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am -index 3e5c3ce..39bb12d 100644 ---- a/libnetbsd/Makefile.am -+++ b/libnetbsd/Makefile.am -@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la - libnetbsd_la_SOURCES = - - --CPPFLAGS = \ -+AM_CPPFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -I$(top_builddir) --- -1.7.10.4 - diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb similarity index 83% rename from meta-networking/recipes-support/tnftp/tnftp_20151004.bb rename to meta-networking/recipes-support/tnftp/tnftp_20210827.bb index 8e03f1bdb..111a63d29 100644 --- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb +++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb @@ -15,7 +15,6 @@ LICENSE = "BSD-4-Clause" DEPENDS = "ncurses" SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ - file://tnftp-autotools.patch \ " inherit autotools update-alternatives pkgconfig @@ -28,9 +27,9 @@ ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" FILES:${PN} = "${bindir}/tnftp" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" -SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" -SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4248c6fb8ecff27f256ba97b25f1a21" +SRC_URI[md5sum] = "fdb6dd1b53dca79148c395b77c6dba5a" +SRC_URI[sha256sum] = "101901e90b656c223ec8106370dd0d783fb63d26aa6f0b2a75f40e86a9f06ea2" PACKAGECONFIG ?= "openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
* License-Update: Update copyright years * Drop tnftp-autotools.patch as the issue had been fixed upstream Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- .../tnftp/tnftp/tnftp-autotools.patch | 42 ------------------- .../{tnftp_20151004.bb => tnftp_20210827.bb} | 7 ++-- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch rename meta-networking/recipes-support/tnftp/{tnftp_20151004.bb => tnftp_20210827.bb} (83%)