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
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
From f492b19f59229b0494b5b9ffe5c660a35493a405 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Mon, 29 Jun 2020 18:58:09 +0200
|
|
Subject: [PATCH] configure: replace deprecated macros
|
|
|
|
* use LT_INIT instead of deprecated AC_PROG_LIBTOOL
|
|
* use AS_HELP_STRING instead of deprecated AC_HELP_STRING
|
|
* quote macros
|
|
|
|
[Retrieved from:
|
|
https://github.com/rpm-software-management/popt/commit/f492b19f59229b0494b5b9ffe5c660a35493a405]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
configure.ac | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
mode change 100755 => 100644 configure.ac
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
old mode 100755
|
|
new mode 100644
|
|
index 3b71d1a..009ae7b
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1,5 +1,5 @@
|
|
-AC_PREREQ(2.57)
|
|
-AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org)
|
|
+AC_PREREQ([2.57])
|
|
+AC_INIT([popt], [1.18], [rpm-maint@lists.rpm.org])
|
|
AC_CONFIG_SRCDIR([src/popt.h])
|
|
AC_CONFIG_HEADERS([config.h])
|
|
|
|
@@ -14,11 +14,11 @@ AC_USE_SYSTEM_EXTENSIONS
|
|
AM_PROG_AR
|
|
|
|
AC_PROG_INSTALL
|
|
-AC_PROG_LIBTOOL
|
|
+LT_INIT
|
|
|
|
AC_SYS_LARGEFILE
|
|
|
|
-AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h)
|
|
+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h])
|
|
|
|
# For some systems we know that we have ld_version scripts.
|
|
# Use it then as default.
|
|
@@ -32,15 +32,15 @@ case "${host}" in
|
|
;;
|
|
esac
|
|
AC_ARG_ENABLE([ld-version-script],
|
|
- AC_HELP_STRING([--enable-ld-version-script],
|
|
+ [AS_HELP_STRING([--enable-ld-version-script],
|
|
[enable/disable use of linker version script.
|
|
- (default is system dependent)]),
|
|
+ (default is system dependent)])],
|
|
[have_ld_version_script=$enableval],
|
|
[ : ] )
|
|
AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
|
|
|
|
-AC_ARG_ENABLE(build-gcov,
|
|
- AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl
|
|
+AC_ARG_ENABLE([build-gcov],
|
|
+ [AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov])], [dnl
|
|
if test ".$enableval" = .yes; then
|
|
if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
|
|
dnl # GNU GCC (usually "gcc")
|
|
@@ -49,8 +49,8 @@ AC_ARG_ENABLE(build-gcov,
|
|
fi
|
|
])
|
|
|
|
-AC_SEARCH_LIBS(setreuid, [ucb])
|
|
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p)
|
|
+AC_SEARCH_LIBS([setreuid], [ucb])
|
|
+AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p])
|
|
|
|
AM_GNU_GETTEXT_VERSION([0.18.2])
|
|
AM_GNU_GETTEXT([external])
|