From 269a79e8c1a223bb5bb830c15e00be27d1aa60c3 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 13:57:02 +0200 Subject: [PATCH 01/10] dtndht: Fix install target The previous copying command includes non-existing variables. This commit replaces the command with a more generic one. Signed-off-by: Johannes Morgenroth --- libs/dtndht/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/dtndht/Makefile b/libs/dtndht/Makefile index 6bc808425..7ab618145 100644 --- a/libs/dtndht/Makefile +++ b/libs/dtndht/Makefile @@ -41,7 +41,7 @@ endef define Package/dtndht/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME){.so,-$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR).so.*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,dtndht)) From ea805a8f26b812999c47fbd2863940c162408f3f Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 13:57:08 +0200 Subject: [PATCH 02/10] ibrcommon: Fix install target The previous copying command includes non-existing variables. This commit replaces the command with a more generic one. Signed-off-by: Johannes Morgenroth --- libs/ibrcommon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ibrcommon/Makefile b/libs/ibrcommon/Makefile index fb95b950c..37e6c1763 100644 --- a/libs/ibrcommon/Makefile +++ b/libs/ibrcommon/Makefile @@ -44,7 +44,7 @@ endef define Package/ibrcommon/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME){.so,-$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR).so.*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,ibrcommon)) From ab25b5cb109409db4c654bb9a7f1bfe78d6adc4b Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 13:57:33 +0200 Subject: [PATCH 03/10] ibrdtn: Fix install target The previous copying command includes non-existing variables. This commit replaces the command with a more generic one. Signed-off-by: Johannes Morgenroth --- libs/ibrdtn/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ibrdtn/Makefile b/libs/ibrdtn/Makefile index d86dcc336..02a1c3c87 100644 --- a/libs/ibrdtn/Makefile +++ b/libs/ibrdtn/Makefile @@ -44,7 +44,7 @@ endef define Package/ibrdtn/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME){.so,-$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR).so.*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,ibrdtn)) From 2c28b81816aa759930a7ef35df2e50020156bbfe Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 13:57:57 +0200 Subject: [PATCH 04/10] libarchive: Fix install target This commit replaces the command with a more generic one. Signed-off-by: Johannes Morgenroth --- libs/libarchive/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index a820f89d1..48264f85c 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -46,7 +46,7 @@ endef define Package/libarchive/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libarchive.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libarchive)) From efb7c5fc597b86b23ffdd97f6671f50581b58ae3 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 14:33:37 +0200 Subject: [PATCH 05/10] dtndht: Remove PKG_BUILD_DEPENDS since it is already defined by DEPENDS Signed-off-by: Johannes Morgenroth --- libs/dtndht/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/dtndht/Makefile b/libs/dtndht/Makefile index 7ab618145..be4385ce5 100644 --- a/libs/dtndht/Makefile +++ b/libs/dtndht/Makefile @@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 PKG_FIXUP:=libtool -PKG_BUILD_DEPENDS:=libopenssl include $(INCLUDE_DIR)/package.mk From ebe346b61664be700a69f828b3d4a06a22597041 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 14:33:45 +0200 Subject: [PATCH 06/10] ibrcommon: Remove PKG_BUILD_DEPENDS since it is already defined by DEPENDS Signed-off-by: Johannes Morgenroth --- libs/ibrcommon/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/ibrcommon/Makefile b/libs/ibrcommon/Makefile index 37e6c1763..6fb746518 100644 --- a/libs/ibrcommon/Makefile +++ b/libs/ibrcommon/Makefile @@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 PKG_FIXUP:=libtool -PKG_BUILD_DEPENDS:=libnl libopenssl include $(INCLUDE_DIR)/package.mk From 3c3d95b0b865f2e0839c77f7e52177acb1f3b7d8 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 14:33:56 +0200 Subject: [PATCH 07/10] ibrdtn: Remove PKG_BUILD_DEPENDS since it is already defined by DEPENDS Signed-off-by: Johannes Morgenroth --- libs/ibrdtn/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/ibrdtn/Makefile b/libs/ibrdtn/Makefile index 02a1c3c87..eb0f07cbb 100644 --- a/libs/ibrdtn/Makefile +++ b/libs/ibrdtn/Makefile @@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 PKG_FIXUP:=libtool -PKG_BUILD_DEPENDS:=ibrcommon zlib include $(INCLUDE_DIR)/package.mk From 750ec01abcf2336c89f13db3ed6e1196ef670ee9 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 14:34:08 +0200 Subject: [PATCH 08/10] ibrdtnd: Remove PKG_BUILD_DEPENDS since it is already defined by DEPENDS Signed-off-by: Johannes Morgenroth --- net/ibrdtnd/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ibrdtnd/Makefile b/net/ibrdtnd/Makefile index 72d58b1ce..a33b31ab1 100644 --- a/net/ibrdtnd/Makefile +++ b/net/ibrdtnd/Makefile @@ -18,7 +18,6 @@ PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=dtndht ibrdtn libsqlite3 include $(INCLUDE_DIR)/package.mk From 353764af544382b64e2c25e6f6c06cd4ae2e5c20 Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 14:34:16 +0200 Subject: [PATCH 09/10] ibrdtn-tools: Remove PKG_BUILD_DEPENDS since it is already defined by DEPENDS Signed-off-by: Johannes Morgenroth --- net/ibrdtn-tools/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/net/ibrdtn-tools/Makefile b/net/ibrdtn-tools/Makefile index 00424a7a8..83fcc617c 100644 --- a/net/ibrdtn-tools/Makefile +++ b/net/ibrdtn-tools/Makefile @@ -18,7 +18,6 @@ PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=Apache-2.0 PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=libarchive ibrdtn include $(INCLUDE_DIR)/package.mk From 4af4395e2d453b065ae2bb373230fa2724680abe Mon Sep 17 00:00:00 2001 From: Johannes Morgenroth Date: Fri, 22 Aug 2014 14:35:35 +0200 Subject: [PATCH 10/10] libarchive: Add missing dependencies Dependencies to libacl, libattr, libbz2, liblzo, and libnettle added. PKG_BUILD_DEPENDS is removed since it is already defined by DEPENDS. Signed-off-by: Johannes Morgenroth --- libs/libarchive/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index 48264f85c..b673111bc 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -19,7 +19,6 @@ PKG_LICENSE:=BSD-2-Clause PKG_INSTALL:=1 PKG_FIXUP:=autoreconf -PKG_BUILD_DEPENDS:=libxml2 libopenssl zlib include $(INCLUDE_DIR)/package.mk @@ -31,7 +30,7 @@ endef define Package/libarchive $(call Package/libarchive/Default) - DEPENDS:=+libxml2 +libopenssl +zlib + DEPENDS:=+libxml2 +libopenssl +zlib +libacl +libattr +libbz2 +liblzo +libnettle TITLE:=Multi-format archive and compression library endef