Bump buildroot to 2020.11-rc1 (#985)
* 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
This commit is contained in:
@@ -22,25 +22,33 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON"
|
||||
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
[Upstream status: http://patchwork.ozlabs.org/patch/1103437/]
|
||||
---
|
||||
src/CMakeLists.txt | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
src/CMakeLists.txt | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 051732b..c5f6dcb 100644
|
||||
index a04dd11..3a2115d 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -10,10 +10,9 @@ SET(include_HEADERS
|
||||
libuboot.h
|
||||
)
|
||||
@@ -12,17 +12,15 @@ SET(include_HEADERS
|
||||
|
||||
include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
|
||||
|
||||
-add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS})
|
||||
+add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS})
|
||||
SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION})
|
||||
SET_TARGET_PROPERTIES(ubootenv PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
|
||||
|
||||
-ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS})
|
||||
-SET_TARGET_PROPERTIES(ubootenv_static PROPERTIES OUTPUT_NAME ubootenv)
|
||||
add_executable(fw_printenv fw_printenv.c)
|
||||
add_executable(fw_setenv fw_setenv.c)
|
||||
target_link_libraries(fw_printenv ubootenv z)
|
||||
target_link_libraries(fw_setenv ubootenv z)
|
||||
|
||||
-install (TARGETS ubootenv ubootenv_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+install (TARGETS ubootenv DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
install (FILES libuboot.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
install (TARGETS fw_printenv DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
install (TARGETS fw_setenv DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 332c45d46401f1859f0781fd0fd316bb1c251264674677c26a4d9b9e1c592719 libubootenv-879c0731fa0725785b9fa4499bbf6aacd04ee4c2.tar.gz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt
|
||||
sha256 4c52dd908b69f18cdd5721b3f24573fb276e61115f66edb74906d766ca60399f libubootenv-0.3.1.tar.gz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBUBOOTENV_VERSION = 879c0731fa0725785b9fa4499bbf6aacd04ee4c2
|
||||
LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION))
|
||||
LIBUBOOTENV_VERSION = 0.3.1
|
||||
LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION))
|
||||
LIBUBOOTENV_LICENSE = LGPL-2.1
|
||||
LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt
|
||||
LIBUBOOTENV_INSTALL_STAGING = YES
|
||||
|
||||
Reference in New Issue
Block a user