diff --git a/device/testing/device-oneplus-bacon/90-android-touch-dev.rules b/device/archived/device-oneplus-bacon-downstream/90-android-touch-dev.rules similarity index 100% rename from device/testing/device-oneplus-bacon/90-android-touch-dev.rules rename to device/archived/device-oneplus-bacon-downstream/90-android-touch-dev.rules diff --git a/device/archived/device-oneplus-bacon-downstream/APKBUILD b/device/archived/device-oneplus-bacon-downstream/APKBUILD new file mode 100644 index 000000000..aae988d6c --- /dev/null +++ b/device/archived/device-oneplus-bacon-downstream/APKBUILD @@ -0,0 +1,39 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +# Maintainer: Luca Weiss +pkgname=device-oneplus-bacon-downstream +pkgver=1 +pkgrel=0 +pkgdesc="OnePlus One (Downstream)" +url="https://postmarketos.org" +arch="armv7" +license="MIT" +depends=" + firmware-oneplus-bacon + linux-oneplus-bacon + mkbootimg + msm-fb-refresher + postmarketos-base + " +makedepends="devicepkg-dev" +source=" + deviceinfo + 90-android-touch-dev.rules + " +options="!check !archcheck" + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname + + install -Dm644 "$srcdir"/90-android-touch-dev.rules \ + "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules +} + +sha512sums=" +487a0b6e4b1e45ba9a2062183919cf5fe65d1fc6aea909b07d90e71a64b2f87a6024c1f53476236a5cd9202acd50bbcfd4a2829a4b8c6b8c9025f42cbfc6aa72 deviceinfo +65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515 90-android-touch-dev.rules +" diff --git a/device/archived/device-oneplus-bacon-downstream/deviceinfo b/device/archived/device-oneplus-bacon-downstream/deviceinfo new file mode 100644 index 000000000..4cc1f8361 --- /dev/null +++ b/device/archived/device-oneplus-bacon-downstream/deviceinfo @@ -0,0 +1,33 @@ +# Reference: +# Please use double quotes only. You can source this file in shell scripts. + +deviceinfo_format_version="0" +deviceinfo_name="OnePlus One" +deviceinfo_manufacturer="OnePlus" +deviceinfo_codename="oneplus-bacon-downstream" +deviceinfo_year="2014" +deviceinfo_arch="armv7" +deviceinfo_create_initfs_extra="true" + +# Device related +deviceinfo_chassis="handset" +deviceinfo_keyboard="false" +deviceinfo_external_storage="false" +deviceinfo_screen_width="1080" +deviceinfo_screen_height="1920" + +# Bootloader related +deviceinfo_flash_method="fastboot" +deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug" +deviceinfo_generate_bootimg="true" +deviceinfo_generate_extlinux_config="true" +deviceinfo_bootimg_qcdt="true" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x02000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x01e00000" +deviceinfo_flash_offset_base="0" +deviceinfo_flash_pagesize="2048" + +# lk2nd does not support GPT for subpartitions/SD cards yet +deviceinfo_partition_type="msdos" diff --git a/device/testing/linux-oneplus-bacon/0001-fix-video-argb-setting.patch b/device/archived/linux-oneplus-bacon-downstream/0001-fix-video-argb-setting.patch similarity index 100% rename from device/testing/linux-oneplus-bacon/0001-fix-video-argb-setting.patch rename to device/archived/linux-oneplus-bacon-downstream/0001-fix-video-argb-setting.patch diff --git a/device/testing/linux-oneplus-bacon/02_gpu-msm-fix-gcc5-compile.patch b/device/archived/linux-oneplus-bacon-downstream/02_gpu-msm-fix-gcc5-compile.patch similarity index 100% rename from device/testing/linux-oneplus-bacon/02_gpu-msm-fix-gcc5-compile.patch rename to device/archived/linux-oneplus-bacon-downstream/02_gpu-msm-fix-gcc5-compile.patch diff --git a/device/testing/linux-oneplus-bacon/APKBUILD b/device/archived/linux-oneplus-bacon-downstream/APKBUILD similarity index 93% rename from device/testing/linux-oneplus-bacon/APKBUILD rename to device/archived/linux-oneplus-bacon-downstream/APKBUILD index 1319511c5..bae005197 100644 --- a/device/testing/linux-oneplus-bacon/APKBUILD +++ b/device/archived/linux-oneplus-bacon-downstream/APKBUILD @@ -1,9 +1,10 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Reference: # Kernel config based on: arch/arm/configs/lineageos_bacon_defconfig -pkgname=linux-oneplus-bacon +pkgname=linux-oneplus-bacon-downstream pkgver=3.4.113 -pkgrel=18 +pkgrel=0 pkgdesc="OnePlus One kernel fork" arch="armv7" _carch="arm" @@ -61,7 +62,7 @@ package() { install -Dm644 "$_outdir/arch/$_carch/boot"/dt.img "$pkgdir"/boot/dt.img } -sha512sums="94d0048439e70b11637a7a122e8652d4e997ee413d6e54ea0aed7f2c68e137fcc19b6784dcc0dedf0b80240ba16060634b517d5865ec6c7222e4dea44d3c059a linux-oneplus-bacon-dd65620ba04a8c6ba0e30553c9c95388daefae02.tar.gz +sha512sums="94d0048439e70b11637a7a122e8652d4e997ee413d6e54ea0aed7f2c68e137fcc19b6784dcc0dedf0b80240ba16060634b517d5865ec6c7222e4dea44d3c059a linux-oneplus-bacon-downstream-dd65620ba04a8c6ba0e30553c9c95388daefae02.tar.gz a436a2568bb8704cdbbe81fad9e3419aa0b2d2408e93e101ec8eda0fa0b0c36b26f148a981c5911991c1c1b33ac3b5aebf87222fee56202aad414449debb307a config-oneplus-bacon.armv7 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch diff --git a/device/testing/linux-oneplus-bacon/config-oneplus-bacon.armv7 b/device/archived/linux-oneplus-bacon-downstream/config-oneplus-bacon.armv7 similarity index 100% rename from device/testing/linux-oneplus-bacon/config-oneplus-bacon.armv7 rename to device/archived/linux-oneplus-bacon-downstream/config-oneplus-bacon.armv7 diff --git a/device/testing/linux-oneplus-bacon/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-oneplus-bacon-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-oneplus-bacon/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-oneplus-bacon-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/linux-oneplus-bacon/mdss_fb_refresh_rate.patch b/device/archived/linux-oneplus-bacon-downstream/mdss_fb_refresh_rate.patch similarity index 100% rename from device/testing/linux-oneplus-bacon/mdss_fb_refresh_rate.patch rename to device/archived/linux-oneplus-bacon-downstream/mdss_fb_refresh_rate.patch diff --git a/device/testing/device-oneplus-bacon/APKBUILD b/device/testing/device-oneplus-bacon/APKBUILD index 0e1cd18f6..669f64344 100644 --- a/device/testing/device-oneplus-bacon/APKBUILD +++ b/device/testing/device-oneplus-bacon/APKBUILD @@ -1,25 +1,26 @@ # Reference: # Maintainer: Luca Weiss pkgname=device-oneplus-bacon -pkgver=6 +pkgver=7 pkgrel=0 pkgdesc="OnePlus One" url="https://postmarketos.org" arch="armv7" license="MIT" depends=" + firmware-oneplus-bacon + firmware-qcom-adreno-a330 + linux-postmarketos-qcom-msm8974 lk2nd-msm8974 mkbootimg postmarketos-base soc-qcom-msm8974 " makedepends="devicepkg-dev" -subpackages=" - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-nonfree-firmware:nonfree_firmware -" -source="deviceinfo modules-initfs.mainline 90-android-touch-dev.rules" +source=" + deviceinfo + modules-initfs + " options="!check !archcheck" build() { @@ -28,30 +29,9 @@ build() { package() { devicepkg_package $startdir $pkgname - install -Dm644 "$srcdir"/90-android-touch-dev.rules \ - "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules -} - -kernel_downstream() { - pkgdesc="Downstream kernel" - depends="linux-oneplus-bacon msm-fb-refresher" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline kernel" - depends="linux-postmarketos-qcom-msm8974" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -nonfree_firmware() { - pkgdesc="GPU, Wi-Fi firmware" - depends="firmware-qcom-adreno-a330 firmware-oneplus-bacon" - mkdir "$subpkgdir" } sha512sums=" -204d345bb08f57746f84376ad3f1ab48235a7f1c5e55fc1d10d8382d611ce6293f6ee2fb28e2cf8871d538cc6311a602dd820a11b5dfe18a0bf274db561816d9 deviceinfo -fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c modules-initfs.mainline -65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515 90-android-touch-dev.rules +14faa011aeab36f0f97c4c320e62c3f09389e03c54b9241e8ed03f37aaac2972a95c5a3dd09ef8b96d566a00424470f4baa2542398f0614f153a145b57b907a7 deviceinfo +fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c modules-initfs " diff --git a/device/testing/device-oneplus-bacon/deviceinfo b/device/testing/device-oneplus-bacon/deviceinfo index f035230fa..c7b2a8496 100644 --- a/device/testing/device-oneplus-bacon/deviceinfo +++ b/device/testing/device-oneplus-bacon/deviceinfo @@ -6,8 +6,8 @@ deviceinfo_name="OnePlus One" deviceinfo_manufacturer="OnePlus" deviceinfo_codename="oneplus-bacon" deviceinfo_year="2014" -deviceinfo_dtb_mainline="qcom-msm8974pro-oneplus-bacon" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="qcom-msm8974pro-oneplus-bacon" +deviceinfo_append_dtb="true" deviceinfo_arch="armv7" deviceinfo_create_initfs_extra="true" @@ -20,11 +20,9 @@ deviceinfo_screen_height="1920" # Bootloader related deviceinfo_flash_method="fastboot" -deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug" -deviceinfo_kernel_cmdline_mainline="msm.vram=192m msm.allow_vram_carveout=1" +deviceinfo_kernel_cmdline="msm.vram=192m msm.allow_vram_carveout=1" deviceinfo_generate_bootimg="true" deviceinfo_generate_extlinux_config="true" -deviceinfo_bootimg_qcdt_downstream="true" deviceinfo_flash_offset_kernel="0x00008000" deviceinfo_flash_offset_ramdisk="0x02000000" deviceinfo_flash_offset_second="0x00f00000" diff --git a/device/testing/device-oneplus-bacon/modules-initfs.mainline b/device/testing/device-oneplus-bacon/modules-initfs similarity index 100% rename from device/testing/device-oneplus-bacon/modules-initfs.mainline rename to device/testing/device-oneplus-bacon/modules-initfs