diff --git a/device/testing/device-xiaomi-lavender/APKBUILD b/device/testing/device-xiaomi-lavender/APKBUILD index 3b443c57a..7f394cbf8 100644 --- a/device/testing/device-xiaomi-lavender/APKBUILD +++ b/device/testing/device-xiaomi-lavender/APKBUILD @@ -2,18 +2,14 @@ # Maintainer: Alexey Min pkgname=device-xiaomi-lavender pkgdesc="Xiaomi Redmi Note 7" -pkgver=0.2 -pkgrel=6 +pkgver=0.3 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg" +depends="linux-postmarketos-qcom-sdm660 mkbootimg postmarketos-base" makedepends="devicepkg-dev" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline -" source="deviceinfo modules-initfs" build() { @@ -24,19 +20,7 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="LineageOS downstream kernel (recommended)" - depends="linux-xiaomi-lavender msm-fb-refresher" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline; for kernel development only (most features aren't working)" - depends="linux-postmarketos-qcom-sdm660" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - sha512sums=" -13b8ac10e595b9f569b33c82f99f2ee6e3acf0a4858765a663bab91bff6c318dec80112ace60ac6610983c37ba7b8615811547db37d0b10abf780fe50bc5f301 deviceinfo +eab75a375ba212afea4c7cdc0754d3eac6b7bb1631d3d98c992c84f3520edfd4abe9861e110cb9d797faf7a516d3dd0f1558b70623391745efe920739e58e6f6 deviceinfo 029156e04ee0f9e20cf37d6fd0f52278ecc6a029b9ca86845a5e9a7b550ed1211b62f09e5ed36083061269d4e83b648788b87bbde0fba3cd1eb68675c47b79eb modules-initfs " diff --git a/device/testing/device-xiaomi-lavender/deviceinfo b/device/testing/device-xiaomi-lavender/deviceinfo index d4b63b153..902030e63 100644 --- a/device/testing/device-xiaomi-lavender/deviceinfo +++ b/device/testing/device-xiaomi-lavender/deviceinfo @@ -6,8 +6,8 @@ deviceinfo_name="Xiaomi Redmi Note 7" deviceinfo_manufacturer="Xiaomi" deviceinfo_codename="xiaomi-lavender" deviceinfo_year="2019" -deviceinfo_dtb_mainline="qcom/sdm660-xiaomi-lavender" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom/sdm660-xiaomi-lavender" +deviceinfo_append_dtb="true" deviceinfo_arch="aarch64" # Device related @@ -20,8 +20,7 @@ deviceinfo_screen_height="2340" # Bootloader related deviceinfo_flash_method="fastboot" deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" -deviceinfo_kernel_cmdline_downstream="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 androidboot.selinux=permissive buildvariant=eng" -deviceinfo_kernel_cmdline_mainline="PMOS_NO_OUTPUT_REDIRECT" +deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_flash_sparse="true" @@ -31,9 +30,3 @@ deviceinfo_flash_offset_ramdisk="0x01000000" deviceinfo_flash_offset_second="0x00f00000" deviceinfo_flash_offset_tags="0x00000100" deviceinfo_flash_pagesize="4096" - -# Xiaomi Communications Co., Ltd. -deviceinfo_usb_idVendor="0x2717" -# Mi/Redmi series (RNDIS) -deviceinfo_usb_idProduct="0xff80" -deviceinfo_usb_network_function_downstream="rndis_bam.rndis" diff --git a/device/unmaintained/device-xiaomi-lavender-downstream/APKBUILD b/device/unmaintained/device-xiaomi-lavender-downstream/APKBUILD new file mode 100644 index 000000000..157cb6ff1 --- /dev/null +++ b/device/unmaintained/device-xiaomi-lavender-downstream/APKBUILD @@ -0,0 +1,26 @@ +# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-lavender)! +# This kernel is mostly used for bringing up new features on mainline, thus unmaintained +# Reference: +pkgname=device-xiaomi-lavender-downstream +pkgdesc="Xiaomi Redmi Note 7 downstream" +pkgver=0.1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends="linux-xiaomi-lavender-downstream mkbootimg msm-fb-refresher postmarketos-base" +makedepends="devicepkg-dev" +source="deviceinfo" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +sha512sums=" +aa1dd81f459fd8768563532d5083d0a2d5e420744b504b534842135b6d8fe47f8ebc958c2f0f49b4287aff1fabb48f64aba0c06c62c08612873732af041d6dfc deviceinfo +" diff --git a/device/unmaintained/device-xiaomi-lavender-downstream/deviceinfo b/device/unmaintained/device-xiaomi-lavender-downstream/deviceinfo new file mode 100644 index 000000000..e2708f4c7 --- /dev/null +++ b/device/unmaintained/device-xiaomi-lavender-downstream/deviceinfo @@ -0,0 +1,37 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Xiaomi Redmi Note 7" +deviceinfo_manufacturer="Xiaomi" +deviceinfo_codename="xiaomi-lavender-downstream" +deviceinfo_year="2019" +deviceinfo_append_dtb="false" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="2340" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_flash_fastboot_partition_vbmeta="vbmeta" +deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 androidboot.selinux=permissive buildvariant=eng" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_flash_sparse="true" +deviceinfo_flash_offset_base="0x00000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_pagesize="4096" + +# Xiaomi Communications Co., Ltd. +deviceinfo_usb_idVendor="0x2717" +# Mi/Redmi series (RNDIS) +deviceinfo_usb_idProduct="0xff80" +deviceinfo_usb_network_function="rndis_bam.rndis" diff --git a/device/testing/linux-xiaomi-lavender/0001-Use-relative-includes.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0001-Use-relative-includes.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0001-Use-relative-includes.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0001-Use-relative-includes.patch diff --git a/device/testing/linux-xiaomi-lavender/0002-Fix-TRACE_INCLUDE_PATH-paths.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0002-Fix-TRACE_INCLUDE_PATH-paths.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0002-Fix-TRACE_INCLUDE_PATH-paths.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0002-Fix-TRACE_INCLUDE_PATH-paths.patch diff --git a/device/testing/linux-xiaomi-lavender/0003-Add-config-option-to-fix-bootloader-cmdline-args.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0003-Add-config-option-to-fix-bootloader-cmdline-args.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0003-Add-config-option-to-fix-bootloader-cmdline-args.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0003-Add-config-option-to-fix-bootloader-cmdline-args.patch diff --git a/device/testing/linux-xiaomi-lavender/0004-Reduce-battery-spam-in-dmesg.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0004-Reduce-battery-spam-in-dmesg.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0004-Reduce-battery-spam-in-dmesg.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0004-Reduce-battery-spam-in-dmesg.patch diff --git a/device/testing/linux-xiaomi-lavender/0005-Adds-and-sets-BGRA-as-default.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0005-Adds-and-sets-BGRA-as-default.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0005-Adds-and-sets-BGRA-as-default.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0005-Adds-and-sets-BGRA-as-default.patch diff --git a/device/testing/linux-xiaomi-lavender/0006-mdss-panel-to-fb-var.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0006-mdss-panel-to-fb-var.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0006-mdss-panel-to-fb-var.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0006-mdss-panel-to-fb-var.patch diff --git a/device/testing/linux-xiaomi-lavender/0007-nvt-touch-f7a-unbreak-libinput.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/0007-nvt-touch-f7a-unbreak-libinput.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/0007-nvt-touch-f7a-unbreak-libinput.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/0007-nvt-touch-f7a-unbreak-libinput.patch diff --git a/device/testing/linux-xiaomi-lavender/APKBUILD b/device/unmaintained/linux-xiaomi-lavender-downstream/APKBUILD similarity index 88% rename from device/testing/linux-xiaomi-lavender/APKBUILD rename to device/unmaintained/linux-xiaomi-lavender-downstream/APKBUILD index ac7701c55..ceaffb95b 100644 --- a/device/testing/linux-xiaomi-lavender/APKBUILD +++ b/device/unmaintained/linux-xiaomi-lavender-downstream/APKBUILD @@ -1,11 +1,11 @@ +# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-lavender)! # Reference: # Kernel config based on: arch/arm64/configs/lavender-perf_defconfig # Original defconfig was: arch/arm64/configs/sdm660-perf_defconfig -# Maintainer: Alexey Min -pkgname=linux-xiaomi-lavender +pkgname=linux-xiaomi-lavender-downstream pkgver=4.4.156 -pkgrel=6 +pkgrel=0 pkgdesc="Xiaomi Redmi Note 7 kernel fork" arch="aarch64" _carch="arm64" @@ -60,7 +60,8 @@ package() { INSTALL_MOD_PATH="$pkgdir" modules_install } -sha512sums="797586ac2757c9b27a5f8fc1c1ff460d959b32de322ff00509d1b3b060dbcc909a150582992e8b5a25b185724d622115fd89a99d07ed10366e1a616a862eb79e linux-xiaomi-lavender-f0ae55603106e1fa3e55c1ab197df79178755eb2.tar.gz +sha512sums=" +797586ac2757c9b27a5f8fc1c1ff460d959b32de322ff00509d1b3b060dbcc909a150582992e8b5a25b185724d622115fd89a99d07ed10366e1a616a862eb79e linux-xiaomi-lavender-downstream-f0ae55603106e1fa3e55c1ab197df79178755eb2.tar.gz ff44ea67bda5f48625acc7385a8d1ba8a6cb7070c4be8505e8448d03ebe1f47bbe45fbadcd8c6e0dde940dfd4160067af56a13886f36d57e1734d7af72b6481b config-xiaomi-lavender.aarch64 9f1b27e523675ecaafd0ffd884e3e8d0fe9b0bf78b09b5fe044a5d5c9888a86fb0007aa9d90118f0b022a4ace62c5be236097df3bb67a3207a24a766d0907c33 0001-Use-relative-includes.patch a8713d22404a5e2c0d2add3deb4cb033e972bd1983e10f1557d4de640c1329af50be2bfd92dc3cf76df711a6b4a422b920da76c2d6c4435e3624c85f7d07ae52 0002-Fix-TRACE_INCLUDE_PATH-paths.patch @@ -69,4 +70,5 @@ a8713d22404a5e2c0d2add3deb4cb033e972bd1983e10f1557d4de640c1329af50be2bfd92dc3cf7 f2a97a9500b6155a11f2341a8fd4b083ceb25a17d656c7975e34b9f3d8bacb495ae687f823db5fd07ddee27b2d95021f193bfadb5274185334255cda12bc85ce 0005-Adds-and-sets-BGRA-as-default.patch d5b868c64b8ebddcf74cb3aa478f30f0897af1e14e4fc42d977921104a6c568cc0bf36fc8a3b0f538cd3ca2ebf59244fdf23186a903259e5acc14d1c4ef4ccc3 0006-mdss-panel-to-fb-var.patch e13adff827073edfaded0a34a1f913b7341069d062552f1444c3de390c3b3b08bf3cd4ad8cdf0f76c6be084ccc14469492a535a96022a0729ce56b3b09cfdfec 0007-nvt-touch-f7a-unbreak-libinput.patch -eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41 linux4.2-gcc10-extern_YYLOC_global_declaration.patch" +eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41 linux4.2-gcc10-extern_YYLOC_global_declaration.patch +" diff --git a/device/testing/linux-xiaomi-lavender/config-xiaomi-lavender.aarch64 b/device/unmaintained/linux-xiaomi-lavender-downstream/config-xiaomi-lavender.aarch64 similarity index 100% rename from device/testing/linux-xiaomi-lavender/config-xiaomi-lavender.aarch64 rename to device/unmaintained/linux-xiaomi-lavender-downstream/config-xiaomi-lavender.aarch64 diff --git a/device/testing/linux-xiaomi-lavender/linux4.2-gcc10-extern_YYLOC_global_declaration.patch b/device/unmaintained/linux-xiaomi-lavender-downstream/linux4.2-gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-xiaomi-lavender/linux4.2-gcc10-extern_YYLOC_global_declaration.patch rename to device/unmaintained/linux-xiaomi-lavender-downstream/linux4.2-gcc10-extern_YYLOC_global_declaration.patch