From 688c8f7488c154d7c8a103ba58872b202febbad4 Mon Sep 17 00:00:00 2001 From: psykose Date: Sat, 27 May 2023 11:33:35 +0000 Subject: [PATCH] community/ofono: remove now unneeded patch nothing uses temp failure retry in the code --- community/ofono/APKBUILD | 4 +--- community/ofono/fix-TEMP_FAILURE_RETRY.patch | 21 -------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 community/ofono/fix-TEMP_FAILURE_RETRY.patch diff --git a/community/ofono/APKBUILD b/community/ofono/APKBUILD index c019e3b6644..864c5557ac5 100644 --- a/community/ofono/APKBUILD +++ b/community/ofono/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista pkgname=ofono pkgver=2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications" url="https://01.org/ofono" arch="all" @@ -25,7 +25,6 @@ subpackages=" $pkgname-scripts::noarch " source="https://www.kernel.org/pub/linux/network/ofono/ofono-$pkgver.tar.xz - fix-TEMP_FAILURE_RETRY.patch skip-broken-test.patch $pkgname.initd $pkgname.confd @@ -66,7 +65,6 @@ scripts() { sha512sums=" 7227939c488c2a62f640d5a8279e0698935aa1df5a2a349e195df9a8d9d9123c73a7f1177aae022b4c805d266c24a9770784193100adffa45f6c36a3ed847bb1 ofono-2.1.tar.xz -687a2fd592add40122b789073ab9970d6e966752fdecc4077afe1c1bba705fe541dd0e457094f1d9cde747c571b7810b5b1a30835a3f1869bcd810751d5bf76f fix-TEMP_FAILURE_RETRY.patch 777ab2e13eebd1ccbe12a304310a83b262a5d934207c6a8d410e75aff380838eed1a52f3c2fe0d80c1e7db7faa9b55bf17e78a1e1acd8cfb95a3c6aef49c5b67 skip-broken-test.patch f0edaf0ee1c18e266b88d6679b1668d56cc114ae21531e1f584e7a3e5f5eacb2a5f48a0bd1e2a17650b4c9d061130b6534094a1b55dbb19b473343d3f9392555 ofono.initd 0a894374b2573b893b6c89efaf3e6ef725f24064c425400ab65951849aee273daa99add6e5ac92e1e4c9c144c2e16def185a38d6b679804a9ed2afca599b22a0 ofono.confd diff --git a/community/ofono/fix-TEMP_FAILURE_RETRY.patch b/community/ofono/fix-TEMP_FAILURE_RETRY.patch deleted file mode 100644 index 70df8c97026..00000000000 --- a/community/ofono/fix-TEMP_FAILURE_RETRY.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c -index 54b18ac..5f924ca 100644 ---- a/drivers/mbimmodem/mbim.c -+++ b/drivers/mbimmodem/mbim.c -@@ -41,6 +41,15 @@ - #define HEADER_SIZE (sizeof(struct mbim_message_header) + \ - sizeof(struct mbim_fragment_header)) - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - const uint8_t mbim_uuid_basic_connect[] = { - 0xa2, 0x89, 0xcc, 0x33, 0xbc, 0xbb, 0x8b, 0x4f, 0xb6, 0xb0, - 0x13, 0x3e, 0xc2, 0xaa, 0xe6, 0xdf -