Skip to contentSkip to conversation

Pull request for branch for-master/armadeus/new-pkgs

GIT PULL New Samuel Martin 4 participants 15 messages Mar 12, 2013 – Mar 18, 2013

lore
Share & tools
lore

Samuel Martin

author
#0 lore raw

Hello All!

Here is the 2nd round of package integration from Armadeus [1,2].

This series does not include any new packages compared to the 1st post.

So, there still some other packages to come later [3]...

Note that:
* openobex: still use the 1.5 release to not break ussp-push. openobex can be updated to version 1.6 once integrated in BR, then ussp-push fixed to linked against it.
* urg: bump to version 0.8.18 from the original patch (which integrate the 0.8.11 release).

[1] www.armadeus.org
[2] git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
[3] http://www.armadeus.com/wiki/index.php?title=Buildroot_Mainline_integration

Changes v1 -> v2:
- Mostly dependency and license fixes
- Remove qwt patch (which is already integrated)

The following changes since commit 1ca9e06f1c9a5ef12feb63711a48379c0eae7e42:

package/tzdata: new package (2013-03-10 23:37:04 +0100)

are available in the git repository at:

git://github.com/tSed/buildroot.git for-master/armadeus/new-pkgs

for you to fetch changes up to 2e13931db1a39313732a16c48f923eb4445dc3d3:

libcanfestival: new package (2013-03-12 05:30:02 +0100)

----------------------------------------------------------------
Samuel Martin (5):
openobex: new package
ussp-push: new package
urg: new package
flite: new package
libcanfestival: new package

 package/Config.in                                  |   4 +
 package/libcanfestival/Config.in                   |  90 +++
 .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
 package/libcanfestival/libcanfestival.mk           |  43 ++
 package/multimedia/Config.in                       |   1 +
 package/multimedia/flite/Config.in                 |  15 +
 package/multimedia/flite/flite.mk                  |  58 ++
 package/openobex/Config.in                         |  45 ++
 ...penobex-libusb_check_when_cross-compiling.patch |  18 +
 .../openobex-replace_deprecated_functions.patch    |  30 +
 package/openobex/openobex.mk                       |  38 ++
 package/urg/Config.in                              |  13 +
 package/urg/urg.mk                                 |  27 +
 package/ussp-push/Config.in                        |  18 +
 .../ussp-push-fix-build-against-bluez-4.patch      |  15 +
 package/ussp-push/ussp-push.mk                     |  14 +
 16 files changed, 1146 insertions(+)
 create mode 100644 package/libcanfestival/Config.in
 create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
 create mode 100644 package/libcanfestival/libcanfestival.mk
 create mode 100644 package/multimedia/flite/Config.in
 create mode 100644 package/multimedia/flite/flite.mk
 create mode 100644 package/openobex/Config.in
 create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
 create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
 create mode 100644 package/openobex/openobex.mk
 create mode 100644 package/urg/Config.in
 create mode 100644 package/urg/urg.mk
 create mode 100644 package/ussp-push/Config.in
 create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
 create mode 100644 package/ussp-push/ussp-push.mk

Yours,
Samuel

--

author
#1 lore raw

PATCH 1/5 openobex: new package

Cc Julien Boibessot <[email protected]>
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>

---
Changes since v1:
- Update dependencies in Config.in (Thomas P.)
- Fix license (Thomas P.)
- Fix missing dependencies against host-pkgconf

---
 package/Config.in                                  |  1 +
 package/openobex/Config.in                         | 45 ++++++++++++++++++++++
 ...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++
 .../openobex-replace_deprecated_functions.patch    | 30 +++++++++++++++
 package/openobex/openobex.mk                       | 38 ++++++++++++++++++
 5 files changed, 132 insertions(+)
 create mode 100644 package/openobex/Config.in
 create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch
 create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch
 create mode 100644 package/openobex/openobex.mk
package/Config.in +1 -0
index a65054c..560ae9c 100644
@@ -689,6 +689,7 @@ source "package/ntp/Config.in"
 source "package/nuttcp/Config.in"
 source "package/olsr/Config.in"
 source "package/openntpd/Config.in"
+source "package/openobex/Config.in"
 source "package/openssh/Config.in"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
package/openobex/Config.in new file +45 -0

45 lines not on this page · raw message

package/openobex/openobex-libusb_check_when_cross-compiling.patch new file +18 -0
new file mode 100644
index 0000000..7b8056a
@@ -0,0 +1,18 @@
+Fix libusb check when cross-compiling.
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/acinclude.m4
+===================================================================
+--- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
++++ openobex-1.5/acinclude.m4	2010-06-16 10:35:33.000000000 +0200
+@@ -158,7 +158,7 @@
+ 		;;
+ 	*)
+ 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
+-		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
++		REQUIRES="libusb"
+ 		;;
+ 	esac
+ 	AC_SUBST(USB_CFLAGS)
package/openobex/openobex-replace_deprecated_functions.patch new file +30 -0
new file mode 100644
index 0000000..17274d3
@@ -0,0 +1,30 @@
+obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
+
+Signed-off-by: Julien Boibessot <[email protected]>
+Signed-off-by: Samuel Martin <[email protected]>
+
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
+--- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
++++ openobex-1.5/apps/obex_test_cable.c	2010-06-16 11:11:05.000000000 +0200
+@@ -113,9 +113,9 @@
+ 			if(total == sizeof(tmpbuf))
+ 				return -1;
+ 
+-			if( (answer = index(tmpbuf, '\n')) )	{
++			if( (answer = strchr(tmpbuf, '\n')) )	{
+ 				// Remove first line (echo)
+-				if( (answer_end = index(answer+1, '\n')) )	{
++				if( (answer_end = strchr(answer+1, '\n')) )	{
+ 					// Found end of answer
+ 					done = 1;
+ 				}
+@@ -178,7 +178,7 @@
+ 	}
+ 
+ 	tcgetattr(gt->ttyfd, &gt->oldtio);
+-	bzero(&gt->newtio, sizeof(struct termios));
++	memset(&gt->newtio, 0, sizeof(struct termios));
+ 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
+ 	gt->newtio.c_iflag = IGNPAR;
+ 	gt->newtio.c_oflag = 0;
package/openobex/openobex.mk new file +38 -0
new file mode 100644
index 0000000..0fb4f65
@@ -0,0 +1,38 @@
+#############################################################
+#
+# openobex
+#
+#############################################################
+
+OPENOBEX_VERSION = 1.5
+OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth
+# Libraries seems to be released under LGPLv2.1+,
+# while other material is under GPLv2+.
+OPENOBEX_LICENSE = GPLv2+/LGPLv2.1+
+OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
+
+OPENOBEX_DEPENDENCIES = host-pkgconf
+OPENOBEX_AUTORECONF = YES
+OPENOBEX_INSTALL_STAGING = YES
+
+OPENOBEX_CONF_OPT += \
+	$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
+	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
+	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
+	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
+OPENOBEX_DEPENDENCIES += bluez_utils
+OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
+OPENOBEX_DEPENDENCIES += libusb
+OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
+else
+OPENOBEX_CONF_OPT += --disable-usb
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 1/5 openobex: new package

Dear Samuel Martin,

Quoted 3 lines · Samuel Martin
Cc Julien Boibessot <[email protected]>
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>
Reviewed-by Thomas Petazzoni <[email protected]>
Build-tested-by Thomas Petazzoni <[email protected]>

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#4 lore raw

PATCH 2/5 ussp-push: new package

In reply to Samuel Martin
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>

---
Changes since v1:
- fix dependencies in Config.in (Thomas P.)
- fix license (Thomas P.)

---
 package/Config.in                                      |  1 +
 package/ussp-push/Config.in                            | 18 ++++++++++++++++++
 .../ussp-push-fix-build-against-bluez-4.patch          | 15 +++++++++++++++
 package/ussp-push/ussp-push.mk                         | 14 ++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 package/ussp-push/Config.in
 create mode 100644 package/ussp-push/ussp-push-fix-build-against-bluez-4.patch
 create mode 100644 package/ussp-push/ussp-push.mk
package/Config.in +1 -0
index 560ae9c..b8b1e60 100644
@@ -729,6 +729,7 @@ source "package/tvheadend/Config.in"
 source "package/udpcast/Config.in"
 source "package/ulogd/Config.in"
 source "package/ushare/Config.in"
+source "package/ussp-push/Config.in"
 source "package/vde2/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
package/ussp-push/Config.in new file +18 -0
new file mode 100644
index 0000000..716ce34
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_USSP_PUSH
+	bool "ussp-push"
+	depends on BR2_INET_IPV6
+	depends on !BR2_avr32
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_OPENOBEX
+	select BR2_PACKAGE_OPENOBEX_BLUEZ
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
+	  BlueTooth stack.
+
+	  http://www.xmailserver.org/ussp-push.html
+
+comment "ussp-push require a toolchain with WCHAR, IPV6 and thread support"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
package/ussp-push/ussp-push-fix-build-against-bluez-4.patch new file +15 -0
new file mode 100644
index 0000000..0694bfb
@@ -0,0 +1,15 @@
+Fix build against bluez4.
+
+Signed-off-by: Samuel Martin <[email protected]>
+
+--- ussp-push-0.11.orig/src/obex_socket.c	2012-11-01 09:58:51.049538708 +0100
++++ ussp-push-0.11/src/obex_socket.c	2012-11-01 12:10:10.719506951 +0100
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
package/ussp-push/ussp-push.mk new file +14 -0
new file mode 100644
index 0000000..c109554
@@ -0,0 +1,14 @@
+#############################################################
+#
+# ussp-push
+#
+#############################################################
+
+USSP_PUSH_VERSION = 0.11
+USSP_PUSH_SITE = http://www.xmailserver.org
+USSP_PUSH_LICENSE = GPLv2+
+USSP_PUSH_LICENSE_FILES = COPYING
+
+USSP_PUSH_DEPENDENCIES = bluez_utils openobex
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.1.5
author
#7 lore raw

PATCH 3/5 urg: new package

In reply to Samuel Martin
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>

---
Changes since v1:
- fix dependencies
- fix license

---
 package/Config.in     |  1 +
 package/urg/Config.in | 13 +++++++++++++
 package/urg/urg.mk    | 27 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 package/urg/Config.in
 create mode 100644 package/urg/urg.mk
package/Config.in +1 -0
index b8b1e60..7d66b75 100644
@@ -464,6 +464,7 @@ source "package/libv4l/Config.in"
 source "package/mtdev/Config.in"
 source "package/neardal/Config.in"
 source "package/pcsc-lite/Config.in"
+source "package/urg/Config.in"
 endmenu
 
 menu "Javascript"
package/urg/Config.in new file +13 -0
new file mode 100644
index 0000000..c8d3b70
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_URG
+	bool "urg library"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_NET
+	help
+	  Library to control Hokuyo's URG series sensors.
+	  Requires SDL & SDL_net.
+
+	  http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+
+comment "urg requires a toolchain with C++ support"
+	depends on !BR2_INSTALL_LIBSTDCPP
package/urg/urg.mk new file +27 -0
new file mode 100644
index 0000000..3f68bf2
@@ -0,0 +1,27 @@
+#############################################################
+#
+# urg library
+#
+#############################################################
+
+URG_VERSION = 0.8.18
+URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+URG_SOURCE = urg-$(URG_VERSION).zip
+URG_LICENSE = LGPLv3+
+URG_LICENSE_FILES = COPYING
+
+URG_INSTALL_STAGING = YES
+
+URG_DEPENDENCIES = sdl sdl_net
+
+URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
+
+define URG_EXTRACT_CMDS
+	$(RM) -rf $(URG_DIR)
+	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
+	test -d $(URG_DIR) || \
+		mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
+endef
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.1.5
#8 lore raw

PATCH 3/5 urg: new package

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

"Samuel" == Samuel Martin <[email protected]> writes:

Samuel> Cc: Eric Jarrige <[email protected]> Samuel> Signed-off-by: Samuel Martin <[email protected]>

Samuel> ---
Samuel> Changes since v1:
Samuel> - fix dependencies
Samuel> - fix license
Samuel> ---

 Samuel>  package/Config.in     |  1 +
 Samuel>  package/urg/Config.in | 13 +++++++++++++
 Samuel>  package/urg/urg.mk    | 27 +++++++++++++++++++++++++++
 Samuel>  3 files changed, 41 insertions(+)
 Samuel>  create mode 100644 package/urg/Config.in
 Samuel>  create mode 100644 package/urg/urg.mk

Samuel> diff --git a/package/Config.in b/package/Config.in Samuel> index b8b1e60..7d66b75 100644
Samuel> --- a/package/Config.in
Samuel> +++ b/package/Config.in
Samuel> @@ -464,6 +464,7 @@ source "package/libv4l/Config.in"

 Samuel>  source "package/mtdev/Config.in"
 Samuel>  source "package/neardal/Config.in"
 Samuel>  source "package/pcsc-lite/Config.in"

Samuel> +source "package/urg/Config.in"
Samuel> endmenu

Samuel> menu "Javascript"
Samuel> diff --git a/package/urg/Config.in b/package/urg/Config.in Samuel> new file mode 100644
Samuel> index 0000000..c8d3b70
Samuel> --- /dev/null
Samuel> +++ b/package/urg/Config.in
Samuel> @@ -0,0 +1,13 @@
Samuel> +config BR2_PACKAGE_URG
Samuel> + bool "urg library"

We normally don't add stuff like " library", so I've dropped that and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#9 lore raw

PATCH 4/5 flite: new package

In reply to Samuel Martin
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>

---
Changes since v1:
- fix dependencies

---
 package/multimedia/Config.in       |  1 +
 package/multimedia/flite/Config.in | 15 ++++++++++
 package/multimedia/flite/flite.mk  | 58 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 package/multimedia/flite/Config.in
 create mode 100644 package/multimedia/flite/flite.mk
package/multimedia/Config.in +1 -0
index 931e6d3..9e91dbb 100644
@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"
 source "package/multimedia/bellagio/Config.in"
 source "package/multimedia/faad2/Config.in"
 source "package/multimedia/flac/Config.in"
+source "package/multimedia/flite/Config.in"
 source "package/multimedia/ffmpeg/Config.in"
 source "package/multimedia/gstreamer/Config.in"
 source "package/multimedia/gst-ffmpeg/Config.in"
package/multimedia/flite/Config.in new file +15 -0
new file mode 100644
index 0000000..6655cc3
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_FLITE
+	bool "flite"
+	depends on BR2_USE_WCHAR
+	help
+	  Flite: a small, fast run time synthesis engine.
+	  Flite (festival-lite) is a small, fast run-time synthesis engine
+	  developed at CMU and primarily designed for small embedded machines
+	  and/or large servers. Flite is designed as an alternative synthesis
+	  engine to Festival for voices built using the FestVox suite of voice
+	  building tools.
+
+	  http://www.speech.cs.cmu.edu/flite
+
+comment "flite require a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
package/multimedia/flite/flite.mk new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#10 lore raw

PATCH 4/5 flite: new package

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

"Samuel" == Samuel Martin <[email protected]> writes:

Samuel> Cc: Eric Jarrige <[email protected]> Samuel> Signed-off-by: Samuel Martin <[email protected]>

Samuel> ---
Samuel> Changes since v1:
Samuel> - fix dependencies
Samuel> ---

 Samuel>  package/multimedia/Config.in       |  1 +
 Samuel>  package/multimedia/flite/Config.in | 15 ++++++++++
 Samuel>  package/multimedia/flite/flite.mk  | 58 ++++++++++++++++++++++++++++++++++++++
 Samuel>  3 files changed, 74 insertions(+)
 Samuel>  create mode 100644 package/multimedia/flite/Config.in
 Samuel>  create mode 100644 package/multimedia/flite/flite.mk

Samuel> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in Samuel> @@ -0,0 +1,58 @@
Samuel> +############################################################# Samuel> +#
Samuel> +# flite
Samuel> +#
Samuel> +############################################################# Samuel> +
Samuel> +FLITE_VERSION = 1.4
Samuel> +FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
Samuel> +FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
Samuel> +FLITE_LICENSE = BSD-4c
Samuel> +FLITE_LICENSE_FILES = COPYING
Samuel> +
Samuel> +FLITE_INSTALL_STAGING = YES
Samuel> +
Samuel> +# Sadly, Flite does not support parallel build,
Samuel> +# especially when building its shared libraries.
Samuel> +FLITE_MAKE = $(MAKE1)
Samuel> +
Samuel> +FLITE_CONF_OPT = \
Samuel> + $(if $(BR2_PREFER_STATIC_LIB),,--enable-shared)

We're already pass --enable-shared in the autotools infrastructure, so why is this needed?

Samuel> +
Samuel> +FLITE_INSTALL_STAGING_OPT = \
Samuel> + INSTALLBINDIR=$(STAGING_DIR)/usr/bin \
Samuel> + INSTALLLIBDIR=$(STAGING_DIR)/usr/lib \
Samuel> + INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite \
Samuel> + install
Samuel> +
Samuel> +FLITE_INSTALL_TARGET_OPT = \
Samuel> + INSTALLBINDIR=$(TARGET_DIR)/usr/bin \
Samuel> + INSTALLLIBDIR=$(TARGET_DIR)/usr/lib \
Samuel> + INSTALLINCDIR=$(TARGET_DIR)/usr/include/flite \
Samuel> + install

It could be good with a note about why this is needed (E.G. flite used a handwritten a Makefile which doesn't handle DESTDIR even though it uses autoconf).

Samuel> +
Samuel> +# Flite totally screw up their tarball generation, so that:
Samuel> +#
Samuel> +# $ tar tf flite-1.4-release.tar.bz2

Argh :/

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

PATCH 4/5 flite: new package

Quoted 5 lines · Peter Korsgaard

Samuel> +FLITE_CONF_OPT = \
Samuel> + $(if $(BR2_PREFER_STATIC_LIB),,--enable-shared)

We're already pass --enable-shared in the autotools infrastructure, so why is this needed?

I've tested without this part, and the package builds fine, so I'm also not sure why it's needed.

Quoted 13 lines

Samuel> +
Samuel> +FLITE_INSTALL_STAGING_OPT = \
Samuel> + INSTALLBINDIR=$(STAGING_DIR)/usr/bin \
Samuel> + INSTALLLIBDIR=$(STAGING_DIR)/usr/lib \
Samuel> + INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite \
Samuel> + install
Samuel> +
Samuel> +FLITE_INSTALL_TARGET_OPT = \
Samuel> + INSTALLBINDIR=$(TARGET_DIR)/usr/bin \
Samuel> + INSTALLLIBDIR=$(TARGET_DIR)/usr/lib \
Samuel> + INSTALLINCDIR=$(TARGET_DIR)/usr/include/flite \
Samuel> + install

Quoted 3 lines

It could be good with a note about why this is needed (E.G. flite used a handwritten a Makefile which doesn't handle DESTDIR even though it uses autoconf).

Another option is to add a patch like:

config/config.in +3 -3
Index: b/config/config.in
===================================================================
@@ -49,6 +49,6 @@
 prefix        = @prefix@
 exec_prefix   = @exec_prefix@
 EXEEXT	      = @EXEEXT@
-INSTALLBINDIR = @bindir@
-INSTALLLIBDIR = @libdir@
-INSTALLINCDIR = @includedir@/flite
+INSTALLBINDIR = $(DESTDIR)@bindir@
+INSTALLLIBDIR = $(DESTDIR)@libdir@
+INSTALLINCDIR = $(DESTDIR)@includedir@/flite

That said, the project hasn't done any release since 2009, so the chances of getting this upstream are pretty small...

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#12 lore raw

PATCH 5/5 libcanfestival: new package

In reply to Samuel Martin
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>

---
Changes since v1:
- clean/fix *.mk

---
 package/Config.in                                  |   1 +
 package/libcanfestival/Config.in                   |  90 +++
 .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
 package/libcanfestival/libcanfestival.mk           |  43 ++
 4 files changed, 851 insertions(+)
 create mode 100644 package/libcanfestival/Config.in
 create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
 create mode 100644 package/libcanfestival/libcanfestival.mk
package/Config.in +1 -0
index 7d66b75..edfd4c4 100644
@@ -495,6 +495,7 @@ endmenu
 
 menu "Networking"
 source "package/glib-networking/Config.in"
+source "package/libcanfestival/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
 source "package/libcurl/Config.in"
package/libcanfestival/Config.in new file +90 -0

90 lines not on this page · raw message

package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch new file +717 -0

717 lines not on this page · raw message

package/libcanfestival/libcanfestival.mk new file +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#13 lore raw

PATCH 5/5 libcanfestival: new package

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

"Samuel" == Samuel Martin <[email protected]> writes:

Samuel> Cc: Eric Jarrige <[email protected]> Samuel> Signed-off-by: Samuel Martin <[email protected]>

Samuel> ---
Samuel> Changes since v1:
Samuel> - clean/fix *.mk
Samuel> ---

 Samuel>  package/Config.in                                  |   1 +
 Samuel>  package/libcanfestival/Config.in                   |  90 +++
 Samuel>  .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
 Samuel>  package/libcanfestival/libcanfestival.mk           |  43 ++
 Samuel>  4 files changed, 851 insertions(+)
 Samuel>  create mode 100644 package/libcanfestival/Config.in
 Samuel>  create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
 Samuel>  create mode 100644 package/libcanfestival/libcanfestival.mk

Samuel> diff --git a/package/Config.in b/package/Config.in Samuel> index 7d66b75..edfd4c4 100644
Samuel> --- a/package/Config.in
Samuel> +++ b/package/Config.in
Samuel> @@ -495,6 +495,7 @@ endmenu

Samuel> menu "Networking"
Samuel> source "package/glib-networking/Config.in" Samuel> +source "package/libcanfestival/Config.in"

 Samuel>  source "package/libcgi/Config.in"
 Samuel>  source "package/libcgicc/Config.in"
 Samuel>  source "package/libcurl/Config.in"

Samuel> diff --git a/package/libcanfestival/Config.in b/package/libcanfestival/Config.in Samuel> new file mode 100644
Samuel> index 0000000..0be45cf
Samuel> --- /dev/null
Samuel> +++ b/package/libcanfestival/Config.in
Samuel> @@ -0,0 +1,90 @@
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL
Samuel> + bool "CanFestival"
Samuel> + help
Samuel> + CanFestival is an OpenSource CANOpen framework, licensed with GPLv2
Samuel> + and LGPLv2.

Licensed under.

Samuel> +
Samuel> + http://www.canfestival.org
Samuel> +
Samuel> +if BR2_PACKAGE_LIBCANFESTIVAL Samuel> +
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
Samuel> + string "Number of can bus to use"
Samuel> + default "4"

Number of can busses to use.

Any specific reason why you set this to 4? Upstream seems to set it to 1, and as far as I can see it isn't used anywhere in the code.

Samuel> +
Samuel> +choice
Samuel> + prompt "Driver to use"
Samuel> + default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
Samuel> +
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
Samuel> + bool "anagate_linux"
Samuel> + help
Samuel> + AnaGate CAN(duo) driver for linux
Samuel> +
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX

It's supposed to be 'config<space>BLAH', not 'config<tab>BLAH'.

Samuel> + bool "peak_linux"
Samuel> + help
Samuel> + Linux build host installed Peak driver and library
Samuel> +
Samuel> + http://www.peak-system.com/linux/
Samuel> +
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
Samuel> + bool "virtual"
Samuel> + help
Samuel> + Unix pipe based virtual can driver
Samuel> +
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
Samuel> + bool "virtual_kernel"
Samuel> + help
Samuel> + Kernel module virtual can driver
Samuel> +
Samuel> +config BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
Samuel> + bool "socket"
Samuel> + help
Samuel> + Socket-can
Samuel> +
Samuel> + http://developer.berlios.de/projects/socketcan/
Samuel> +

Might be good to mention that this is the "normal" mainline CAN bus interface.

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

PATCH 5/5 libcanfestival: new package

In reply to Samuel Martin
Quoted 68 lines · Samuel Martin
Cc Eric Jarrige <[email protected]>
Signed-off-by Samuel Martin <[email protected]>

---
Changes since v1:
- clean/fix *.mk

---
 package/Config.in                                  |   1 +
 package/libcanfestival/Config.in                   |  90 +++
 .../libcanfestival-allow-to-set-DESTDIR.patch      | 717 +++++++++++++++++++++
 package/libcanfestival/libcanfestival.mk           |  43 ++
 4 files changed, 851 insertions(+)
 create mode 100644 package/libcanfestival/Config.in
 create mode 100644 package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
 create mode 100644 package/libcanfestival/libcanfestival.mk
package/Config.in +1 -0
index 7d66b75..edfd4c4 100644
@@ -495,6 +495,7 @@ endmenu
 
 menu "Networking"
 source "package/glib-networking/Config.in"
+source "package/libcanfestival/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
 source "package/libcurl/Config.in"
package/libcanfestival/Config.in new file +34 -0
new file mode 100644
index 0000000..0be45cf
@@ -0,0 +1,90 @@
+config BR2_PACKAGE_LIBCANFESTIVAL
+       bool "CanFestival"
+       help
+         CanFestival is an OpenSource CANOpen framework, licensed with GPLv2
+         and LGPLv2.
+
+         http://www.canfestival.org
+
+if BR2_PACKAGE_LIBCANFESTIVAL
+
+config BR2_PACKAGE_LIBCANFESTIVAL_NBMMAXCAN
+       string "Number of can bus to use"
+       default "4"
+
+choice
+       prompt "Driver to use"
+       default BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
+
+config BR2_PACKAGE_LIBCANFESTIVAL_ANAGATE_LINUX
+       bool "anagate_linux"
+       help
+         AnaGate CAN(duo) driver for linux
+
+config BR2_PACKAGE_LIBCANFESTIVAL_PEAK_LINUX
+       bool "peak_linux"
+       help
+         Linux build host installed Peak driver and library
+
+         http://www.peak-system.com/linux/
+
+config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL
+       bool "virtual"
+       help
+         Unix pipe based virtual can driver

package/libcanfestival/Config.in line 44

Quoted 10 lines
package/libcanfestival/Config.in new file +10 -0
+
+config BR2_PACKAGE_LIBCANFESTIVAL_VIRTUAL_KERNEL
+       bool "virtual_kernel"
+       help
+         Kernel module virtual can driver
+
+config BR2_PACKAGE_LIBCANFESTIVAL_SOCKET
+       bool "socket"
+       help
+         Socket-can

s/Socket-can/SocketCAN

Yegor