| Message ID | 1412282436-9176-1-git-send-email-matthew.weber@rockwellcollins.com |
|---|---|
| State | Accepted |
| Commit | 7b6304af9d69d44ee3040c00b0670f19c02de7d2 |
| Headers | show |
>>>>> "Matt" == Matt Weber <matthew.weber@rockwellcollins.com> writes: > * Adds powerpc architecture support > * Changes to the new github upstream site > * Updates the license filename > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > Changes v1 -> v2 > - Updated to not change license file. Had looked > a tip not tag for 2.6.0 so it actually didn't > changed in the latest release.(Suggested by Peter K.) Committed, thanks.
Dear Matt Weber, On Thu, 2 Oct 2014 15:40:36 -0500, Matt Weber wrote: > * Adds powerpc architecture support > * Changes to the new github upstream site > * Updates the license filename > > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > > Changes v1 -> v2 > - Updated to not change license file. Had looked > a tip not tag for 2.6.0 so it actually didn't > changed in the latest release.(Suggested by Peter K.) This bump seems to have broken some packages that depend on protobuf: * host-protobuf-c-v1.0.0-rc1 http://autobuild.buildroot.org/results/647/64707ecd9acfbf519d5f22dd6bd5b39c3b544073/build-end.log * python-protobuf-2.6.0 http://autobuild.buildroot.org/results/b3b/b3b36c72b233a624ebae9eaac592b7c6fbd394be/build-end.log Could you have a look? Thanks, Thomas
Thomas, On Oct 4, 2014 7:28 AM, "Thomas Petazzoni" < thomas.petazzoni@free-electrons.com> wrote: > > Dear Matt Weber, > > On Thu, 2 Oct 2014 15:40:36 -0500, Matt Weber wrote: > > * Adds powerpc architecture support > > * Changes to the new github upstream site > > * Updates the license filename > > > > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > > --- > > > > Changes v1 -> v2 > > - Updated to not change license file. Had looked > > a tip not tag for 2.6.0 so it actually didn't > > changed in the latest release.(Suggested by Peter K.) > > This bump seems to have broken some packages that depend on protobuf: > > * host-protobuf-c-v1.0.0-rc1 > http://autobuild.buildroot.org/results/647/64707ecd9acfbf519d5f22dd6bd5b39c3b544073/build-end.log > > * python-protobuf-2.6.0 > http://autobuild.buildroot.org/results/b3b/b3b36c72b233a624ebae9eaac592b7c6fbd394be/build-end.log > > Could you have a look? Sure > > Thanks, > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com
Thomas, On Sat, Oct 4, 2014 at 7:27 AM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Dear Matt Weber, > > On Thu, 2 Oct 2014 15:40:36 -0500, Matt Weber wrote: >> * Adds powerpc architecture support >> * Changes to the new github upstream site >> * Updates the license filename >> >> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> >> --- >> >> Changes v1 -> v2 >> - Updated to not change license file. Had looked >> a tip not tag for 2.6.0 so it actually didn't >> changed in the latest release.(Suggested by Peter K.) > > This bump seems to have broken some packages that depend on protobuf: > > * host-protobuf-c-v1.0.0-rc1 > http://autobuild.buildroot.org/results/647/64707ecd9acfbf519d5f22dd6bd5b39c3b544073/build-end.log Known issue https://github.com/protobuf-c/protobuf-c/issues/163. I'll bump protobuf-c to v1.0.2 and retest. > > * python-protobuf-2.6.0 > http://autobuild.buildroot.org/results/b3b/b3b36c72b233a624ebae9eaac592b7c6fbd394be/build-end.log This one is a failure on dependencies that the setup.py is trying to download. What's the general feeling with setuptools doing downloads on it's own? I assume we need to add those python packages to buildroot and correct the missing dependencies? Initially it looks like the package dependency list would be: google_apputils pytz python_gflags I'm not to familiar with how setuptools checks for dependencies existing before defaulting to retrieving a pypi archive. Does it check the sysroot path we point it at to make the decision? Thanks,
Dear Matthew Weber, On Sat, 4 Oct 2014 10:37:13 -0500, Matthew Weber wrote: > > * host-protobuf-c-v1.0.0-rc1 > > http://autobuild.buildroot.org/results/647/64707ecd9acfbf519d5f22dd6bd5b39c3b544073/build-end.log > > Known issue https://github.com/protobuf-c/protobuf-c/issues/163. > I'll bump protobuf-c to v1.0.2 and retest. Sounds good. > > * python-protobuf-2.6.0 > > http://autobuild.buildroot.org/results/b3b/b3b36c72b233a624ebae9eaac592b7c6fbd394be/build-end.log > > This one is a failure on dependencies that the setup.py is trying to > download. What's the general feeling with setuptools doing downloads > on it's own? I assume we need to add those python packages to > buildroot and correct the missing dependencies? Absolutely. > Initially it looks like the package dependency list would be: > google_apputils > pytz > python_gflags > I'm not to familiar with how setuptools checks for dependencies > existing before defaulting to retrieving a pypi archive. Does it > check the sysroot path we point it at to make the decision? I don't really know. I guess it checks in PYTHONPATH. Best regards, Thomas
diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index 6015b13..e45ed14 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -3,17 +3,16 @@ config BR2_PACKAGE_PROTOBUF depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # See src/google/protobuf/stubs/platform_macros.h for supported archs. - # PowerPC doesn't actually work. - depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 + depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 || BR2_powerpc # host-protobuf only builds on certain architectures depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" help Protocol buffers are Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. - http://code.google.com/p/protobuf/ + https://github.com/google/protobuf/ comment "protobuf needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 + depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 || BR2_powerpc depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index f5e11df..c8f5d63 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROTOBUF_VERSION = 2.5.0 -PROTOBUF_SITE = http://protobuf.googlecode.com/files +PROTOBUF_VERSION = 2.6.0 +PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/ PROTOBUF_LICENSE = BSD-3c PROTOBUF_LICENSE_FILES = COPYING.txt
* Adds powerpc architecture support * Changes to the new github upstream site * Updates the license filename Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v1 -> v2 - Updated to not change license file. Had looked a tip not tag for 2.6.0 so it actually didn't changed in the latest release.(Suggested by Peter K.) package/protobuf/Config.in | 7 +++---- package/protobuf/protobuf.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-)