libgpg-error: bump version to 1.17

PATCH Superseded Vicente Olivert Riera 3 participants 3 messages Nov 28, 2014

Share & tools

Vicente Olivert Riera

author

2014-11-28 15:55 UTC #0 lore raw

PATCH 1/1 libgpg-error: bump version to 1.17

- Bump version to 1.17
- Add a hash file
- Add a hook to fix cross-compilation
- Fix license and license files
- Remove unnecessary <pkg>_CONFIG_SCRIPTS option
- Add a positive 'depends on' for supported architectures

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 package/libgpg-error/Config.in         |    5 ++
 package/libgpg-error/libgpg-error.hash |    2 +
 package/libgpg-error/libgpg-error.mk   |   73 ++++++++++++++++++++++++++++++--
 3 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 package/libgpg-error/libgpg-error.hash

package/libgpg-error/Config.in +5 -0

index 8287f98..2b46ffd 100644
@@ -1,5 +1,10 @@
 config BR2_PACKAGE_LIBGPG_ERROR
 	bool "libgpg-error"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
+		BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+		BR2_mk68 || BR2_powerpc || BR2_powerpc64 || \
+		BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || BR2_sh4a || \
+		BR2_sh4aeb || BR2_sparc || BR2_x86_64
 	help
 	  Libgpg-error is a small library with error codes and
 	  descriptions shared by most GnuPG related software.

package/libgpg-error/libgpg-error.hash new file +2 -0

new file mode 100644
index 0000000..5a736b0
@@ -0,0 +1,2 @@
+# From https://www.gnupg.org/download/integrity_check.html
+sha1  ba5858b2947e7272dd197c87bac9f32caf29b256  libgpg-error-1.17.tar.bz2

package/libgpg-error/libgpg-error.mk +69 -4

80 lines not on this page · raw message

Signature · 1 line

1.7.1

Gustavo Zacarias

2014-11-28 18:15 UTC #1 lore raw

PATCH 1/1 libgpg-error: bump version to 1.17

Quoted 20 lines · Vicente Olivert Riera

- Bump version to 1.17
- Add a hash file
- Add a hook to fix cross-compilation
- Fix license and license files
- Remove unnecessary <pkg>_CONFIG_SCRIPTS option
- Add a positive 'depends on' for supported architectures
Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/libgpg-error/Config.in         |    5 ++
 package/libgpg-error/libgpg-error.hash |    2 +
 package/libgpg-error/libgpg-error.mk   |   73 ++++++++++++++++++++++++++++++--
 3 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 package/libgpg-error/libgpg-error.hash
package/libgpg-error/Config.in +0 -0
index 8287f98..2b46ffd 100644

package/libgpg-error/Config.in line 7

Quoted 7 lines

package/libgpg-error/Config.in +5 -0

@@ -1,5 +1,10 @@
 config BR2_PACKAGE_LIBGPG_ERROR
 	bool "libgpg-error"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
+		BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+		BR2_mk68 || BR2_powerpc || BR2_powerpc64 || \
+		BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || BR2_sh4a || \
+		BR2_sh4aeb || BR2_sparc || BR2_x86_64

Aaand you're not propagating the new depends to all of the packages that use libgpg-error... which may not be too wise unless the bump is really necessary IMHO.
Also ... BR2_mk68, who's that? ;)
Regards.

Thomas Petazzoni

2014-11-28 21:39 UTC #2 lore raw

PATCH 1/1 libgpg-error: bump version to 1.17

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

package/libgpg-error/Config.in line 7

Quoted 12 lines · Vicente Olivert Riera

package/libgpg-error/Config.in +5 -0

index 8287f98..2b46ffd 100644
@@ -1,5 +1,10 @@
 config BR2_PACKAGE_LIBGPG_ERROR
 	bool "libgpg-error"
+	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
+		BR2_mipsel || BR2_mips64 || BR2_mips64el || \
+		BR2_mk68 || BR2_powerpc || BR2_powerpc64 || \
+		BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || BR2_sh4a || \
+		BR2_sh4aeb || BR2_sparc || BR2_x86_64

As Gustavo pointed out, you need to propagate this to the reverse dependencies of libgpg-error. To do this, please add a BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS variable.

BTW, did you investigate a bit why libgpg-error now has some architecture-specific stuff? It seems strange for such a library.

Quoted 47 lines

package/libgpg-error/Config.in +47 -0

+ifeq ($(findstring mips,$(BR2_ARCH)),aarch64)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = aarch64
+else
+ifeq ($(findstring arm,$(BR2_ARCH)),arm)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu$(ABI)
+LIBGPG_ERROR_ARCH = arm
+else
+ifeq ($(findstring m68k,$(BR2_ARCH)),m68k)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = m68k
+else
+ifeq ($(findstring mips,$(BR2_ARCH)),mips)
+ifeq ($(findstring el,$(BR2_ARCH)),el)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = mipsel
+else
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = mips
+endif
+else
+ifeq ($(findstring powerpc64le,$(BR2_ARCH)),powerpc64le)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = powerpc64le
+else
+ifeq ($(findstring powerpc64,$(BR2_ARCH)),powerpc64)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = powerpc64
+else
+ifeq ($(findstring powerpc,$(BR2_ARCH)),powerpc)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = powerpc
+else
+ifeq ($(findstring sh4,$(BR2_ARCH)),sh4)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = sh4
+else
+ifeq ($(findstring sparc,$(BR2_ARCH)),sparc)
+LIBGPG_ERROR_TRIPLET = unknown-linux-gnu
+LIBGPG_ERROR_ARCH = sparc
+else
+ifeq ($(findstring x86_64,$(BR2_ARCH)),x86_64)
+LIBGPG_ERROR_TRIPLET = pc-linux-gnu
+LIBGPG_ERROR_ARCH = x86_64
+else
+LIBGPG_ERROR_TRIPLET = pc-linux-gnu
+LIBGPG_ERROR_ARCH = i486

package/libgpg-error/Config.in

Quoted 10 lines

package/libgpg-error/Config.in +10 -0

+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif

There's no need for this long list of endif, you can normally write:

ifeq (....)
...
else ifeq (....)
...
else ifeq (....)
...
else
...
endif

Thanks,

Thomas

Signature · 3 lines

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