openpgm: bump to version release-5-2-122
PATCH 1/1 openpgm: bump to version release-5-2-122
At the same time perform a GitHub migration, since Google Code will disappear soon.
- Bump to version release-5-2-122
- Switch to GitHub
- Remove trailing slash from OPENPGM_SUBDIR
- Remove unnecessary python dependencies
- Run the bootstrap.sh script it fails to autoreconf properly
- Add a hash file
- Rewrap the help text to 72 characters length
- Change the project URL
--- package/openpgm/Config.in | 13 +++++++------ package/openpgm/openpgm.hash | 2 ++ package/openpgm/openpgm.mk | 17 +++++++++++------ 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 package/openpgm/openpgm.hash
package/openpgm/Config.in +7 -6
@@ -6,13 +6,14 @@ config BR2_PACKAGE_OPENPGM depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR help - OpenPGM is an open source implementation of the Pragmatic General - Multicast (PGM) specification in RFC 3208 available at www.ietf.org. - PGM is a reliable and scalable multicast protocol that enables - receivers to detect loss, request retransmission of lost data, or - notify an application of unrecoverable loss. + OpenPGM is an open source implementation of the Pragmatic + General Multicast (PGM) specification in RFC 3208 available at + www.ietf.org. PGM is a reliable and scalable multicast + protocol that enables receivers to detect loss, request + retransmission of lost data, or notify an application of + unrecoverable loss. - http://code.google.com/p/openpgm/ + https://github.com/steve-o/openpgm/ comment "openpgm needs a toolchain w/ wchar, threads" depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
package/openpgm/openpgm.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally calculated +sha256 ecd48fd0bcfd8351ce6dcf31b063dd8fe83d3dab41bca62a6ebd6880a88c4a69 openpgm-release-5-2-122.tar.gz
package/openpgm/openpgm.mk +11 -6
@@ -4,15 +4,20 @@ # ################################################################################ -OPENPGM_VERSION = 5.1.118~dfsg -OPENPGM_SOURCE = libpgm-$(OPENPGM_VERSION).tar.gz -OPENPGM_SITE = http://openpgm.googlecode.com/files +OPENPGM_VERSION = release-5-2-122 +OPENPGM_SITE = $(call github,steve-o,openpgm,$(OPENPGM_VERSION)) OPENPGM_LICENSE = LGPLv2.1+ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE OPENPGM_INSTALL_STAGING = YES -OPENPGM_AUTORECONF = YES -OPENPGM_SUBDIR = openpgm/pgm/ -OPENPGM_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) +OPENPGM_SUBDIR = openpgm/pgm + +# openpgm doesn't autoreconf properly, we have to bootstrap it. +OPENPGM_DEPENDENCIES += host-automake host-autoconf host-libtool +define OPENPGM_BOOTSTRAP + cd $(@D)/$(OPENPGM_SUBDIR) && PATH=$(BR_PATH) ./bootstrap.sh +endef +OPENPGM_PRE_CONFIGURE_HOOKS += OPENPGM_BOOTSTRAP + OPENPGM_CONF_ENV = \ ac_cv_file__proc_cpuinfo=yes \ ac_cv_file__dev_rtc=no \
Signature · 1 line
1.7.1
PATCH 1/1 openpgm: bump to version release-5-2-122
On 10/21/2015 02:56 PM, Vicente Olivert Riera wrote:
[snip]
Quoted 1 line
- Run the
bootstrap.shscript it fails to autoreconf properly
- Run the bootstrap.sh script; it fails to autoreconf properly
(missing semicolon to separate)
[snip]
PATCH 1/1 openpgm: bump to version release-5-2-122
Dear Vicente Olivert Riera,
Quoted 4 lines · Vicente Olivert Riera
On 10/21/2015 02:56 PM, Vicente Olivert Riera wrote:
[snip]Quoted 1 line
- Run the
bootstrap.shscript it fails to autoreconf properly- Run the
bootstrap.shscript; it fails to autoreconf properly
I quickly looked at the bootstrap.sh script, and besides the messages in Japanese (or what I guessed to be Japanese), nothing really unusual stands out. What fails if you just have AUTORECONF = YES ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 openpgm: bump to version release-5-2-122
Dear Thomas Petazzoni,
Quoted 11 lines · Thomas Petazzoni
Dear Vicente Olivert Riera,
Quoted 4 lines · Vicente Olivert Riera
On 10/21/2015 02:56 PM, Vicente Olivert Riera wrote:
[snip]Quoted 1 line
- Run the
bootstrap.shscript it fails to autoreconf properly- Run the
bootstrap.shscript; it fails to autoreconf properlyI quickly looked at the
bootstrap.shscript, and besides the messages in Japanese (or what I guessed to be Japanese), nothing really unusual stands out. What fails if you just have AUTORECONF = YES ?
This is the failure:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
openpgm release-5-2-122 Configuring
openpgm release-5-2-122 Autoreconfiguring
aclocal: error: couldn't open directory 'm4': No such file or directory
autoreconf: /br/output/host/usr/bin/aclocal failed with exit status: 1
With AUTORECONF = YES, we start running aclocal. I think it normally starts running libtoolize, but since the m4 directory doesn't exist, it starts directly with aclocal.
With the bootstrap script work because it will call libtoolize despite of the m4 directory not existing.
If you prefer, this approach also works, although libtoolize is ran twice (first by the hook, and then by autoreconf):
(I keep the line numbers to preserve the indentation)
13 OPENPGM_AUTORECONF = YES
14
15 # we need to run libtoolize before autoreconf, so the missing m4 16 # directory is created.
17 define OPENPGM_LIBTOOLIZE
18 cd $(@D)/$(OPENPGM_SUBDIR) && PATH=$(BR_PATH) libtoolize
19 endef
20 OPENPGM_PRE_CONFIGURE_HOOKS += OPENPGM_LIBTOOLIZE
Regards,
Vincent.
Quoted 3 lines
Thomas
PATCH 1/1 openpgm: bump to version release-5-2-122
Dear Vicente Olivert Riera,
Quoted 8 lines · Vicente Olivert Riera
13
OPENPGM_AUTORECONF= YES
14
15 # we need to run libtoolize before autoreconf, so the missing m4 16 # directory is created.
17 defineOPENPGM_LIBTOOLIZE
18 cd $(@D)/$(OPENPGM_SUBDIR) && PATH=$(BR_PATH) libtoolize
19 endef
20OPENPGM_PRE_CONFIGURE_HOOKS+=OPENPGM_LIBTOOLIZE
Why not just:
define OPENPGM_CREATE_M4_DIR
mkdir -p $(@D)/$(OPENPGM_SUBDIR)/m4
endefOPENPGM_POST_PATCH_HOOKS += OPENPGM_CREATE_M4_DIR
which works (tested locally).
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com