d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump buildroot to 2020.11-rc1 (#985)

Browse Source 
* 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
2020-11-13 18:25:44 +01:00
committed by GitHub
parent 25a0dd3082
commit a0871be6c0
4024 changed files with 68095 additions and 47900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
buildroot/package/gnuplot/0001-configure-add-without-demo-option.patch
View File

@@ -3,15 +3,16 @@ Add options to enable/disable docs and demos
Originally written by Anthony Viallard
<viallard@syscom-instruments.com>.
[Vincent: adapt patch to 5.0.5 version]
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 -rup a/configure.in b/configure.in
--- a/configure.in 2016-09-07 05:14:29.000000000 +0100
+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000
@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then
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
@@ -24,13 +25,14 @@ diff -rup a/configure.in b/configure.in
+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)
@@ -1303,6 +1313,24 @@ fi
dnl No configuration option for this one yet
AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported])
@@ -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
@@ -53,15 +55,15 @@ diff -rup a/configure.in b/configure.in
dnl Substitute variables
AC_SUBST(PACKAGE)
AC_SUBST(VERSION_MAJOR)
diff -rup a/Makefile.am b/Makefile.am
--- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100
+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000
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 $(LISPDIR) man demo tutorial share
+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
-SUBDIRS = config m4 term src docs man demo share
+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) share
EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
PATCHLEVEL PGPKEYS README RELEASE_NOTES \

27
buildroot/package/gnuplot/0002-use-gdlib-config-properly.patch
View File

@@ -1,27 +0,0 @@
Fix usage of gdlib-config
gnuplot configure.in script properly takes care of finding
gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config
instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG
has defined. Which means that whenever a gdlib-config binary not in
the PATH is being used, it does not use it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/configure.in
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -537,9 +537,9 @@
if test "$with_gd" != no; then
AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
if test -n "$GDLIB_CONFIG"; then
- libgd_CPPFLAGS=`gdlib-config --cflags`
- libgd_LDFLAGS=`gdlib-config --ldflags`
- libgd_LIBS=`gdlib-config --libs`
+ libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
+ libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
+ libgd_LIBS=`$GDLIB_CONFIG --libs`
elif test -d "$with_gd"; then
libgd_CPPFLAGS="-I$with_gd/include"
libgd_LDFLAGS="-L$with_gd/lib"

17
buildroot/package/gnuplot/0002-without-history.patch Normal file
View File

@@ -0,0 +1,17 @@
history.c: Patch to solve the 'undefined reference to gp_read_history'
Signed-off-by: Michael Fischer <mf@go-sys.de>
diff -purN gnuplot-5.4.0.org/src/history.c gnuplot-5.4.0/src/history.c
--- gnuplot-5.4.0.org/src/history.c 2019-12-10 07:22:32.000000000 +0100
+++ gnuplot-5.4.0/src/history.c 2020-09-14 10:07:36.525441702 +0200
@@ -91,7 +91,9 @@ write_history(char *filename)
void
read_history(char *filename)
{
- gp_read_history(filename);
+#ifdef GNUPLOT_HISTORY
+ gp_read_history(filename);
+#endif
}

8
buildroot/package/gnuplot/gnuplot.hash
View File

@@ -1,6 +1,6 @@
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.6/
md5 8ec46520a86a61163a701b00404faf1a gnuplot-5.0.6.tar.gz
sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0 gnuplot-5.0.6.tar.gz
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.0/
md5 ac586178f3b031dea82cd3890cefb21b gnuplot-5.4.0.tar.gz
sha1 b4660dff7d047a453c55fd77faba11f63bb2d5ed gnuplot-5.4.0.tar.gz
# Locally computed
sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz
sha256 eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47 gnuplot-5.4.0.tar.gz
sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright

2
buildroot/package/gnuplot/gnuplot.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
GNUPLOT_VERSION = 5.0.6
GNUPLOT_VERSION = 5.4.0
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
GNUPLOT_LICENSE = gnuplot license (open source)
GNUPLOT_LICENSE_FILES = Copyright