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
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From a7a862bab5e4aae4615ddae3cbe230345f92ed0d Mon Sep 17 00:00:00 2001
|
|
From: Lauri Kasanen <cand@gmx.com>
|
|
Date: Mon, 1 Jun 2020 12:11:45 +0300
|
|
Subject: [PATCH v3] Bug 1642174 /usr/bin/ld: OBJS/Linux_SINGLE_SHLIB/sha512-p8.o:
|
|
ABI version 2 is not compatible with ABI version 1 output
|
|
|
|
Don't try to build the SHA-2 accelerated asm on old-ABI ppc.
|
|
|
|
Currently make only, I don't have enough gyp-fu to do that side.
|
|
However, the reporters of 1642174 and 1635625 both used make, not gyp.
|
|
|
|
Signed-off-by: Lauri Kasanen <cand@gmx.com>
|
|
[Fetch-from: https://bugzilla.mozilla.org/show_bug.cgi?id=1642174
|
|
Manually modified paths to apply to nss subdirectory in release tarball.]
|
|
Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
|
|
---
|
|
lib/freebl/Makefile | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
|
|
index 5f7384429..e0461c7d3 100644
|
|
--- a/nss/lib/freebl/Makefile
|
|
+++ b/nss/lib/freebl/Makefile
|
|
@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
|
|
endif
|
|
ifeq ($(CPU_ARCH),ppc)
|
|
EXTRA_SRCS += gcm-ppc.c
|
|
- ASFILES += sha512-p8.s
|
|
ifdef USE_64
|
|
DEFINES += -DNSS_NO_INIT_SUPPORT
|
|
+ PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
|
|
+ ifeq ($(PPC_ABI),2)
|
|
+ ASFILES += sha512-p8.s
|
|
+ endif
|
|
endif # USE_64
|
|
endif # ppc
|
|
endif # Linux
|
|
--
|
|
2.19.1
|
|
|