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
61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From 9225b076d107538209fbd5b8bbc21a68d1b2c016 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Wed, 15 Jul 2020 22:42:44 +0200
|
|
Subject: [PATCH] Revert "build: Always build gupnp-binding-tool manpage"
|
|
|
|
This reverts commit 23f54c2a1e8718e836224d68dafded091604a677 until
|
|
upstream decides what to do between adding a new option or renaming
|
|
gtk_doc into documentation:
|
|
https://gitlab.gnome.org/GNOME/gupnp/-/issues/17
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
doc/meson.build | 2 --
|
|
meson.build | 5 ++++-
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/doc/meson.build b/doc/meson.build
|
|
index b71b657..478650b 100644
|
|
--- a/doc/meson.build
|
|
+++ b/doc/meson.build
|
|
@@ -4,7 +4,6 @@ version_xml = configure_file(input: 'version.xml.in',
|
|
output: 'version.xml', configuration:
|
|
entities)
|
|
|
|
-if get_option('gtk_doc')
|
|
gnome.gtkdoc('gupnp',
|
|
main_xml : 'gupnp-docs.xml',
|
|
src_dir : [join_paths(meson.source_root(), 'libgupnp'),
|
|
@@ -27,7 +26,6 @@ gnome.gtkdoc('gupnp',
|
|
'gupnp-types-private.h'
|
|
],
|
|
install : true)
|
|
-endif
|
|
|
|
xsltproc = find_program('xsltproc', required: false)
|
|
if xsltproc.found()
|
|
diff --git a/meson.build b/meson.build
|
|
index 28c40b2..dea0a49 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -31,12 +31,15 @@ dependencies = [
|
|
subdir('libgupnp')
|
|
subdir('tests')
|
|
subdir('tools')
|
|
-subdir('doc')
|
|
|
|
if get_option('vapi') and get_option('introspection')
|
|
subdir('vala')
|
|
endif
|
|
|
|
+if get_option('gtk_doc')
|
|
+ subdir('doc')
|
|
+endif
|
|
+
|
|
if get_option('examples')
|
|
subdir('examples')
|
|
endif
|
|
--
|
|
2.27.0
|
|
|