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/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"
 }