| Message ID | 1439078419-2828-1-git-send-email-tom_a_sparks@yahoo.com.au |
|---|---|
| State | Accepted |
| Headers | show |
Dear Tom Sparks, On Sun, 9 Aug 2015 10:00:19 +1000, Tom Sparks wrote: > Signed-off-by: Tom Sparks <tom_a_sparks@yahoo.com.au> > --- > package/ibrdtn-tools/Config.in | 16 ++++++++++++++++ > package/ibrdtn-tools/ibrdtn-tools.mk | 30 ++++++++++++++++++++++++++++++ > package/ibrdtnd/Config.in | 1 + > 3 files changed, 47 insertions(+) > create mode 100644 package/ibrdtn-tools/Config.in > create mode 100644 package/ibrdtn-tools/ibrdtn-tools.mk I've applied your patch to the next branch, after doing a good number of changes: [Thomas: - include package/ibrdtn-tools/Config.in from package/Config.in - fix the Config.in option name: we don't use - in option names, it should be replaced by _. Also do the same change in the .mk file. - from Config.in, don't select BR2_PACKAGE_IBRDTND (it's not a dependency of ibrdtn-tools), but instead select BR2_PACKAGE_IBRCOMMON and BR2_PACKAGE_IBRDTN. - in the Config.in file, fix the comment dependency logic (we want the comment to be shown when either thread support *or* C++ support is missing) - add hash file. - do not install to staging, since the package does not install any library - remove IBRDTN_TOOLS_SOURCE variable, since it's equal to the default value - add ibrcommon, ibrdtn and host-pkgconf as mandatory dependencies, and handle libdaemon and libarchive as optional dependencies. - remove custom INSTALL_STAGING_OPTS and INSTALL_TARGET_OPTS: automake is used, so there's no need for any hack.] Now, if you could test the next branch, and verify that the four ibrdtn packages you submitted are still working, it would be good. Also, on the ibrdtnd package, which installs a daemon, it would be good to add an init script to start the daemon at boot time. Thanks! Thomas
diff --git a/package/ibrdtn-tools/Config.in b/package/ibrdtn-tools/Config.in new file mode 100644 index 0000000..d7f2db1 --- /dev/null +++ b/package/ibrdtn-tools/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_IBRDTN-TOOLS + bool "ibrdtn-tools" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_IBRDTND + + 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 + +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 diff --git a/package/ibrdtn-tools/ibrdtn-tools.mk b/package/ibrdtn-tools/ibrdtn-tools.mk new file mode 100644 index 0000000..9eb1d38 --- /dev/null +++ b/package/ibrdtn-tools/ibrdtn-tools.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# ibrdtn-tools +# +################################################################################ + +IBRDTN-TOOLS_VERSION = 1.0.1 +IBRDTN-TOOLS_SOURCE = IBRDTN-TOOLS-$(IBRDTN-TOOLS_VERSION).tar.gz +IBRDTN-TOOLS_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ +IBRDTN-TOOLS_INSTALL_STAGING = YES +IBRDTN-TOOLS_LICENSE = Apache-2.0 +IBRDTN-TOOLS_LICENSE_FILES = COPYING +IBRDTN-TOOLS_CONF_OPTS = +IBRDTN-TOOLS_DEPENDENCIES = IBRDTN-TOOLS + +# 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. +IBRDTN-TOOLS_INSTALL_STAGING_OPTS = \ + prefix=$(STAGING_DIR)/usr \ + exec_prefix=$(STAGING_DIR)/usr \ + PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ + install + +IBRDTN-TOOLS_INSTALL_TARGET_OPTS = \ + prefix=$(TARGET_DIR)/usr \ + exec_prefix=$(TARGET_DIR)/usr \ + install + +$(eval $(autotools-package)) \ No newline at end of file diff --git a/package/ibrdtnd/Config.in b/package/ibrdtnd/Config.in index 9cd55f3..37ba94d 100644 --- a/package/ibrdtnd/Config.in +++ b/package/ibrdtnd/Config.in @@ -19,6 +19,7 @@ if BR2_PACKAGE_IBRDTND source "package/ibrcommon/Config.in" source "package/ibrdtn/Config.in" +source "package/ibrdtn-tools/Config.in" endif
Signed-off-by: Tom Sparks <tom_a_sparks@yahoo.com.au> --- package/ibrdtn-tools/Config.in | 16 ++++++++++++++++ package/ibrdtn-tools/ibrdtn-tools.mk | 30 ++++++++++++++++++++++++++++++ package/ibrdtnd/Config.in | 1 + 3 files changed, 47 insertions(+) create mode 100644 package/ibrdtn-tools/Config.in create mode 100644 package/ibrdtn-tools/ibrdtn-tools.mk