From 57abb8e4a7fd2266d295921c4c0492b0d0cbd06e Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Thu, 24 Jan 2019 13:14:39 +0100
Subject: [PATCH] Rebase ABI disabling patch
---
.../hack/0008-Disable-ABI-stuff-for-now.patch | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/patches/openwrt/hack/0008-Disable-ABI-stuff-for-now.patch b/patches/openwrt/hack/0008-Disable-ABI-stuff-for-now.patch
index 13401034a..48d8f371c 100644
--- a/patches/openwrt/hack/0008-Disable-ABI-stuff-for-now.patch
+++ b/patches/openwrt/hack/0008-Disable-ABI-stuff-for-now.patch
@@ -1,15 +1,15 @@
-From 4e0531b2eb06db532adae3eaef409994abf94a21 Mon Sep 17 00:00:00 2001
+From 1c0c0455d405b0c90f178d6b33fddc062cb4725c Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 23 Jan 2019 22:31:51 +0100
Subject: [PATCH] Disable ABI stuff for now
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
- include/package-ipkg.mk | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
+ include/package-ipkg.mk | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index dc05eefc7c..f4aa35e05b 100644
+index 1cb4da8e30..c50c222352 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -93,9 +93,8 @@ _endef=endef
@@ -23,7 +23,7 @@ index dc05eefc7c..f4aa35e05b 100644
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
-@@ -148,22 +147,21 @@ ifeq ($(DUMP),)
+@@ -148,21 +147,20 @@ ifeq ($(DUMP),)
$(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
mkdir -p $(STAGING_DIR_ROOT)/stamp
@@ -43,12 +43,11 @@ index dc05eefc7c..f4aa35e05b 100644
Version: $(VERSION)
$$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
--)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)$$(if $$(ABIV_$(1)), $(1)))
+-)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1)))))
+)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES))
)$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
)$$(call addfield,Source,$(SOURCE)
)$$(call addfield,SourceName,$(1)
- )$$(call addfield,License,$(LICENSE)
--
2.20.1
--
GitLab