From 13e4578b7af7cf265b67a704a3d4237f14ba9ddb Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 13 Jan 2020 14:47:52 +0100 Subject: [PATCH] Migrate Buildroot 2019.02.9 (#539) --- .../0001-Docker-AppArmor-support.patch | 53 ++++++ ...001-docker-containerd-bump-to-v1.2.7.patch | 44 ----- .../0002-Docker-tini-static.patch | 41 +++++ .../0002-runc-add-AppArmor.patch | 26 --- ...3-docker-engine-add-AppArmor-support.patch | 37 ----- ...-Bump-firmware-for-kernel-4.19-RPi4.patch} | 0 ...network-manager-Bump-version-1.16.2.patch} | 0 ...lient.patch => 0005-Fix-dhcp-client.patch} | 0 ... => 0006-rpi-use-latest-wifi-driver.patch} | 0 ...e.patch => 0007-odroid-ux4-firmware.patch} | 0 ...el-5.4.patch => 0008-Add-kernel-5.4.patch} | 0 .../0008-tini-make-static-for-docker.patch | 25 --- ...-5.52.patch => 0009-Bump-bluez-5.52.patch} | 0 ...tch => 0010-Bump-WireGuard-20191219.patch} | 0 buildroot/CHANGES | 23 +++ buildroot/Makefile | 4 +- .../docs/manual/adding-packages-generic.txt | 8 +- buildroot/docs/manual/manual.html | 38 +++-- buildroot/docs/manual/manual.pdf | Bin 540805 -> 541567 bytes buildroot/docs/manual/manual.text | 21 ++- buildroot/docs/manual/rebuilding-packages.txt | 10 ++ buildroot/linux/Config.in | 2 +- buildroot/linux/linux.hash | 8 +- buildroot/package/busybox/busybox.mk | 4 +- buildroot/package/cc-tool/cc-tool.hash | 3 + .../package/cpio/0001-fix-CVE-2016-2037.patch | 51 ------ buildroot/package/cpio/cpio.hash | 7 +- buildroot/package/cpio/cpio.mk | 3 +- buildroot/package/cups/cups.hash | 2 +- buildroot/package/cups/cups.mk | 2 +- buildroot/package/dante/dante.mk | 2 +- .../dillo/0003-Fix-openssl-detection.patch | 29 ++++ .../dillo/0004-Support-OpenSSL-1.1.0.patch | 33 ++++ buildroot/package/docker-cli/docker-cli.hash | 2 +- buildroot/package/docker-cli/docker-cli.mk | 2 +- .../docker-containerd/docker-containerd.hash | 4 +- .../docker-containerd/docker-containerd.mk | 4 +- ...ix-faulty-runc-version-commit-scrape.patch | 45 ------ .../package/docker-engine/docker-engine.hash | 4 +- .../package/docker-engine/docker-engine.mk | 2 +- buildroot/package/easy-rsa/Config.in | 3 +- buildroot/package/ebtables/ebtables.mk | 10 +- .../0003-fix-parallel-build-issue.patch | 61 +++++++ buildroot/package/ecryptfs-utils/Config.in | 2 +- buildroot/package/efl/Config.in | 1 - .../package/freescale-imx/freescale-imx.mk | 2 +- buildroot/package/git/git.hash | 2 +- buildroot/package/git/git.mk | 2 +- .../glibc.hash | 2 +- buildroot/package/glibc/glibc.mk | 2 +- buildroot/package/gnupg2/gnupg2.hash | 8 +- buildroot/package/gnupg2/gnupg2.mk | 2 +- .../gstreamer1/gst1-plugins-bad/Config.in | 1 - .../kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 8 +- ...mize-archive_wstring_append_from_mbs.patch | 103 ++++++++++++ buildroot/package/libgit2/libgit2.hash | 2 +- buildroot/package/libgit2/libgit2.mk | 2 +- buildroot/package/libkrb5/libkrb5.mk | 2 +- ....in-add-libcroco-to-Requires.Private.patch | 35 ++++ ...uffer-Fix-size-comparison-with-count.patch | 48 ------ ...t-for-argc-argument-in-ssh_buffer_-u.patch | 152 ------------------ .../0003-more-strict-overflow-fixes.patch | 122 -------------- buildroot/package/libssh/libssh.hash | 4 +- buildroot/package/libssh/libssh.mk | 4 +- .../libtomcrypt/0001-fix-CVE-2019-17362.patch | 29 ++++ buildroot/package/libuio/libuio.mk | 2 +- .../package/linux-headers/Config.in.host | 8 +- buildroot/package/lirc-tools/lirc-tools.mk | 2 +- buildroot/package/lvm2/lvm2.mk | 4 + buildroot/package/mali-t76x/Config.in | 2 +- .../matchbox-desktop/matchbox-desktop.mk | 1 - buildroot/package/nodejs/nodejs.hash | 4 +- buildroot/package/nodejs/nodejs.mk | 2 +- .../package/ntp/0003-override-shell.patch | 20 +++ buildroot/package/ntp/ntp.mk | 2 +- ...otobuf-fix-compilation-issue-on-s390.patch | 38 ----- buildroot/package/opencv3/Config.in | 1 + buildroot/package/opencv3/opencv3.hash | 4 +- buildroot/package/opencv3/opencv3.mk | 11 +- buildroot/package/openpowerlink/Config.in | 1 - buildroot/package/perl-sys-cpu/Config.in | 2 + buildroot/package/pimd/Config.in | 2 +- buildroot/package/pkg-python.mk | 11 +- buildroot/package/python-coherence/Config.in | 2 +- buildroot/package/python-crc16/Config.in | 2 +- .../package/python-django/python-django.hash | 4 +- .../package/python-django/python-django.mk | 4 +- buildroot/package/python-dpkt/Config.in | 2 +- .../package/python-ecdsa/python-ecdsa.hash | 9 +- .../package/python-ecdsa/python-ecdsa.mk | 4 +- .../package/python-pyasn-modules/Config.in | 2 +- buildroot/package/python-pypcap/Config.in | 2 +- .../package/python-pyqt5/python-pyqt5.hash | 3 + .../package/python-pyqt5/python-pyqt5.mk | 108 ++++++++++++- .../python-subprocess32.mk | 17 ++ buildroot/package/python3/python3.hash | 6 +- buildroot/package/python3/python3.mk | 2 +- buildroot/package/qpdf/Config.in | 1 - buildroot/package/qpdf/qpdf.hash | 1 + buildroot/package/qpdf/qpdf.mk | 6 +- buildroot/package/qt-webkit-kiosk/Config.in | 2 + .../package/qt5/qt5virtualkeyboard/Config.in | 2 + buildroot/package/rpcbind/Config.in | 2 + buildroot/package/rtl8821au/Config.in | 2 +- buildroot/package/runc/runc.hash | 2 +- buildroot/package/runc/runc.mk | 4 +- buildroot/package/rygel/rygel.mk | 2 - buildroot/package/samba4/samba4.hash | 4 +- buildroot/package/samba4/samba4.mk | 2 +- .../sdl2/0002-fix-busy-loop-in-dlopen.patch | 41 +++++ buildroot/package/setserial/Config.in | 2 + buildroot/package/spidev_test/Config.in | 2 +- buildroot/package/syslog-ng/Config.in | 2 +- buildroot/package/tcllib/Config.in | 2 +- buildroot/package/tftpd/Config.in | 2 + buildroot/package/usbmount/Config.in | 2 +- buildroot/package/w_scan/Config.in | 2 +- ...ew-dependency-on-wchar-t-by-removing.patch | 70 -------- ...overwrite-stack-on-corrupt-RF64-file.patch | 118 -------------- ...overwrite-heap-on-corrupt-DSDIFF-fil.patch | 38 ----- ...fer-overflows-and-bad-allocs-on-corr.patch | 72 --------- ...1-issue-32-no-multiple-format-chunks.patch | 64 -------- ...e-size-of-unknown-chunks-before-mall.patch | 75 --------- buildroot/package/wavpack/wavpack.hash | 3 +- buildroot/package/wavpack/wavpack.mk | 7 +- buildroot/package/wsapi-fcgi/Config.in | 2 +- buildroot/package/wsapi-xavante/Config.in | 2 +- buildroot/package/wsapi/Config.in | 2 +- .../0001-modesettings-needs-dri2.patch | 2 +- ...ure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 ...003-Remove-check-for-useSIGIO-option.patch | 0 ...0004-include-misc.h-fix-uClibc-build.patch | 0 ...nd-Makefile.am-fix-build-without-glx.patch | 0 ...mon-xf86Init.c-fix-build-without-glx.patch | 45 ++++++ .../x11r7/xserver_xorg-server/Config.in | 4 +- .../xserver_xorg-server.hash | 13 +- buildroot/package/x265/Config.in | 2 +- ...ne.c-needs-time.h-fixes-musl-compile.patch | 38 +++++ buildroot/utils/scanpypi | 2 + 139 files changed, 898 insertions(+), 1178 deletions(-) create mode 100644 buildroot-patches/0001-Docker-AppArmor-support.patch delete mode 100644 buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch create mode 100644 buildroot-patches/0002-Docker-tini-static.patch delete mode 100644 buildroot-patches/0002-runc-add-AppArmor.patch delete mode 100644 buildroot-patches/0003-docker-engine-add-AppArmor-support.patch rename buildroot-patches/{0004-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch => 0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch} (100%) rename buildroot-patches/{0005-network-manager-Bump-version-1.16.2.patch => 0004-network-manager-Bump-version-1.16.2.patch} (100%) rename buildroot-patches/{0006-Fix-dhcp-client.patch => 0005-Fix-dhcp-client.patch} (100%) rename buildroot-patches/{0007-rpi-use-latest-wifi-driver.patch => 0006-rpi-use-latest-wifi-driver.patch} (100%) rename buildroot-patches/{0009-odroid-ux4-firmware.patch => 0007-odroid-ux4-firmware.patch} (100%) rename buildroot-patches/{0010-Add-kernel-5.4.patch => 0008-Add-kernel-5.4.patch} (100%) delete mode 100644 buildroot-patches/0008-tini-make-static-for-docker.patch rename buildroot-patches/{0011-Bump-bluez-5.52.patch => 0009-Bump-bluez-5.52.patch} (100%) rename buildroot-patches/{0012-Bump-WireGuard-20191219.patch => 0010-Bump-WireGuard-20191219.patch} (100%) delete mode 100644 buildroot/package/cpio/0001-fix-CVE-2016-2037.patch create mode 100644 buildroot/package/dillo/0003-Fix-openssl-detection.patch create mode 100644 buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch delete mode 100644 buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch create mode 100644 buildroot/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch rename buildroot/package/glibc/{glibc-2.28-110-g57922433fa038faa6e37798b9655f85a94978d89 => glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f}/glibc.hash (69%) create mode 100644 buildroot/package/libarchive/0008-Bugfix-and-optimize-archive_wstring_append_from_mbs.patch create mode 100644 buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch delete mode 100644 buildroot/package/libssh/0001-buffer-Fix-size-comparison-with-count.patch delete mode 100644 buildroot/package/libssh/0002-buffer-Use-size_t-for-argc-argument-in-ssh_buffer_-u.patch delete mode 100644 buildroot/package/libssh/0003-more-strict-overflow-fixes.patch create mode 100644 buildroot/package/libtomcrypt/0001-fix-CVE-2019-17362.patch create mode 100644 buildroot/package/ntp/0003-override-shell.patch delete mode 100644 buildroot/package/opencv3/0001-3rdparty-protobuf-fix-compilation-issue-on-s390.patch create mode 100644 buildroot/package/sdl2/0002-fix-busy-loop-in-dlopen.patch delete mode 100644 buildroot/package/wavpack/0001-fix-Github-issue-19-new-dependency-on-wchar-t-by-removing.patch delete mode 100644 buildroot/package/wavpack/0002-issue-27-do-not-overwrite-stack-on-corrupt-RF64-file.patch delete mode 100644 buildroot/package/wavpack/0003-issue-28-do-not-overwrite-heap-on-corrupt-DSDIFF-fil.patch delete mode 100644 buildroot/package/wavpack/0004-issue-28-fix-buffer-overflows-and-bad-allocs-on-corr.patch delete mode 100644 buildroot/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch delete mode 100644 buildroot/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch rename buildroot/package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0001-modesettings-needs-dri2.patch (89%) rename buildroot/package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename buildroot/package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0003-Remove-check-for-useSIGIO-option.patch (100%) rename buildroot/package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0004-include-misc.h-fix-uClibc-build.patch (100%) rename buildroot/package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch (100%) create mode 100644 buildroot/package/x11r7/xserver_xorg-server/1.20.6/0006-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch create mode 100644 buildroot/package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch diff --git a/buildroot-patches/0001-Docker-AppArmor-support.patch b/buildroot-patches/0001-Docker-AppArmor-support.patch new file mode 100644 index 000000000..6bb90865a --- /dev/null +++ b/buildroot-patches/0001-Docker-AppArmor-support.patch @@ -0,0 +1,53 @@ +From a874e0babaeefacd8e3d04a9c056dd6f1121307d Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Mon, 13 Jan 2020 12:27:06 +0000 +Subject: [PATCH 1/1] Docker: AppArmor support + +Signed-off-by: Pascal Vizeli +--- + package/docker-containerd/docker-containerd.mk | 1 + + package/docker-engine/docker-engine.mk | 2 +- + package/runc/runc.mk | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk +index 69068e44f8..4dc0ef4672 100644 +--- a/package/docker-containerd/docker-containerd.mk ++++ b/package/docker-containerd/docker-containerd.mk +@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \ + DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim + + DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim ++DOCKER_CONTAINERD_TAGS = apparmor + + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) + DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf +diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk +index 24022f7107..14673f3183 100644 +--- a/package/docker-engine/docker-engine.mk ++++ b/package/docker-engine/docker-engine.mk +@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \ + -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ + -X main.Version=$(DOCKER_ENGINE_VERSION) + +-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen ++DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor + DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd + + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +diff --git a/package/runc/runc.mk b/package/runc/runc.mk +index acf61ab160..3432dd5fe0 100644 +--- a/package/runc/runc.mk ++++ b/package/runc/runc.mk +@@ -13,7 +13,7 @@ RUNC_WORKSPACE = Godeps/_workspace + + RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) + +-RUNC_TAGS = cgo static_build ++RUNC_TAGS = cgo static_build apparmor + + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) + RUNC_TAGS += seccomp +-- +2.17.1 + diff --git a/buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch b/buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch deleted file mode 100644 index afd6d33bd..000000000 --- a/buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9759621540997500a9dc0163506a8eac1e4769cc Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Wed, 26 Jun 2019 09:57:05 +0000 -Subject: [PATCH 1/1] docker-containerd: bump to v1.2.7 - -Signed-off-by: Pascal Vizeli ---- - package/docker-containerd/docker-containerd.hash | 2 +- - package/docker-containerd/docker-containerd.mk | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash -index 525191c651..163a519d36 100644 ---- a/package/docker-containerd/docker-containerd.hash -+++ b/package/docker-containerd/docker-containerd.hash -@@ -1,3 +1,3 @@ - # Computed locally --sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 docker-containerd-v1.2.6.tar.gz -+sha256 7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801 docker-containerd-v1.2.7.tar.gz - sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE -diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index c67b36e7dc..4c0877ecd1 100644 ---- a/package/docker-containerd/docker-containerd.mk -+++ b/package/docker-containerd/docker-containerd.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --DOCKER_CONTAINERD_VERSION = v1.2.6 -+DOCKER_CONTAINERD_VERSION = v1.2.7 - DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) - DOCKER_CONTAINERD_LICENSE = Apache-2.0 - DOCKER_CONTAINERD_LICENSE_FILES = LICENSE -@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \ - DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim - - DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim -+DOCKER_CONTAINERD_TAGS = apparmor - - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf --- -2.17.1 - diff --git a/buildroot-patches/0002-Docker-tini-static.patch b/buildroot-patches/0002-Docker-tini-static.patch new file mode 100644 index 000000000..32815ddfb --- /dev/null +++ b/buildroot-patches/0002-Docker-tini-static.patch @@ -0,0 +1,41 @@ +From 81bf3979ac5aec0dd8d4bccc690fe1bcef5de139 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Mon, 13 Jan 2020 12:30:48 +0000 +Subject: [PATCH 1/1] Docker: tini & static + +Signed-off-by: Pascal Vizeli +--- + package/docker-engine/docker-engine.mk | 6 ++++++ + package/tini/tini.mk | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk +index 14673f3183..b0eaae9580 100644 +--- a/package/docker-engine/docker-engine.mk ++++ b/package/docker-engine/docker-engine.mk +@@ -82,4 +82,10 @@ define DOCKER_ENGINE_USERS + - - docker -1 * - - - Docker Application Container Framework + endef + ++define DOCKER_ENGINE_INSTALL_SYMLINKS ++ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init ++endef ++ ++DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS ++ + $(eval $(golang-package)) +diff --git a/package/tini/tini.mk b/package/tini/tini.mk +index 132bfc99dd..b6d7d80b22 100644 +--- a/package/tini/tini.mk ++++ b/package/tini/tini.mk +@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE + TINI_CFLAGS = $(TARGET_CFLAGS) \ + -DTINI_VERSION=\"$(TINI_VERSION)\" \ + -DTINI_GIT=\"\" ++TINI_CFLAGS += -static + + ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) + TINI_CFLAGS += -DTINI_MINIMAL +-- +2.17.1 + diff --git a/buildroot-patches/0002-runc-add-AppArmor.patch b/buildroot-patches/0002-runc-add-AppArmor.patch deleted file mode 100644 index 56af8933c..000000000 --- a/buildroot-patches/0002-runc-add-AppArmor.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 021395083b5829c4fd00bebcdc7d38c2acd7232d Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Wed, 26 Jun 2019 10:00:31 +0000 -Subject: [PATCH 1/1] runc: add AppArmor - -Signed-off-by: Pascal Vizeli ---- - package/runc/runc.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/package/runc/runc.mk b/package/runc/runc.mk -index 55097e5a17..31da4fae58 100644 ---- a/package/runc/runc.mk -+++ b/package/runc/runc.mk -@@ -13,7 +13,7 @@ RUNC_WORKSPACE = Godeps/_workspace - - RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) - --RUNC_TAGS = cgo static_build -+RUNC_TAGS = cgo static_build apparmor - - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - RUNC_TAGS += seccomp --- -2.17.1 - diff --git a/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch b/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch deleted file mode 100644 index 98334cdce..000000000 --- a/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 93c43e8572d374edbea8521f63c071a0a5cb1098 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Thu, 3 Jan 2019 19:54:57 +0000 -Subject: [PATCH 1/1] docker-engine: add AppArmor support - -Signed-off-by: Pascal Vizeli ---- - package/docker-engine/docker-engine.mk | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index f19c1d9..9ecfd10 100644 ---- a/package/docker-engine/docker-engine.mk -+++ b/package/docker-engine/docker-engine.mk -@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \ - -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) - --DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen -+DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor - DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd - - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -@@ -77,4 +77,10 @@ define DOCKER_ENGINE_USERS - - - docker -1 * - - - Docker Application Container Framework - endef - -+define DOCKER_ENGINE_INSTALL_SYMLINKS -+ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init -+endef -+ -+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS -+ - $(eval $(golang-package)) --- -2.17.1 - diff --git a/buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch b/buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch similarity index 100% rename from buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch rename to buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch diff --git a/buildroot-patches/0005-network-manager-Bump-version-1.16.2.patch b/buildroot-patches/0004-network-manager-Bump-version-1.16.2.patch similarity index 100% rename from buildroot-patches/0005-network-manager-Bump-version-1.16.2.patch rename to buildroot-patches/0004-network-manager-Bump-version-1.16.2.patch diff --git a/buildroot-patches/0006-Fix-dhcp-client.patch b/buildroot-patches/0005-Fix-dhcp-client.patch similarity index 100% rename from buildroot-patches/0006-Fix-dhcp-client.patch rename to buildroot-patches/0005-Fix-dhcp-client.patch diff --git a/buildroot-patches/0007-rpi-use-latest-wifi-driver.patch b/buildroot-patches/0006-rpi-use-latest-wifi-driver.patch similarity index 100% rename from buildroot-patches/0007-rpi-use-latest-wifi-driver.patch rename to buildroot-patches/0006-rpi-use-latest-wifi-driver.patch diff --git a/buildroot-patches/0009-odroid-ux4-firmware.patch b/buildroot-patches/0007-odroid-ux4-firmware.patch similarity index 100% rename from buildroot-patches/0009-odroid-ux4-firmware.patch rename to buildroot-patches/0007-odroid-ux4-firmware.patch diff --git a/buildroot-patches/0010-Add-kernel-5.4.patch b/buildroot-patches/0008-Add-kernel-5.4.patch similarity index 100% rename from buildroot-patches/0010-Add-kernel-5.4.patch rename to buildroot-patches/0008-Add-kernel-5.4.patch diff --git a/buildroot-patches/0008-tini-make-static-for-docker.patch b/buildroot-patches/0008-tini-make-static-for-docker.patch deleted file mode 100644 index dc5873b98..000000000 --- a/buildroot-patches/0008-tini-make-static-for-docker.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e757b263a4f3ff67e69ae6cc6abdaa83039bf6b6 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Tue, 27 Nov 2018 20:31:33 +0000 -Subject: [PATCH 1/1] tini: make static for docker - -Signed-off-by: Pascal Vizeli ---- - package/tini/tini.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/package/tini/tini.mk b/package/tini/tini.mk -index 132bfc9..b6d7d80 100644 ---- a/package/tini/tini.mk -+++ b/package/tini/tini.mk -@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE - TINI_CFLAGS = $(TARGET_CFLAGS) \ - -DTINI_VERSION=\"$(TINI_VERSION)\" \ - -DTINI_GIT=\"\" -+TINI_CFLAGS += -static - - ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) - TINI_CFLAGS += -DTINI_MINIMAL --- -2.17.1 - diff --git a/buildroot-patches/0011-Bump-bluez-5.52.patch b/buildroot-patches/0009-Bump-bluez-5.52.patch similarity index 100% rename from buildroot-patches/0011-Bump-bluez-5.52.patch rename to buildroot-patches/0009-Bump-bluez-5.52.patch diff --git a/buildroot-patches/0012-Bump-WireGuard-20191219.patch b/buildroot-patches/0010-Bump-WireGuard-20191219.patch similarity index 100% rename from buildroot-patches/0012-Bump-WireGuard-20191219.patch rename to buildroot-patches/0010-Bump-WireGuard-20191219.patch diff --git a/buildroot/CHANGES b/buildroot/CHANGES index f95245379..a4d732bd2 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,26 @@ +2019.02.9, released January 12th, 2020 + + Important / security related fixes. + + pkg-python infrastructure: Ensure correct compiler and linker + flags are used for compiled code + + utils/scanpypi: Remind users to update DEVELOPERS + + Updated/fixed packages: busybox, cc-tool, cpio, cups, dante, + dillo, docker-cli, docker-containerd, docker-engine, easy-rsa, + ecryptfs-utils, efl, git, glibc, gnupg2, gst1-plugins-bad, + kf5-kcoreaddons, libarchive, libgit2, libkrb5, librsvg, + libssh, libtomcrypt, libuio, lirc-tools, lvm2, + matchbox-desktop, nodejs, ntp, opencv3, openpowerlink, + python-django, python-ecdsa, python-pyasn-modules, + python-pyqt5, python-subprocess32, python3, qpdf, runc, rygel, + samba4, sdl2, wavpack, xserver_xorg-server, zip + + Issues resolved (http://bugs.uclibc.org): + + #12121: PyQt5.QtSerialPort and other modules not being built + 2019.02.8, released December 7th, 2019 Important / security related fixes. diff --git a/buildroot/Makefile b/buildroot/Makefile index dfa62870c..93d30ff14 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2019.02.8 +export BR2_VERSION := 2019.02.9 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1575746000 +BR2_VERSION_EPOCH = 1578842000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/docs/manual/adding-packages-generic.txt b/buildroot/docs/manual/adding-packages-generic.txt index 7be1754f5..1e2f08cec 100644 --- a/buildroot/docs/manual/adding-packages-generic.txt +++ b/buildroot/docs/manual/adding-packages-generic.txt @@ -358,9 +358,11 @@ not and can not work as people would expect it should: * +LIBFOO_DEPENDENCIES+ lists the dependencies (in terms of package name) that are required for the current target package to compile. These dependencies are guaranteed to be compiled and - installed before the configuration of the current package starts. In - a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for - the current host package. + installed before the configuration of the current package starts. + However, modifications to configuration of these dependencies will + not force a rebuild of the current package. In a similar way, + +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for the current + host package. * +LIBFOO_EXTRACT_DEPENDENCIES+ lists the dependencies (in terms of package name) that are required for the current target package to be diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index 615893952..48f7cb006 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual


Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Integration with Eclipse
8.12. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
22. DEVELOPERS file and get-developers
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

Buildroot 2019.02.8 manual generated on 2019-12-07 -19:24:18 UTC from git revision aaa1437b11

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual


Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Graphing the dependencies between packages
8.9. Graphing the build duration
8.10. Graphing the filesystem size contribution of packages
8.11. Integration with Eclipse
8.12. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Frequently Asked Questions & Troubleshooting
10.1. The boot hangs after Starting network…
10.2. Why is there no compiler on the target?
10.3. Why are there no development files on the target?
10.4. Why is there no documentation on the target?
10.5. Why are some packages not visible in the Buildroot config menu?
10.6. Why not use the target directory as a chroot directory?
10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
10.8. How to speed-up the build process?
11. Known issues
12. Legal notice and licensing
12.1. Complying with open source licenses
12.2. Complying with the Buildroot license
13. Beyond Buildroot
13.1. Boot the generated images
13.2. Chroot
III. Developer guide
14. How Buildroot works
15. Coding style
15.1. Config.in file
15.2. The .mk file
15.3. The documentation
15.4. Support scripts
16. Adding support for a particular board
17. Adding new packages to Buildroot
17.1. Package directory
17.2. Config files
17.3. The .mk file
17.4. The .hash file
17.5. Infrastructure for packages with specific build systems
17.6. Infrastructure for autotools-based packages
17.7. Infrastructure for CMake-based packages
17.8. Infrastructure for Python packages
17.9. Infrastructure for LuaRocks-based packages
17.10. Infrastructure for Perl/CPAN packages
17.11. Infrastructure for virtual packages
17.12. Infrastructure for packages using kconfig for configuration files
17.13. Infrastructure for rebar-based packages
17.14. Infrastructure for Waf-based packages
17.15. Infrastructure for Meson-based packages
17.16. Integration of Cargo-based packages
17.17. Infrastructure for Go packages
17.18. Infrastructure for packages building kernel modules
17.19. Infrastructure for asciidoc documents
17.20. Infrastructure specific to the Linux kernel package
17.21. Hooks available in the various build steps
17.22. Gettext integration and interaction with packages
17.23. Tips and tricks
17.24. Conclusion
18. Patching a package
18.1. Providing patches
18.2. How patches are applied
18.3. Format and licensing of the package patches
18.4. Integrating patches found on the Web
19. Download infrastructure
20. Debugging Buildroot
21. Contributing to Buildroot
21.1. Reproducing, analyzing and fixing bugs
21.2. Analyzing and fixing autobuild failures
21.3. Reviewing and testing patches
21.4. Work on items from the TODO list
21.5. Submitting patches
21.6. Reporting issues/bugs or getting help
22. DEVELOPERS file and get-developers
IV. Appendix
23. Makedev syntax documentation
24. Makeusers syntax documentation
25. Migrating from older Buildroot versions
25.1. Migrating to 2016.11
25.2. Migrating to 2017.08

Buildroot 2019.02.9 manual generated on 2020-01-12 +15:28:43 UTC from git revision 24f25c8d23

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING +COPYING file in the Buildroot sources for the full text of this license.

Copyright © 2004-2019 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC processors, MIPS processors, ARM processors, etc.

Buildroot supports numerous processors and their variants; it also comes with default configurations for several boards available off-the-shelf. Besides this, a number of third-party projects are based on, -or develop their BSP [1] or -SDK [2] on top of Buildroot.



[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the +or develop their BSP [1] or +SDK [2] on top of Buildroot.



[1] BSP: Board Support Package

[2] SDK: Software Development Kit

Chapter 2. System requirements

Buildroot is designed to run on Linux systems.

While Buildroot itself will build most host packages it needs for the compilation, certain standard Linux utilities are expected to be already installed on the host system. Below you will find an overview of the mandatory and optional packages (note that package names may vary @@ -273,7 +273,7 @@ processor. Under most Linux systems, the compilation toolchain uses the GNU libc (glibc) as the C standard library. This compilation toolchain is called the "host compilation toolchain". The machine on which it is running, and on which you’re working, is called the "host -system" [3].

The compilation toolchain is provided by your distribution, and +system" [3].

The compilation toolchain is provided by your distribution, and Buildroot has nothing to do with it (other than using it to build a cross-compilation toolchain and other tools that are run on the development host).

As said above, the compilation toolchain that comes with your system @@ -577,7 +577,7 @@ The third solution is systemd. http://www.freedesktop.org/wiki/Software/systemd.

The solution recommended by Buildroot developers is to use the BusyBox init as it is sufficient for most embedded -systems. systemd can be used for more complex situations.



[3] This terminology differs from what is used by GNU +systems. systemd can be used for more complex situations.



[3] This terminology differs from what is used by GNU configure, where the host is the machine on which the application will run (which is usually the same as target)

Chapter 7. Configuration of other components

Before attempting to modify any of the components below, make sure you have already configured Buildroot itself, and have enabled the @@ -728,6 +728,16 @@ When a change to the root filesystem skeleton is made, a full overlay, a post-build script or a post-image script are made, there is no need for a full rebuild: a simple make invocation will take the changes into account. +

  • +When a package listed in FOO_DEPENDENCIES is rebuilt or removed, + the package foo is not automatically rebuilt. For example, if a + package bar is listed in FOO_DEPENDENCIES with FOO_DEPENDENCIES + = bar and the configuration of the bar package is changed, the + configuration change would not result in a rebuild of package foo + automatically. In this scenario, you may need to either rebuild any + packages in your build which reference bar in their DEPENDENCIES, + or perform a full rebuild to ensure any bar dependent packages are + up to date.
  • Generally speaking, when you’re facing a build error and you’re unsure of the potential consequences of the configuration changes you’ve made, do a full rebuild. If you get the same build error, then you are @@ -2700,7 +2710,7 @@ flags. The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s) of the shell script(s) needing fixing. All these names are relative to $(STAGING_DIR)/usr/bin and if needed multiple names can be given.

    In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed -from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

    Example 17.1. Config script: divine package

    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

    So its fixup would be:

    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 17.2. Config script: imagemagick package:

    Package imagemagick installs the following scripts: +from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

    Example 17.1. Config script: divine package

    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

    So its fixup would be:

    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 17.2. Config script: imagemagick package:

    Package imagemagick installs the following scripts: $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config

    So it’s fixup would be:

    IMAGEMAGICK_CONFIG_SCRIPTS = \
        Magick-config Magick++-config \
        MagickCore-config MagickWand-config Wand-config

    On line 14, we specify the list of dependencies this package relies @@ -2918,9 +2928,11 @@ because two builds can never be perfectly simultaneous, and because LIBFOO_DEPENDENCIES lists the dependencies (in terms of package name) that are required for the current target package to compile. These dependencies are guaranteed to be compiled and - installed before the configuration of the current package starts. In - a similar way, HOST_LIBFOO_DEPENDENCIES lists the dependencies for - the current host package. + installed before the configuration of the current package starts. + However, modifications to configuration of these dependencies will + not force a rebuild of the current package. In a similar way, + HOST_LIBFOO_DEPENDENCIES lists the dependencies for the current + host package.

  • LIBFOO_EXTRACT_DEPENDENCIES lists the dependencies (in terms of package name) that are required for the current target package to be @@ -5004,7 +5016,7 @@ large number of commits in the series;
  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. @@ -5083,7 +5095,7 @@ pastebin service. Note that not all available pastebin services will preserve Unix-style line terminators when downloading raw pastes. Following pastebin services are known to work correctly: - https://gist.github.com/ -- http://code.bulix.org/



  • [4] RFC: (Request for comments) change proposal

    Chapter 22. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that +- http://code.bulix.org/



    [4] RFC: (Request for comments) change proposal

    Chapter 22. DEVELOPERS file and get-developers

    The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks to this file, the get-developers tool allows to: