Bump buildroot to 2020.11-rc1 (#985)
* 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:
@@ -1,36 +0,0 @@
|
||||
From df8a2c4f18293cb2eafcf81e5dc169a06dccf304 Mon Sep 17 00:00:00 2001
|
||||
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
|
||||
Date: Tue, 9 Jul 2019 16:42:28 -0600
|
||||
Subject: [PATCH] fix qztest build error.
|
||||
|
||||
If int is bigger than quint16 then you will get the following
|
||||
linker error:
|
||||
|
||||
.obj/testquazip.o: In function `TestQuaZip::setOsCode()':
|
||||
testquazip.cpp:(.text+0x42bd): undefined reference to `bool QTest::qCompare<int, unsigned short>(int const&, unsigned short const&, char const*, char const*, char const*, int)'
|
||||
collect2: error: ld returned 1 exit status
|
||||
|
||||
This error indicates the two parameters of QCOMPARE do not have the same type.
|
||||
|
||||
This occurs because integral promotions can be applied to fi.versionCreated.
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/stachenov/quazip/commit/df8a2c4f18293cb2eafcf81e5dc169a06dccf304]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
qztest/testquazip.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qztest/testquazip.cpp b/qztest/testquazip.cpp
|
||||
index 70a64fc..86f6556 100644
|
||||
--- a/qztest/testquazip.cpp
|
||||
+++ b/qztest/testquazip.cpp
|
||||
@@ -233,7 +233,7 @@ void TestQuaZip::setOsCode()
|
||||
checkZip.goToFirstFile();
|
||||
QuaZipFileInfo64 fi;
|
||||
QVERIFY(checkZip.getCurrentFileInfo(&fi));
|
||||
- QCOMPARE(fi.versionCreated >> 8, static_cast<quint16>(osCode));
|
||||
+ QCOMPARE(static_cast<uint>(fi.versionCreated) >> 8, osCode);
|
||||
}
|
||||
|
||||
void TestQuaZip::setDataDescriptorWritingEnabled()
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 4fda4d4248e08015b5090d0369ef9e68bdc4475aa12494f7c0f6d79e43270d14 quazip-0.8.1.tar.gz
|
||||
sha256 d2a653b46b87963f29a7f1523e7c39bafdbb3592dfa01725e61a523387148e72 COPYING
|
||||
sha256 54edce9c11371762bd4f0003c2937b5d8806a2752dd9c0fd9085e90792612ad0 quazip-1.1.tar.gz
|
||||
sha256 3aab586a5bdc8ffbbf033c7106550fd3e849fd8888e33cbc9bfd30a433c4b1cb COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QUAZIP_VERSION = 0.8.1
|
||||
QUAZIP_VERSION = 1.1
|
||||
QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION))
|
||||
QUAZIP_INSTALL_STAGING = YES
|
||||
QUAZIP_DEPENDENCIES = \
|
||||
@@ -13,20 +13,4 @@ QUAZIP_DEPENDENCIES = \
|
||||
QUAZIP_LICENSE = LGPL-2.1
|
||||
QUAZIP_LICENSE_FILES = COPYING
|
||||
|
||||
define QUAZIP_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr)
|
||||
endef
|
||||
|
||||
define QUAZIP_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define QUAZIP_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR)
|
||||
endef
|
||||
|
||||
define QUAZIP_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user