bandwidthd: Version bump to fix autobuilder errors
PATCH v4 1/1 bandwidthd: Version bump to fix autobuilder errors
Thanks to Romain Naour, we've found that certain tests in configure fail if their dependencies aren't tested for beforehand.
zlib has been added as a dependency just to make sure it gets built.
In upstream the changes to fix this issue are:
- Test for libusb-1.0 purely to ensure that variables are set (it's only needed if libpcap was built with it).
- Test for libz and continue/fail because it's actually needed by libpng and it's probably more meaningful to fail on libz rather than libpng if libz is the issue.
Also, the X.Org tests have been removed from the configure script and therefore we don't need --without-x to be defined anymore.
Additional upstream changes:
- Handle the postgres/sqlite flags better (should not effect BR).
- Other general configure.ac cleanups.
Fixes:
autobuild.buildroot.net/results/37a/37a94e0f2d3faa0aec9c488e987cfff706fc9f3b/build-end.log
---
Changes v1 to v2
- Fixed spelling of Romain's name
- Added link to the build failure
Changes v2 to v3
- Added back the SOff and Ack lines
Changes v3 to v4
- Removed the commend on Config.in regarding zlib
- Corrected a libpng instance in commit message to zlib
--- package/bandwidthd/Config.in | 1 + package/bandwidthd/bandwidthd.mk | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-)
package/bandwidthd/Config.in +1 -0
@@ -1,6 +1,7 @@ config BR2_PACKAGE_BANDWIDTHD bool "bandwidthd" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_GD
package/bandwidthd/bandwidthd.mk +2 -4
@@ -4,19 +4,17 @@ # ################################################################################ -BANDWIDTHD_VERSION = v2.0.1-auto-r08 +BANDWIDTHD_VERSION = v2.0.1-auto-r10 BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,$(BANDWIDTHD_VERSION)) # Specified as "any version of the GPL that is current as of your # download" by upstream. BANDWIDTHD_LICENSE = GPL -BANDWIDTHD_DEPENDENCIES = gd libpng libpcap +BANDWIDTHD_DEPENDENCIES = gd libpng libpcap zlib BANDWIDTHD_AUTORECONF = YES -BANDWIDTHD_CONF_OPT += --without-x - ifeq ($(BR2_PACKAGE_BANDWIDTHD_POSTGRESQL),y) BANDWIDTHD_DEPENDENCIES += postgresql BANDWIDTHD_CONF_OPT += --with-postgresql-logging=true
Signature · 1 line
2.1.0.rc1
PATCH v4 1/1 bandwidthd: Version bump to fix autobuilder errors
Hi Nathaniel,
Quoted 47 lines · Nathaniel Roach
Thanks to Romain Naour, we've found that certain tests in configure fail if their dependencies aren't tested for beforehand.
zlib has been added as a dependency just to make sure it gets built.
In upstream the changes to fix this issue are:
- Test for libusb-1.0 purely to ensure that variables are set (it's only needed if libpcap was built with it).
- Test for libz and continue/fail because it's actually needed by libpng and it's probably more meaningful to fail on libz rather than libpng if libz is the issue.Also, the X.Org tests have been removed from the configure script and therefore we don't need --without-x to be defined anymore.
Additional upstream changes:
- Handle the postgres/sqlite flags better (should not effect BR).
- Other general configure.ac cleanups.Fixes:
autobuild.buildroot.net/results/37a/37a94e0f2d3faa0aec9c488e987cfff706fc9f3b/build-end.logSigned-off-by Nathaniel Roach <[email protected]>Acked-by Romain Naour <[email protected]>---
Changes v1 to v2
- Fixed spelling of Romain's name
- Added link to the build failureChanges v2 to v3
- Added back the SOff and Ack linesChanges v3 to v4
- Removed the commend on Config.in regarding zlib
- Corrected a libpng instance in commit message to zlib--- package/bandwidthd/Config.in | 1 + package/bandwidthd/bandwidthd.mk | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-)package/bandwidthd/Config.in +0
-0
package/bandwidthd/Config.in line 4
Quoted 4 lines
package/bandwidthd/Config.in +1
-0@@ -1,6 +1,7 @@ config BR2_PACKAGE_BANDWIDTHD bool "bandwidthd" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB
Is bandwidthd using libz directly? If not, libpng already selects BR2_PACKAGE_ZLIB so this may not actually be needed?
Quoted 11 lines
package/bandwidthd/Config.in +0
-0select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_GDpackage/bandwidthd/bandwidthd.mk +0
-0@@ -4,19 +4,17 @@ # ################################################################################
package/bandwidthd/bandwidthd.mk line 14
Quoted 10 lines
package/bandwidthd/bandwidthd.mk +2
-2-BANDWIDTHD_VERSION = v2.0.1-auto-r08 +BANDWIDTHD_VERSION = v2.0.1-auto-r10 BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,$(BANDWIDTHD_VERSION)) # Specified as "any version of the GPL that is current as of your # download" by upstream. BANDWIDTHD_LICENSE = GPL -BANDWIDTHD_DEPENDENCIES = gd libpng libpcap +BANDWIDTHD_DEPENDENCIES = gd libpng libpcap zlib
Same here.
baruch
Quoted 8 lines
package/bandwidthd/bandwidthd.mk +0
-2BANDWIDTHD_AUTORECONF = YES -BANDWIDTHD_CONF_OPT += --without-x - ifeq ($(BR2_PACKAGE_BANDWIDTHD_POSTGRESQL),y) BANDWIDTHD_DEPENDENCIES += postgresql BANDWIDTHD_CONF_OPT += --with-postgresql-logging=true
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH v4 1/1 bandwidthd: Version bump to fix autobuilder errors
Quoted 11 lines · Baruch Siach
Hi Nathaniel,
package/bandwidthd/Config.in line 4
Quoted 5 lines · Nathaniel Roach
Thanks to Romain Naour, we've found that certain tests in configure fail if their dependencies aren't tested for beforehand.
package/bandwidthd/Config.in +1
-0depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIBIs bandwidthd using libz directly? If not, libpng already selects
BR2_PACKAGE_ZLIBso this may not actually be needed?
You are correct, it's only through libpng that zlib is used. I put it in there as a safeguard because bandwidthd's configure script does test for it's existence, as the libpng tests can fail without first testing for zlib.
The above issue should be covered by libpng anyway. I don't see any harm in it being there, but if you think it should be removed I'll undo the changes.
Quoted 9 lines
package/bandwidthd/bandwidthd.mk line 14
Quoted 3 lines
package/bandwidthd/bandwidthd.mk +1
-1-BANDWIDTHD_DEPENDENCIES = gd libpng libpcap +BANDWIDTHD_DEPENDENCIES = gd libpng libpcap zlibSame here.
baruch
Quoted 1 line
Quoted 8 lines
package/bandwidthd/bandwidthd.mk line 20
Quoted 7 lines
BANDWIDTHD_AUTORECONF= YESpackage/bandwidthd/bandwidthd.mk +0
-2-BANDWIDTHD_CONF_OPT += --without-x - ifeq ($(BR2_PACKAGE_BANDWIDTHD_POSTGRESQL),y) BANDWIDTHD_DEPENDENCIES += postgresql BANDWIDTHD_CONF_OPT += --with-postgresql-logging=true
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140821/e613a9cf/attachment.asc>
PATCH v4 1/1 bandwidthd: Version bump to fix autobuilder errors
Hi Nathaniel,
Quoted 11 lines · Nathaniel Roach
Quoted 9 lines · Baruch Siach
package/bandwidthd/Config.in line 4
Quoted 5 lines · Nathaniel Roach
Thanks to Romain Naour, we've found that certain tests in configure fail if their dependencies aren't tested for beforehand.
package/bandwidthd/Config.in +1
-0depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIBIs bandwidthd using libz directly? If not, libpng already selects
BR2_PACKAGE_ZLIBso this may not actually be needed?
Quoted 7 lines
You are correct, it's only through libpng that zlib is used. I put it in there as a safeguard because bandwidthd's configure script does test for it's existence, as the libpng tests can fail without first testing for zlib.
The above issue should be covered by libpng anyway. I don't see any harm in it being there, but if you think it should be removed I'll undo the changes.
I'll let the maintainers make the final decision on that. It just feels wrong to workaround a libpng issue in a dependent packages. At the very least there should be a comment here (again) clearly stating that bandwidthd doesn't actually use libz, and that once the libpng issue is fixed this dependency can be removed.
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -