From 18e44a52ab49bf5fe61e3ae0c4294af9c34a9f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Mon, 4 Dec 2023 21:20:20 +0100
Subject: [PATCH] main/devicepkg-dev: remove deviceinfo link in kernel
 subpackages (MR 4596)

This was a fallout from the /usr/share relocation, only found and
reported now by z3ntu. If the device package happened to be installed
later, then the link would point to the wrong location.

Fixes 1d748a93dd4a0878752f79c0afb543fe086ac4ba
---
 main/devicepkg-dev/APKBUILD                       | 4 ++--
 main/devicepkg-dev/devicepkg_subpackage_kernel.sh | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index cfa194474..cfef7c221 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=devicepkg-dev
-pkgver=0.17.0
+pkgver=0.17.1
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -81,7 +81,7 @@ d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214a
 3b997a00e76be7d4540290275585026c5b83832c0b9a7214346763f03ec196b3f1bea9f50a9928a5cab0bc22dc557af136ffe146bd45d3666b5c05589891047d  devicepkg_pmtest_post_install.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh
-ece2e6352c61c5764b2502d05b388880f53f2cded3056aed003c9cf5245328627c0b0fb08a3102e7064acdcba8715b8d5bf4c07a7b87e9f635b87e2450e75fc0  devicepkg_subpackage_kernel.sh
+57e9c3a4caffc8b2eed07553725b25d0917c74cf774994e61de4874d1ca8e6df646c36f8f9d34c75497bea860e383f1abf429599141ea163ce90d69dbb31a9bb  devicepkg_subpackage_kernel.sh
 9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3  deviceinfo
 136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1  expected-deviceinfo-downstream
 8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097  expected-deviceinfo-mainline
diff --git a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
index 9a4b4cc82..f39493d96 100644
--- a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
+++ b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
@@ -13,9 +13,8 @@ srcdir="$startdir/src"
 pkgdir="$startdir/pkg/$pkgname"
 subpkgdir="$startdir/pkg/$subpkgname"
 
-if [ -e "$pkgdir/usr/share/deviceinfo/$pkgname" ]; then
-	rm -v "$pkgdir/usr/share/deviceinfo/$pkgname"
-fi
+rm -fv "$pkgdir/usr/share/deviceinfo/$pkgname"
+rm -fv "$pkgdir/usr/share/deviceinfo/deviceinfo"
 
 deviceinfo="$subpkgdir/usr/share/deviceinfo/$subpkgname"
 install -Dm644 "$srcdir/deviceinfo" \