Commit in hwdetect/trunk (PKGBUILD hwdetect)

[Tobias Powalowski]

    Date: Sunday, February 12, 2023 @ 17:37:22
  Author: tpowa
Revision: 468650

upgpkg: hwdetect 2023.02.12-1: remove file depends, kver is now detected by od

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

----------+
 PKGBUILD |    2 +-
 hwdetect |   12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-02-12 17:36:45 UTC (rev 468649)
+++ PKGBUILD    2023-02-12 17:37:22 UTC (rev 468650)
@@ -11,7 +11,7 @@
             'lvm2:       for lvm2 mkinitcpio config support'
             'mdadm:      for raid mkinitcpio config support')
 source=(hwdetect)
-sha512sums=('915ba67023f1e2ded5d306c9fbca6d3048e17750efc5f7bb68ed3156155c4f025f50546897be6102bdd71d9f510d26b2ea75913099fded69ecb14c37aff7c9bd')
+sha512sums=('bbd5834de4a6172cdc01873e467859b46113d4645a3679a966ac9ae1e828b18940cdab8c8d359dd7199f89d4e1d89678885397713d872d22f4a48b49ee5c10e6')
 
 package() {
   install -D -m 755 "${srcdir}/hwdetect" "${pkgdir}/usr/bin/hwdetect"

Modified: hwdetect
===================================================================
--- hwdetect    2023-02-12 17:36:45 UTC (rev 468649)
+++ hwdetect    2023-02-12 17:37:22 UTC (rev 468650)
@@ -100,13 +100,11 @@
     # get kernel version from installed kernel
     [[ "$(uname -m)" == "x86_64" || "$(uname -m)" == "riscv64" ]] && 
VMLINUZ=/boot/vmlinuz-linux
     [[ "$(uname -m)" == "aarch64" ]] && VMLINUZ=/boot/Image
-
-    if [[ -f "${VMLINUZ}" ]]; then
+    if [[ -f "${VMLINUZ}" && "$(uname -m)" == "x86_64" ]]; then
         offset="$(od -An -j0x20E -dN2 "${VMLINUZ}")"
         read -r _HWKVER _ < <(dd if="${VMLINUZ}" bs=1 count=127 skip=$((offset 
+ 0x200)) 2>/dev/null)
     fi
-
-    if [[ -f "${VMLINUZ}" ]]; then
+    if [[ -f "${VMLINUZ}" ]]  &&  {{ "$(uname -m)" == "riscv64" || "$(uname 
-m)" == "aarch64" ]]; then
         reader="cat"
         # try if the image is gzip compressed
         bytes="$(od -An -t x2 -N2 "${VMLINUZ}" | tr -dc '[:alnum:]')"
@@ -113,12 +111,6 @@
         [[ $bytes == '8b1f' ]] && reader="zcat"
         read -r _ _ _HWKVER _ < <($reader "${VMLINUZ}" | grep -m1 -aoE 'Linux 
version .(\.[-[:alnum:]]+)+')
     fi
-
-    if [[ -f "${VMLINUZ}" ]]; then
-        reader="cat"
-        [[ $(file -b --mime-type "${VMLINUZ}") == 'application/gzip' ]] && 
reader="zcat"
-        read -r _ _ kver _ < <($reader "${VMLINUZ}" | grep -m1 -aoE 'Linux 
version .(\.[-[:alnum:]]+)+')
-    fi
     # fallback if no detectable kernel is installed
     [[ "${_HWKVER}" == "" ]] && _HWKVER="$(uname -r)"
 }