From 64d757945ddfa18a873d7bed0c97b5b5f3127eb1 Mon Sep 17 00:00:00 2001 From: Pavel Machek <8401486+pavelmachek@users.noreply.github.com> Date: Sun, 21 Jan 2018 16:09:38 +0100 Subject: [PATCH] Rename Nokia rx51->n900 and rm-696->n9 (#1146) Closes #1143. --- .../{device-nokia-rm-696 => device-nokia-n9}/APKBUILD | 4 ++-- .../{device-nokia-rm-696 => device-nokia-n9}/deviceinfo | 0 .../{device-nokia-rm-696 => device-nokia-n9}/initfs-hook.sh | 0 .../{device-nokia-rm-696 => device-nokia-n9}/weston.ini | 0 .../{device-nokia-rx51 => device-nokia-n900}/APKBUILD | 6 +++--- .../{device-nokia-rx51 => device-nokia-n900}/acpi.map | 0 .../acpi_handler.sh | 0 .../{device-nokia-rx51 => device-nokia-n900}/asound.state | 0 .../backlight-enable.sh | 0 .../device-nokia-n900.post-install} | 0 .../{device-nokia-rx51 => device-nokia-n900}/deviceinfo | 0 .../keymaps/rx51_us.map | 0 .../{device-nokia-rx51 => device-nokia-n900}/pointercal | 0 .../uboot-script.cmd | 0 .../udev/10-nokia-modem.rules | 0 .../udev/90-touchscreen-dev.rules | 0 .../{device-nokia-rx51 => device-nokia-n900}/weston.ini | 0 .../{linux-nokia-rm-696 => linux-nokia-n9}/0001-SEB.patch | 0 .../0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch | 0 ...m-omap-panel-dsi-cm-use-defines-from-mipi_display..patch | 0 .../0004-ARM-dts-n9-add-display-support.patch | 0 ...vert-drm-omap-work-around-for-omap3-display-enable.patch | 0 ...CK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch | 0 .../0007-ARM-dts-N9-Add-support-for-volume-keys.patch | 0 .../0008-ARM-dts-N9-N950-Add-touchscreen-support.patch | 0 .../0009-misc-apds990x-Add-device-tree-support.patch | 0 .../0010-misc-apds990x-convert-to-iio.patch | 0 .../0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch | 0 ...CK-export-dma-access-functions-needed-by-PVR-drive.patch | 0 .../device/{linux-nokia-rm-696 => linux-nokia-n9}/APKBUILD | 4 ++-- .../RM-696_Pyrenees_SMD_V1_6.raw | 0 .../config-nokia-n9.armhf} | 0 test/test_questions.py | 2 +- 33 files changed, 8 insertions(+), 8 deletions(-) rename aports/device/{device-nokia-rm-696 => device-nokia-n9}/APKBUILD (91%) rename aports/device/{device-nokia-rm-696 => device-nokia-n9}/deviceinfo (100%) rename aports/device/{device-nokia-rm-696 => device-nokia-n9}/initfs-hook.sh (100%) rename aports/device/{device-nokia-rm-696 => device-nokia-n9}/weston.ini (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/APKBUILD (98%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/acpi.map (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/acpi_handler.sh (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/asound.state (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/backlight-enable.sh (100%) rename aports/device/{device-nokia-rx51/device-nokia-rx51.post-install => device-nokia-n900/device-nokia-n900.post-install} (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/deviceinfo (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/keymaps/rx51_us.map (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/pointercal (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/uboot-script.cmd (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/udev/10-nokia-modem.rules (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/udev/90-touchscreen-dev.rules (100%) rename aports/device/{device-nokia-rx51 => device-nokia-n900}/weston.ini (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0001-SEB.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0004-ARM-dts-n9-add-display-support.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0007-ARM-dts-N9-Add-support-for-volume-keys.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0009-misc-apds990x-Add-device-tree-support.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0010-misc-apds990x-convert-to-iio.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch (100%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/APKBUILD (99%) rename aports/device/{linux-nokia-rm-696 => linux-nokia-n9}/RM-696_Pyrenees_SMD_V1_6.raw (100%) rename aports/device/{linux-nokia-rm-696/config-nokia-rm-696.armhf => linux-nokia-n9/config-nokia-n9.armhf} (100%) diff --git a/aports/device/device-nokia-rm-696/APKBUILD b/aports/device/device-nokia-n9/APKBUILD similarity index 91% rename from aports/device/device-nokia-rm-696/APKBUILD rename to aports/device/device-nokia-n9/APKBUILD index e70b823f..64d85282 100644 --- a/aports/device/device-nokia-rm-696/APKBUILD +++ b/aports/device/device-nokia-n9/APKBUILD @@ -1,11 +1,11 @@ -pkgname=device-nokia-rm-696 +pkgname=device-nokia-n9 pkgver=1 pkgrel=0 pkgdesc="Nokia N9" url="https://github.com/postmarketOS" arch="noarch" license="MIT" -depends="linux-nokia-rm-696 linux-firmware ofono watchdog-kick" +depends="linux-nokia-n9 linux-firmware ofono watchdog-kick" makedepends="" install="" subpackages="$pkgname-weston:weston" diff --git a/aports/device/device-nokia-rm-696/deviceinfo b/aports/device/device-nokia-n9/deviceinfo similarity index 100% rename from aports/device/device-nokia-rm-696/deviceinfo rename to aports/device/device-nokia-n9/deviceinfo diff --git a/aports/device/device-nokia-rm-696/initfs-hook.sh b/aports/device/device-nokia-n9/initfs-hook.sh similarity index 100% rename from aports/device/device-nokia-rm-696/initfs-hook.sh rename to aports/device/device-nokia-n9/initfs-hook.sh diff --git a/aports/device/device-nokia-rm-696/weston.ini b/aports/device/device-nokia-n9/weston.ini similarity index 100% rename from aports/device/device-nokia-rm-696/weston.ini rename to aports/device/device-nokia-n9/weston.ini diff --git a/aports/device/device-nokia-rx51/APKBUILD b/aports/device/device-nokia-n900/APKBUILD similarity index 98% rename from aports/device/device-nokia-rx51/APKBUILD rename to aports/device/device-nokia-n900/APKBUILD index 0ed1831d..bd47d4b4 100644 --- a/aports/device/device-nokia-rx51/APKBUILD +++ b/aports/device/device-nokia-n900/APKBUILD @@ -1,6 +1,6 @@ -pkgname=device-nokia-rx51 +pkgname=device-nokia-n900 pkgver=1 -pkgrel=28 +pkgrel=0 pkgdesc="Nokia N900" url="https://github.com/postmarketOS" arch="noarch" @@ -80,4 +80,4 @@ c9ff8b5968fe94007e1139db5ae76f3ee6c214356bff297b9672276c6adb332ba2342b6ca54cf799 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff pointercal e023df91295fe7e410e163747d17e5b92fe3c022ff076e286778b8334368f885603b8fda65671e4a7328766da7b2552ea4df1b1399df23e504a41a6655771142 asound.state e7749ce65de8e90b64f728f6ff695d4199cfcac31f0a7def19c46cd3cd6fba623b03202036ab99bdaec8611bfe7c787259f6f6ef7316f208a2b2fe9a7d01d22f weston.ini -a7ce458dd3c6d2b94639b59719ee972fe8c71781c3415f74f5340a4de1c8211853a07c29001ecbca832c471c288bed54b45c37fad05e088c197edc2bd7e7ce1b device-nokia-rx51.post-install" +a7ce458dd3c6d2b94639b59719ee972fe8c71781c3415f74f5340a4de1c8211853a07c29001ecbca832c471c288bed54b45c37fad05e088c197edc2bd7e7ce1b device-nokia-n900.post-install" diff --git a/aports/device/device-nokia-rx51/acpi.map b/aports/device/device-nokia-n900/acpi.map similarity index 100% rename from aports/device/device-nokia-rx51/acpi.map rename to aports/device/device-nokia-n900/acpi.map diff --git a/aports/device/device-nokia-rx51/acpi_handler.sh b/aports/device/device-nokia-n900/acpi_handler.sh similarity index 100% rename from aports/device/device-nokia-rx51/acpi_handler.sh rename to aports/device/device-nokia-n900/acpi_handler.sh diff --git a/aports/device/device-nokia-rx51/asound.state b/aports/device/device-nokia-n900/asound.state similarity index 100% rename from aports/device/device-nokia-rx51/asound.state rename to aports/device/device-nokia-n900/asound.state diff --git a/aports/device/device-nokia-rx51/backlight-enable.sh b/aports/device/device-nokia-n900/backlight-enable.sh similarity index 100% rename from aports/device/device-nokia-rx51/backlight-enable.sh rename to aports/device/device-nokia-n900/backlight-enable.sh diff --git a/aports/device/device-nokia-rx51/device-nokia-rx51.post-install b/aports/device/device-nokia-n900/device-nokia-n900.post-install similarity index 100% rename from aports/device/device-nokia-rx51/device-nokia-rx51.post-install rename to aports/device/device-nokia-n900/device-nokia-n900.post-install diff --git a/aports/device/device-nokia-rx51/deviceinfo b/aports/device/device-nokia-n900/deviceinfo similarity index 100% rename from aports/device/device-nokia-rx51/deviceinfo rename to aports/device/device-nokia-n900/deviceinfo diff --git a/aports/device/device-nokia-rx51/keymaps/rx51_us.map b/aports/device/device-nokia-n900/keymaps/rx51_us.map similarity index 100% rename from aports/device/device-nokia-rx51/keymaps/rx51_us.map rename to aports/device/device-nokia-n900/keymaps/rx51_us.map diff --git a/aports/device/device-nokia-rx51/pointercal b/aports/device/device-nokia-n900/pointercal similarity index 100% rename from aports/device/device-nokia-rx51/pointercal rename to aports/device/device-nokia-n900/pointercal diff --git a/aports/device/device-nokia-rx51/uboot-script.cmd b/aports/device/device-nokia-n900/uboot-script.cmd similarity index 100% rename from aports/device/device-nokia-rx51/uboot-script.cmd rename to aports/device/device-nokia-n900/uboot-script.cmd diff --git a/aports/device/device-nokia-rx51/udev/10-nokia-modem.rules b/aports/device/device-nokia-n900/udev/10-nokia-modem.rules similarity index 100% rename from aports/device/device-nokia-rx51/udev/10-nokia-modem.rules rename to aports/device/device-nokia-n900/udev/10-nokia-modem.rules diff --git a/aports/device/device-nokia-rx51/udev/90-touchscreen-dev.rules b/aports/device/device-nokia-n900/udev/90-touchscreen-dev.rules similarity index 100% rename from aports/device/device-nokia-rx51/udev/90-touchscreen-dev.rules rename to aports/device/device-nokia-n900/udev/90-touchscreen-dev.rules diff --git a/aports/device/device-nokia-rx51/weston.ini b/aports/device/device-nokia-n900/weston.ini similarity index 100% rename from aports/device/device-nokia-rx51/weston.ini rename to aports/device/device-nokia-n900/weston.ini diff --git a/aports/device/linux-nokia-rm-696/0001-SEB.patch b/aports/device/linux-nokia-n9/0001-SEB.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0001-SEB.patch rename to aports/device/linux-nokia-n9/0001-SEB.patch diff --git a/aports/device/linux-nokia-rm-696/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch b/aports/device/linux-nokia-n9/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch rename to aports/device/linux-nokia-n9/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch diff --git a/aports/device/linux-nokia-rm-696/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch b/aports/device/linux-nokia-n9/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch rename to aports/device/linux-nokia-n9/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch diff --git a/aports/device/linux-nokia-rm-696/0004-ARM-dts-n9-add-display-support.patch b/aports/device/linux-nokia-n9/0004-ARM-dts-n9-add-display-support.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0004-ARM-dts-n9-add-display-support.patch rename to aports/device/linux-nokia-n9/0004-ARM-dts-n9-add-display-support.patch diff --git a/aports/device/linux-nokia-rm-696/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch b/aports/device/linux-nokia-n9/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch rename to aports/device/linux-nokia-n9/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch diff --git a/aports/device/linux-nokia-rm-696/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch b/aports/device/linux-nokia-n9/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch rename to aports/device/linux-nokia-n9/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch diff --git a/aports/device/linux-nokia-rm-696/0007-ARM-dts-N9-Add-support-for-volume-keys.patch b/aports/device/linux-nokia-n9/0007-ARM-dts-N9-Add-support-for-volume-keys.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0007-ARM-dts-N9-Add-support-for-volume-keys.patch rename to aports/device/linux-nokia-n9/0007-ARM-dts-N9-Add-support-for-volume-keys.patch diff --git a/aports/device/linux-nokia-rm-696/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch b/aports/device/linux-nokia-n9/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch rename to aports/device/linux-nokia-n9/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch diff --git a/aports/device/linux-nokia-rm-696/0009-misc-apds990x-Add-device-tree-support.patch b/aports/device/linux-nokia-n9/0009-misc-apds990x-Add-device-tree-support.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0009-misc-apds990x-Add-device-tree-support.patch rename to aports/device/linux-nokia-n9/0009-misc-apds990x-Add-device-tree-support.patch diff --git a/aports/device/linux-nokia-rm-696/0010-misc-apds990x-convert-to-iio.patch b/aports/device/linux-nokia-n9/0010-misc-apds990x-convert-to-iio.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0010-misc-apds990x-convert-to-iio.patch rename to aports/device/linux-nokia-n9/0010-misc-apds990x-convert-to-iio.patch diff --git a/aports/device/linux-nokia-rm-696/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch b/aports/device/linux-nokia-n9/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch rename to aports/device/linux-nokia-n9/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch diff --git a/aports/device/linux-nokia-rm-696/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch b/aports/device/linux-nokia-n9/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch similarity index 100% rename from aports/device/linux-nokia-rm-696/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch rename to aports/device/linux-nokia-n9/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch diff --git a/aports/device/linux-nokia-rm-696/APKBUILD b/aports/device/linux-nokia-n9/APKBUILD similarity index 99% rename from aports/device/linux-nokia-rm-696/APKBUILD rename to aports/device/linux-nokia-n9/APKBUILD index 87552e82..47ba7bb5 100644 --- a/aports/device/linux-nokia-rm-696/APKBUILD +++ b/aports/device/linux-nokia-n9/APKBUILD @@ -1,4 +1,4 @@ -_flavor=nokia-rm-696 +_flavor=nokia-n9 _config="config-${_flavor}.armhf" pkgname=linux-${_flavor} @@ -129,5 +129,5 @@ d1ae4758f669de894b4c612e2d6e4599226e0be5c9e2f61d67a0885c30a8de1e3bf0832a57951c60 4600c0ef918c03c22ce1f280d4c7e329e0e5b8e9fabea4cee29f5e521e521b08ff7f7b0cc0937e92acf16af130218b9eab66e212cc108c0d5163399b4d87a6e1 0010-misc-apds990x-convert-to-iio.patch acc0399f7f3fda4d8c1e0a0c0ac7c36d27e8704d8aac4f085ad3a0c6460e55ce51dd541d692aa8d79e239d9005e9859d4263a599b058801f4dc43e0e75ae18e9 0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch 02da1c4538cc16b344745f6b7dab76a42286e9e17e549229273930557b5498f70628aa1a24654dbbdbb504942a8d502037f4e722d6119921a20bb14be21e3784 0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch -b666d18e505bdf9f806f133b0930555ab911cd8625f84b6d2a9caa9cffa805c6fc2c9c0485f9e3dea19b29c7c43cd688d4a5f2d3722d33f67b6435944a164ee0 config-nokia-rm-696.armhf +b666d18e505bdf9f806f133b0930555ab911cd8625f84b6d2a9caa9cffa805c6fc2c9c0485f9e3dea19b29c7c43cd688d4a5f2d3722d33f67b6435944a164ee0 config-nokia-n9.armhf a9b2eba95ead1226108bf664f49bcad70be99df7284ba807abdbd86a8dc68ebda6fc5d88c15846009f7748f1ae4d6735477d316bb9f298e7728071dad506b35f RM-696_Pyrenees_SMD_V1_6.raw" diff --git a/aports/device/linux-nokia-rm-696/RM-696_Pyrenees_SMD_V1_6.raw b/aports/device/linux-nokia-n9/RM-696_Pyrenees_SMD_V1_6.raw similarity index 100% rename from aports/device/linux-nokia-rm-696/RM-696_Pyrenees_SMD_V1_6.raw rename to aports/device/linux-nokia-n9/RM-696_Pyrenees_SMD_V1_6.raw diff --git a/aports/device/linux-nokia-rm-696/config-nokia-rm-696.armhf b/aports/device/linux-nokia-n9/config-nokia-n9.armhf similarity index 100% rename from aports/device/linux-nokia-rm-696/config-nokia-rm-696.armhf rename to aports/device/linux-nokia-n9/config-nokia-n9.armhf diff --git a/test/test_questions.py b/test/test_questions.py index a121177a..cdf800a0 100644 --- a/test/test_questions.py +++ b/test/test_questions.py @@ -137,7 +137,7 @@ def test_questions(args, monkeypatch, tmpdir): # Keymaps func = pmb.config.init.ask_for_keymaps answers = ["invalid_keymap", "us/rx51_us"] - assert func(args, "nokia-rx51") == "us/rx51_us" + assert func(args, "nokia-n900") == "us/rx51_us" assert func(args, "lg-mako") == "" # Qemu native mesa driver