jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/sunxi-mali: remove sunxi-mali libMali for r2p4 Mali kernel modules

Browse Source 
sunxi-mali userspace drivers (libMali.so) for r2p4 Mali kernel modules
are linked against libUMP.so.2 but libump package in Buildroot only
provide libUMP.so.3.

In upstream commit 1c5063f43cdc9de341c0d63b2e3921cab86c7742 [1], library
versioning was added. For the r3p* libraries, libUMP.so.3 is used (and
provided by Buildroot libump package), but for the r2p* libraries,
libUMP.so.2 is used (and not provided by Buildroot libump package).

Due to this any program or library trying to link with -lGLESv2 or -lEGL
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 provides libUMP.so.2, this commit removes the
BR2_PACKAGE_SUNXI_MALI_R2P4 option and adds the BR2_ARM_EABIHF
dependency directly to sunxi-mali package.

Fixes:

  http://autobuild.buildroot.net/results/8d0/8d0b78798abf0c4ca124952d0d0455da6f8fa14f/

[1] 1c5063f43c
[2] http://lists.busybox.net/pipermail/buildroot/2017-February/183500.html

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Francois Perrad <francois.perrad@gadz.org>
[Thomas: fix conflicts when applying on master, tweak commit log.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Romain Naour 2017-02-21 22:43:16 +01:00 committed by Thomas Petazzoni
parent 3e23b1c9bb
commit 95426afd59
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in.legacy
View File

@ -145,6 +145,14 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2017.05" comment "Legacy options removed in 2017.05"
config BR2_PACKAGE_SUNXI_MALI_R2P4
bool "sunxi-mali r2p4 removed"
select BR2_LEGACY
help
sunxi-mali libMali for r2p4 Mali kernel module has been
removed since the libump package only provides libUMP.so.3.
libMali for r2p4 Mali kernel module requires libUMP.so.2.
config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT
bool "CoffeeScript option has been removed" bool "CoffeeScript option has been removed"
select BR2_LEGACY select BR2_LEGACY

25
package/sunxi-mali/Config.in
View File

@ -1,6 +1,12 @@
config BR2_PACKAGE_SUNXI_MALI config BR2_PACKAGE_SUNXI_MALI
bool "sunxi-mali" bool "sunxi-mali"
depends on BR2_arm depends on BR2_arm
# libump package only provide libUMP.so.3 which is used by
# libMali for r3p0 and r3p1 Mali kernel module. This version
# is only available for ARM EABIhf.
# libMali for r2p4 Mali kernel module (available for ARM EABI)
# requires libUMP.so.2.
depends on BR2_ARM_EABIHF # libUMP.so.3 only
depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_LIBGLES
@ -36,31 +42,16 @@ choice
appropriate version number is r3p0. For other kernels, use the maliver appropriate version number is r3p0. For other kernels, use the maliver
application to determine the appropriate version. 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 config BR2_PACKAGE_SUNXI_MALI_R3P0
bool "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 config BR2_PACKAGE_SUNXI_MALI_R3P1
bool "r3p1" bool "r3p1"
depends on BR2_ARM_EABIHF
comment "r3p1 requires an EABIhf toolchain"
depends on !BR2_ARM_EABIHF
endchoice endchoice
endif endif
comment "sunxi-mali needs a glibc toolchain" comment "sunxi-mali needs an EABIhf glibc toolchain"
depends on BR2_arm depends on BR2_arm
depends on !BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF

12
package/sunxi-mali/sunxi-mali.mk
View File

@ -28,17 +28,9 @@ SUNXI_MALI_MAKE_ENV = \
CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \ CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \
$(TARGET_MAKE_ENV) $(TARGET_MAKE_ENV)
ifeq ($(BR2_ARM_EABIHF),y) SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \
SUNXI_MALI_MAKE_OPTS += ABI=armhf ABI=armhf
else
SUNXI_MALI_MAKE_OPTS += ABI=armel
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) ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y)
SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 SUNXI_MALI_MAKE_OPTS += VERSION=r3p0
endif endif