Skip to contentSkip to conversation

Bump sigrok packages

PATCH New Bernd Kuhls 3 participants 9 messages Jan 31, 2016 – Feb 2, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

cover Bump sigrok packages

Hi,

this small series bumps the packages from the sigrok project:
https://www.sigrok.org/blog/major-sigrok-releases-libsigrok-libsigrokdecode-sigrok-cli-pulseview

All packages now use upstream tarballs, no need for autoreconf anymore :)

Regards, Bernd

Bernd Kuhls (6):
package/libserialport: bump version to 0.1.1
package/libsigrok: bump version to 0.4.0
package/libsigrok: fix musl build
package/libsigrokdecode: bump version to 0.4.0
package/sigrok-cli: bump version to 0.6.0
package/pulseview: bump version to 0.3.0

 package/libserialport/libserialport.hash           |  2 ++
 package/libserialport/libserialport.mk             | 13 ++------
 ...01-beaglelogic.h-fix-build-with-musl-libc.patch | 38 ++++++++++++++++++++++
 package/libsigrok/libsigrok.hash                   |  2 ++
 package/libsigrok/libsigrok.mk                     | 13 ++------
 package/libsigrokdecode/Config.in                  |  2 +-
 package/libsigrokdecode/libsigrokdecode.hash       |  2 ++
 package/libsigrokdecode/libsigrokdecode.mk         | 13 ++------
 package/pulseview/pulseview.hash                   |  3 ++
 package/pulseview/pulseview.mk                     | 15 +++++++--
 package/sigrok-cli/sigrok-cli.hash                 |  2 ++
 package/sigrok-cli/sigrok-cli.mk                   | 13 ++------
 12 files changed, 70 insertions(+), 48 deletions(-)
 create mode 100644 package/libserialport/libserialport.hash
 create mode 100644 package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
 create mode 100644 package/libsigrok/libsigrok.hash
 create mode 100644 package/libsigrokdecode/libsigrokdecode.hash
 create mode 100644 package/pulseview/pulseview.hash
 create mode 100644 package/sigrok-cli/sigrok-cli.hash
Signature · 1 line
2.7.0
author
#1 lore raw

PATCH 1/6 package/libserialport: bump version to 0.1.1

Switch to upstream tarball, remove autoreconf.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libserialport/libserialport.hash |  2 ++
 package/libserialport/libserialport.mk   | 13 ++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 package/libserialport/libserialport.hash
package/libserialport/libserialport.hash new file +2 -0
new file mode 100644
index 0000000..f261902
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d	libserialport-0.1.1.tar.gz
package/libserialport/libserialport.mk +2 -11
index 3dcbccb..d8c3a3d 100644
@@ -4,20 +4,11 @@
 #
 ################################################################################
 
-LIBSERIALPORT_VERSION = f77bb46df5d883527da8b7eb4a5328ea7e990dbb
-# No https access on upstream git
-LIBSERIALPORT_SITE = git://sigrok.org/libserialport
+LIBSERIALPORT_VERSION = 0.1.1
+LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport
 LIBSERIALPORT_LICENSE = LGPLv3+
 LIBSERIALPORT_LICENSE_FILES = COPYING
-# Git checkout has no configure script
-LIBSERIALPORT_AUTORECONF = YES
 LIBSERIALPORT_INSTALL_STAGING = YES
 LIBSERIALPORT_DEPENDENCIES = host-pkgconf
 
-define LIBSERIALPORT_ADD_MISSING
-	mkdir -p $(@D)/autostuff
-endef
-
-LIBSERIALPORT_PRE_CONFIGURE_HOOKS += LIBSERIALPORT_ADD_MISSING
-
 $(eval $(autotools-package))
Signature · 1 line
2.7.0
author
#2 lore raw

PATCH 2/6 package/libsigrok: bump version to 0.4.0

In reply to Bernd Kuhls

Switch to upstream tarball, remove autoreconf, add hash.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libsigrok/libsigrok.hash |  2 ++
 package/libsigrok/libsigrok.mk   | 13 ++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 package/libsigrok/libsigrok.hash
package/libsigrok/libsigrok.hash new file +2 -0
new file mode 100644
index 0000000..999cef5
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e	libsigrok-0.4.0.tar.gz
package/libsigrok/libsigrok.mk +2 -11
index 54d0482..e4e079d 100644
@@ -4,23 +4,14 @@
 #
 ################################################################################
 
-LIBSIGROK_VERSION = fe473123ba836445d477149f2e2c0ae372fc0c4c
-# No https access on upstream git
-LIBSIGROK_SITE = git://sigrok.org/libsigrok
+LIBSIGROK_VERSION = 0.4.0
+LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok
 LIBSIGROK_LICENSE = GPLv3+
 LIBSIGROK_LICENSE_FILES = COPYING
-# Git checkout has no configure script
-LIBSIGROK_AUTORECONF = YES
 LIBSIGROK_INSTALL_STAGING = YES
 LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf
 LIBSIGROK_CONF_OPTS = --disable-glibtest --disable-java --disable-python
 
-define LIBSIGROK_ADD_MISSING
-	mkdir -p $(@D)/autostuff
-endef
-
-LIBSIGROK_PRE_CONFIGURE_HOOKS += LIBSIGROK_ADD_MISSING
-
 ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y)
 LIBSIGROK_CONF_OPTS += --enable-libserialport
 LIBSIGROK_DEPENDENCIES += libserialport
Signature · 1 line
2.7.0
author
#3 lore raw

PATCH 3/6 package/libsigrok: fix musl build

In reply to Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/afc/afcea2068d5b0ba707aa90339401550602103ca7/
http://autobuild.buildroot.net/results/a4d/a4dab61fb39dd642f85fad20972a0a4572af9a73/
and others

Signed-off-by Bernd Kuhls <[email protected]>
---
 ...01-beaglelogic.h-fix-build-with-musl-libc.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch new file +38 -0
new file mode 100644
index 0000000..e9ecf85
@@ -0,0 +1,38 @@
+From 1b9ca481b2447154d12a7a94fe90c5b968ddf41c Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 30 Jan 2016 20:01:05 +0100
+Subject: [PATCH 1/1] beaglelogic.h: fix build with musl libc
+
+This patch fixes a build error seen on the buildroot project:
+http://autobuild.buildroot.net/results/afc/afcea2068d5b0ba707aa90339401550602103ca7/
+
+Patch taken from
+https://github.com/dx9/ceph/commit/4f7bcabca7737c3f48f07ca2b4b1296c29e3358b
+which solved a similar problem.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+Patch sent upstream:
+http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1948
+
+ src/hardware/beaglelogic/beaglelogic.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h
+index 9015c61..165b386 100644
+--- a/src/hardware/beaglelogic/beaglelogic.h
++++ b/src/hardware/beaglelogic/beaglelogic.h
+@@ -28,6 +28,10 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#ifndef __STRING
++# define __STRING(x) #x
++#endif
++
+ /* BeagleLogic device node name */
+ #define BEAGLELOGIC_DEV_NODE        "/dev/beaglelogic"
+ #define BEAGLELOGIC_SYSFS_ATTR(a)   "/sys/devices/virtual/misc/beaglelogic/"\
+-- 
+2.7.0.rc3
+
Signature · 1 line
2.7.0
#4 lore raw

PATCH 3/6 package/libsigrok: fix musl build

Quoted 6 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/afc/afcea2068d5b0ba707aa90339401550602103ca7/
http://autobuild.buildroot.net/results/a4d/a4dab61fb39dd642f85fad20972a0a4572af9a73/
and others

Signed-off-by Bernd Kuhls <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 50 lines
---
 ...01-beaglelogic.h-fix-build-with-musl-libc.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch new file +38 -0
new file mode 100644
index 0000000..e9ecf85
@@ -0,0 +1,38 @@
+From 1b9ca481b2447154d12a7a94fe90c5b968ddf41c Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 30 Jan 2016 20:01:05 +0100
+Subject: [PATCH 1/1] beaglelogic.h: fix build with musl libc
+
+This patch fixes a build error seen on the buildroot project:
+http://autobuild.buildroot.net/results/afc/afcea2068d5b0ba707aa90339401550602103ca7/
+
+Patch taken from
+https://github.com/dx9/ceph/commit/4f7bcabca7737c3f48f07ca2b4b1296c29e3358b
+which solved a similar problem.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+Patch sent upstream:
+http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1948
+
+ src/hardware/beaglelogic/beaglelogic.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h
+index 9015c61..165b386 100644
+--- a/src/hardware/beaglelogic/beaglelogic.h
++++ b/src/hardware/beaglelogic/beaglelogic.h
+@@ -28,6 +28,10 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#ifndef __STRING
++# define __STRING(x) #x
++#endif
++
+ /* BeagleLogic device node name */
+ #define BEAGLELOGIC_DEV_NODE        "/dev/beaglelogic"
+ #define BEAGLELOGIC_SYSFS_ATTR(a)   "/sys/devices/virtual/misc/beaglelogic/"\
+-- 
+2.7.0.rc3
+
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author
#5 lore raw

PATCH 4/6 package/libsigrokdecode: bump version to 0.4.0

In reply to Bernd Kuhls

Switch to upstream tarball, remove autoreconf, add hash, fix typo.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libsigrokdecode/Config.in            |  2 +-
 package/libsigrokdecode/libsigrokdecode.hash |  2 ++
 package/libsigrokdecode/libsigrokdecode.mk   | 13 ++-----------
 3 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 package/libsigrokdecode/libsigrokdecode.hash
package/libsigrokdecode/Config.in +1 -1
index a8f4e85..70f86ce 100644
@@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBSIGROKDECODE
 
 	  http://sigrok.org/wiki/Libsigrokdecode
 
-comment "libsigrokecode needs a toolchain w/ wchar, threads, dynamic library"
+comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_PYTHON
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/libsigrokdecode/libsigrokdecode.hash new file +2 -0
new file mode 100644
index 0000000..3ac8a76
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	fd7e9d1b73245e844ead97a16d5321c766196f946c9b28a8646cab2e98ec3537	libsigrokdecode-0.4.0.tar.gz
package/libsigrokdecode/libsigrokdecode.mk +2 -11
index c0a4017..b8b3c59 100644
@@ -4,20 +4,11 @@
 #
 ################################################################################
 
-LIBSIGROKDECODE_VERSION = 9177963de41c2d003d417049470eea3c98eeb2ef
-# No https access on upstream git
-LIBSIGROKDECODE_SITE = git://sigrok.org/libsigrokdecode
+LIBSIGROKDECODE_VERSION = 0.4.0
+LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
 LIBSIGROKDECODE_LICENSE = GPLv3+
 LIBSIGROKDECODE_LICENSE_FILES = COPYING
-# Git checkout has no configure script
-LIBSIGROKDECODE_AUTORECONF = YES
 LIBSIGROKDECODE_INSTALL_STAGING = YES
 LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3
 
-define LIBSIGROKDECODE_ADD_MISSING
-	mkdir -p $(@D)/autostuff
-endef
-
-LIBSIGROKDECODE_PRE_CONFIGURE_HOOKS += LIBSIGROKDECODE_ADD_MISSING
-
 $(eval $(autotools-package))
Signature · 1 line
2.7.0
author
#6 lore raw

PATCH 5/6 package/sigrok-cli: bump version to 0.6.0

In reply to Bernd Kuhls

Switch to upstream tarball, remove autoreconf, add hash.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/sigrok-cli/sigrok-cli.hash |  2 ++
 package/sigrok-cli/sigrok-cli.mk   | 13 ++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 package/sigrok-cli/sigrok-cli.hash
package/sigrok-cli/sigrok-cli.hash new file +2 -0
new file mode 100644
index 0000000..b60b57e
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	ab2ede4e245f3987e19a89a530bd204e0d792c07474d9fed3345d4af4e84723c	sigrok-cli-0.6.0.tar.gz
package/sigrok-cli/sigrok-cli.mk +2 -11
index 34e0a0e..ec5c8bd 100644
@@ -4,13 +4,10 @@
 #
 ################################################################################
 
-SIGROK_CLI_VERSION = c59bf72b694ab1d08b2ea44de4349c277e206414
-# No https access on upstream git
-SIGROK_CLI_SITE = git://sigrok.org/sigrok-cli
+SIGROK_CLI_VERSION = 0.6.0
+SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli
 SIGROK_CLI_LICENSE = GPLv3+
 SIGROK_CLI_LICENSE_FILES = COPYING
-# Git checkout has no configure script
-SIGROK_CLI_AUTORECONF = YES
 SIGROK_CLI_DEPENDENCIES = host-pkgconf libsigrok
 
 ifeq ($(BR2_PACKAGE_LIBSIGROKDECODE),y)

@@ -20,10 +17,4 @@ else
 SIGROK_CLI_CONF_OPTS += --with-libsigrokdecode=NO
 endif
 
-define SIGROK_CLI_ADD_MISSING
-	mkdir -p $(@D)/autostuff
-endef
-
-SIGROK_CLI_PRE_CONFIGURE_HOOKS += SIGROK_CLI_ADD_MISSING
-
 $(eval $(autotools-package))
Signature · 1 line
2.7.0
author
#7 lore raw

PATCH 6/6 package/pulseview: bump version to 0.3.0

In reply to Bernd Kuhls

Switch to upstream tarball, remove autoreconf, add hash.

Upstream expects the boost unit tests being activated by default:
http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff;f=CMakeLists.txt;h=77b0137db22b7b6cab80d8aee7c97fecb8c542bf;hp=a82953cc166141af626ace0e5d2b3a285bf20eea;hb=f513bec599b8d626f914aa804a01325914bdb5e9;hpb=8ada6ef1319fa11fd594a34853967c1f9688913b
Add some logic to pulseview.mk to disable them if needed.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/pulseview/pulseview.hash |  3 +++
 package/pulseview/pulseview.mk   | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 package/pulseview/pulseview.hash
package/pulseview/pulseview.hash new file +3 -0
new file mode 100644
index 0000000..dc50ec6
@@ -0,0 +1,3 @@
+# Locally computed
+sha256	5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e	pulseview-0.3.0.tar.gz
+sha256	7de425dfe3b0f76e76e266374dca8b2951510d232380901ef2abda71c7c30bb0	dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch
package/pulseview/pulseview.mk +12 -3
index 67f293f..f26249a 100644
@@ -6,14 +6,23 @@
 
 # TODO Pulseview can be built and linked against Qt4 as well.
 
-# No https access on upstream git
-PULSEVIEW_SITE = git://sigrok.org/pulseview
-PULSEVIEW_VERSION = ec6cc07fed12f5070eee6b8cb11343e83d42533c
+PULSEVIEW_VERSION = 0.3.0
+PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
+# bug fixed upstream
+# http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1950
+PULSEVIEW_PATCH = \
+	https://github.com/abraxa/pulseview/commit/dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch
 PULSEVIEW_LICENSE = GPLv3+
 PULSEVIEW_LICENSE_FILES = COPYING
 PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost
 PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE
 
+ifeq ($(BR2_PACKAGE_BOOST_TEST),y)
+PULSEVIEW_CONF_OPTS += -DENABLE_TESTS=TRUE
+else
+PULSEVIEW_CONF_OPTS += -DENABLE_TESTS=FALSE
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSIGROKDECODE),y)
 PULSEVIEW_CONF_OPTS += -DENABLE_DECODE=TRUE
 PULSEVIEW_DEPENDENCIES += libsigrokdecode
Signature · 1 line
2.7.0
#8 lore raw

cover Bump sigrok packages

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls

Bernd Kuhls (6):
package/libserialport: bump version to 0.1.1
package/libsigrok: bump version to 0.4.0
package/libsigrok: fix musl build
package/libsigrokdecode: bump version to 0.4.0
package/sigrok-cli: bump version to 0.6.0
package/pulseview: bump version to 0.3.0

All applied, thanks a lot!

Thomas

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