d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump buildroot to 2020.11-rc1 (#985)

Browse Source 
* 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
This commit is contained in:
Stefan Agner
2020-11-13 18:25:44 +01:00
committed by GitHub
parent 25a0dd3082
commit a0871be6c0
4024 changed files with 68095 additions and 47900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
buildroot/package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch Normal file
View File

@@ -0,0 +1,50 @@
From 7c5475187d1bdf861360ffd8bc1aaea84a341db3 Mon Sep 17 00:00:00 2001
From: Dagg Stompler <daggs@gmx.com>
Date: Fri, 11 Sep 2020 12:28:52 +0300
Subject: [PATCH] amlbootenc-gxl: remove non std C convention in for
not all compilers have c99 or gnu99 enabled, so try not to use a
non std C convention in for call loops
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
amlbootenc-gxl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/amlbootenc-gxl.c b/amlbootenc-gxl.c
index 3695e13..233563d 100644
--- a/amlbootenc-gxl.c
+++ b/amlbootenc-gxl.c
@@ -51,6 +51,7 @@ static int boot_enc(const char *input, const char *output)
._unknown3 = 0x02000000,
.sig2 = AMLOGIC_C_SIGNATURE,
};
+ int i;
assert(sizeof(hdr) == 0x100);
@@ -130,10 +131,10 @@ static int boot_enc(const char *input, const char *output)
memcpy(hdr.iv, (uint8_t[]){ 0x14, 0x82, 0x5b, 0x1b, 0x10, 0xc1, 0x49, 0x0d, 0x8f, 0x13, 0x0a, 0x99, 0x15, 0x50, 0x1d, 0x37 }, 16);
}
#else
- for (int i = 0; i < sizeof(hdr.key); i++) {
+ for (i = 0; i < sizeof(hdr.key); i++) {
hdr.key[i] = rand();
}
- for (int i = 0; i < sizeof(hdr.iv); i++) {
+ for (i = 0; i < sizeof(hdr.iv); i++) {
hdr.iv[i] = rand();
}
#endif
@@ -151,7 +152,7 @@ static int boot_enc(const char *input, const char *output)
AES_cbc_encrypt(src_buf, buf + hdr.first_offset, hdr.block_size, &aes_key, iv, AES_ENCRYPT);
SHA256_Update(&sha256_ctx, buf + hdr.first_offset, hdr.block_size);
- for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) {
+ for (i = 1; i < hdr.payload_size / hdr.block_size; i++) {
memset(src_buf, 0, hdr.block_size);
fread(src_buf, 1, hdr.block_size, fin);
AES_cbc_encrypt(src_buf, buf + hdr.data_offset + (i - 1) * hdr.block_size, hdr.block_size, &aes_key, iv, AES_ENCRYPT);
--
2.28.0

9
buildroot/package/meson-tools/Config.in.host Normal file
View File

@@ -0,0 +1,9 @@
config BR2_PACKAGE_HOST_MESON_TOOLS
bool "host meson-tools"
help
meson-tools is a collection of tools for use with the
Amlogic Meson family of ARM based SoCs. It allows management
of signatures which are required for booting amlogic based
boards with u-boot.
https://github.com/afaerber/meson-tools

3
buildroot/package/meson-tools/meson-tools.hash Normal file
View File

@@ -0,0 +1,3 @@
# Locally calculated
sha256 10d707b2f741df03ff5000f2a82c6f577036ce1cd34d9278b22b92cb616b6fce meson-tools-0a02e2d34413f4bf9b15946352bc8c8ee13a5843.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

26
buildroot/package/meson-tools/meson-tools.mk Normal file
View File

@@ -0,0 +1,26 @@
################################################################################
#
# meson-tools
#
################################################################################
HOST_MESON_TOOLS_VERSION = 0a02e2d34413f4bf9b15946352bc8c8ee13a5843
HOST_MESON_TOOLS_SITE = $(call github,afaerber,meson-tools,$(HOST_MESON_TOOLS_VERSION))
HOST_MESON_TOOLS_LICENSE = GPL-2.0+
HOST_MESON_TOOLS_LICENSE_FILES = COPYING
HOST_MESON_TOOLS_DEPENDENCIES = host-openssl
HOST_MESON_TOOLS_PROGS = amlbootsig unamlbootsig amlinfo
define HOST_MESON_TOOLS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) \
LDFLAGS="$(HOST_LDFLAGS) -lssl -lcrypto"
endef
define HOST_MESON_TOOLS_INSTALL_CMDS
$(foreach f,$(HOST_MESON_TOOLS_PROGS), \
$(INSTALL) -D -m 0755 $(@D)/$(f) $(HOST_DIR)/bin/$(f)
)
endef
$(eval $(host-generic-package))