From b4a41340e4bfb1a996ee54b9f513ba3c34de72be Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sun, 7 Apr 2019 16:49:31 +0200 Subject: [PATCH] open-isns: update to 0.99 Removed patch has been upstreammed. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- ...dian.h-is-available-on-musl-on-linux.patch | 38 ------------------- .../{open-isns_0.98.bb => open-isns_0.99.bb} | 6 +-- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch rename meta-networking/recipes-support/open-isns/{open-isns_0.98.bb => open-isns_0.99.bb} (86%) diff --git a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch b/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch deleted file mode 100644 index fbdc4e9113..0000000000 --- a/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0d86318227a23f00cf0f6639a6685bb9f5771a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Dec 2017 09:42:19 -0800 -Subject: [PATCH] util.h: endian.h is available on musl on linux - -just checking for glibc alone is not enough since -it excludes musl, therefore check for platform -being linux as well - -Fixes build issues - -include/libisns/util.h:114:12: fatal error: sys/endian.h: No such file or directory - # include - ^~~~~~~~~~~~~~ - -Upstream-Status: Submitted - -Signed-off-by: Khem Raj ---- - include/libisns/util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/libisns/util.h b/include/libisns/util.h -index 9a2bd13..6cc1a1b 100644 ---- a/include/libisns/util.h -+++ b/include/libisns/util.h -@@ -100,7 +100,7 @@ enum { - * There's no htonll yet - */ - #ifndef htonll --# ifdef __GLIBC__ -+# if defined(__GLIBC__) || defined(__linux__) - # include - # include - # if __BYTE_ORDER == __BIG_ENDIAN --- -2.15.1 - diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.98.bb b/meta-networking/recipes-support/open-isns/open-isns_0.99.bb similarity index 86% rename from meta-networking/recipes-support/open-isns/open-isns_0.98.bb rename to meta-networking/recipes-support/open-isns/open-isns_0.99.bb index 5e64f893e0..a03b92f5fe 100644 --- a/meta-networking/recipes-support/open-isns/open-isns_0.98.bb +++ b/meta-networking/recipes-support/open-isns/open-isns_0.99.bb @@ -13,11 +13,9 @@ SECTION = "net" DEPENDS = "openssl" -SRC_URI = "git://github.com/open-iscsi/open-isns \ - file://0001-util.h-endian.h-is-available-on-musl-on-linux.patch \ - " +SRC_URI = "git://github.com/open-iscsi/open-isns" -SRCREV = "e84374ce7d1f5fc58a4c0fc751e075b2cc752c34" +SRCREV = "cfdbcff867ee580a71bc9c18c3a38a6057df0150" S = "${WORKDIR}/git"