mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 13:49:26 +00:00
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
105 lines
3.1 KiB
Diff
105 lines
3.1 KiB
Diff
From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001
|
|
From: James Hilliard <james.hilliard1@gmail.com>
|
|
Date: Tue, 3 Mar 2020 15:27:51 -0700
|
|
Subject: [PATCH] build: add option to disable tests
|
|
|
|
When building for a product, tests are not needed.
|
|
|
|
Besides, one test requires a C++ compiler, which is not always
|
|
available.
|
|
|
|
So, add an option to configure to disable building tests altogether.
|
|
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
|
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
|
[Upstream status:
|
|
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
|
|
---
|
|
Makefile.am | 2 ++
|
|
configure.ac | 9 +++++++++
|
|
meson.build | 4 +++-
|
|
meson_options.txt | 4 ++++
|
|
4 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index cc87392..d5d43e3 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
|
|
include_HEADERS += egl/wayland-egl-backend.h
|
|
pkgconfig_DATA += egl/wayland-egl-backend.pc
|
|
|
|
+if ENABLE_TESTS
|
|
built_test_programs = \
|
|
array-test \
|
|
client-test \
|
|
@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la
|
|
|
|
exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
|
|
exec_fd_leak_checker_LDADD = libtest-helpers.la
|
|
+endif
|
|
|
|
EXTRA_DIST += tests/scanner-test.sh \
|
|
protocol/tests.xml \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index dda5e48..99b7c96 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries],
|
|
[],
|
|
[enable_libraries=yes])
|
|
|
|
+AC_ARG_ENABLE([tests],
|
|
+ [AC_HELP_STRING([--disable-tests],
|
|
+ [Disable compilation of test programs])],
|
|
+ [],
|
|
+ [enable_tests=yes])
|
|
+
|
|
+
|
|
AC_ARG_WITH([host-scanner],
|
|
[AC_HELP_STRING([--with-host-scanner],
|
|
[Use installed wayland-scanner from host PATH during build])],
|
|
@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
|
|
|
|
AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
|
|
|
|
+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
|
|
+
|
|
AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
|
|
[ ICONDIR=$withval],
|
|
[ ICONDIR=${datadir}/icons])
|
|
diff --git a/meson.build b/meson.build
|
|
index 5632f4e..b37bb7a 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -83,7 +83,9 @@ subdir('src')
|
|
if get_option('libraries')
|
|
subdir('cursor')
|
|
subdir('egl')
|
|
- subdir('tests')
|
|
+ if get_option('tests')
|
|
+ subdir('tests')
|
|
+ endif
|
|
endif
|
|
|
|
if get_option('documentation')
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 76314f7..ab4be92 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -2,6 +2,10 @@ option('libraries',
|
|
description: 'Compile Wayland libraries',
|
|
type: 'boolean',
|
|
value: 'true')
|
|
+option('tests',
|
|
+ description: 'Compile Wayland tests',
|
|
+ type: 'boolean',
|
|
+ value: 'true')
|
|
option('documentation',
|
|
description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
|
|
type: 'boolean',
|
|
--
|
|
2.20.1
|
|
|