mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-24 13:36:31 +00:00
Update patches
This commit is contained in:
Pascal Vizeli
parent
9a39a222ca
commit
7698f7f60d
@ -0,0 +1,35 @@
|
||||
From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Sat, 31 Mar 2018 16:58:14 +0200
|
||||
Subject: [PATCH 1/1] NetworkManager: allow to wait on boot
|
||||
|
||||
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
---
|
||||
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
|
||||
|
||||
60
buildroot-patches/0012-Add-apparmor-support-to-docker.patch
Normal file
60
buildroot-patches/0012-Add-apparmor-support-to-docker.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From a5d50577d81efeccb4904e6b56793f84b7e3e89f Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
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
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
Version 0.4 supports bootloader updates to eMMC boot partitions.
|
||||
|
||||
Signed-off-by: Jim Brennan <jbrennan at impinj.com>
|
||||
---
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user