From 49ab97ca86593de1bcb16c70e58e3cb62c16623d Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Fri, 17 Apr 2020 00:32:18 +0300 Subject: [PATCH 1/3] bcm27xx: backup /boot/cmdline.txt and restore early If you want to use the Raspberry Pi UART, "console=serial0,115200" needs to be removed from the kernel cmdline. This is done by editing /boot/cmdline.txt. However, this file is not currently backed up during sysupgrade, so this effectively breaks HATs that require the use of the UART every sysupgrade. Backup this file during sysupgrade, and restore it before rebooting. Signed-off-by: Stijn Tintel --- target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform | 1 + target/linux/bcm27xx/base-files/lib/upgrade/platform.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform b/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform index 786796577d..22f09da43d 100644 --- a/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform +++ b/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform @@ -1 +1,2 @@ +/boot/cmdline.txt /boot/config.txt diff --git a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh index 811355b8f7..37c77edb34 100644 --- a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh @@ -92,7 +92,7 @@ platform_copy_config() { mkdir -p /boot [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" - tar -C / -zxvf "$UPGRADE_BACKUP" boot/config.txt + tar -C / -zxvf "$UPGRADE_BACKUP" boot/cmdline.txt boot/config.txt sync unmount /boot fi From 3a79e3b18572d8932f44de43a232e349bf32f37d Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sun, 3 May 2020 20:31:30 +0300 Subject: [PATCH 2/3] argp-standalone: fix segfault in canon_doc_option Backported from glibc. Signed-off-by: Stijn Tintel --- .../900-fix-segfault-in_canon_doc_option.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch diff --git a/package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch b/package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch new file mode 100644 index 0000000000..46bffbb0a9 --- /dev/null +++ b/package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch @@ -0,0 +1,14 @@ +--- a/argp-help.c ++++ b/argp-help.c +@@ -777,9 +777,9 @@ hol_entry_cmp (const struct hol_entry *e + const char *long2 = hol_entry_first_long (entry2); + + if (doc1) +- doc1 = canon_doc_option (&long1); ++ doc1 = long1 != NULL && canon_doc_option (&long1); + if (doc2) +- doc2 = canon_doc_option (&long2); ++ doc2 = long2 != NULL && canon_doc_option (&long2); + + if (doc1 != doc2) + /* `documentation' options always follow normal options (or From 0e522d5f4a31182312bd115c26c7edb654769724 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 2 May 2020 15:03:47 +0200 Subject: [PATCH 3/3] curl: update to version 7.70.0 - Release notes: https://curl.haxx.se/changes.html#7_70_0 - Refreshed patch Signed-off-by: Josef Schlehofer --- package/network/utils/curl/Makefile | 4 ++-- .../utils/curl/patches/200-no_docs_tests.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index c483ec1186..f2a7406164 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.69.1 +PKG_VERSION:=7.70.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \ https://curl.mirror.anstey.ca/ \ https://curl.askapache.com/download/ \ https://curl.haxx.se/download/ -PKG_HASH:=03c7d5e6697f7b7e40ada1b2256e565a555657398e6c1fcfa4cb251ccd819d4f +PKG_HASH:=032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/package/network/utils/curl/patches/200-no_docs_tests.patch b/package/network/utils/curl/patches/200-no_docs_tests.patch index e52694e2c9..53f8c6c3f6 100644 --- a/package/network/utils/curl/patches/200-no_docs_tests.patch +++ b/package/network/utils/curl/patches/200-no_docs_tests.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -179,7 +179,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -189,7 +189,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src @@ -9,14 +9,14 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc -@@ -290,8 +290,8 @@ cygwinbin: +@@ -300,8 +300,8 @@ cygwinbin: # We extend the standard install with a custom hook: install-data-hook: - cd include && $(MAKE) install -- cd docs && $(MAKE) install -- cd docs/libcurl && $(MAKE) install -+ #cd docs && $(MAKE) install -+ #cd docs/libcurl && $(MAKE) install + (cd include && $(MAKE) install) +- (cd docs && $(MAKE) install) +- (cd docs/libcurl && $(MAKE) install) ++ #(cd docs && $(MAKE) install) ++ #(cd docs/libcurl && $(MAKE) install) # We extend the standard uninstall with a custom hook: uninstall-hook: