From d35e71596a8d4e055bcdc9e9053db54e3d863ff1 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 17 Feb 2022 17:20:24 +0100 Subject: run-postinsts: rely on properly working upstream Unfortunately, our bbappend broke execution of the ontarget postinst scripts as the following openembedded-core commit changed the way this works upstream. 1af421fcf054 ("run-postinsts: for dpkg/opkg, do not rely on /etc/*-postinsts") Just get rid of our bbappend and rely on properly working upstream. Signed-off-by: Marcel Ziswiler (cherry picked from commit ff479c129366b7f67945e661472762ae6cb541f2) --- .../run-postinsts/run-postinsts/run-postinsts.service | 16 ---------------- .../run-postinsts/run-postinsts_1.0.bbappend | 1 - 2 files changed, 17 deletions(-) delete mode 100644 recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service delete mode 100644 recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend diff --git a/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service deleted file mode 100644 index 1b71a1f..0000000 --- a/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Run pending postinsts -DefaultDependencies=no -After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount -Before=sysinit.target -ConditionPathExistsGlob=#SYSCONFDIR#/*-postinsts - -[Service] -Type=oneshot -ExecStart=#SBINDIR#/run-postinsts -ExecStartPost=#BASE_BINDIR#/systemctl --no-reload disable run-postinsts.service -RemainAfterExit=No -TimeoutSec=0 - -[Install] -WantedBy=sysinit.target diff --git a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend b/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend deleted file mode 100644 index f8ccc1a..0000000 --- a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/run-postinsts:" -- cgit v1.2.3