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
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From cb8326de54ad7a56658b0dc8efb7da5e71684a7c Mon Sep 17 00:00:00 2001
|
|
From: Pablo Galindo <pablogsal@gmail.com>
|
|
Date: Tue, 22 Sep 2020 01:33:47 +0100
|
|
Subject: [PATCH] Use sh_offset instead of sh_addr when checking already
|
|
replaced libs
|
|
|
|
When checking for already replaced libs, the check against the size must
|
|
be done using the section header offset, not the section file address.
|
|
This was not crashing in many situations because normally sh_address and
|
|
sh_offset have the same value but these two may differ and using the
|
|
sh_address value instead can cause library corruption in these
|
|
situations.
|
|
|
|
Fetch from: https://github.com/NixOS/patchelf/commit/83aa89addf8757e2d63aa73222f2fa9bc6d7321a
|
|
|
|
Backported to v0.9
|
|
|
|
Signed-off-by: Conrad Ratschan <conrad.ratschan@rockwellcollins.com>
|
|
---
|
|
src/patchelf.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/patchelf.cc b/src/patchelf.cc
|
|
index 4676157..c025ae2 100644
|
|
--- a/src/patchelf.cc
|
|
+++ b/src/patchelf.cc
|
|
@@ -666,7 +666,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
|
|
/* Some sections may already be replaced so account for that */
|
|
unsigned int i = 1;
|
|
Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr);
|
|
- while( shdrs[i].sh_addr <= pht_size && i < rdi(hdr->e_shnum) ) {
|
|
+ while( shdrs[i].sh_offset <= pht_size && i < rdi(hdr->e_shnum) ) {
|
|
if (not haveReplacedSection(getSectionName(shdrs[i])))
|
|
replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size);
|
|
i++;
|
|
--
|
|
2.17.1
|
|
|