Skip to contentSkip to conversation

ibrdtnd: new package

PATCH New Tom Sparks 2 participants 4 messages Aug 8, 2015 – Aug 29, 2015

lore
Share & tools
lore

Tom Sparks

author
#0 lore raw

PATCH 1/2 ibrdtnd: new package

Signed-off-by Tom Sparks <[email protected]>
---
 package/ibrdtnd/Config.in  | 27 +++++++++++++++++++++++++++
 package/ibrdtnd/ibrdtnd.mk | 30 ++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 package/ibrdtnd/Config.in
 create mode 100644 package/ibrdtnd/ibrdtnd.mk
package/ibrdtnd/Config.in new file +27 -0
new file mode 100644
index 0000000..9cd55f3
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_IBRDTND
+	bool "ibrdtnd"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_IBRDTN
+	select BR2_PACKAGE_LIBDAEMON
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_OPENSSL
+
+	help
+	  IBR-DTN is a small dtn application that supports:
+	  Bundle Protocol RFC 5050
+	  Bundle Security Protocol RFC 6257
+
+	  http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn
+
+if BR2_PACKAGE_IBRDTND
+
+source "package/ibrcommon/Config.in"
+source "package/ibrdtn/Config.in"
+
+endif
+
+comment "ibrcommon needs a toolchain w/ C++, threads"
+        depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
\ No newline at end of file
package/ibrdtnd/ibrdtnd.mk new file +30 -0
new file mode 100644
index 0000000..91a1de0
@@ -0,0 +1,30 @@
+################################################################################
+#
+# ibrdtnd
+#
+################################################################################
+
+IBRDTND_VERSION = 1.0.1
+IBRDTND_SOURCE = ibrdtnd-$(IBRDTND_VERSION).tar.gz
+IBRDTND_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/
+IBRDTND_INSTALL_STAGING = YES
+IBRDTND_LICENSE = Apache-2.0
+IBRDTND_LICENSE_FILES = COPYING
+IBRDTND_CONF_OPTS = --with-curl --with-sqlite --with-tls  
+IBRDTND_DEPENDENCIES = ibrdtn libdaemon libcurl sqlite openssl 
+
+# While the configuration system uses autoconf, the Makefiles are
+# hand-written and do not use automake. Therefore, we have to hack
+# around their deficiencies by passing installation paths.
+IBRDTND_INSTALL_STAGING_OPTS = \
+	prefix=$(STAGING_DIR)/usr \
+	exec_prefix=$(STAGING_DIR)/usr  \
+	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
+	install
+
+IBRDTND_INSTALL_TARGET_OPTS =  \
+	prefix=$(TARGET_DIR)/usr \
+	exec_prefix=$(TARGET_DIR)/usr  \
+	install
+
+$(eval $(autotools-package))
\ No newline at end of file
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 4/4 ibrdtnd: new package

Signed-off-by Tom Sparks <[email protected]>
---
 package/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/Config.in +1 -0
index 47d14d7..c901774 100644
@@ -1221,6 +1221,7 @@ endif
 	source "package/hostapd/Config.in"
 	source "package/hplip/Config.in"
 	source "package/httping/Config.in"
+	source "package/ibrdtnd/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/ifplugd/Config.in"
 endif
Signature · 1 line
1.9.1
#2 lore raw

PATCH 4/4 ibrdtnd: new package

Dear Tom Sparks,

Quoted 10 lines · Tom Sparks
Signed-off-by Tom Sparks <[email protected]>
---
 package/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/Config.in +0 -0
index 47d14d7..c901774 100644

package/Config.in endif · line 1227

Quoted 7 lines
package/Config.in +1 -0
@@ -1221,6 +1221,7 @@ endif
 	source "package/hostapd/Config.in"
 	source "package/hplip/Config.in"
 	source "package/httping/Config.in"
+	source "package/ibrdtnd/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/ifplugd/Config.in"
 endif

This patch should have been part of the patch adding ibrdtnd/ibrdtnd.mk and ibrdtnd/Config.in. Therefore, I've marked this patch as rejected, and I will modify the patch really adding ibrdtnd so that it gets added to package/Config.in.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 ibrdtnd: new package

In reply to Tom Sparks

Dear Tom Sparks,

Quoted 7 lines · Tom Sparks
Signed-off-by Tom Sparks <[email protected]>
---
 package/ibrdtnd/Config.in  | 27 +++++++++++++++++++++++++++
 package/ibrdtnd/ibrdtnd.mk | 30 ++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 package/ibrdtnd/Config.in
 create mode 100644 package/ibrdtnd/ibrdtnd.mk

I've applied your patch to the next branch, after doing numerous changes:

[Thomas:
- add package to package/Config.in
- remove "select" on libdaemon, libcurl, sqlite and openssl from Config.in, since those are optional dependency.
- add "select" on ibrcommon, since it is a mandatory dependency.
- remove bogus includes of package/ibrcommon/Config.in and package/ibrdtn/Config.in, those are directly from package/Config.in.
- fix Config.in comment dependency and indentation.
- remove INSTALL_STAGING = YES, since ibrdtnd does not install a library.
- remove libdaemon, libcurl, sqlite and openssl as mandatory dependencies, and handle them as optional dependencies.
- add ibrcommon in the dependencies (even if ibrdtn already depends on it)
- remove custom INSTALL_STAGING_OPTS and INSTALL_TARGET_OPTS, they are not needed, since the Makefiles are properly generated by automake.
- explicitly disable features for which Buildroot doesn't have the necessary dependencies (dtndht, wifip2p, vmime)
- add hash file.]

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com