Skip to contentSkip to conversation

Some more Patchwork Day patches

Buildroot New Thomas Petazzoni 3 participants 10 messages Mar 24, 2013

lore
Share & tools
lore
#0 lore raw

Hello,

Another round of four patches, three of which are package additions, initially contributed by Gr?gory Hermant from Calao Systems.

Thomas

#1 lore raw

PATCH 1/4 libpthsem: new package

From: Gregory Hermant <[email protected]>

[Thomas: various fixes/improvements]
---
 package/Config.in                                  |    1 +
 package/libpthsem/Config.in                        |    9 +++++++
 ...bpthsem-2.0.8-fix-build-on-linux-3.x-host.patch |   28 ++++++++++++++++++++
 package/libpthsem/libpthsem.mk                     |   18 +++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 package/libpthsem/Config.in
 create mode 100644 package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch
 create mode 100644 package/libpthsem/libpthsem.mk
package/Config.in +1 -0
index bdfc0f2..1ba356c 100644
@@ -562,6 +562,7 @@ source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
+source "package/libpthsem/Config.in"
 source "package/libsigc/Config.in"
 source "package/libtasn1/Config.in"
 source "package/libtpl/Config.in"
package/libpthsem/Config.in new file +9 -0
new file mode 100644
index 0000000..f818ee0
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBPTHSEM
+	bool "libpthsem"
+	select BR2_PACKAGE_ARGP_STANDALONE
+	help
+	  GNU pth is a user mode multi threading library. pthsem is an extend
+	  version, with support for semaphores added.
+
+	  http://www.auto.tuwien.ac.at/~mkoegler/pth/
+
package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch new file +28 -0
new file mode 100644
index 0000000..21fff4e
@@ -0,0 +1,28 @@
+From 2d0450bfa3fb7003098da1a7fe24c3ae140912dc Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <[email protected]>
+Date: Mon, 22 Oct 2012 15:11:53 +0200
+Subject: [PATCH] pthsem build on Linux 3.x host
+
+
+Signed-off-by: Michael Markstaller <[email protected]>
+Signed-off-by: Gregory Hermant <[email protected]>
+---
+ acinclude.m4 |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 03b42de..fea9bc8 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -892,6 +892,8 @@ case $PLATFORM in
+         case "x`uname -r`" in
+ changequote(, )dnl
+             x2.[23456789]* ) ;;
++changequote(, )dnl
++            x3.* ) ;;
+ changequote([, ])
+             * ) braindead=yes ;;
+         esac
+-- 
+1.7.9.5
+
package/libpthsem/libpthsem.mk new file +18 -0
new file mode 100644
index 0000000..f035fa8
@@ -0,0 +1,18 @@
+#############################################################
+#
+# libpthsem
+#
+#############################################################
+
+LIBPTHSEM_VERSION = 2.0.8
+LIBPTHSEM_SOURCE = pthsem_$(LIBPTHSEM_VERSION).tar.gz
+LIBPTHSEM_SITE = http://www.auto.tuwien.ac.at/~mkoegler/pth/
+LIBPTHSEM_LICENSE = LGPLv2.1+
+LIBPTHSEM_LICENSE_FILES = COPYING
+LIBPTHSEM_AUTORECONF = YES
+LIBPTHSEM_INSTALL_STAGING = YES
+LIBPTHSEM_DEPENDENCIES = argp-standalone
+LIBPTHSEM_CONFIG_SCRIPTS = pthsem-config
+
+$(eval $(autotools-package))
+
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/4 libpthsem: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> From: Gregory Hermant <[email protected]> Thomas> [Thomas: various fixes/improvements]
Thomas> Signed-off-by: Gregory Hermant <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  package/Config.in                                  |    1 +
 Thomas>  package/libpthsem/Config.in                        |    9 +++++++
 Thomas>  ...bpthsem-2.0.8-fix-build-on-linux-3.x-host.patch |   28 ++++++++++++++++++++
 Thomas>  package/libpthsem/libpthsem.mk                     |   18 +++++++++++++
 Thomas>  4 files changed, 56 insertions(+)
 Thomas>  create mode 100644 package/libpthsem/Config.in
 Thomas>  create mode 100644 package/libpthsem/libpthsem-2.0.8-fix-build-on-linux-3.x-host.patch
 Thomas>  create mode 100644 package/libpthsem/libpthsem.mk

Thomas> +++ b/package/libpthsem/Config.in
Thomas> @@ -0,0 +1,9 @@
Thomas> +config BR2_PACKAGE_LIBPTHSEM
Thomas> + bool "libpthsem"
Thomas> + select BR2_PACKAGE_ARGP_STANDALONE
Thomas> + help
Thomas> + GNU pth is a user mode multi threading library. pthsem is an extend
Thomas> + version, with support for semaphores added.
Thomas> +
Thomas> + http://www.auto.tuwien.ac.at/~mkoegler/pth/
Thomas> +

Trailing newline.

Thomas> +LIBPTHSEM_AUTORECONF = YES Thomas> +LIBPTHSEM_INSTALL_STAGING = YES Thomas> +LIBPTHSEM_DEPENDENCIES = argp-standalone Thomas> +LIBPTHSEM_CONFIG_SCRIPTS = pthsem-config Thomas> +
Thomas> +$(eval $(autotools-package)) Thomas> +

Here as well.

Committed with those fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/4 bcusdk: new package

In reply to Thomas Petazzoni

From: Gregory Hermant <[email protected]>

[Thomas: various fixes/improvements]
---
 package/Config.in        |    1 +
 package/bcusdk/Config.in |   22 ++++++++++++++++++++++
 package/bcusdk/bcusdk.mk |   26 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 package/bcusdk/Config.in
 create mode 100644 package/bcusdk/bcusdk.mk
package/Config.in +1 -0
index 1ba356c..be1aa99 100644
@@ -633,6 +633,7 @@ source "package/argus/Config.in"
 source "package/arptables/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
+source "package/bcusdk/Config.in"
 source "package/bluez_utils/Config.in"
 source "package/boa/Config.in"
 source "package/bind/Config.in"
package/bcusdk/Config.in new file +22 -0
new file mode 100644
index 0000000..62d1e32
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_BCUSDK
+	bool "bcusdk"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBPTHSEM
+	help
+	  A free development environment for the Bus Coupling Units of
+	  the European Installation Bus.
+
+	  The European Installation Bus EIB is a home and building
+	  automation bus system. It is optimized for low-speed control
+	  applications like lighting and blinds control.
+
+	  BCUs (Bus Coupling Units) are standardized, generic
+	  platforms for embedded EIB devices. They include the entire
+	  physical layer network interface, power supply and a
+	  microcontroller with an implementation of the EIB protocol
+	  stack stored in the ROM.
+
+	  http://www.auto.tuwien.ac.at/~mkoegler/eib/
+
+comment "bcusdk requires a toolchain with C++ "
+	depends on !BR2_INSTALL_LIBSTDCPP
package/bcusdk/bcusdk.mk new file +26 -0
new file mode 100644
index 0000000..3e07143
@@ -0,0 +1,26 @@
+#############################################################
+#
+# bcusck
+#
+#############################################################
+
+BCUSDK_VERSION = 0.0.5
+BCUSDK_SOURCE = bcusdk_$(BCUSDK_VERSION).tar.gz
+BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib/
+BCUSDK_LICENSE = GPLv2+
+BCUSDK_LICENSE_FILES = COPYING
+BCUSDK_INSTALL_STAGING = YES
+BCUSDK_CONF_OPT =  --enable-onlyeibd --enable-ft12 --enable-pei16 \
+		 --enable-eibnetip --enable-eibnetipserver \
+		 --enable-eibnetiptunnel --without-pth-test \
+		 --with-pth=$(STAGING_DIR)/usr
+
+BCUSDK_DEPENDENCIES = libpthsem
+
+define BCUSDK_REMOVE_EXAMPLES
+	$(RM) -rf $(TARGET_DIR)/usr/share/bcusdk
+endef
+
+BCUSDK_POST_INSTALL_TARGET_HOOKS += BCUSDK_REMOVE_EXAMPLES
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 2/4 bcusdk: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> From: Gregory Hermant <[email protected]> Thomas> [Thomas: various fixes/improvements]
Thomas> Signed-off-by: Gregory Hermant <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Thomas> +config BR2_PACKAGE_BCUSDK
Thomas> + bool "bcusdk"
Thomas> + depends on BR2_INSTALL_LIBSTDCPP
Thomas> + select BR2_PACKAGE_LIBPTHSEM
Thomas> + help
Thomas> + A free development environment for the Bus Coupling Units of
Thomas> + the European Installation Bus.
Thomas> +

 Thomas> +	  The European Installation Bus EIB is a home and building
 Thomas> +	  automation bus system. It is optimized for low-speed control
 Thomas> +	  applications like lighting and blinds control.
 Thomas> +
 Thomas> +	  BCUs (Bus Coupling Units) are standardized, generic
 Thomas> +	  platforms for embedded EIB devices. They include the entire
 Thomas> +	  physical layer network interface, power supply and a
 Thomas> +	  microcontroller with an implementation of the EIB protocol
 Thomas> +	  stack stored in the ROM.

Thomas> +
Thomas> + http://www.auto.tuwien.ac.at/~mkoegler/eib/
Thomas> +
Thomas> +comment "bcusdk requires a toolchain with C++ "
Thomas> + depends on !BR2_INSTALL_LIBSTDCPP

We normall add 'support, E.G. C++ support'

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 3/4 linknx: new package

In reply to Thomas Petazzoni

From: Gregory Hermant <[email protected]>

[Thomas: various fixes/improvements]
---
 package/Config.in        |    1 +
 package/linknx/Config.in |    8 ++++++++
 package/linknx/linknx.mk |   31 +++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 package/linknx/Config.in
 create mode 100644 package/linknx/linknx.mk
package/Config.in +1 -0
index be1aa99..97aab31 100644
@@ -672,6 +672,7 @@ source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
 source "package/lighttpd/Config.in"
+source "package/linknx/Config.in"
 source "package/links/Config.in"
 source "package/linphone/Config.in"
 source "package/lrzsz/Config.in"
package/linknx/Config.in new file +8 -0
new file mode 100644
index 0000000..70942fc
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LINKNX
+	bool "linknx"
+	select BR2_PACKAGE_LIBPTHSEM
+	help
+	  Linknx is an automation platform providing high level functionalities
+	  to EIB/KNX installation.
+
+	  http://linknx.sourceforge.net/
package/linknx/linknx.mk new file +31 -0
new file mode 100644
index 0000000..2520382
@@ -0,0 +1,31 @@
+#############################################################
+#
+# linknx
+#
+#############################################################
+
+LINKNX_VERSION = 0.0.1.30
+LINKNX_SOURCE = linknx-${LINKNX_VERSION}.tar.gz
+LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
+LINKNX_LICENSE = GPLv2+
+LINKNX_INSTALL_STAGING = YES
+LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
+		  --with-pth=$(STAGING_DIR)/usr
+
+LINKNX_DEPENDENCIES = libpthsem
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
+LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
+LINKNX_DEPENDENCIES = mysql_client
+else
+LINKNX_CONF_OPT += --without-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LINKNX_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
+LINKNX_DEPENDENCIES += libcurl
+else
+LINKNX_CONF_OPT += --without-libcurl
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 3/4 linknx: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> From: Gregory Hermant <[email protected]> Thomas> [Thomas: various fixes/improvements]
Thomas> Signed-off-by: Gregory Hermant <[email protected]> Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  package/Config.in        |    1 +
 Thomas>  package/linknx/Config.in |    8 ++++++++
 Thomas>  package/linknx/linknx.mk |   31 +++++++++++++++++++++++++++++++
 Thomas>  3 files changed, 40 insertions(+)
 Thomas>  create mode 100644 package/linknx/Config.in
 Thomas>  create mode 100644 package/linknx/linknx.mk

Thomas> diff --git a/package/Config.in b/package/Config.in Thomas> index be1aa99..97aab31 100644
Thomas> --- a/package/Config.in
Thomas> +++ b/package/Config.in
Thomas> @@ -672,6 +672,7 @@ source "package/iptables/Config.in"

 Thomas>  source "package/iw/Config.in"
 Thomas>  source "package/kismet/Config.in"
 Thomas>  source "package/lighttpd/Config.in"
 Thomas> +source "package/linknx/Config.in"
 Thomas>  source "package/links/Config.in"
 Thomas>  source "package/linphone/Config.in"
 Thomas>  source "package/lrzsz/Config.in"

Thomas> diff --git a/package/linknx/Config.in b/package/linknx/Config.in Thomas> new file mode 100644
Thomas> index 0000000..70942fc
Thomas> --- /dev/null
Thomas> +++ b/package/linknx/Config.in
Thomas> @@ -0,0 +1,8 @@
Thomas> +config BR2_PACKAGE_LINKNX
Thomas> + bool "linknx"
Thomas> + select BR2_PACKAGE_LIBPTHSEM
Thomas> + help
Thomas> + Linknx is an automation platform providing high level functionalities
Thomas> + to EIB/KNX installation.
Thomas> +
Thomas> + http://linknx.sourceforge.net/

If I'm not mistaken, linknx is implemented in C++, so you need the INSTALL_LIBSTDCPP dependency.

Thomas> +LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
Thomas> + --with-pth=$(STAGING_DIR)/usr

The log4cpp reference seems to confirm that. We do have a log4cxx package now though.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 4/4 argp-standalone: add license information

In reply to Thomas Petazzoni

There is unfortunately no license file.

---
 package/argp-standalone/argp-standalone.mk |    1 +
 1 file changed, 1 insertion(+)
package/argp-standalone/argp-standalone.mk +1 -0
index ba7f757..4fc4321 100644
@@ -7,6 +7,7 @@
 ARGP_STANDALONE_VERSION = 1.3
 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
 ARGP_STANDALONE_INSTALL_STAGING = YES
+ARGP_STANDALONE_LICENSE = LGPLv2+
 
 ARGP_STANDALONE_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -fPIC"
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 4/4 argp-standalone: add license information

Thomas, All,

Quoted 12 lines · On Sunday 24 March 2013 Thomas Petazzoni wrote:

There is unfortunately no license file.

---
 package/argp-standalone/argp-standalone.mk |    1 +
 1 file changed, 1 insertion(+)
package/argp-standalone/argp-standalone.mk +0 -0
index ba7f757..4fc4321 100644

package/argp-standalone/argp-standalone.mk line 10

Quoted 4 lines
package/argp-standalone/argp-standalone.mk +1 -0
@@ -7,6 +7,7 @@
 ARGP_STANDALONE_VERSION = 1.3
 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
 ARGP_STANDALONE_INSTALL_STAGING = YES
+ARGP_STANDALONE_LICENSE = LGPLv2+

It is indeed LGPLV2+
LGPLV2 almost never existed, so it's weird enough to warrant a double-check...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'