package/sunxi-mali: reorder select/depends
PATCH 1/2 package/sunxi-mali: reorder select/depends
From [1]:
"Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects."
Also, the Config.in example in the manual suggests to use this coding style [2].
[1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
[2] https://buildroot.org/downloads/manual/manual.html#writing-rules-config-in
--- package/sunxi-mali/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/sunxi-mali/Config.in +2 -2
@@ -1,10 +1,10 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" + depends on BR2_arm + depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_LIBUMP - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_arm help Install the ARM Mali drivers for sunxi based systems (i.e systems based on ARM Allwinner SoCs). This driver requires
Signature · 1 line
2.9.3
PATCH 2/2 package/sunxi-mali: remove sunxi-mali r2p4 kernel module
sunxi-mali r2p4 kernel module are linked against libUMP.so.2 but libump package in Buildroot only provide libUMP.so.3, see [1].
./r2p4/armhf/x11/libGLESv2.so.2.0
./r2p4/armhf/x11/libMali.so
- 0x00000001 (NEEDED) Shared library: [libUMP.so]
+ 0x00000001 (NEEDED) Shared library: [libUMP.so.2]
./r2p4/armhf/x11/libGLESv1_CM.so.1.1
./r2p4/armhf/x11/libEGL.so.1.4
0x00000001 (NEEDED) Shared library: [libX11.so.6] 0x00000001 (NEEDED) Shared library: [libdrm.so.2] 0x00000001 (NEEDED) Shared library: [libXfixes.so.3] 0x00000001 (NEEDED) Shared library: [libXext.so.6]
./r2p4/armel/framebuffer/libGLESv2.so
./r2p4/armel/framebuffer/libMali.so
- 0x00000001 (NEEDED) Shared library: [libUMP.so]
+ 0x00000001 (NEEDED) Shared library: [libUMP.so.2]
./r2p4/armel/framebuffer/libGLESv1_CM.so
./r2p4/armel/framebuffer/libEGL.so
So any program or library trying to link with -lGLESv2 will fail with the following error:
arm-none-linux-gnueabi/bin/ld: warning: libUMP.so.2, needed by output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libMali.so, not found (try using -rpath or -rpath-link)
output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_close' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_mapped_pointer_get' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_secure_id_get' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_mapped_pointer_release' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libMali.so:
undefined reference to `ump_reference_add' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libMali.so:
undefined reference to `ump_size_get' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_reference_release' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_open'
collect2: error: ld returned 1 exit status
Since nothing provide libUMP.so.2, remove BR2_PACKAGE_SUNXI_MALI_R2P4 option and add BR2_ARM_EABIHF dependency directly to sunxi-mali package.
Also the defconfig olimex_a20_olinuxino_lime_mali_defconfig maintained by Francois Perrad, is an ARM EABIHF system.
Fixes:
http://autobuild.buildroot.net/results/8d0/8d0b78798abf0c4ca124952d0d0455da6f8fa14f/
[1] https://github.com/linux-sunxi/sunxi-mali-proprietary/commit/1c5063f43cdc9de341c0d63b2e3921cab86c7742
[2] http://lists.busybox.net/pipermail/buildroot/2017-February/183500.html
--- Config.in.legacy | 8 ++++++++ package/sunxi-mali/Config.in | 23 ++++++----------------- package/sunxi-mali/sunxi-mali.mk | 3 --- 3 files changed, 14 insertions(+), 20 deletions(-)
Config.in.legacy +8 -0
@@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_SUNXI_MALI_R2P4 + bool "sunxi-mali r2p4 removed" + select BR2_LEGACY + help + sunxi-mali r2p4 has been removed since libump package only + provide libUMP.so.3 for r3p0 and r3p1 mali kernel module. + r2p4 for ARM EABI systems require libUMP.so.2. + config BR2_PACKAGE_PERL_DB_FILE bool "perl-db-file removed" select BR2_LEGACY
package/sunxi-mali/Config.in +6 -17
@@ -1,6 +1,10 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" depends on BR2_arm + # libump package only provide libUMP.so.3 for r3p0 and r3p1 + # mali kernel module. r2p4 for ARM EABI systems require + # libUMP.so.2. + depends on BR2_ARM_EABIHF # libUMP.so.3 only depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES
@@ -36,31 +40,16 @@ choice appropriate version number is r3p0. For other kernels, use the maliver application to determine the appropriate version. -config BR2_PACKAGE_SUNXI_MALI_R2P4 - bool "r2p4" - depends on BR2_ARM_EABI - -comment "r2p4 requires an EABI toolchain" - depends on !BR2_ARM_EABI - config BR2_PACKAGE_SUNXI_MALI_R3P0 bool "r3p0" - depends on BR2_ARM_EABIHF - -comment "r3p0 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF config BR2_PACKAGE_SUNXI_MALI_R3P1 - depends on BR2_ARM_EABIHF bool "r3p1" -comment "r3p1 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF - endchoice endif -comment "sunxi-mali needs a glibc toolchain" +comment "sunxi-mali needs a glibc toolchain w/ armhf enabled" depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF
package/sunxi-mali/sunxi-mali.mk +0 -3
@@ -36,9 +36,6 @@ endif SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r2p4 -endif ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y) SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 endif
Signature · 1 line
2.9.3
PATCH 2/2 package/sunxi-mali: remove sunxi-mali r2p4 kernel module
Romain, All,
On 2017-02-18 15:52 +0100, Romain Naour spake thusly:
Quoted 2 lines
sunxi-mali r2p4 kernel module are linked against libUMP.so.2 but libump package in Buildroot only provide libUMP.so.3, see [1].
OTOH, it looks like the versioning is just arbitrary:
https://github.com/linux-sunxi/libump/commit/1c1f6337dffffe8f7aea98f710f681727ed45f4f
We prefer version 3, as r2pX is pretty rare by now, but if needs be, this can be easily changed.
So maybe libump could add a legacy symlink libUMP.so.2 -> libUMP.so.3 ?
Regards,
Yann E. MORIN.
Quoted 152 lines
./r2p4/armhf/x11/libGLESv2.so.2.0
./r2p4/armhf/x11/libMali.so
-0x00000001(NEEDED) Shared library: [libUMP.so]
+0x00000001(NEEDED) Shared library: [libUMP.so.2]
./r2p4/armhf/x11/libGLESv1_CM.so.1.1
./r2p4/armhf/x11/libEGL.so.1.40x00000001 (NEEDED) Shared library: [libX11.so.6] 0x00000001 (NEEDED) Shared library: [libdrm.so.2] 0x00000001 (NEEDED) Shared library: [libXfixes.so.3] 0x00000001 (NEEDED) Shared library: [libXext.so.6]./r2p4/armel/framebuffer/libGLESv2.so
./r2p4/armel/framebuffer/libMali.so
-0x00000001(NEEDED) Shared library: [libUMP.so]
+0x00000001(NEEDED) Shared library: [libUMP.so.2]
./r2p4/armel/framebuffer/libGLESv1_CM.so
./r2p4/armel/framebuffer/libEGL.soSo any program or library trying to link with -lGLESv2 will fail with the following error:
arm-none-linux-gnueabi/bin/ld: warning: libUMP.so.2, needed by output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libMali.so, not found (try using -rpath or -rpath-link)
output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_close' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_mapped_pointer_get' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_secure_id_get' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_mapped_pointer_release' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libMali.so:
undefined reference to `ump_reference_add' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libMali.so:
undefined reference to `ump_size_get' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_reference_release' output/host/usr/arm-buildroot-linux-gnueabi/sysroot/armv4t/usr/lib/libEGL.so:
undefined reference to `ump_open'
collect2: error: ld returned 1 exit statusSince nothing provide libUMP.so.2, remove
BR2_PACKAGE_SUNXI_MALI_R2P4option and addBR2_ARM_EABIHFdependency directly to sunxi-mali package.Also the defconfig
olimex_a20_olinuxino_lime_mali_defconfigmaintained by Francois Perrad, is an ARM EABIHF system.Fixes:
http://autobuild.buildroot.net/results/8d0/8d0b78798abf0c4ca124952d0d0455da6f8fa14f/[1] https://github.com/linux-sunxi/sunxi-mali-proprietary/commit/1c5063f43cdc9de341c0d63b2e3921cab86c7742
[2] http://lists.busybox.net/pipermail/buildroot/2017-February/183500.htmlSigned-off-by Romain Naour <[email protected]>Cc Francois Perrad <[email protected]>--- Config.in.legacy | 8 ++++++++ package/sunxi-mali/Config.in | 23 ++++++----------------- package/sunxi-mali/sunxi-mali.mk | 3 --- 3 files changed, 14 insertions(+), 20 deletions(-)Config.in.legacy +8
-0@@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_SUNXI_MALI_R2P4 + bool "sunxi-mali r2p4 removed" + select BR2_LEGACY + help + sunxi-mali r2p4 has been removed since libump package only + provide libUMP.so.3 for r3p0 and r3p1 mali kernel module. + r2p4 for ARM EABI systems require libUMP.so.2. + config BR2_PACKAGE_PERL_DB_FILE bool "perl-db-file removed" select BR2_LEGACYpackage/sunxi-mali/Config.in +6
-17@@ -1,6 +1,10 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" depends on BR2_arm + # libump package only provide libUMP.so.3 for r3p0 and r3p1 + # mali kernel module. r2p4 for ARM EABI systems require + # libUMP.so.2. + depends on BR2_ARM_EABIHF # libUMP.so.3 only depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES@@ -36,31 +40,16 @@ choice appropriate version number is r3p0. For other kernels, use the maliver application to determine the appropriate version. -config BR2_PACKAGE_SUNXI_MALI_R2P4 - bool "r2p4" - depends on BR2_ARM_EABI - -comment "r2p4 requires an EABI toolchain" - depends on !BR2_ARM_EABI - config BR2_PACKAGE_SUNXI_MALI_R3P0 bool "r3p0" - depends on BR2_ARM_EABIHF - -comment "r3p0 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF config BR2_PACKAGE_SUNXI_MALI_R3P1 - depends on BR2_ARM_EABIHF bool "r3p1" -comment "r3p1 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF - endchoice endif -comment "sunxi-mali needs a glibc toolchain" +comment "sunxi-mali needs a glibc toolchain w/ armhf enabled" depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHFpackage/sunxi-mali/sunxi-mali.mk +0
-3@@ -36,9 +36,6 @@ endif SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r2p4 -endif ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y) SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 endifSignature · 6 lines
2.9.3 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 package/sunxi-mali: remove sunxi-mali r2p4 kernel module
Yann, All,
Le 18/02/2017 ? 16:05, Yann E. MORIN a ?crit :
Quoted 6 lines
Romain, All,
On 2017-02-18 15:52 +0100, Romain Naour spake thusly:
Quoted 2 lines
sunxi-mali r2p4 kernel module are linked against libUMP.so.2 but libump package in Buildroot only provide libUMP.so.3, see [1].
Quoted 8 lines
OTOH, it looks like the versioning is just arbitrary:
https://github.com/linux-sunxi/libump/commit/1c1f6337dffffe8f7aea98f710f681727ed45f4f
We prefer version 3, as r2pX is pretty rare by now, but if needs be, this can be easily changed.
So maybe libump could add a legacy symlink libUMP.so.2 -> libUMP.so.3 ?
Yes probably in this specific case but doing so is generally highly not recommended :p
Also since r2pX was pretty rare back in 2013, I don't think it's a big loss.
Best regards,
Romain
Quoted 4 lines
Regards,
Yann E. MORIN.
PATCH 2/2 package/sunxi-mali: remove sunxi-mali r2p4 kernel module
In reply to Romain NaourHello,
Quoted 1 line · Romain Naour
sunxi-mali r2p4 kernel module are linked against libUMP.so.2 but libump
A kernel module cannot be linked against a userspace shared library, so the commit title and this description do not make sense. Perhaps you're talking about the libGLES library?
Quoted 17 lines
package in Buildroot only provide libUMP.so.3, see [1].
./r2p4/armhf/x11/libGLESv2.so.2.0
./r2p4/armhf/x11/libMali.so
-0x00000001(NEEDED) Shared library: [libUMP.so]
+0x00000001(NEEDED) Shared library: [libUMP.so.2]
./r2p4/armhf/x11/libGLESv1_CM.so.1.1
./r2p4/armhf/x11/libEGL.so.1.40x00000001 (NEEDED) Shared library: [libX11.so.6] 0x00000001 (NEEDED) Shared library: [libdrm.so.2] 0x00000001 (NEEDED) Shared library: [libXfixes.so.3] 0x00000001 (NEEDED) Shared library: [libXext.so.6]./r2p4/armel/framebuffer/libGLESv2.so
./r2p4/armel/framebuffer/libMali.so
-0x00000001(NEEDED) Shared library: [libUMP.so]
+0x00000001(NEEDED) Shared library: [libUMP.so.2]
Config.in.legacy endif · line 153
Quoted 2 lines
Config.in.legacy +2
-0+ sunxi-mali r2p4 has been removed since libump package only + provide libUMP.so.3 for r3p0 and r3p1 mali kernel module.
kernel module ?
Quoted 10 lines
Config.in.legacy +2
-0+ r2p4 for ARM EABI systems require libUMP.so.2. + config BR2_PACKAGE_PERL_DB_FILE bool "perl-db-file removed" select BR2_LEGACYpackage/sunxi-mali/Config.in +0
-0
package/sunxi-mali/Config.in line 5
Quoted 5 lines
package/sunxi-mali/Config.in +2
-0@@ -1,6 +1,10 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" depends on BR2_arm + # libump package only provide libUMP.so.3 for r3p0 and r3p1 + # mali kernel module. r2p4 for ARM EABI systems require
kernel module ?
package/sunxi-mali/Config.in choice · line 53
Quoted 2 lines
package/sunxi-mali/Config.in +1
-1-comment "sunxi-mali needs a glibc toolchain" +comment "sunxi-mali needs a glibc toolchain w/ armhf enabled"
Please use:
needs an EABIhf glibc toolchain
instead.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 2/2 package/sunxi-mali: remove sunxi-mali r2p4 kernel module
Hi Thomas,
Le 20/02/2017 ? 22:52, Thomas Petazzoni a ?crit :
Quoted 8 lines
Hello,
Quoted 1 line · Romain Naour
sunxi-mali r2p4 kernel module are linked against libUMP.so.2 but libump
A kernel module cannot be linked against a userspace shared library, so the commit title and this description do not make sense. Perhaps you're talking about the libGLES library?
Yes obviously...
I'm speaking about the libGLES library provided by sunxi-mali for r2p4 mali kernel module. This library is linked against libUMP.so.2 but libump package in Buildroot only provide libUMP.so.3.
Quoted 18 lines
Quoted 17 lines
package in Buildroot only provide libUMP.so.3, see [1].
./r2p4/armhf/x11/libGLESv2.so.2.0
./r2p4/armhf/x11/libMali.so
-0x00000001(NEEDED) Shared library: [libUMP.so]
+0x00000001(NEEDED) Shared library: [libUMP.so.2]
./r2p4/armhf/x11/libGLESv1_CM.so.1.1
./r2p4/armhf/x11/libEGL.so.1.40x00000001 (NEEDED) Shared library: [libX11.so.6] 0x00000001 (NEEDED) Shared library: [libdrm.so.2] 0x00000001 (NEEDED) Shared library: [libXfixes.so.3] 0x00000001 (NEEDED) Shared library: [libXext.so.6]./r2p4/armel/framebuffer/libGLESv2.so
./r2p4/armel/framebuffer/libMali.so
-0x00000001(NEEDED) Shared library: [libUMP.so]
+0x00000001(NEEDED) Shared library: [libUMP.so.2]
Quoted 4 lines
Config.in.legacy endif · line 153
Quoted 2 lines
Config.in.legacy +2
-0+ sunxi-mali r2p4 has been removed since libump package only + provide libUMP.so.3 for r3p0 and r3p1 mali kernel module.kernel module ?
As far I understand, r3p0 and r3p1 are the version of the mali kernel module which create /dev/mali and /dev/ump devices and require libUMP.so.3.
See: http://linux-sunxi.org/Mali_binary_driver
Ok my comments wasn't good, let me respin...
Best regards,
Romain
Quoted 32 lines
Quoted 11 lines
Config.in.legacy +2
-0+ r2p4 for ARM EABI systems require libUMP.so.2. + config BR2_PACKAGE_PERL_DB_FILE bool "perl-db-file removed" select BR2_LEGACYpackage/sunxi-mali/Config.in +0
-0package/sunxi-mali/Config.in line 5
Quoted 5 lines
package/sunxi-mali/Config.in +2
-0@@ -1,6 +1,10 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" depends on BR2_arm + # libump package only provide libUMP.so.3 for r3p0 and r3p1 + # mali kernel module. r2p4 for ARM EABI systems requirekernel module ?
package/sunxi-mali/Config.in choice · line 53
Quoted 2 lines
package/sunxi-mali/Config.in +1
-1-comment "sunxi-mali needs a glibc toolchain" +comment "sunxi-mali needs a glibc toolchain w/ armhf enabled"Please use:
needs an EABIhf glibc toolchain
instead.
Thanks!
Thomas
Thomas Petazzoni
AppliedPATCH 1/2 package/sunxi-mali: reorder select/depends
In reply to Romain NaourHello,
Quoted 8 lines · Romain Naour
From [1]:
"Even though the ordering has absolutely no consequences inKconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects."Also, the Config.in example in the manual suggests to use this coding style [2].
Quoted 7 lines
[1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
[2] https://buildroot.org/downloads/manual/manual.html#writing-rules-config-inSigned-off-by Romain Naour <[email protected]>--- package/sunxi-mali/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com