diff mbox

[v2,1/1] boinc: new package

Message ID 1490523107-130671-1-git-send-email-fontaine.fabrice@gmail.com
State Superseded
Headers show

Commit Message

Fabrice Fontaine March 26, 2017, 10:11 a.m. UTC 
Open-source software for volunteer computing and grid computing.

Use the idle time on your computer to cure diseases, study global
warming, discover pulsars, and do many other types of scientific
research.

https://boinc.berkeley.edu

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
 - Update LDFLAGS patch and retrieve it from upstream
 - Use client_release/7.6.33 tag instead of vboxwrapper/26198 tag and add a
   comment about it following advice of upstream project member
 - Keep license as LGPLv3 as confirmed by upstream project member (see last
   comments of https://github.com/BOINC/boinc/pull/1798)
 - Put dependencies on one line

 package/Config.in                  |  1 +
 package/boinc/Config.in            | 20 +++++++++++
 package/boinc/S99boinc-client      | 37 ++++++++++++++++++++
 package/boinc/boinc-client.service | 10 ++++++
 package/boinc/boinc.hash           |  4 +++
 package/boinc/boinc.mk             | 70 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 142 insertions(+)
 create mode 100644 package/boinc/Config.in
 create mode 100644 package/boinc/S99boinc-client
 create mode 100644 package/boinc/boinc-client.service
 create mode 100644 package/boinc/boinc.hash
 create mode 100644 package/boinc/boinc.mk

Comments

Bernd Kuhls June 11, 2017, 1:47 p.m. UTC | #1 
Hi Fabrice,

Am Sun, 26 Mar 2017 12:11:47 +0200 schrieb Fabrice Fontaine:

> diff --git a/package/boinc/Config.in b/package/boinc/Config.in
> new file mode 100644
> index 0000000..ca1b283
> --- /dev/null
> +++ b/package/boinc/Config.in
> @@ -0,0 +1,20 @@
> +config BR2_PACKAGE_BOINC
> +	bool "boinc"
> +	depends on BR2_USE_MMU # fork()
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	depends on BR2_INSTALL_LIBSTDCPP
> +	depends on BR2_USE_WCHAR

Why is wchar needed? The boinc client can be build with this defconfig:

BR2_x86_i486=y
BR2_GCC_VERSION_7_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_BOINC=y

$ grep _WCHAR .config
# BR2_TOOLCHAIN_BUILDROOT_WCHAR is not set

> diff --git a/package/boinc/boinc.hash b/package/boinc/boinc.hash
> new file mode 100644
> index 0000000..f15be8c
> --- /dev/null
> +++ b/package/boinc/boinc.hash
> @@ -0,0 +1,4 @@
> +# Locally computed:
> +sha256	
c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d	
boinc-7.6.33.tar.gz
> +sha256	
39dc32290378ab5ed258944b80140adc48613677e1792701d6fbeba1b0aa60e3	
25c2f1839753a2695c62cc4d4edb7e88345af8cb.patch
> +sha256	
d141fba93a0081cd558a20209098b105c7e9dc1cd36d7913873db8bcec79ce66	
bf807980c1b217c0f20668a664806d8727df3239.patch

Please re-download the patches and update their hashes, the files you 
download today differ from the time when you created the package.

> diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk
> new file mode 100644
> index 0000000..a01289c
> --- /dev/null
> +++ b/package/boinc/boinc.mk
> @@ -0,0 +1,70 @@
> 
+################################################################################
> +#
> +# boinc
> +#
> 
+################################################################################
> +
> +BOINC_VERSION_MAJOR = 7.6
> +BOINC_VERSION = $(BOINC_VERSION_MAJOR).33

Version 7.6.34 was released meanwhile.

> +# client_release can be used to build the Client and Manager but not 
the Server
> +# part. The Server currently has no versioning (see
> +# https://github.com/BOINC/boinc/pull/1798).
> +BOINC_SITE = \
> +	$(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/
$(BOINC_VERSION))
> +BOINC_LICENSE = LGPLv3
> +BOINC_LICENSE_FILES = COPYING COPYING.LESSER 

please remove the white-space at the end of the line as reported by 

.git/rebase-apply/patch:150: trailing whitespace.
BOINC_LICENSE_FILES = COPYING COPYING.LESSER 
warning: 1 line adds whitespace errors.

> +BOINC_DEPENDENCIES = host-pkgconf
> +BOINC_INSTALL_STAGING = YES

Are there other packages currently or in planning which use libboinc*.so?

> +BOINC_AUTORECONF = YES
> +BOINC_CONF_OPTS = \
> +	--disable-apps \
> +	--disable-boinczip \
> +	--disable-manager \
> +	--disable-server \
> +	--enable-libraries \
> +	--with-pkg-config=$(PKG_CONFIG_HOST_BINARY)
> +
> +# Fix execinfo.h detection and LDFLAGS
> +BOINC_PATCH += \
> +	https://github.com/BOINC/boinc/
commit/25c2f1839753a2695c62cc4d4edb7e88345af8cb.patch \
> +	https://github.com/BOINC/boinc/commit/
bf807980c1b217c0f20668a664806d8727df3239.patch
> +
> +ifeq ($(BR2_PACKAGE_LIBFCGI),y)
> +BOINC_DEPENDENCIES += libfcgi
> +BOINC_CONF_OPTS += --enable-fcgi
> +else
> +BOINC_CONF_OPTS += --disable-fcgi
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBCURL)$(BR2_PACKAGE_OPENSSL),yy)
> +BOINC_DEPENDENCIES += libcurl openssl
> +BOINC_CONF_OPTS += \
> +	--enable-client \
> +	--with-libcurl=$(STAGING_DIR)/usr/lib \
> +	$(if $(BR2_STATIC_LIBS),--disable-dynamic-client-linkage, \
> +		--enable-dynamic-client-linkage)
> +else
> +BOINC_CONF_OPTS += --disable-client

Does it make any sense to build boinc without the client, i.e. only the 
libraries? Imho we should always select libcurl and openssl, both hard 
dependencies for the boinc client, they do not bring new dependencies 
with them.

The rest of the patch is useful only when the client was built.

> +endif
> +
> +# Remove boinc-client because it is incompatible with buildroot
> +define BOINC_REMOVE_UNNEEDED_FILE
> +	$(RM) $(TARGET_DIR)/etc/init.d/boinc-client
> +endef
> +
> +BOINC_POST_INSTALL_TARGET_HOOKS += BOINC_REMOVE_UNNEEDED_FILE
> +
> +define BOINC_INSTALL_INIT_SYSV
> +	 $(INSTALL) -D -m 0755 package/boinc/S99boinc-client \
> +		$(TARGET_DIR)/etc/init.d/S99boinc-client
> +endef
> +
> +define BOINC_INSTALL_INIT_SYSTEMD
> +	$(INSTALL) -D -m 644 package/boinc/boinc-client.service \
> +		$(TARGET_DIR)/usr/lib/systemd/system/boinc-client.service
> +	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> +	ln -sf ../../../../usr/lib/systemd/system/boinc-client.service \
> +		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
boinc-client.service
> +endef
> +
> +$(eval $(autotools-package))

Regards, Bernd
Bernd Kuhls June 11, 2017, 3:12 p.m. UTC | #2 
Hi Fabrice,

running test-pkg fails with a static-only build:

       br-arm-full-static [11/49]: FAILED

Because of that I have two more things to note:

Am Sun, 26 Mar 2017 12:11:47 +0200 schrieb Fabrice Fontaine:

> +BOINC_CONF_OPTS += \
> +	--enable-client \
> +	--with-libcurl=$(STAGING_DIR)/usr/lib \

this should read

	--with-libcurl=$(STAGING_DIR)/usr

$ output/build/boinc-7.6.34/configure --help | grep curl
  --with-libcurl=PREFIX   look for the curl library in PREFIX/lib and headers

> +	$(if $(BR2_STATIC_LIBS),--disable-dynamic-client-linkage, \
> +		--enable-dynamic-client-linkage)

Building with BR2_STATIC_LIBS=y is broken:

coproc.cpp:45:19: fatal error: dlfcn.h: No such file or directory
 #include <dlfcn.h>

Tested static-only build using this defconfig:

BR2_STATIC_LIBS=y
BR2_KERNEL_HEADERS_3_2=y
BR2_BINUTILS_VERSION_2_26_X=y
BR2_GCC_VERSION_4_9_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_OPENSSL=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_BOINC=y

Regards, Bernd
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 3b4b8e8..b1f9c5f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1489,6 +1489,7 @@  menu "Networking applications"
 	source "package/bluez5_utils/Config.in"
 	source "package/bmon/Config.in"
 	source "package/boa/Config.in"
+	source "package/boinc/Config.in"
 	source "package/bridge-utils/Config.in"
 	source "package/bwm-ng/Config.in"
 	source "package/c-icap/Config.in"
diff --git a/package/boinc/Config.in b/package/boinc/Config.in
new file mode 100644
index 0000000..ca1b283
--- /dev/null
+++ b/package/boinc/Config.in
@@ -0,0 +1,20 @@ 
+config BR2_PACKAGE_BOINC
+	bool "boinc"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	help
+	  Open-source software for volunteer computing and grid
+	  computing.
+
+	  Use the idle time on your computer to cure diseases, study
+	  global warming, discover pulsars, and do many other types of
+	  scientific research.
+
+	  https://boinc.berkeley.edu
+
+comment "boinc needs a toolchain w/ C++, threads, wchar"
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_USE_WCHAR
diff --git a/package/boinc/S99boinc-client b/package/boinc/S99boinc-client
new file mode 100644
index 0000000..f4b2a2c
--- /dev/null
+++ b/package/boinc/S99boinc-client
@@ -0,0 +1,37 @@ 
+#!/bin/sh
+
+NAME=boinc_client
+PIDFILE=/var/run/$NAME.pid
+DAEMON=/usr/bin/$NAME
+
+start() {
+	printf "Starting $NAME: "
+	start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+stop() {
+	printf "Stopping $NAME: "
+	start-stop-daemon -K -q -p $PIDFILE
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+esac
+
+exit $?
diff --git a/package/boinc/boinc-client.service b/package/boinc/boinc-client.service
new file mode 100644
index 0000000..9de940e
--- /dev/null
+++ b/package/boinc/boinc-client.service
@@ -0,0 +1,10 @@ 
+[Unit]
+Description=BOINC client
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/boinc_client
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/package/boinc/boinc.hash b/package/boinc/boinc.hash
new file mode 100644
index 0000000..f15be8c
--- /dev/null
+++ b/package/boinc/boinc.hash
@@ -0,0 +1,4 @@ 
+# Locally computed:
+sha256	c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d	boinc-7.6.33.tar.gz
+sha256	39dc32290378ab5ed258944b80140adc48613677e1792701d6fbeba1b0aa60e3	25c2f1839753a2695c62cc4d4edb7e88345af8cb.patch
+sha256	d141fba93a0081cd558a20209098b105c7e9dc1cd36d7913873db8bcec79ce66	bf807980c1b217c0f20668a664806d8727df3239.patch
diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk
new file mode 100644
index 0000000..a01289c
--- /dev/null
+++ b/package/boinc/boinc.mk
@@ -0,0 +1,70 @@ 
+################################################################################
+#
+# boinc
+#
+################################################################################
+
+BOINC_VERSION_MAJOR = 7.6
+BOINC_VERSION = $(BOINC_VERSION_MAJOR).33
+# client_release can be used to build the Client and Manager but not the Server
+# part. The Server currently has no versioning (see
+# https://github.com/BOINC/boinc/pull/1798).
+BOINC_SITE = \
+	$(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION))
+BOINC_LICENSE = LGPLv3
+BOINC_LICENSE_FILES = COPYING COPYING.LESSER 
+BOINC_DEPENDENCIES = host-pkgconf
+BOINC_INSTALL_STAGING = YES
+BOINC_AUTORECONF = YES
+BOINC_CONF_OPTS = \
+	--disable-apps \
+	--disable-boinczip \
+	--disable-manager \
+	--disable-server \
+	--enable-libraries \
+	--with-pkg-config=$(PKG_CONFIG_HOST_BINARY)
+
+# Fix execinfo.h detection and LDFLAGS
+BOINC_PATCH += \
+	https://github.com/BOINC/boinc/commit/25c2f1839753a2695c62cc4d4edb7e88345af8cb.patch \
+	https://github.com/BOINC/boinc/commit/bf807980c1b217c0f20668a664806d8727df3239.patch
+
+ifeq ($(BR2_PACKAGE_LIBFCGI),y)
+BOINC_DEPENDENCIES += libfcgi
+BOINC_CONF_OPTS += --enable-fcgi
+else
+BOINC_CONF_OPTS += --disable-fcgi
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL)$(BR2_PACKAGE_OPENSSL),yy)
+BOINC_DEPENDENCIES += libcurl openssl
+BOINC_CONF_OPTS += \
+	--enable-client \
+	--with-libcurl=$(STAGING_DIR)/usr/lib \
+	$(if $(BR2_STATIC_LIBS),--disable-dynamic-client-linkage, \
+		--enable-dynamic-client-linkage)
+else
+BOINC_CONF_OPTS += --disable-client
+endif
+
+# Remove boinc-client because it is incompatible with buildroot
+define BOINC_REMOVE_UNNEEDED_FILE
+	$(RM) $(TARGET_DIR)/etc/init.d/boinc-client
+endef
+
+BOINC_POST_INSTALL_TARGET_HOOKS += BOINC_REMOVE_UNNEEDED_FILE
+
+define BOINC_INSTALL_INIT_SYSV
+	 $(INSTALL) -D -m 0755 package/boinc/S99boinc-client \
+		$(TARGET_DIR)/etc/init.d/S99boinc-client
+endef
+
+define BOINC_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/boinc/boinc-client.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/boinc-client.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/boinc-client.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/boinc-client.service
+endef
+
+$(eval $(autotools-package))