package/openobex: disable on Blackfin
PATCH 1/4 package/openobex: disable on Blackfin
Openobex uses accept4 syscall, which is not available on Blackfin flavored uclibc. So, diasble openobex on blackfin (do not add extra checks on the c-library since uclibc is the only choice for Blackfin).
Fixed:
http://autobuild.buildroot.net/results/78e033fe9f43845581a5d87b21a8451f67520e44
--- package/openobex/Config.in | 1 + 1 file changed, 1 insertion(+)
package/openobex/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOBEX bool "openobex" + depends on !BR2_bfin help Free open source implementation of the Object Exchange (OBEX) protocol.
Signature · 1 line
2.15.0
PATCH 2/4 package/opencv: fix build failure
Backport fix from upstream.
Fixes:
http://autobuild.buildroot.net/results/b27d324331f6e351e95dd4742f4d0a50af60c590
http://autobuild.buildroot.net/results/44ed0be0bd94028b7b37e7bf21233adc1753d94b
--- .../0003-Update-OpenCVCompilerOptions.cmake.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch new file +33 -0
@@ -0,0 +1,33 @@ +Fetch from upstream: https://github.com/opencv/opencv/commit/126de0cd95418811e302996161e03195bf7e631a + +From 126de0cd95418811e302996161e03195bf7e631a Mon Sep 17 00:00:00 2001 +From: neok-m4700 <[email protected]> +Date: Tue, 25 Jul 2017 10:25:20 +0200 +Subject: [PATCH] Update OpenCVCompilerOptions.cmake + +misplaced else + +Signed-off-by: Samuel Martin <[email protected]> +--- + cmake/OpenCVCompilerOptions.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake +index 9b2a4e42e..7b079c5f9 100644 +--- a/cmake/OpenCVCompilerOptions.cmake ++++ b/cmake/OpenCVCompilerOptions.cmake +@@ -18,9 +18,9 @@ if(ENABLE_CCACHE AND NOT CMAKE_COMPILER_IS_CCACHE) + message(STATUS "Unable to compile program with enabled ccache, reverting...") + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}") + endif() +- else() +- message(STATUS "Looking for ccache - not found") + endif() ++ else() ++ message(STATUS "Looking for ccache - not found") + endif() + endif() + +-- +2.15.0 +
Signature · 1 line
2.15.0
Thomas Petazzoni
AppliedPATCH 2/4 package/opencv: fix build failure
Hello,
Quoted 7 lines · Samuel Martin
Backport fix from upstream.
Fixes:
http://autobuild.buildroot.net/results/b27d324331f6e351e95dd4742f4d0a50af60c590
http://autobuild.buildroot.net/results/44ed0be0bd94028b7b37e7bf21233adc1753d94bSigned-off-by Samuel Martin <[email protected]>
Applied, with one small change, see below.
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch line 1
Quoted 12 lines
--- .../0003-Update-OpenCVCompilerOptions.cmake.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patchpackage/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch new file +1
-0@@ -0,0 +1,33 @@ +Fetch from upstream: https://github.com/opencv/opencv/commit/126de0cd95418811e302996161e03195bf7e631a
By putting this comment here, you break the possibility of applying the patch with "git am", i.e the patch is no longer a proper Git formatted patch. Therefore, such comments should go...
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch line 8
Quoted 7 lines
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch new file +7
-0+ +From 126de0cd95418811e302996161e03195bf7e631a Mon Sep 17 00:00:00 2001 +From: neok-m4700 <[email protected]> +Date: Tue, 25 Jul 2017 10:25:20 +0200 +Subject: [PATCH] Update OpenCVCompilerOptions.cmake + +misplaced else
... here.
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch line 10
Quoted 2 lines
package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch new file +2
-0+ +Signed-off-by: Samuel Martin <[email protected]>
Applied with this change. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 3/4 package/opencv: add hashes for patch and license files
In reply to Samuel Martin--- package/opencv/opencv.hash | 4 ++++ 1 file changed, 4 insertions(+)
package/opencv/opencv.hash +4 -0
@@ -1,2 +1,6 @@ # Locally calculated sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41 opencv-2.4.13.3.tar.gz +sha256 934825dcbd68ec46936d5b12f4734d07fffc864226a9122e46a23c55d0e5bb5c 0001-atomic.patch +sha256 f211b79c126021de2f553e894bb5d0896be542289e8f55f5289eba45c86f5d6e 0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +sha256 78622658634e0297588037e26e54ee37754f739e30336184921f42f4888cda7f 0003-Update-OpenCVCompilerOptions.cmake.patch +sha256 46e42877dfc3ac65769292cb4dc1a04b204ad9e40859a390f4c035d6179fbcc4 LICENSE
Signature · 1 line
2.15.0
PATCH 3/4 package/opencv: add hashes for patch and license files
Hello,
Quoted 10 lines · Samuel Martin
Signed-off-by Samuel Martin <[email protected]>--- package/opencv/opencv.hash | 4 ++++ 1 file changed, 4 insertions(+)package/opencv/opencv.hash +0
-0
package/opencv/opencv.hash line 6
Quoted 6 lines
package/opencv/opencv.hash +4
-0@@ -1,2 +1,6 @@ # Locally calculated sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41 opencv-2.4.13.3.tar.gz +sha256 934825dcbd68ec46936d5b12f4734d07fffc864226a9122e46a23c55d0e5bb5c 0001-atomic.patch +sha256 f211b79c126021de2f553e894bb5d0896be542289e8f55f5289eba45c86f5d6e 0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +sha256 78622658634e0297588037e26e54ee37754f739e30336184921f42f4888cda7f 0003-Update-OpenCVCompilerOptions.cmake.patch +sha256 46e42877dfc3ac65769292cb4dc1a04b204ad9e40859a390f4c035d6179fbcc4 LICENSE
Since when are we adding hashes for patches that are stored in Buildroot itself? We are not doing this for any other package, and the package infrastructure is not even checking the hashes for patches available locally I believe.
So I've tweaked your patch to only add the license file hash, and applied.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 4/4 package/ussp-push: removed deprecated/no longer needed deps on openobex-bluez
In reply to Samuel MartinCommit 49a9fb0f13789298e65f21405502a9106e2c7382 deprecates the BR2_PACKAGE_OPENOBEX_BLUEZ option, which should be turned in BR2_PACKAGE_BLUEZ_UTILS instead.
--- package/ussp-push/Config.in | 1 - 1 file changed, 1 deletion(-)
package/ussp-push/Config.in +0 -1
@@ -5,7 +5,6 @@ config BR2_PACKAGE_USSP_PUSH depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # dbus select BR2_PACKAGE_OPENOBEX - select BR2_PACKAGE_OPENOBEX_BLUEZ select BR2_PACKAGE_BLUEZ_UTILS help ussp-push is an OBEX object pusher for Linux, using the BlueZ
Signature · 1 line
2.15.0
Thomas Petazzoni
AppliedPATCH 4/4 package/ussp-push: removed deprecated/no longer needed deps on openobex-bluez
Hello,
Quoted 3 lines · Samuel Martin
Commit
49a9fb0f13789298e65f21405502a9106e2c7382deprecates theBR2_PACKAGE_OPENOBEX_BLUEZoption, which should be turned inBR2_PACKAGE_BLUEZ_UTILSinstead.
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 4/4 package/ussp-push: removed deprecated/no longer needed deps on openobex-bluez
In reply to Samuel MartinHello,
Quoted 7 lines · Samuel Martin
Commit
49a9fb0f13789298e65f21405502a9106e2c7382deprecates theBR2_PACKAGE_OPENOBEX_BLUEZoption, which should be turned inBR2_PACKAGE_BLUEZ_UTILSinstead.Cc Bernd Kuhls <[email protected]>Reported-by Romain Naour <[email protected]>Signed-off-by Samuel Martin <[email protected]>
I clearly don't see how this could be related to your patch, but we've started to see ussp-push build failures:
http://autobuild.buildroot.net/?reason=ussp-push-0.11
Could you have a look? :-)
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/4 package/openobex: disable on Blackfin
In reply to Samuel MartinHello,
Quoted 17 lines · Samuel Martin
Openobex uses accept4 syscall, which is not available on Blackfin flavored uclibc. So, diasble openobex on blackfin (do not add extra checks on the c-library since uclibc is the only choice for Blackfin).
Fixed:
http://autobuild.buildroot.net/results/78e033fe9f43845581a5d87b21a8451f67520e44Signed-off-by Samuel Martin <[email protected]>--- package/openobex/Config.in | 1 + 1 file changed, 1 insertion(+)package/openobex/Config.in +0
-0
package/openobex/Config.in line 6
Quoted 6 lines
package/openobex/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOBEX bool "openobex" + depends on !BR2_bfin help Free open source implementation of the Object Exchange (OBEX) protocol.
What about the Config.in comment, and the reverse dependencies of BR2_PACKAGE_OPENOBEX ?
Also, I'd like to hear from Waldemar about accept4 availability on Blackfin/uClibc-ng.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/4 package/openobex: disable on Blackfin
Hi Thomas,
Thomas Petazzoni wrote,
Quoted 30 lines
Hello,
Quoted 17 lines · Samuel Martin
Openobex uses accept4 syscall, which is not available on Blackfin flavored uclibc. So, diasble openobex on blackfin (do not add extra checks on the c-library since uclibc is the only choice for Blackfin).
Fixed:
http://autobuild.buildroot.net/results/78e033fe9f43845581a5d87b21a8451f67520e44Signed-off-by Samuel Martin <[email protected]>--- package/openobex/Config.in | 1 + 1 file changed, 1 insertion(+)package/openobex/Config.in +0
-0package/openobex/Config.in line 6
Quoted 6 lines
package/openobex/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOBEX bool "openobex" + depends on !BR2_bfin help Free open source implementation of the Object Exchange (OBEX) protocol.What about the Config.in comment, and the reverse dependencies of
BR2_PACKAGE_OPENOBEX?
Quoted 2 lines
Also, I'd like to hear from Waldemar about accept4 availability on Blackfin/uClibc-ng.
For me it looks like a uClibc bug.
When socketcalls.c was converted to use cancel.h for syscall cancellation (19607f1113ef9916a0a0ac2bf99b5bc32526f0de) it seems accept4 was left out for no specific reason.
For Linuxthreads the syscall wrapper for accept4 isn't compiled in. I think for NPTL we do not see the issue.
I am going to sent out a patch soon.
best regards
Waldemar
PATCH 1/4 package/openobex: disable on Blackfin
Hello,
Quoted 8 lines · Waldemar Brodkorb
Quoted 2 lines
Also, I'd like to hear from Waldemar about accept4 availability on Blackfin/uClibc-ng.
For me it looks like a uClibc bug.
Whensocketcalls.cwas converted to usecancel.hfor syscall cancellation (19607f1113ef9916a0a0ac2bf99b5bc32526f0de) it seems accept4 was left out for no specific reason.
Quoted 4 lines
For Linuxthreads the syscall wrapper for accept4 isn't compiled in. I think for NPTL we do not see the issue.
I am going to sent out a patch soon.
Great, thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/4 package/openobex: disable on Blackfin
In reply to Thomas PetazzoniHi all,
Quoted 15 lines · Thomas Petazzoni
Hello,
Quoted 12 lines · Samuel Martin
Openobex uses accept4 syscall, which is not available on Blackfin flavored uclibc. So, diasble openobex on blackfin (do not add extra checks on the c-library since uclibc is the only choice for Blackfin).
Fixed:
http://autobuild.buildroot.net/results/78e033fe9f43845581a5d87b21a8451f67520e44Signed-off-by Samuel Martin <[email protected]>--- package/openobex/Config.in | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
package/openobex/Config.in line 6
Quoted 11 lines
package/openobex/Config.in +1
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOBEX bool "openobex" + depends on !BR2_bfin help Free open source implementation of the Object Exchange (OBEX) protocol.What about the Config.in comment, and the reverse dependencies of
BR2_PACKAGE_OPENOBEX?
Well, I was not really sure about what to mention... and also wanted to heard Waldemar opinion.
FYI, this commit 53996bee433f09a91b12aa53b2be0f7d22c0acbe seems to fix a similar issue.
Quoted 11 lines
Also, I'd like to hear from Waldemar about accept4 availability on Blackfin/uClibc-ng.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Regards,
Signature · 1 line
Samuel
PATCH 1/4 package/openobex: disable on Blackfin
Hello,
Quoted 15 lines · Samuel Martin
Quoted 6 lines
Quoted 6 lines
package/openobex/Config.in +0
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOBEXQuoted 8 lines
package/openobex/Config.in line 6
Quoted 5 lines
package/openobex/Config.in +1
-0bool "openobex" + depends on !BR2_bfin help Free open source implementation of the Object Exchange (OBEX) protocol.What about the Config.in comment, and the reverse dependencies of
BR2_PACKAGE_OPENOBEX?
Quoted 2 lines
Well, I was not really sure about what to mention... and also wanted to heard Waldemar opinion.
I don't understand what you mean here. If you're adding a new dependency to a package, you must:
- Propagate it to the Config.in comment of that package
- Propagate it to the reverse dependencies of that package
So I'm not sure how you can be "not really sure about what to mention".
You must add a "depends on !BR2_bfin" in the Config.in comment, and then a depends on !BR2_bfin to all reverse dependencies of openobex, including their Config.in comments. There is nothing to "mention".
But since Waldemar has submitted a patch to fix the actual problem in uClibc, this is all moot :)
Quoted 2 lines
FYI, this commit
53996bee433f09a91b12aa53b2be0f7d22c0acbeseems to fix a similar issue.
We should revert this commit once Waldemar fix is merged, and we have rebuilt the toolchains.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/4 package/openobex: disable on Blackfin
Quoted 35 lines · Thomas Petazzoni
Hello,
Quoted 15 lines · Samuel Martin
Quoted 6 lines
Quoted 6 lines
package/openobex/Config.in +0
-0@@ -1,5 +1,6 @@ config BR2_PACKAGE_OPENOBEXQuoted 8 lines
package/openobex/Config.in line 6
Quoted 5 lines
package/openobex/Config.in +1
-0bool "openobex" + depends on !BR2_bfin help Free open source implementation of the Object Exchange (OBEX) protocol.What about the Config.in comment, and the reverse dependencies of
BR2_PACKAGE_OPENOBEX?Quoted 2 lines
Well, I was not really sure about what to mention... and also wanted to heard Waldemar opinion.
I don't understand what you mean here. If you're adding a new dependency to a package, you must:
- Propagate it to the Config.in comment of that package
- Propagate it to the reverse dependencies of that package
So I'm not sure how you can be "not really sure about what to mention".
You must add a "depends on !BR2_bfin" in the Config.in comment, and then a depends on !BR2_bfin to all reverse dependencies of openobex, including their Config.in comments. There is nothing to "mention".
Quoted 8 lines
But since Waldemar has submitted a patch to fix the actual problem in uClibc, this is all moot :)
Quoted 2 lines
FYI, this commit
53996bee433f09a91b12aa53b2be0f7d22c0acbeseems to fix a similar issue.We should revert this commit once Waldemar fix is merged, and we have rebuilt the toolchains.
That's the plan.
Regards,
Quoted 8 lines
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Signature · 1 line
Samuel