mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-14 05:09:27 +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
70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
Add options to enable/disable docs and demos
|
|
|
|
Originally written by Anthony Viallard
|
|
<viallard@syscom-instruments.com>.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
[Vincent: adapt patch to 5.0.5 version]
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
[Michael: adapt patch to 5.4.0 version]
|
|
Signed-off-by: Michael Fischer <mf@go-sys.de>
|
|
|
|
diff -Naur a/configure.ac b/configure.ac
|
|
--- a/configure.ac 2020-07-12 02:29:47.000000000 +0200
|
|
+++ b/configure.ac 2020-08-06 14:21:17.918756893 +0200
|
|
@@ -713,6 +713,17 @@
|
|
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
|
|
fi
|
|
|
|
+dnl Whether we want to build the doc files
|
|
+dnl Does nothing here, is passed on to the doc subdir
|
|
+AC_ARG_ENABLE(doc,dnl
|
|
+[ --disable-doc do not build doc files])
|
|
+
|
|
+dnl Whether we want to build the demo files
|
|
+dnl Does nothing here, is passed on to the demo subdir
|
|
+AC_ARG_ENABLE(demo,dnl
|
|
+[ --disable-demo do not build demo files])
|
|
+
|
|
+
|
|
dnl Sort help/subtopic tables by row or column
|
|
AC_ARG_WITH(row-help,dnl
|
|
[ --with-row-help format help and subtopic tables by row (default)
|
|
@@ -1095,6 +1106,24 @@
|
|
AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
|
|
fi
|
|
|
|
+dnl build doc files
|
|
+if test "$enable_doc" != no; then
|
|
+ AC_CONFIG_SUBDIRS(docs)
|
|
+ DOCSUBDIR=docs
|
|
+else
|
|
+ DOCSUBDIR=
|
|
+fi
|
|
+AC_SUBST(DOCSUBDIR)
|
|
+
|
|
+dnl build demo files
|
|
+if test "$enable_demo" != no; then
|
|
+ AC_CONFIG_SUBDIRS(demo)
|
|
+ DEMOSUBDIR=demo
|
|
+else
|
|
+ DEMOSUBDIR=
|
|
+fi
|
|
+AC_SUBST(DEMOSUBDIR)
|
|
+
|
|
dnl Substitute variables
|
|
AC_SUBST(PACKAGE)
|
|
AC_SUBST(VERSION_MAJOR)
|
|
diff -Naur a/Makefile.am b/Makefile.am
|
|
--- a/Makefile.am 2020-03-31 19:28:16.000000000 +0200
|
|
+++ b/Makefile.am 2020-08-06 14:34:12.995097799 +0200
|
|
@@ -1,7 +1,7 @@
|
|
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
-SUBDIRS = config m4 term src docs man demo share
|
|
+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share
|
|
|
|
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
|
|
PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|