nokia-n900: move to community (MR 1177)

device/community/device-nokia-n900/APKBUILD

@@ -1,7 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Martijn Braam <martijn@brixit.nl>
+# Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-nokia-n900
-pkgver=5
-pkgrel=11
+pkgver=6
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -151,7 +153,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="1bc4c108ab6c09ccf62dbeb75ad1b018f18bb7add9e79bb2c3b0e81ead9b0351d9a084eda899d79302e156cbce6b264afe45392e0761ae41c54e039c6b91d35f  deviceinfo
+sha512sums="342996ddabc00215f2d52e0698d2ed89a4bba577f15b9480f76ccb14f6f5088c08bea2189a110311905f8e6e9f5c229433ce22ffb42692b6cea8f1b231473fd1  deviceinfo
 01520977509df36248d0e44b3b2c18db0cefeb65e9ed5df96508eb0ed08304458a58ecd2bd21117771fe71e765b5f811c583909cad9a2c210de687a161e7234b  uboot-script.cmd
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules

device/community/device-nokia-n900/deviceinfo

@@ -12,13 +12,16 @@ deviceinfo_keymaps="us/rx51_us ch/rx51_ch it/rx51_it"
 deviceinfo_dtb="omap3-n900"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="tsc2005 tsc200x-core omap_wdt twl4030_wdt omap-sham"
-deviceinfo_external_storage="true"
-deviceinfo_flash_method="0xffff"
-deviceinfo_generate_legacy_uboot_initfs="true"
 deviceinfo_arch="armv7"
-deviceinfo_dev_touchscreen="/dev/input/event3"
-deviceinfo_swap_size_recommended="1024"
 
-# Splash screen
+# Device related
+deviceinfo_keyboard="true"
+deviceinfo_keymaps="us/rx51_us ch/rx51_ch it/rx51_it"
+deviceinfo_external_storage="true"
 deviceinfo_screen_width="800"
 deviceinfo_screen_height="480"
+deviceinfo_swap_size_recommended="1024"
+
+# Bootloader related
+deviceinfo_flash_method="0xffff"
+deviceinfo_generate_legacy_uboot_initfs="true"

device/community/linux-nokia-n900/0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch

@@ -1,3 +1,6 @@
+Ignore the uncalibrated flag in the battery controller and always show a capacity, even if it's
+not completely accurate.
+
 diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
 index 195c18c2f..be33a32cb 100644
 --- a/drivers/power/supply/bq27xxx_battery.c

device/community/linux-nokia-n900/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Daniele Debernardi <drebrez@gmail.com>
 
 pkgname=linux-nokia-n900
-pkgver=5.3.2
-pkgrel=2
+pkgver=5.7.0
+pkgrel=0
 pkgdesc="Mainline kernel fork for Nokia N900"
 arch="armv7"
 url="https://kernel.org/"
@@ -26,15 +26,11 @@ source="
 "
 if [ "${pkgver%.0}" = "$pkgver" ]; then
 	source="$source
-	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
+	linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
 fi
 builddir="$srcdir/linux-$_kernver"
 
 prepare() {
-	if [ "$_kernver" != "$pkgver" ]; then
-		msg "Applying patch-$pkgver.xz"
-		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N
-	fi
 	default_prepare
 	cp -v "$srcdir"/$_config .config
 }
@@ -49,6 +45,7 @@ package() {
 	mkdir -p "$pkgdir"/boot
 	make zinstall modules_install dtbs_install \
 		ARCH="$_carch" \
+		INSTALL_MOD_STRIP=1 \
 		INSTALL_PATH="$pkgdir"/boot \
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
@@ -57,9 +54,8 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 
-sha512sums="6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d  linux-5.3.tar.xz
-1bb77dba5753194437fae7304a8304d4f4f0a2e4c5bf9c8c410ee07486e7eccff44ffbd3fd81e937bf32a2c5ead766f0606203addc8a024cbf6b471040c3d051  config-nokia-n900.armv7
+sha512sums="45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6  linux-5.7.tar.xz
+91fa33ac6abf6908d9054ef651e724ceb825ee004e8931b66437ff442d9755cffc75c52b4b3cec1891b205360a504e4485ab3948cfd9fce4dcb5e99a2f96250d  config-nokia-n900.armv7
 04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31  0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
 c1055c7a4d2e39ce13db3871d948022b62eb7ebeb898777d197169b3e7c04d705ce7f52f28214754e3cefe99d1dd66f339a1a5770bae1ee970d5926067032061  0002-ARM-dts-n900-remove-rx51-battery.patch
-cca336961620cc8aea700bf22d4d788f514177c37fb2a660478b731cf2f01d4e63bfa0951aae39b7dfa722966a1692bc237eda1951e4fe1da3f597aa68b56ebe  0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch
-3528b4355ebbf1a1cbc4ac7efd7cdd5b5dddb28c30e182e8c0f3119c61a97d6bc1fb07ec8f2cf0a78067b098c27535bc006485428c76d6c8fb653f215218dff3  patch-5.3.2.xz"
+93e82f7041e347b63fc32ce54176ee3fe7e8260cc793810bcf0146a3699567b63a0cb7ce8c531b0484390907a25c51bfbeb15b32dddb2220c2481ec1f86e5eb5  0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch"