mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-16 14:19:26 +00:00
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
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Tue, 11 Aug 2020 23:07:08 +0200
|
|
Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in
|
|
a Git repo
|
|
|
|
If the librtlsdr code comes from a tarball, it doesn't have any .git/
|
|
metadata, and therefore even if Git (as a tool) is found, the logic in
|
|
cmake/Modules/Version.cmake fails finding a version through Git:
|
|
|
|
-- Extracting version information from git describe...
|
|
fatal: Not a git repository (or any of the parent directories): .git
|
|
|
|
As a consequence, the VERSION variable is empty, which later causes
|
|
cmake to bail out with:
|
|
|
|
CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message):
|
|
No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE()
|
|
Call Stack (most recent call first):
|
|
/home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file)
|
|
CMakeLists.txt:173 (write_basic_package_version_file)
|
|
|
|
To avoid this, we only use Git to determine the version if the cmake
|
|
project top-level source directory has a .git/ folder.
|
|
|
|
Upstream: https://github.com/librtlsdr/librtlsdr/pull/75
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
cmake/Modules/Version.cmake | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake
|
|
index 2d4e76d..6f67fa4 100644
|
|
--- a/cmake/Modules/Version.cmake
|
|
+++ b/cmake/Modules/Version.cmake
|
|
@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION})
|
|
########################################################################
|
|
find_package(Git QUIET)
|
|
|
|
-if(GIT_FOUND)
|
|
+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
|
|
message(STATUS "Extracting version information from git describe...")
|
|
execute_process(
|
|
COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long
|
|
--
|
|
2.26.2
|
|
|