diff --git a/device/testing/device-motorola-ocean/APKBUILD b/device/testing/device-motorola-ocean/APKBUILD index 617c3fdea..7f37f6314 100644 --- a/device/testing/device-motorola-ocean/APKBUILD +++ b/device/testing/device-motorola-ocean/APKBUILD @@ -1,17 +1,22 @@ -# Maintainer: Ultracoolguy +# Maintainer: Ultracoolguy # Reference: pkgname=device-motorola-ocean pkgdesc="Motorola Moto G7 Power" -pkgver=0.2 +pkgver=0.3 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base mkbootimg mesa-dri-gallium" +depends=" + linux-postmarketos-qcom-msm8953 + mkbootimg + mesa-dri-gallium + postmarketos-base +" makedepends="devicepkg-dev" source="deviceinfo" -subpackages="$pkgname-kernel-downstream:kernel_downstream $pkgname-kernel-mainline:kernel_mainline $pkgname-nonfree-firmware:nonfree_firmware" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" build() { devicepkg_build $startdir $pkgname @@ -21,18 +26,6 @@ package() { devicepkg_package $startdir $pkgname } -kernel_downstream() { - pkgdesc="Wifi, USB, partially screen, and other miscellanious stuff works. (See device table for details)" - depends="linux-motorola-ocean wcnss-wlan" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="It's currently WIP. Most features don't work." - depends="linux-postmarketos-qcom-msm8953" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - nonfree_firmware() { pkgdesc="Wifi, GPU, modem, and audio firmware" depends="firmware-motorola-ocean" @@ -40,5 +33,5 @@ nonfree_firmware() { } sha512sums=" -7718e1d1c59f82832c446ccaac9bad6833339f5ba968942df10df538d11f90c431117ff2f5408262c5a9b333bfd1d3af96ab2913aacb380c919c465f61e9f759 deviceinfo +8959c93adb1459c53953403e8ea90d73138f65d7a5349edac00918bce0a11187f1488172b821ed1417a54fd8029b043dbf85cee1f979a8da383a5c35ee024c44 deviceinfo " diff --git a/device/testing/device-motorola-ocean/deviceinfo b/device/testing/device-motorola-ocean/deviceinfo index a633c7097..dd0ff0406 100644 --- a/device/testing/device-motorola-ocean/deviceinfo +++ b/device/testing/device-motorola-ocean/deviceinfo @@ -7,9 +7,9 @@ deviceinfo_manufacturer="Motorola" deviceinfo_codename="motorola-ocean" deviceinfo_year="2019" deviceinfo_arch="aarch64" -deviceinfo_dtb_mainline="qcom/sdm632-motorola-ocean" -deviceinfo_append_dtb_mainline="true" -deviceinfo_modules_initfs_mainline="msm" +deviceinfo_dtb="qcom/sdm632-motorola-ocean" +deviceinfo_append_dtb="true" +deviceinfo_modules_initfs="msm" # Device related deviceinfo_chassis="handset" @@ -20,8 +20,7 @@ deviceinfo_screen_height="1520" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_downstream="console=ttyMSM0,115200 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_hs,0x78af000 firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7 printk.devkmsg=on androidboot.hab.csv=12 androidboot.hab.product=ocean androidboot.hab.cid=21 buildvariant=user veritykeyid=id:b640f6ee9102b88daa3450b13ef25fc9eb143d63" -deviceinfo_kernel_cmdline_mainline="console=ttyMSM0,115200" +deviceinfo_kernel_cmdline="console=ttyMSM0,115200" deviceinfo_generate_bootimg="true" deviceinfo_bootimg_qcdt="false" deviceinfo_bootimg_dtb_second="false" diff --git a/device/unmaintained/device-motorola-ocean-downstream/APKBUILD b/device/unmaintained/device-motorola-ocean-downstream/APKBUILD new file mode 100644 index 000000000..c52c3e5d6 --- /dev/null +++ b/device/unmaintained/device-motorola-ocean-downstream/APKBUILD @@ -0,0 +1,32 @@ +# Unmaintained: Downstream port, only for testing. Use mainline port (motorola-ocean)! +# Reference: +pkgname=device-motorola-ocean-downstream +pkgdesc="Motorola Moto G7 Power" +pkgver=0.1 +pkgrel=0 +url="https://postmarketos.org" +license="MIT" +arch="aarch64" +options="!check !archcheck" +depends="postmarketos-base linux-motorola-ocean-downstream mkbootimg mesa-dri-gallium" +makedepends="devicepkg-dev" +source="deviceinfo" +subpackages="$pkgname-nonfree-firmware:nonfree_firmware" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname +} + +nonfree_firmware() { + pkgdesc="Wifi, GPU, modem, and audio firmware" + depends="firmware-motorola-ocean" + mkdir "$subpkgdir" +} + +sha512sums=" +28fbf43b00ab02535fb8c5822e7adb32025b0593a3f99f43778ab891fb2c8ac5db9dfc0d6ecefca7ad3484bd72e3d26a73fee06d723419921ad513a6f7f08177 deviceinfo +" diff --git a/device/unmaintained/device-motorola-ocean-downstream/deviceinfo b/device/unmaintained/device-motorola-ocean-downstream/deviceinfo new file mode 100644 index 000000000..f1a807e7b --- /dev/null +++ b/device/unmaintained/device-motorola-ocean-downstream/deviceinfo @@ -0,0 +1,29 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="Motorola Moto G7 Power" +deviceinfo_manufacturer="Motorola" +deviceinfo_codename="motorola-ocean-downstream" +deviceinfo_year="2019" +deviceinfo_arch="aarch64" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="true" +deviceinfo_screen_width="720" +deviceinfo_screen_height="1520" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="console=ttyMSM0,115200 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_hs,0x78af000 firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7 printk.devkmsg=on androidboot.hab.csv=12 androidboot.hab.product=ocean androidboot.hab.cid=21 buildvariant=user" +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_bootimg_dtb_second="false" +deviceinfo_flash_offset_base="0x80000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_pagesize="2048" diff --git a/device/testing/linux-motorola-ocean/APKBUILD b/device/unmaintained/linux-motorola-ocean-downstream/APKBUILD similarity index 77% rename from device/testing/linux-motorola-ocean/APKBUILD rename to device/unmaintained/linux-motorola-ocean-downstream/APKBUILD index 871526baf..9f0d5da9c 100644 --- a/device/testing/linux-motorola-ocean/APKBUILD +++ b/device/unmaintained/linux-motorola-ocean-downstream/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Ultracoolguy +# Unmaintained: Downstream port, only for testing. Use mainline port (motorola-ocean)! # Reference: # Kernel config based on: arch/arm64/configs/ocean_defconfig -pkgname=linux-motorola-ocean +pkgname=linux-motorola-ocean-downstream pkgver=4.9.206 pkgrel=0 pkgdesc="Motorola Moto G7 Power kernel fork" @@ -41,6 +41,8 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" } -sha512sums="20ff9ba981b3818df07ffc7421357e19e12cd50d5fb7b9b2bcc7aaa8bf82dbf8d60b92f91142dc10aa12b253a7a8403f7bbb8096cbbbacf3624646b8fd951c72 linux-motorola-ocean-8f94fe92fabc32ead1a726545adcc16d4d233058.tar.gz +sha512sums=" +20ff9ba981b3818df07ffc7421357e19e12cd50d5fb7b9b2bcc7aaa8bf82dbf8d60b92f91142dc10aa12b253a7a8403f7bbb8096cbbbacf3624646b8fd951c72 linux-motorola-ocean-downstream-8f94fe92fabc32ead1a726545adcc16d4d233058.tar.gz 4238c3feec82d1944a2e4c13cedd6856efa6425a2258502fb8b3b2590ad15ceb970c557f078b4210f435f9d3e93c0e56122735622c4d05bfaaa52bf71b412858 config-motorola-ocean.aarch64 -186ab6850d93497cb54b97bb36c884d8b75140b7f37ce2971725364376fb1f0975b92ccf7fb01e438a13dd17552642463ff6f945fa09b5f9ba9ac72f344a42d8 disable_skip_initramfs.patch" +186ab6850d93497cb54b97bb36c884d8b75140b7f37ce2971725364376fb1f0975b92ccf7fb01e438a13dd17552642463ff6f945fa09b5f9ba9ac72f344a42d8 disable_skip_initramfs.patch +" diff --git a/device/testing/linux-motorola-ocean/config-motorola-ocean.aarch64 b/device/unmaintained/linux-motorola-ocean-downstream/config-motorola-ocean.aarch64 similarity index 100% rename from device/testing/linux-motorola-ocean/config-motorola-ocean.aarch64 rename to device/unmaintained/linux-motorola-ocean-downstream/config-motorola-ocean.aarch64 diff --git a/device/testing/linux-motorola-ocean/disable_skip_initramfs.patch b/device/unmaintained/linux-motorola-ocean-downstream/disable_skip_initramfs.patch similarity index 100% rename from device/testing/linux-motorola-ocean/disable_skip_initramfs.patch rename to device/unmaintained/linux-motorola-ocean-downstream/disable_skip_initramfs.patch