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

47
buildroot/package/sshfs/0001-sshfs.c-fix-build-with-gcc-4.8.patch Normal file
View File

@@ -0,0 +1,47 @@
From 35ff9ed71b89f34e5462de1ee63f88edf98aeb69 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 31 Oct 2020 21:08:53 +0100
Subject: [PATCH] sshfs.c: fix build with gcc 4.8
Fix the following build failure with gcc 4.8:
../sshfs.c:1092:2: error: 'for' loop initial declarations are only allowed in C99 mode
for (int i = 0; i < sshfs.max_conns; i++) {
^
This build failure has been added with
https://github.com/libfuse/sshfs/commit/8822b60d9dbd9907065e7999f616b11ddce6d584
Fixes:
- http://autobuild.buildroot.org/results/2dbdc579c55543175716d5f739cabe2ad0864ed6
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/libfuse/sshfs/pull/233]
---
sshfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sshfs.c b/sshfs.c
index d5f2ff7..2c2db42 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -1068,6 +1068,7 @@ static struct conn* get_conn(const struct sshfs_file *sf,
const char *path)
{
struct conntab_entry *ce;
+ int i;
if (sshfs.max_conns == 1)
return &sshfs.conns[0];
@@ -1089,7 +1090,7 @@ static struct conn* get_conn(const struct sshfs_file *sf,
int best_index = 0;
uint64_t best_score = ~0ULL; /* smaller is better */
- for (int i = 0; i < sshfs.max_conns; i++) {
+ for (i = 0; i < sshfs.max_conns; i++) {
uint64_t score = ((uint64_t) sshfs.conns[i].req_count << 43) +
((uint64_t) sshfs.conns[i].dir_count << 22) +
((uint64_t) sshfs.conns[i].file_count << 1) +
--
2.28.0

8
buildroot/package/sshfs/Config.in
View File

@@ -1,10 +1,10 @@
config BR2_PACKAGE_SSHFS
bool "sshfs (FUSE)"
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
depends on BR2_USE_MMU # libfuse, glib2
depends on !BR2_STATIC_LIBS # libfuse
select BR2_PACKAGE_LIBFUSE
depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse3, glib2
depends on BR2_USE_MMU # libfuse3, glib2
depends on !BR2_STATIC_LIBS # libfuse3
select BR2_PACKAGE_LIBFUSE3
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_OPENSSH

2
buildroot/package/sshfs/sshfs.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated after checking pgp signature
sha256 7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 sshfs-2.8.tar.gz
sha256 6e7e86831f3066b356e7f16e22f1b8a8f177fda05146f6a5eb821c2fd0541c34 sshfs-3.7.0.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

9
buildroot/package/sshfs/sshfs.mk
View File

@@ -4,13 +4,14 @@
#
################################################################################
SSHFS_VERSION = 2.8
SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs_$(SSHFS_VERSION)
SSHFS_VERSION = 3.7.0
SSHFS_SOURCE = sshfs-$(SSHFS_VERSION).tar.xz
SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs-$(SSHFS_VERSION)
SSHFS_LICENSE = GPL-2.0
SSHFS_LICENSE_FILES = COPYING
SSHFS_DEPENDENCIES = \
libglib2 libfuse openssh \
libglib2 libfuse3 openssh \
$(TARGET_NLS_DEPENDENCIES) \
$(if $(BR2_ENABLE_LOCALE),,libiconv)
$(eval $(autotools-package))
$(eval $(meson-package))