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
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 246b9e07f22d551fae0718315273760c087b79ca Mon Sep 17 00:00:00 2001
|
|
From: Sergio Prado <sergio.prado@e-labworks.com>
|
|
Date: Sat, 4 Jul 2020 20:28:26 -0300
|
|
Subject: [PATCH] Fix musl build: wrong usage of LONG_BIT
|
|
|
|
LONG_BIT is not a sysconf value, it is either 32 or 64. Using it as
|
|
a sysconf value will give weird results.
|
|
|
|
Originally it was sysconf(_SC_LONG_BIT) (before it was "fixed" by the
|
|
gentoo guys). But this is useless: it will always return a value
|
|
equal to LONG_BIT: it's either compiled 32-bit or 64-bit so a runtime
|
|
lookup doesn't make sense. For this reason, musl has removed the
|
|
definition of _SC_LONG_BIT.
|
|
|
|
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
|
|
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
|
---
|
|
src/core/abi.cc | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/core/abi.cc b/src/core/abi.cc
|
|
index adff7b55acfa..76c664c03ce7 100644
|
|
--- a/src/core/abi.cc
|
|
+++ b/src/core/abi.cc
|
|
@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
|
|
bool scan_abi(hwNode & system)
|
|
{
|
|
// are we compiled as 32- or 64-bit process ?
|
|
- long sc = sysconf(LONG_BIT);
|
|
- if(sc==-1) sc = sysconf(_SC_LONG_BIT);
|
|
- if(sc!=-1) system.setWidth(sc);
|
|
+ system.setWidth(LONG_BIT);
|
|
|
|
pushd(PROC_SYS);
|
|
|
|
--
|
|
2.17.1
|
|
|