diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index ba08e6f60..433c0833b 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -56,6 +56,8 @@ BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BAREBOX=y +BR2_TARGET_BAREBOX_CUSTOM_VERSION=y +BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2018.05.0" BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/barebox.config" BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/board/ova/barebox-env $(BR2_EXTERNAL_HASSOS_PATH)/barebox-env" diff --git a/buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch b/buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch deleted file mode 100644 index ad9b89547..000000000 --- a/buildroot-patches/0011-barebox-bump-to-version-2018.03.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ce08194279b6debecfa6105ec0db8afb24977f65 Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Wed, 21 Mar 2018 11:21:00 +0100 -Subject: [PATCH 1/1] barebox: bump to version 2018.03.0 - -Signed-off-by: Pascal Vizeli ---- - boot/barebox/Config.in | 4 ++-- - boot/barebox/barebox.hash | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in -index fd22d90..e703b07 100644 ---- a/boot/barebox/Config.in -+++ b/boot/barebox/Config.in -@@ -12,7 +12,7 @@ choice - Select the specific Barebox version you want to use - - config BR2_TARGET_BAREBOX_LATEST_VERSION -- bool "2017.09.0" -+ bool "2018.03.0" - - config BR2_TARGET_BAREBOX_CUSTOM_VERSION - bool "Custom version" -@@ -40,7 +40,7 @@ endif - - config BR2_TARGET_BAREBOX_VERSION - string -- default "2017.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION -+ default "2018.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION - default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION - default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL - default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT -diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash -index b241970..a34e228 100644 ---- a/boot/barebox/barebox.hash -+++ b/boot/barebox/barebox.hash -@@ -1,5 +1,5 @@ --# http://www.barebox.org/download/barebox-2017.09.0.tar.bz2.md5 --md5 b92e9c99cda7fbb61d01baf5679df261 barebox-2017.09.0.tar.bz2 -+# http://www.barebox.org/download/barebox-2018.03.0.tar.bz2.md5 -+md5 5a7692364684ad681c6a3c7a46e5000e barebox-2018.03.0.tar.bz2 - - # Locally calculated --sha256 43283edc019f95a53fdb7d1b7c294afc4741bfcace348d6beeded5fe5147a81b barebox-2017.09.0.tar.bz2 -+sha256 dbd1d3b21bcc7c885709bec6a7d728c51e05ae08b0552004e071fa09c3ec541e barebox-2018.03.0.tar.bz2 --- -2.7.4 - diff --git a/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch b/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch deleted file mode 100644 index 667065f09..000000000 --- a/buildroot-patches/0012-NetworkManager-allow-to-wait-on-boot.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Sat, 31 Mar 2018 16:58:14 +0200 -Subject: [PATCH 1/1] NetworkManager: allow to wait on boot - -Signed-off-by: Pascal Vizeli ---- - package/network-manager/network-manager.mk | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk -index a520aad..fb2012a 100644 ---- a/package/network-manager/network-manager.mk -+++ b/package/network-manager/network-manager.mk -@@ -93,6 +93,7 @@ endef - - define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -+ mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants - - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service -@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - -+ ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \ -+ $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service -+ - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - endef --- -2.7.4 - diff --git a/buildroot-patches/0013-Add-apparmor-support-to-docker.patch b/buildroot-patches/0013-Add-apparmor-support-to-docker.patch deleted file mode 100644 index 6aeca9863..000000000 --- a/buildroot-patches/0013-Add-apparmor-support-to-docker.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a5d50577d81efeccb4904e6b56793f84b7e3e89f Mon Sep 17 00:00:00 2001 -From: Pascal Vizeli -Date: Tue, 1 May 2018 23:35:05 +0200 -Subject: [PATCH 1/1] Add apparmor support to docker - ---- - package/docker-containerd/docker-containerd.mk | 1 + - package/docker-engine/docker-engine.mk | 2 +- - package/runc/runc.mk | 3 +-- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index 230307d..9be658d 100644 ---- a/package/docker-containerd/docker-containerd.mk -+++ b/package/docker-containerd/docker-containerd.mk -@@ -18,6 +18,7 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_CONTAINERD_GOPATH)" - -+DOCKER_CONTAINERD_BUILD_TAGS = apparmor - DOCKER_CONTAINERD_GLDFLAGS = \ - -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_COMMIT) - -diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index e3dde03..d500e71 100644 ---- a/package/docker-engine/docker-engine.mk -+++ b/package/docker-engine/docker-engine.mk -@@ -27,7 +27,7 @@ DOCKER_ENGINE_GLDFLAGS = \ - -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION) - --DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen -+DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen apparmor - DOCKER_ENGINE_BUILD_TARGETS = cli:docker - DOCKER_ENGINE_BUILD_TARGET_PARSE = \ - export targetpkg=$$(echo $(target) | cut -d: -f1); \ -diff --git a/package/runc/runc.mk b/package/runc/runc.mk -index f19fc5f..1ab0b70 100644 ---- a/package/runc/runc.mk -+++ b/package/runc/runc.mk -@@ -18,6 +18,7 @@ RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - GOPATH="$(RUNC_GOPATH)" \ - PATH=$(BR_PATH) - -+RUNC_GOTAGS = cgo apparmor - RUNC_GLDFLAGS = \ - -X main.gitCommit=$(RUNC_VERSION) - -@@ -26,8 +27,6 @@ RUNC_GLDFLAGS += -extldflags '-static' - RUNC_GOTAGS += static_build - endif - --RUNC_GOTAGS = cgo -- - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) - RUNC_GOTAGS += seccomp - RUNC_DEPENDENCIES += libseccomp host-pkgconf --- -2.7.4 - diff --git a/buildroot-patches/0014-package-rauc-Version-bump-to-0.4.patch b/buildroot-patches/0014-package-rauc-Version-bump-to-0.4.patch deleted file mode 100644 index 690bdd4c2..000000000 --- a/buildroot-patches/0014-package-rauc-Version-bump-to-0.4.patch +++ /dev/null @@ -1,34 +0,0 @@ -Version 0.4 supports bootloader updates to eMMC boot partitions. - -Signed-off-by: Jim Brennan ---- - package/rauc/rauc.hash | 4 ++-- - package/rauc/rauc.mk | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash -index 91d7c1d62e..a16340f185 100644 ---- a/package/rauc/rauc.hash -+++ b/package/rauc/rauc.hash -@@ -1,3 +1,3 @@ - # Locally calculated, after verifying against --# https://github.com/rauc/rauc/releases/download/v0.3/rauc-0.3.tar.xz.asc --sha256 dc01bfb08b1830376782f9a51cfec290171519267ab97cc909435da9ac6d6d98 rauc-0.3.tar.xz -+# https://github.com/rauc/rauc/releases/download/v0.4/rauc-0.4.tar.xz.asc -+sha256 89656b6330ac1f31293d450f5179896397c588ab52e77ec229382a6abd125d35 rauc-0.4.tar.xz -diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk -index 63fbc53022..f1705a8c33 100644 ---- a/package/rauc/rauc.mk -+++ b/package/rauc/rauc.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RAUC_VERSION = 0.3 -+RAUC_VERSION = 0.4 - RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) - RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz - RAUC_LICENSE = LGPL-2.1 --- -2.11.0 - diff --git a/buildroot/boot/barebox/Config.in b/buildroot/boot/barebox/Config.in index e703b0701..fd22d904b 100644 --- a/buildroot/boot/barebox/Config.in +++ b/buildroot/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2018.03.0" + bool "2017.09.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2018.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2017.09.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/buildroot/boot/barebox/barebox.hash b/buildroot/boot/barebox/barebox.hash index a34e22883..b24197024 100644 --- a/buildroot/boot/barebox/barebox.hash +++ b/buildroot/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2018.03.0.tar.bz2.md5 -md5 5a7692364684ad681c6a3c7a46e5000e barebox-2018.03.0.tar.bz2 +# http://www.barebox.org/download/barebox-2017.09.0.tar.bz2.md5 +md5 b92e9c99cda7fbb61d01baf5679df261 barebox-2017.09.0.tar.bz2 # Locally calculated -sha256 dbd1d3b21bcc7c885709bec6a7d728c51e05ae08b0552004e071fa09c3ec541e barebox-2018.03.0.tar.bz2 +sha256 43283edc019f95a53fdb7d1b7c294afc4741bfcace348d6beeded5fe5147a81b barebox-2017.09.0.tar.bz2 diff --git a/scripts/update-barebox.sh b/scripts/update-barebox.sh new file mode 100755 index 000000000..060764ffb --- /dev/null +++ b/scripts/update-barebox.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ -z "$1" ]; then + echo "Need a version!" + exit 1 +fi + +sed -i "s/BAREBOX_CUSTOM_VERSION_VALUE=\".*\"/BAREBOX_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/* diff --git a/scripts/update-cli.sh b/scripts/update-cli.sh new file mode 100755 index 000000000..9a9a183cb --- /dev/null +++ b/scripts/update-cli.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ -z "$1" ]; then + echo "Need a version!" + exit 1 +fi + +sed -i "s/CLI_VERSION=\".*\"/CLI_VERSION=\"$1\"/g" buildroot-external/configs/* diff --git a/scripts/update-supervisor.sh b/scripts/update-supervisor.sh new file mode 100755 index 000000000..6dcb0a7cf --- /dev/null +++ b/scripts/update-supervisor.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +if [ -z "$1" ]; then + echo "Need a version!" + exit 1 +fi + +sed -i "s/SUPERVISOR_VERSION=\".*\"/SUPERVISOR_VERSION=\"$1\"/g" buildroot-external/configs/*