From 01a2b20b1c9fda3e8ac0348c70c72fe9f09e5ba3 Mon Sep 17 00:00:00 2001 From: Lucien Mueller Date: Thu, 21 Feb 2019 14:07:34 +0100 Subject: [PATCH] ostree: remove custom ostree recipe patch-file is now available in meta-updater and thus this bbappend file is not required anymore. BugzID: 55796 Signed-off-by: Lucien Mueller Signed-off-by: Patrick Zysset --- ...lize-staged-set-default-timeout-to-infinity.patch | 12 ------------ recipes-sota/ostree/ostree_%.bbappend | 3 --- 2 files changed, 15 deletions(-) delete mode 100644 recipes-sota/ostree/ostree/ostree-finalize-staged-set-default-timeout-to-infinity.patch delete mode 100644 recipes-sota/ostree/ostree_%.bbappend diff --git a/recipes-sota/ostree/ostree/ostree-finalize-staged-set-default-timeout-to-infinity.patch b/recipes-sota/ostree/ostree/ostree-finalize-staged-set-default-timeout-to-infinity.patch deleted file mode 100644 index 55047af..0000000 --- a/recipes-sota/ostree/ostree/ostree-finalize-staged-set-default-timeout-to-infinity.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/boot/ostree-finalize-staged.service b/src/boot/ostree-finalize-staged.service -index 570138c..37b5679 100644 ---- a/src/boot/ostree-finalize-staged.service -+++ b/src/boot/ostree-finalize-staged.service -@@ -31,6 +31,7 @@ Conflicts=final.target - Type=oneshot - RemainAfterExit=yes - ExecStop=/usr/bin/ostree admin finalize-staged -+TimeoutStopSec=infinity - - [Install] - WantedBy=multi-user.target diff --git a/recipes-sota/ostree/ostree_%.bbappend b/recipes-sota/ostree/ostree_%.bbappend deleted file mode 100644 index 6711b48..0000000 --- a/recipes-sota/ostree/ostree_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://ostree-finalize-staged-set-default-timeout-to-infinity.patch"