From 7fc1292b9b2499bb62434d693d15da6c525957bb Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Fri, 15 May 2020 19:41:48 +0200
Subject: [PATCH] main/devicepkg-dev: generate /etc/machine-info (MR 1246)
---
main/devicepkg-dev/APKBUILD | 6 +++---
main/devicepkg-dev/devicepkg_build.sh | 13 +++++++++++++
main/devicepkg-dev/devicepkg_package.sh | 2 ++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 0c5ba8fde26..76c1886575b 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
pkgname=devicepkg-dev
-pkgver=0.12.1
+pkgver=0.12.2
pkgrel=0
pkgdesc="Provides default device package functions"
url="https://postmarketos.org"
@@ -61,8 +61,8 @@ package() {
"$pkgdir/usr/share/devicepkg-dev/compiler-gcc.h"
}
sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h
-332f693abfb3260ad6c1ef5d245062af8cc8eedba7db360d54db5a7fcf7b301a37a299a0004e9ff4de80b5dfcd260d0cd0f99f96ed6d56080bb4dea81116cc82 devicepkg_build.sh
-10bda1a999891d6234bcfa3eb277b125c02361a031c5ff8445dabaae11e289321a6227f9f0973c7aa143a3df0512399bd0e3b2aa5a8ee560b28e1b135bad8635 devicepkg_package.sh
+30f116f668bad60a0e62ef3e0625c331a1b044f5bbd137eb7b909039675f4aefca7e0206b755167b834aabd31fcf28b53c6f1a61782da66fd05f9dfcd09c0664 devicepkg_build.sh
+74c1b9b265a943604d5d538ca66d4b7bcad9adcf40710ab19d795b55aac39669bf1089f7f0ec81aa7a01b537784bef4310e4acc3d7a6ba1f282ab01652bdc4d4 devicepkg_package.sh
f7583b92a27b39d79762700a48853b8d641845cdd45eb875d6fddc236f4d70598927d4dfc7d237870617b77b42820686692a68220f610dbc01c76402d9edfb2e downstreamkernel_prepare.sh
776d7c36afc7bedbd531641abe90fa4bf06a519ad9e300dedf67b6d3b4997b57a398938dd528d5eeda6d17e0d34644472702a4fdd8ff41e0a4a7ad0671f4a216 downstreamkernel_package.sh
cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8 devicepkg_subpackage_kernel.sh
diff --git a/main/devicepkg-dev/devicepkg_build.sh b/main/devicepkg-dev/devicepkg_build.sh
index 5a1fbe409c3..ca38fdb3a26 100644
--- a/main/devicepkg-dev/devicepkg_build.sh
+++ b/main/devicepkg-dev/devicepkg_build.sh
@@ -104,8 +104,21 @@ echo_libinput_calibration()
echo "ENV{LIBINPUT_CALIBRATION_MATRIX}=\"$1 $2 $x_offset $4 $5 $y_offset\", \\"
}
+# Generate the contents for /etc/machine-info
+generate_machine_info()
+{
+ {
+ # shellcheck disable=SC2154
+ echo "PRETTY_HOSTNAME=\"$deviceinfo_name\""
+ # shellcheck disable=SC2154
+ echo "CHASSIS=\"${deviceinfo_chassis}\""
+ } > "$srcdir/machine-info"
+}
+
generate_splash_screens
+generate_machine_info
+
# shellcheck disable=SC2154
if [ -n "$deviceinfo_dev_touchscreen" ]; then
# Create touchscreen udev rule
diff --git a/main/devicepkg-dev/devicepkg_package.sh b/main/devicepkg-dev/devicepkg_package.sh
index 86ad286251d..21587116718 100644
--- a/main/devicepkg-dev/devicepkg_package.sh
+++ b/main/devicepkg-dev/devicepkg_package.sh
@@ -21,6 +21,8 @@ fi
install -Dm644 "$srcdir/deviceinfo" \
"$pkgdir/etc/deviceinfo"
install -Dm644 -t "$pkgdir/usr/share/postmarketos-splashes" "$srcdir"/*.ppm.gz
+install -Dm644 "$srcdir/machine-info" \
+ "$pkgdir/etc/machine-info"
if [ -f "$srcdir/90-$pkgname.rules" ]; then
install -Dm644 "$srcdir/90-$pkgname.rules" \
--
GitLab