a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
64 lines
3.6 KiB
Diff
64 lines
3.6 KiB
Diff
From 7fdcabd80c823694d190e5baa8c657ffcae5e777 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 31 Jan 2020 17:14:11 +0100
|
|
Subject: [PATCH] cmake/FindLibMagic.cmake: fix static linking
|
|
|
|
libmagic can optionally depends on xz (for lzma) or bzip2 since version
|
|
5.38 and
|
|
https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7
|
|
so use pkg-config to retrieve those static dependencies and avoid the
|
|
following build failure:
|
|
|
|
[100%] Linking CXX executable gerbera
|
|
/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf':
|
|
compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit'
|
|
/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress'
|
|
/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd'
|
|
/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder'
|
|
/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code'
|
|
/home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end'
|
|
|
|
It should be noted that libmagic.pc is not currently provided in the
|
|
official file package (which provides libmagic), an issue has been
|
|
opened to add libmagic.pc: https://bugs.astron.com/view.php?id=136
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Retrieved from:
|
|
https://github.com/gerbera/gerbera/commit/7fdcabd80c823694d190e5baa8c657ffcae5e777]
|
|
---
|
|
cmake/FindLibMagic.cmake | 15 +++++++++++++--
|
|
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmake/FindLibMagic.cmake b/cmake/FindLibMagic.cmake
|
|
index f68ab923..04995af4 100644
|
|
--- a/cmake/FindLibMagic.cmake
|
|
+++ b/cmake/FindLibMagic.cmake
|
|
@@ -1,11 +1,22 @@
|
|
INCLUDE (FindPackageHandleStandardArgs)
|
|
|
|
-FIND_PATH(MAGIC_INCLUDE_DIR magic.h)
|
|
-FIND_LIBRARY(MAGIC_LIBRARIES NAMES magic)
|
|
+find_package(PkgConfig QUIET)
|
|
+
|
|
+pkg_check_modules(PC_MAGIC QUIET libmagic)
|
|
+
|
|
+FIND_PATH(MAGIC_INCLUDE_DIR magic.h
|
|
+ HINTS ${PC_MAGIC_INCLUDEDIR} ${PC_MAGIC_INCLUDE_DIRS})
|
|
+FIND_LIBRARY(MAGIC_LIBRARIES NAMES magic
|
|
+ HINTS ${PC_MAGIC_LIBDIR} ${PC_MAGIC_LIBRARY_DIRS})
|
|
|
|
# handle the QUIETLY and REQUIRED arguments and set MAGIC_FOUND to TRUE
|
|
find_package_handle_standard_args(MAGIC DEFAULT_MSG MAGIC_LIBRARIES)
|
|
|
|
+if (MAGIC_FOUND)
|
|
+ set (MAGIC_LIBRARIES ${MAGIC_LIBRARY} ${PC_MAGIC_LIBRARIES})
|
|
+ set (MAGIC_INCLUDE_DIRS ${MAGIC_INCLUDE_DIR} )
|
|
+endif ()
|
|
+
|
|
MARK_AS_ADVANCED(
|
|
MAGIC_LIBRARIES
|
|
MAGIC_INCLUDE_DIRS )
|