From 8437d79df7532c4777dccd44c01eeba1c4c3b6b5 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 17 May 2020 17:17:31 +0200 Subject: [PATCH] device/*: Improve device name for some devices (MR 1248) [ci:ignore-count] --- device/testing/device-htc-a5ul/APKBUILD | 7 +++---- device/testing/device-htc-a5ul/deviceinfo | 4 ++-- device/testing/device-htc-vivo/APKBUILD | 5 ++--- device/testing/device-htc-vivo/deviceinfo | 4 ++-- device/testing/device-samsung-i9003/APKBUILD | 12 +++++------- device/testing/device-samsung-i9003/deviceinfo | 2 +- device/testing/device-sony-leo/APKBUILD | 10 ++++------ device/testing/device-sony-leo/deviceinfo | 2 +- device/testing/device-xiaomi-ido/APKBUILD | 10 +++++----- device/testing/device-xiaomi-ido/deviceinfo | 2 +- device/testing/device-yu-tomato/APKBUILD | 8 +++----- device/testing/device-yu-tomato/deviceinfo | 4 ++-- device/testing/linux-htc-a5ul/APKBUILD | 4 ++-- device/testing/linux-samsung-i9003/APKBUILD | 4 ++-- device/testing/linux-sony-leo/APKBUILD | 4 ++-- device/testing/linux-xiaomi-ido/APKBUILD | 4 ++-- device/testing/linux-yu-tomato/APKBUILD | 4 ++-- 17 files changed, 41 insertions(+), 49 deletions(-) diff --git a/device/testing/device-htc-a5ul/APKBUILD b/device/testing/device-htc-a5ul/APKBUILD index 4e1265b1a..a7ec8f4e7 100644 --- a/device/testing/device-htc-a5ul/APKBUILD +++ b/device/testing/device-htc-a5ul/APKBUILD @@ -1,8 +1,8 @@ # Reference: pkgname=device-htc-a5ul -pkgdesc="hTC Desire 816" +pkgdesc="HTC Desire 816" pkgver=0.1 -pkgrel=6 +pkgrel=7 url="https://postmarketos.org" license="MIT" arch="armhf" @@ -18,6 +18,5 @@ build() { package() { devicepkg_package $startdir $pkgname } - -sha512sums="9da8b0bc1ac9a6a1a63131bc83a27699bed6c5916a61ba32b81592a1dc7d38f3d3f4ab8debafed5976b936d89769f60dcb506b7c8e4bec24c9dd17109ff6c643 deviceinfo +sha512sums="756cf49e1f57c2feccfc8fe364fa1f254c1fd21eccd4d181c61c46f8c5d7e41b5ab9735bf77ea203d902ade49184b1f4b907367772208b8c7d53d2e9980a6fdf deviceinfo 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb initfs-hook.sh" diff --git a/device/testing/device-htc-a5ul/deviceinfo b/device/testing/device-htc-a5ul/deviceinfo index 489b271a9..116b4f8b6 100644 --- a/device/testing/device-htc-a5ul/deviceinfo +++ b/device/testing/device-htc-a5ul/deviceinfo @@ -2,8 +2,8 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="hTC Desire 816" -deviceinfo_manufacturer="hTC" +deviceinfo_name="HTC Desire 816" +deviceinfo_manufacturer="HTC" deviceinfo_codename="htc-a5ul" deviceinfo_year="2014" deviceinfo_dtb="" diff --git a/device/testing/device-htc-vivo/APKBUILD b/device/testing/device-htc-vivo/APKBUILD index 88ef40228..90f9a0409 100644 --- a/device/testing/device-htc-vivo/APKBUILD +++ b/device/testing/device-htc-vivo/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-htc-vivo pkgdesc="Incredible S" pkgver=1 -pkgrel=6 +pkgrel=7 url="https://postmarketos.org" license="MIT" arch="armhf" @@ -18,6 +18,5 @@ build() { package() { devicepkg_package $startdir $pkgname } - -sha512sums="1c9ed953441a604aa209fd6de511287d6582feee90f2c0b33accbb9e062ba372c0e05fe7f1ed4d237a2b262cedb2dff268654179b0b0ba25643f4f3b21c02829 deviceinfo +sha512sums="1598ea2876a6d060714ff49669e621f0637f47ecab1196219bb37fd477a70866d7c17078975bf08bb0f8493a051ff4d31cf7d246d545fa7ef542f915bcaba1c3 deviceinfo 2d02a02649ee3dc28041045086ffe11c9077067393954295343efb80727432902494da4c3b68f992880f3c0f01a9d164c2517f51519c92445e3ed88872a71e2f initfs-hook.sh" diff --git a/device/testing/device-htc-vivo/deviceinfo b/device/testing/device-htc-vivo/deviceinfo index 6858111d1..e5fa3ff22 100644 --- a/device/testing/device-htc-vivo/deviceinfo +++ b/device/testing/device-htc-vivo/deviceinfo @@ -2,8 +2,8 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="hTC Incredible S" -deviceinfo_manufacturer="hTC" +deviceinfo_name="HTC Incredible S" +deviceinfo_manufacturer="HTC" deviceinfo_codename="htc-vivo" deviceinfo_year="2011" deviceinfo_dtb="" diff --git a/device/testing/device-samsung-i9003/APKBUILD b/device/testing/device-samsung-i9003/APKBUILD index 0606064fa..e36b3c3e4 100644 --- a/device/testing/device-samsung-i9003/APKBUILD +++ b/device/testing/device-samsung-i9003/APKBUILD @@ -1,17 +1,16 @@ # Reference: pkgname=device-samsung-i9003 pkgver=1 -pkgrel=25 -pkgdesc="Samsung Galaxy SI SLC" +pkgrel=26 +pkgdesc="Samsung Galaxy SL" url="https://postmarketos.org" arch="armhf" license="MIT" depends="postmarketos-base linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast" makedepends="devicepkg-dev" -source=" - deviceinfo +source="deviceinfo 90-android-touch-dev.rules -" + " options="!check !archcheck" build() { @@ -23,6 +22,5 @@ package() { install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules } - -sha512sums="c36176a712ed37370dbce3cca6d7f081d92f7e2ace22cf5077856d0897cf8818613e0faf25c686a3f3f60ac4cc318d607def00f6ad4aa2078168d4668085a270 deviceinfo +sha512sums="eaeb459baa89a570e91f87658f60a0c39a799eae03634b1f5b61e728f70d0329aea1c66477e4b60744711f77f66d1e18f38e0489294f6cffcf80028350e11056 deviceinfo 079336f0a62fe45e839dcaa56479736fb67125ef5adf9bf73fc513c696d5a9fe14cfc9912f4aeb989476aa23bcd1befca25f0163c827691eea7eec1c7b97f303 90-android-touch-dev.rules" diff --git a/device/testing/device-samsung-i9003/deviceinfo b/device/testing/device-samsung-i9003/deviceinfo index 77b62ad0d..c51bbe5c3 100644 --- a/device/testing/device-samsung-i9003/deviceinfo +++ b/device/testing/device-samsung-i9003/deviceinfo @@ -2,7 +2,7 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Samsung Galaxy SI SLC" +deviceinfo_name="Samsung Galaxy SL" deviceinfo_manufacturer="Samsung" deviceinfo_codename="samsung-i9003" deviceinfo_year="2011" diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD index feae03ac5..4faa5e278 100644 --- a/device/testing/device-sony-leo/APKBUILD +++ b/device/testing/device-sony-leo/APKBUILD @@ -1,17 +1,16 @@ # Maintainer: Audun MG # Reference: pkgname=device-sony-leo -pkgdesc="Sony Z3" +pkgdesc="Sony Xperia Z3" pkgver=0.1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends="postmarketos-base mkbootimg mesa-dri-swrast msm-fb-refresher" makedepends="devicepkg-dev" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream +subpackages="$pkgname-kernel-downstream:kernel_downstream $pkgname-nonfree-firmware:nonfree_firmware " source="deviceinfo @@ -39,6 +38,5 @@ nonfree_firmware() { depends="firmware-sony-leo" mkdir "$subpkgdir" } - -sha512sums="fa237846bf919d596e6b4802140cd2dc9029ec50f28f93c0bd649b460a91b7df2e1247cc37588dd3cad96a20baa117e16483797e8e74ff917d5663b60b95db35 deviceinfo +sha512sums="cc1662a8453ee437a8282813b497fcf3f0b5597785336ffa795d692d6d16c65bee757e30b2c8703e64bd4bf423a1887200995a11485b78895ac3fb76fe052199 deviceinfo 0fbbc5ef5b303431a0f1a9b9ef939f03aef6f1774765089102ce95e57dc5edb692c685a6c11adcada40db608998b714029d12a05c9364bd0445ce8fda7bf5fde 90-android-touch-dev.rules" diff --git a/device/testing/device-sony-leo/deviceinfo b/device/testing/device-sony-leo/deviceinfo index e3e92ebaf..2b93dcd74 100644 --- a/device/testing/device-sony-leo/deviceinfo +++ b/device/testing/device-sony-leo/deviceinfo @@ -2,7 +2,7 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Sony Z3" +deviceinfo_name="Sony Xperia Z3" deviceinfo_manufacturer="Sony" deviceinfo_codename="sony-leo" deviceinfo_year="2014" diff --git a/device/testing/device-xiaomi-ido/APKBUILD b/device/testing/device-xiaomi-ido/APKBUILD index 95e2e3373..163edaf1d 100644 --- a/device/testing/device-xiaomi-ido/APKBUILD +++ b/device/testing/device-xiaomi-ido/APKBUILD @@ -1,8 +1,8 @@ # Reference: pkgname=device-xiaomi-ido -pkgdesc="Xiaomi Xiaomi RedMi 3" +pkgdesc="Xiaomi Xiaomi Redmi 3" pkgver=0.1 -pkgrel=9 +pkgrel=10 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,7 +11,8 @@ depends="postmarketos-base linux-xiaomi-ido mkbootimg mesa-dri-swrast" makedepends="devicepkg-dev" source="deviceinfo fb.modes - initfs-hook.sh" + initfs-hook.sh + " build() { devicepkg_build $startdir $pkgname @@ -21,7 +22,6 @@ package() { devicepkg_package $startdir $pkgname install -Dm644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes } - -sha512sums="d2d5e39e30aefb385aace01af3a328d09ba66296002c49a1b7a10ffd91f343f6790007ce0c7f0f6386400c0a36a3f7172a55bdd0c7148e6f1acfd2ea59066a3d deviceinfo +sha512sums="984f81de19aafc3a354317c2fa1fbfa4809311fd85dc437e5074eb49e9c74d5a0ce7a0d1bf722c8a5e83ae6915fb2bcaca0abdb3f904ccb37359b158317f4ac9 deviceinfo 8a72f8d34fd0a8c7b6de0a2ab16e255b3fe28993e1aef7c25c3c4becc5851e51f5dcc3814acc75c8bb829bc02d180d976ee3877a98982d29cfc5cb7ea84f1c32 fb.modes 3b46dfab8465935349a8775e0247a3ea4274c16a9f526f17e1397ae2f6bdef11d9cbd969dc630a7d647e4130f5a2f1a8e85357fc34a5b1900411f9219a62b38e initfs-hook.sh" diff --git a/device/testing/device-xiaomi-ido/deviceinfo b/device/testing/device-xiaomi-ido/deviceinfo index 4c5d37118..f78689a01 100644 --- a/device/testing/device-xiaomi-ido/deviceinfo +++ b/device/testing/device-xiaomi-ido/deviceinfo @@ -2,7 +2,7 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Xiaomi RedMi 3" +deviceinfo_name="Xiaomi Redmi 3" deviceinfo_manufacturer="Xiaomi" deviceinfo_codename="xiaomi-ido" deviceinfo_year="2016" diff --git a/device/testing/device-yu-tomato/APKBUILD b/device/testing/device-yu-tomato/APKBUILD index eab1676a2..2ab23c0c3 100644 --- a/device/testing/device-yu-tomato/APKBUILD +++ b/device/testing/device-yu-tomato/APKBUILD @@ -1,10 +1,9 @@ # Reference: # Maintainer: xeon zolt - pkgname=device-yu-tomato -pkgdesc="Yureka" +pkgdesc="YU Yureka" pkgver=0.1 -pkgrel=4 +pkgrel=5 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -20,5 +19,4 @@ build() { package() { devicepkg_package $startdir $pkgname } - -sha512sums="65d4b29f6b84981716f9baab1387fbdfe160aa9976efc63dcd7174b0381fc45abda82421078ba78d634a39ee516bb75a08de359fbdded1cf2cb0e3e7812caf92 deviceinfo" +sha512sums="8cad22c9664013f54ddee59565370237bd8299edb69dc0d63401c970c371c198c10a17ea807b8fa7ec6044210eb300895c94afa01f71da64d07b3eca40a4dce4 deviceinfo" diff --git a/device/testing/device-yu-tomato/deviceinfo b/device/testing/device-yu-tomato/deviceinfo index 984292239..0eb87bdb5 100644 --- a/device/testing/device-yu-tomato/deviceinfo +++ b/device/testing/device-yu-tomato/deviceinfo @@ -2,8 +2,8 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Yureka" -deviceinfo_manufacturer="Yu" +deviceinfo_name="YU Yureka" +deviceinfo_manufacturer="YU" deviceinfo_codename="yu-tomato" deviceinfo_year="2015" deviceinfo_dtb="" diff --git a/device/testing/linux-htc-a5ul/APKBUILD b/device/testing/linux-htc-a5ul/APKBUILD index eae4c69d0..ad0d127f6 100644 --- a/device/testing/linux-htc-a5ul/APKBUILD +++ b/device/testing/linux-htc-a5ul/APKBUILD @@ -2,8 +2,8 @@ pkgname=linux-htc-a5ul pkgver=3.4.0 -pkgrel=2 -pkgdesc="hTC Desire 816 kernel fork" +pkgrel=3 +pkgdesc="HTC Desire 816 kernel fork" arch="armhf" _carch="arm" _flavor="htc-a5ul" diff --git a/device/testing/linux-samsung-i9003/APKBUILD b/device/testing/linux-samsung-i9003/APKBUILD index 2113ba172..c9921ac61 100644 --- a/device/testing/linux-samsung-i9003/APKBUILD +++ b/device/testing/linux-samsung-i9003/APKBUILD @@ -3,8 +3,8 @@ pkgname=linux-samsung-i9003 pkgver=3.0.101 -pkgrel=15 -pkgdesc="Samsung Galaxy SI SLC kernel" +pkgrel=16 +pkgdesc="Samsung Galaxy SL kernel" arch="armhf" _carch="arm" _flavor="samsung-i9003" diff --git a/device/testing/linux-sony-leo/APKBUILD b/device/testing/linux-sony-leo/APKBUILD index ca1f614a2..bcb72391e 100644 --- a/device/testing/linux-sony-leo/APKBUILD +++ b/device/testing/linux-sony-leo/APKBUILD @@ -3,8 +3,8 @@ # Kernel config based on: arch/arm/configs/lineageos_shinano_leo_defconfig pkgname=linux-sony-leo pkgver=3.4.113 -pkgrel=0 -pkgdesc="Sony Z3 LineageOS Kernel" +pkgrel=1 +pkgdesc="Sony Xperia Z3 LineageOS Kernel" arch="armv7" _carch="arm" _flavor="sony-leo" diff --git a/device/testing/linux-xiaomi-ido/APKBUILD b/device/testing/linux-xiaomi-ido/APKBUILD index 2725c895f..77ef80c13 100644 --- a/device/testing/linux-xiaomi-ido/APKBUILD +++ b/device/testing/linux-xiaomi-ido/APKBUILD @@ -2,8 +2,8 @@ pkgname=linux-xiaomi-ido pkgver=3.10.107 -pkgrel=5 -pkgdesc="Xiaomi RedMi 3 kernel fork" +pkgrel=6 +pkgdesc="Xiaomi Redmi 3 kernel fork" arch="aarch64" _carch="arm64" _flavor="xiaomi-ido" diff --git a/device/testing/linux-yu-tomato/APKBUILD b/device/testing/linux-yu-tomato/APKBUILD index f17471b7b..738887182 100644 --- a/device/testing/linux-yu-tomato/APKBUILD +++ b/device/testing/linux-yu-tomato/APKBUILD @@ -4,8 +4,8 @@ pkgname=linux-yu-tomato pkgver=3.10.108 -pkgrel=0 -pkgdesc="Yureka kernel fork" +pkgrel=1 +pkgdesc="YU Yureka kernel fork" arch="aarch64" _carch="arm64" _flavor="yu-tomato"