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
@@ -3,8 +3,8 @@ Use pkg-config to determine alsa link flags. This fixes static linking.
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
|
||||
diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
|
||||
--- flite-1.4-release.orig/flite-1.4-release/configure.in 2009-08-14 23:46:38.000000000 +0300
|
||||
+++ flite-1.4-release/flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300
|
||||
--- flite-1.4-release.orig/configure.in 2009-08-14 23:46:38.000000000 +0300
|
||||
+++ flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300
|
||||
@@ -275,7 +275,10 @@
|
||||
#endif],
|
||||
[AUDIODRIVER="alsa"
|
||||
@@ -1,30 +0,0 @@
|
||||
From 658f3243238efe951f6242fa384e990d77078afc Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Fri, 27 Dec 2013 17:42:39 +0100
|
||||
Subject: [PATCH] now honor DESTDIR env. var.
|
||||
|
||||
Flite used a handwritten a Makefile which doesn't honor DESTDIR environment
|
||||
variable, though it uses autoconf.
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
---
|
||||
config/config.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/config/config.in b/config/config.in
|
||||
index 914d2bf..43f1a56 100644
|
||||
--- a/flite-1.4-release/config/config.in
|
||||
+++ b/flite-1.4-release/config/config.in
|
||||
@@ -49,6 +49,6 @@ include $(TOP)/config/$(langvox).lv
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
EXEEXT = @EXEEXT@
|
||||
-INSTALLBINDIR = @bindir@
|
||||
-INSTALLLIBDIR = @libdir@
|
||||
-INSTALLINCDIR = @includedir@/flite
|
||||
+INSTALLBINDIR = $(DESTDIR)@bindir@
|
||||
+INSTALLLIBDIR = $(DESTDIR)@libdir@
|
||||
+INSTALLINCDIR = $(DESTDIR)@includedir@/flite
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
[PATCH] fix alsa version check
|
||||
|
||||
Check the entire alsa version, and not just the subminor - As this broke
|
||||
with the recent alsa 1.0.x -> 1.1.0 release.
|
||||
|
||||
It is not clear what major/minor versions the check was supposed to be
|
||||
against (0.9 or 1.0). I went with 1.0.11 to be on the safe side.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
flite-1.4-release/configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: flite-1.4/flite-1.4-release/configure.in
|
||||
===================================================================
|
||||
--- flite-1.4.orig/flite-1.4-release/configure.in
|
||||
+++ flite-1.4/flite-1.4-release/configure.in
|
||||
@@ -270,7 +270,7 @@
|
||||
# the one I know -- you can still specific --with-audio=alsa
|
||||
AC_TRY_COMPILE([#include <alsa/version.h>],
|
||||
[int j=
|
||||
- #if SND_LIB_SUBMINOR >= 11
|
||||
+ #if SND_LIB_VERSION >= 0x1000b
|
||||
3;
|
||||
#endif],
|
||||
[AUDIODRIVER="alsa"
|
||||
@@ -10,7 +10,7 @@ config BR2_PACKAGE_FLITE
|
||||
an alternative synthesis engine to Festival for voices built
|
||||
using the FestVox suite of voice building tools.
|
||||
|
||||
http://www.speech.cs.cmu.edu/flite
|
||||
http://www.festvox.org/flite
|
||||
|
||||
comment "flite needs a toolchain w/ wchar"
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# locally computed hash
|
||||
sha256 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c flite-1.4-release.tar.bz2
|
||||
sha256 c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85 flite-2.1-release.tar.bz2
|
||||
# License files, locally calculated
|
||||
sha256 4cbeaee8c9a8f23f251f0ce56e9212d244d9ea6b0dbe48601623d920054249a1 flite-1.4-release/COPYING
|
||||
sha256 d31bceaf2823d56a8c9400f7bde3b17140e739e991eb4f203bdcf9827754ab59 COPYING
|
||||
|
||||
@@ -4,28 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FLITE_VERSION = 1.4
|
||||
FLITE_VERSION = 2.1
|
||||
FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
|
||||
FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
|
||||
# $ tar tf flite-1.4-release.tar.bz2
|
||||
# ...
|
||||
# flite-1.4-release//install-sh
|
||||
# flite-1.4-release//mkinstalldirs
|
||||
# flite-1.4-release//Exports.def
|
||||
# flite-1.4-release//flite.sln
|
||||
# flite-1.4-release//fliteDll.vcproj
|
||||
# flite-1.4-release/config/Makefile
|
||||
# flite-1.4-release/config/common_make_rules
|
||||
# flite-1.4-release/config/project.mak
|
||||
# flite-1.4-release/config/config.in
|
||||
# flite-1.4-release/config/system.mak.in
|
||||
#
|
||||
# So, we set FLITE_STRIP_COMPONENTS=0 to avoid writing to "/", and then
|
||||
# build in flite-1.4-release/
|
||||
FLITE_STRIP_COMPONENTS = 0
|
||||
FLITE_SUBDIR = flite-$(FLITE_VERSION)-release
|
||||
FLITE_SITE = http://www.festvox.org/flite/packed/flite-$(FLITE_VERSION)
|
||||
FLITE_LICENSE = BSD-4-Clause
|
||||
FLITE_LICENSE_FILES = $(FLITE_SUBDIR)/COPYING
|
||||
FLITE_LICENSE_FILES = COPYING
|
||||
|
||||
FLITE_INSTALL_STAGING = YES
|
||||
# Patching configure.in
|
||||
|
||||
Reference in New Issue
Block a user