mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 13:49: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
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 4a82c97e8a0677706d1d532812daaa73249768a8 Mon Sep 17 00:00:00 2001
|
|
From: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Date: Fri, 21 Jul 2017 12:33:53 +0300
|
|
Subject: [PATCH] fix adjusting startPage
|
|
|
|
startPage is adjusted unconditionally for all executables.
|
|
This results in incorrect addresses assigned to INTERP and LOAD
|
|
program headers, which breaks patched executable.
|
|
|
|
Adjusting startPage variable only when startOffset > startPage
|
|
should fix this.
|
|
|
|
This change is related to the issue NixOS#10
|
|
|
|
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
|
|
Fetch from: https://github.com/NixOS/patchelf/commit/1cc234fea5600190d872329aca60e2365cefc39e
|
|
|
|
Backported to v0.9
|
|
|
|
Signed-off-by: Conrad Ratschan <conrad.ratschan@rockwellcollins.com>
|
|
---
|
|
src/patchelf.cc | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/patchelf.cc b/src/patchelf.cc
|
|
index 1224a89..4676157 100644
|
|
--- a/src/patchelf.cc
|
|
+++ b/src/patchelf.cc
|
|
@@ -697,10 +697,8 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
|
|
since DYN executables tend to start at virtual address 0, so
|
|
rewriteSectionsExecutable() won't work because it doesn't have
|
|
any virtual address space to grow downwards into. */
|
|
- if (isExecutable) {
|
|
- if (startOffset >= startPage) {
|
|
- debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage);
|
|
- }
|
|
+ if (isExecutable && startOffset > startPage) {
|
|
+ debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage);
|
|
startPage = startOffset;
|
|
}
|
|
|
|
--
|
|
2.17.1
|
|
|