From 88fb1140f4b65ed33cdd4152ef506461a33371a5 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 30 Aug 2019 13:26:14 +0800 Subject: libbsd: upgrade 0.9.1 -> 0.10.0 License-Update: copyright years updated. Drop the backport patch. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../0001-flopen-Add-missing-fcntl.h-include.patch | 46 ---------------------- meta/recipes-support/libbsd/libbsd_0.10.0.bb | 41 +++++++++++++++++++ meta/recipes-support/libbsd/libbsd_0.9.1.bb | 44 --------------------- 3 files changed, 41 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch create mode 100644 meta/recipes-support/libbsd/libbsd_0.10.0.bb delete mode 100644 meta/recipes-support/libbsd/libbsd_0.9.1.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch b/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch deleted file mode 100644 index 8abb876c7b..0000000000 --- a/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 5 Jun 2018 19:21:46 +0300 -Subject: [PATCH] flopen: Add missing include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the -fcntl.h header. This breaks the build with musl libc: - -flopen.c: In function ‘vflopenat’: -flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) - if (flags & O_CREAT) { - ^~~~~~~ - -Restore the fcntl.h header include to fix the build. - -Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4 -Submitted-also-by: parazyd -Signed-off-by: Baruch Siach -Signed-off-by: Guillem Jover - -Upstream-Status: Backport -[https://gitlab.freedesktop.org/libbsd/libbsd/commit/13c32916b4baab58d93940d57fea9ff0777f1931] - -Signed-off-by: Yi Zhao ---- - src/flopen.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/flopen.c b/src/flopen.c -index b9972c9..ff20d07 100644 ---- a/src/flopen.c -+++ b/src/flopen.c -@@ -32,6 +32,7 @@ - #include - - #include -+#include - #include - #include - --- -2.7.4 - diff --git a/meta/recipes-support/libbsd/libbsd_0.10.0.bb b/meta/recipes-support/libbsd/libbsd_0.10.0.bb new file mode 100644 index 0000000000..eaf244a3b7 --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.10.0.bb @@ -0,0 +1,41 @@ +# Copyright (C) 2013 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library of utility functions from BSD systems" +DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ + and lacking on others like GNU systems, thus making it easier to port \ + projects with strong BSD origins, without needing to embed the same \ + code over and over again on each project." + +HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" +# There seems to be more licenses used in the code, I don't think we want to list them all here, complete list: +# OE @ ~/projects/libbsd $ grep ^License: COPYING | sort -u +# License: BSD-2-clause +# License: BSD-2-clause-NetBSD +# License: BSD-2-clause-author +# License: BSD-2-clause-verbatim +# License: BSD-3-clause +# License: BSD-3-clause-author +# License: BSD-3-clause-John-Birrell +# License: BSD-3-clause-Regents +# License: BSD-4-clause-Christopher-G-Demetriou +# License: BSD-4-clause-Niels-Provos +# License: BSD-5-clause-Peter-Wemm +# License: Beerware +# License: Expat +# License: ISC +# License: ISC-Original +# License: public-domain +# License: public-domain-Colin-Plumb +LICENSE = "BSD-4-Clause & ISC & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=2120be0173469a06ed185b688e0e1ae0" +SECTION = "libs" + +SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "ead96d240d02faa5b921c0aa50c812b5" +SRC_URI[sha256sum] = "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libbsd/libbsd_0.9.1.bb b/meta/recipes-support/libbsd/libbsd_0.9.1.bb deleted file mode 100644 index 2b75cdf956..0000000000 --- a/meta/recipes-support/libbsd/libbsd_0.9.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2013 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Library of utility functions from BSD systems" -DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ - and lacking on others like GNU systems, thus making it easier to port \ - projects with strong BSD origins, without needing to embed the same \ - code over and over again on each project." - -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" -# There seems to be more licenses used in the code, I don't think we want to list them all here, complete list: -# OE @ ~/projects/libbsd $ grep ^License: COPYING | sort -u -# License: BSD-2-clause -# License: BSD-2-clause-NetBSD -# License: BSD-2-clause-author -# License: BSD-2-clause-verbatim -# License: BSD-3-clause -# License: BSD-3-clause-author -# License: BSD-3-clause-John-Birrell -# License: BSD-3-clause-Regents -# License: BSD-4-clause-Christopher-G-Demetriou -# License: BSD-4-clause-Niels-Provos -# License: BSD-5-clause-Peter-Wemm -# License: Beerware -# License: Expat -# License: ISC -# License: ISC-Original -# License: public-domain -# License: public-domain-Colin-Plumb -LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b552602fda69e34c753d26de383f33c5" -SECTION = "libs" - -SRC_URI = " \ - http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-flopen-Add-missing-fcntl.h-include.patch \ -" - -SRC_URI[md5sum] = "a74b80c4143afa032c90226a4518fffe" -SRC_URI[sha256sum] = "56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg