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:
Stefan Agner
@@ -1,56 +0,0 @@
|
||||
From 2e3dd0040e676530f7e735fab335ff449b9b3f4d Mon Sep 17 00:00:00 2001
|
||||
From: Lauren Post <lauren.post@freescale.com>
|
||||
Date: Tue, 22 Mar 2016 22:08:25 +0100
|
||||
Subject: [PATCH] Add ARM support into xf86drm.h
|
||||
|
||||
This provides support for Xorg interface. Without this the vivante
|
||||
samples will hang during close requiring a reboot
|
||||
|
||||
[Adapted from yocto project]
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Lauren Post <lauren.post@freescale.com>
|
||||
Signed-off-by: Evan Kotara <evan.kotara@freescale.com>
|
||||
[Thomas: change CAS code to only be used on ARMv6/ARMv7, and not
|
||||
ARMv4/ARMv5, which don't support ldrex/strex. If no CAS implementation
|
||||
is provided libdrm falls back to a system call for locking/unlocking.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
xf86drm.h | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/xf86drm.h b/xf86drm.h
|
||||
index 481d882..72341f6 100644
|
||||
--- a/xf86drm.h
|
||||
+++ b/xf86drm.h
|
||||
@@ -469,6 +469,28 @@ do { register unsigned int __old __asm("o0"); \
|
||||
: "cr0", "memory"); \
|
||||
} while (0)
|
||||
|
||||
+# elif defined (__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
|
||||
+ || defined (__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \
|
||||
+ || defined (__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \
|
||||
+ || defined (__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
|
||||
+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
|
||||
+ || defined(__ARM_ARCH_7EM__)
|
||||
+ #undef DRM_DEV_MODE
|
||||
+ #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
|
||||
+
|
||||
+ #define DRM_CAS(lock,old,new,__ret) \
|
||||
+ do { \
|
||||
+ __asm__ __volatile__ ( \
|
||||
+ "1: ldrex %0, [%1]\n" \
|
||||
+ " teq %0, %2\n" \
|
||||
+ " ite eq\n" \
|
||||
+ " strexeq %0, %3, [%1]\n" \
|
||||
+ " movne %0, #1\n" \
|
||||
+ : "=&r" (__ret) \
|
||||
+ : "r" (lock), "r" (old), "r" (new) \
|
||||
+ : "cc","memory"); \
|
||||
+ } while (0)
|
||||
+
|
||||
#endif /* architecture */
|
||||
#endif /* __GNUC__ >= 2 */
|
||||
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 7384f79f69fdb7b691cc5b0c28c301b3fe8b633e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 26 May 2016 10:46:57 +0200
|
||||
Subject: [PATCH] xf86atomic: require CAS support in libatomic_ops
|
||||
|
||||
Since AO_compare_and_swap_full() is used by libdrm, AO_REQUIRE_CAS
|
||||
must be defined before including <atomic_ops.h> so that we are sure
|
||||
that CAS support will be provided. This is necessary to make sure that
|
||||
the AO_compare_and_swap_full() function will be provided on all
|
||||
architectures, including the ones that don't have built-in CAS support
|
||||
such as SPARCv8.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
xf86atomic.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/xf86atomic.h b/xf86atomic.h
|
||||
index 922b37d..d7017a5 100644
|
||||
--- a/xf86atomic.h
|
||||
+++ b/xf86atomic.h
|
||||
@@ -58,6 +58,7 @@ typedef struct {
|
||||
#endif
|
||||
|
||||
#if HAVE_LIB_ATOMIC_OPS
|
||||
+#define AO_REQUIRE_CAS
|
||||
#include <atomic_ops.h>
|
||||
|
||||
#define HAS_ATOMIC_OPS 1
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 00f6ac3c24f36fa07fa93f4a89ee873edf125098 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Mon, 16 Jul 2018 23:01:40 +0200
|
||||
Subject: [PATCH] meson.build: fix intel atomics detection
|
||||
|
||||
Use the stronger compiler.link() test (instead of the weaker
|
||||
compiler.compile()) to fix the intel atomics detection.
|
||||
|
||||
Fixes false positive in case of sparc compile (buildroot toolchain).
|
||||
|
||||
Upstream suggested: https://lists.freedesktop.org/archives/dri-devel/2018-July/183885.html
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
meson.build | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 9b443a5..3c8afb6 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -49,9 +49,10 @@ intel_atomics = false
|
||||
lib_atomics = false
|
||||
|
||||
dep_atomic_ops = dependency('atomic_ops', required : false)
|
||||
-if cc.compiles('''
|
||||
+if cc.links('''
|
||||
int atomic_add(int *i) { return __sync_add_and_fetch (i, 1); }
|
||||
int atomic_cmpxchg(int *i, int j, int k) { return __sync_val_compare_and_swap (i, j, k); }
|
||||
+ int main() { }
|
||||
''',
|
||||
name : 'Intel Atomics')
|
||||
intel_atomics = true
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
From c7d89412884de2dbfa543720d185027377e62f21 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
Date: Fri, 5 Jun 2020 23:46:52 +0200
|
||||
Subject: [PATCH] xf86drm.c: fix build failure
|
||||
|
||||
./xf86drm.c: In function 'drmNodeIsDRM':
|
||||
../xf86drm.c:2825:7: error: "__FreeBSD__" is not defined [-Werror=undef]
|
||||
#elif __FreeBSD__
|
||||
^
|
||||
../xf86drm.c: In function 'drmGetMinorNameForFD':
|
||||
../xf86drm.c:2938:7: error: "__FreeBSD__" is not defined [-Werror=undef]
|
||||
#elif __FreeBSD__
|
||||
^
|
||||
../xf86drm.c: In function 'drmParsePciBusInfo':
|
||||
../xf86drm.c:3258:7: error: "__FreeBSD__" is not defined [-Werror=undef]
|
||||
#elif __FreeBSD__
|
||||
^
|
||||
../xf86drm.c: In function 'drmParsePciDeviceInfo':
|
||||
../xf86drm.c:3427:7: error: "__FreeBSD__" is not defined [-Werror=undef]
|
||||
#elif __FreeBSD__
|
||||
^
|
||||
../xf86drm.c: In function 'drmGetDeviceNameFromFd2':
|
||||
../xf86drm.c:4305:7: error: "__FreeBSD__" is not defined [-Werror=undef]
|
||||
#elif __FreeBSD__
|
||||
^
|
||||
|
||||
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
[A merge-request with this fix is opened at https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/75]
|
||||
---
|
||||
xf86drm.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/xf86drm.c b/xf86drm.c
|
||||
index 07a18c44..50a6f092 100644
|
||||
--- a/xf86drm.c
|
||||
+++ b/xf86drm.c
|
||||
@@ -2822,7 +2822,7 @@ static bool drmNodeIsDRM(int maj, int min)
|
||||
snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device/drm",
|
||||
maj, min);
|
||||
return stat(path, &sbuf) == 0;
|
||||
-#elif __FreeBSD__
|
||||
+#elif defined(__FreeBSD__)
|
||||
char name[SPECNAMELEN];
|
||||
|
||||
if (!devname_r(makedev(maj, min), S_IFCHR, name, sizeof(name)))
|
||||
@@ -2935,7 +2935,7 @@ static char *drmGetMinorNameForFD(int fd, int type)
|
||||
|
||||
closedir(sysdir);
|
||||
return NULL;
|
||||
-#elif __FreeBSD__
|
||||
+#elif defined(__FreeBSD__)
|
||||
struct stat sbuf;
|
||||
char dname[SPECNAMELEN];
|
||||
const char *mname;
|
||||
@@ -3255,7 +3255,7 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
|
||||
info->func = pinfo.func;
|
||||
|
||||
return 0;
|
||||
-#elif __FreeBSD__
|
||||
+#elif defined(__FreeBSD__)
|
||||
return get_sysctl_pci_bus_info(maj, min, info);
|
||||
#else
|
||||
#warning "Missing implementation of drmParsePciBusInfo"
|
||||
@@ -3424,7 +3424,7 @@ static int drmParsePciDeviceInfo(int maj, int min,
|
||||
device->subdevice_id = pinfo.subdevice_id;
|
||||
|
||||
return 0;
|
||||
-#elif __FreeBSD__
|
||||
+#elif defined(__FreeBSD__)
|
||||
drmPciBusInfo info;
|
||||
struct pci_conf_io pc;
|
||||
struct pci_match_conf patterns[1];
|
||||
@@ -4302,7 +4302,7 @@ drm_public char *drmGetDeviceNameFromFd2(int fd)
|
||||
free(value);
|
||||
|
||||
return strdup(path);
|
||||
-#elif __FreeBSD__
|
||||
+#elif defined(__FreeBSD__)
|
||||
return drmGetDeviceNameFromFd(fd);
|
||||
#else
|
||||
struct stat sbuf;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From 6c7b305869b941e52cb846cbed5e4a5c85d035d9 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Mon, 18 Jun 2018 15:07:03 +0100
|
||||
Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
|
||||
|
||||
POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
|
||||
use (int, unsigned long int, ...) instead.
|
||||
|
||||
Use a #ifdef to adapt the replacement function as appropriate.
|
||||
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
[Taken from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
tests/nouveau/threaded.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
|
||||
index 3669bcd..e1c27c0 100644
|
||||
--- a/tests/nouveau/threaded.c
|
||||
+++ b/tests/nouveau/threaded.c
|
||||
@@ -36,7 +36,11 @@ static int failed;
|
||||
|
||||
static int import_fd;
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
int ioctl(int fd, unsigned long request, ...)
|
||||
+#else
|
||||
+int ioctl(int fd, int request, ...)
|
||||
+#endif
|
||||
{
|
||||
va_list va;
|
||||
int ret;
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From f0adb08424e624aeee340291343281256b7a98e8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sat, 7 Mar 2020 12:23:09 +0100
|
||||
Subject: [PATCH] tests/amdgpu: needs atomic_ops
|
||||
|
||||
[Upstream: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/50]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
tests/amdgpu/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build
|
||||
index 1726cb43..4dfa5c83 100644
|
||||
--- a/tests/amdgpu/meson.build
|
||||
+++ b/tests/amdgpu/meson.build
|
||||
@@ -26,7 +26,7 @@ if dep_cunit.found()
|
||||
'vce_tests.c', 'uvd_enc_tests.c', 'vcn_tests.c', 'deadlock_tests.c',
|
||||
'vm_tests.c', 'ras_tests.c', 'syncobj_tests.c',
|
||||
),
|
||||
- dependencies : [dep_cunit, dep_threads],
|
||||
+ dependencies : [dep_cunit, dep_threads, dep_atomic_ops],
|
||||
include_directories : [inc_root, inc_drm, include_directories('../../amdgpu')],
|
||||
link_with : [libdrm, libdrm_amdgpu],
|
||||
install : with_install_tests,
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# From https://lists.freedesktop.org/archives/dri-devel/2019-October/240455.html
|
||||
md5 f47bc87e28198ba527e6b44ffdd62f65 libdrm-2.4.100.tar.bz2
|
||||
sha1 9f526909aba08b5658cfba3f7fde9385cad6f3b5 libdrm-2.4.100.tar.bz2
|
||||
sha256 c77cc828186c9ceec3e56ae202b43ee99eb932b4a87255038a80e8a1060d0a5d libdrm-2.4.100.tar.bz2
|
||||
sha512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247 libdrm-2.4.100.tar.bz2
|
||||
# From https://lists.freedesktop.org/archives/dri-devel/2020-May/267255.html
|
||||
sha256 8bcbf9336c28e393d76c1f16d7e79e394a7fce8a2e929d52d3ad7ad8525ba05b libdrm-2.4.102.tar.xz
|
||||
sha512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBDRM_VERSION = 2.4.100
|
||||
LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
|
||||
LIBDRM_VERSION = 2.4.102
|
||||
LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz
|
||||
LIBDRM_SITE = https://dri.freedesktop.org/libdrm
|
||||
LIBDRM_LICENSE = MIT
|
||||
LIBDRM_INSTALL_STAGING = YES
|
||||
|
||||
Reference in New Issue
Block a user