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
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From 84dea8284c521f08508bb2dcbc99db3b5d3438fd Mon Sep 17 00:00:00 2001
|
|
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
|
|
Date: Thu, 27 Aug 2020 17:32:09 +0200
|
|
Subject: [PATCH] gnuradio-runtime_pmt: dont hardcode
|
|
INTERFACE_INCLUDE_DIRECTORIES
|
|
|
|
gnuradio-runtimeTargets.cmake and gnuradio-pmtTargets.cmake are filled
|
|
using CMAKE_INSTALL_PREFIX for INSTALL_INTERFACE.
|
|
|
|
Since CMAKE_INSTALL_PREFIX, in buildroot, is set to /usr, these files contains
|
|
path to host system.
|
|
|
|
With BR2_COMPILER_PARANOID_UNSAFE_PATH package using gnuradio fails with:
|
|
arm-linux-gnueabihf-g++: ERROR: unsafe header/library path used in cross-compilation: '-isystem' '/usr/include'
|
|
|
|
By simply providing 'include', produced .cmake contains:
|
|
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
|
|
instead of
|
|
INTERFACE_INCLUDE_DIRECTORIES "/usr/include"
|
|
|
|
[Upstream status: https://github.com/gnuradio/gnuradio/pull/3737]
|
|
|
|
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
|
|
---
|
|
gnuradio-runtime/lib/CMakeLists.txt | 2 +-
|
|
gnuradio-runtime/lib/pmt/CMakeLists.txt | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt
|
|
index 5aa90a5e1..fc32f473b 100644
|
|
--- a/gnuradio-runtime/lib/CMakeLists.txt
|
|
+++ b/gnuradio-runtime/lib/CMakeLists.txt
|
|
@@ -214,7 +214,7 @@ target_link_libraries(gnuradio-runtime PUBLIC
|
|
|
|
target_include_directories(gnuradio-runtime
|
|
PUBLIC
|
|
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
|
|
+ $<INSTALL_INTERFACE:include>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
|
|
PRIVATE
|
|
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt
|
|
index 9fb98d0fc..6dfcd945c 100644
|
|
--- a/gnuradio-runtime/lib/pmt/CMakeLists.txt
|
|
+++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt
|
|
@@ -33,7 +33,7 @@ target_link_libraries(gnuradio-pmt
|
|
|
|
target_include_directories(gnuradio-pmt
|
|
PUBLIC
|
|
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
|
|
+ $<INSTALL_INTERFACE:include>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
|
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/
|
|
)
|
|
--
|
|
2.26.2
|
|
|