From 6460e7c967f2bb4a72bf28dd1f451b72912fa5f8 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 13 Mar 2023 21:46:00 +0100 Subject: [PATCH] main/devicepkg-dev: add hardware vendor & model into machine-info (MR 3950) Soon openrc-settingsd (hostnamed) will uses these properties so the information can be exposed to apps like GNOME Settings. Let's also move the shellcheck comment to the outer scope, otherwise we'd need four of these comments now, and let's not use ${} but just $. --- main/devicepkg-dev/APKBUILD | 4 ++-- main/devicepkg-dev/devicepkg_build.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD index 558c94c7e..085f823da 100644 --- a/main/devicepkg-dev/APKBUILD +++ b/main/devicepkg-dev/APKBUILD @@ -1,5 +1,5 @@ pkgname=devicepkg-dev -pkgver=0.14.1 +pkgver=0.14.2 pkgrel=0 pkgdesc="Provides default device package functions" url="https://postmarketos.org" @@ -61,7 +61,7 @@ package() { } sha512sums=" d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h -55bf74eca4f2e486ffcc053f937d3c5acc9e5d6ecf8c022c24b400085186e91b775e843aa56c2be73d4d15e76f9f26fc1968e90c065de40e7c1833d376463eee devicepkg_build.sh +54b369ff87e017114edae03986dec79742280c55a156a98ea8c6a1c740632e904e51c01810e7dac99add0d9d06c0fcebb040fed595348f180233b3ec810443ba devicepkg_build.sh b51055b7376e115acadf8530238b77f4b58fdf19f9e8b48183180263a86f3318847c9432b25edfd2d6c3d29d9576a83ccaf6d2b264b1ef1eaf28d60457483565 devicepkg_package.sh f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6 downstreamkernel_prepare.sh 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe downstreamkernel_package.sh diff --git a/main/devicepkg-dev/devicepkg_build.sh b/main/devicepkg-dev/devicepkg_build.sh index 0b3ee3551..437ae234e 100644 --- a/main/devicepkg-dev/devicepkg_build.sh +++ b/main/devicepkg-dev/devicepkg_build.sh @@ -67,11 +67,12 @@ echo_libinput_calibration() # Generate the contents for /etc/machine-info generate_machine_info() { + # shellcheck disable=SC2154 { - # shellcheck disable=SC2154 echo "PRETTY_HOSTNAME=\"$deviceinfo_name\"" - # shellcheck disable=SC2154 - echo "CHASSIS=\"${deviceinfo_chassis}\"" + echo "CHASSIS=\"$deviceinfo_chassis\"" + echo "HARDWARE_VENDOR=\"$deviceinfo_manufacturer\"" + echo "HARDWARE_MODEL=\"$deviceinfo_name\"" } > "$srcdir/machine-info" }