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
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 664ef61e19d6261d8984493b5f22127ec2ad44fc Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@gmail.com>
|
|
Date: Sun, 10 May 2020 23:15:32 +0200
|
|
Subject: [PATCH] tools/env/fw_env.h: remove env.h
|
|
|
|
As reported by Nicolas Carrier on the Buildroot mailing list [1],
|
|
there is a new build issue while building a program which interacts with
|
|
the u-boot environment. This program uses the headers of the ubootenv
|
|
library provided by uboot-tools.
|
|
|
|
This is an upstream change from uboot [2] adding "#include <env.h>" to
|
|
fw_env.h. Adding env.h require a board configuration to build.
|
|
|
|
But only fw_env.h header is installed in the staging directory by
|
|
uboot-tools package, but since it now include env.h the build is broken
|
|
because env.h is missing from the staging directory.
|
|
|
|
It's seems an upstream bug since env_set() is not used in fw_env tool.
|
|
|
|
Adding env.h is an error since it also include compiler.h (and others
|
|
uboot internal includes).
|
|
|
|
Nicolas removed env.h from fw_env tool and fixed it's build issue.
|
|
|
|
This problem is present since uboot v2019.10, so the uboot version
|
|
present in Buildroot 2020.02 is affected.
|
|
|
|
[1] http://lists.busybox.net/pipermail/buildroot/2020-April/280307.html
|
|
[2] https://gitlab.denx.de/u-boot/u-boot/-/commit/9fb625ce05539fe6876a59ce1dcadb76b33c6f6e
|
|
|
|
Reported-by: Nicolas Carrier <nicolas.carrier@orolia.com>
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
Upstream: https://gitlab.denx.de/u-boot/u-boot/-/commit/2aca8804d8d5f84d2d661e76e8d232c5c12445b5
|
|
---
|
|
tools/env/fw_env.h | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
|
|
index b60fbfc8f8..78c803c944 100644
|
|
--- a/tools/env/fw_env.h
|
|
+++ b/tools/env/fw_env.h
|
|
@@ -4,7 +4,6 @@
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*/
|
|
|
|
-#include <env.h>
|
|
#include <stdint.h>
|
|
|
|
/*
|
|
--
|
|
2.25.4
|
|
|