From dec0c8e50ceeb18d5abe2b7f6e1221b1192f6424 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 11 May 2025 22:11:08 +0200 Subject: [PATCH] ouya-ouya: split downstream into separate package (MR 6491) --- .../device-ouya-ouya-downstream/APKBUILD | 52 ++++++++++++++++++ .../device-ouya-ouya-downstream/deviceinfo | 33 ++++++++++++ .../device-ouya-ouya-downstream}/fb.modes | 0 .../initfs-hook.sh | 6 +++ .../networkmanager.conf | 0 .../00_fix_return_address.patch | 0 .../linux-ouya-ouya-downstream}/APKBUILD | 7 +-- .../config-ouya-ouya.armv7 | 0 ...cc10-extern_YYLOC_global_declaration.patch | 0 device/testing/device-ouya-ouya/APKBUILD | 53 ++++--------------- device/testing/device-ouya-ouya/deviceinfo | 4 +- .../testing/device-ouya-ouya/initfs-hook.sh | 14 +---- 12 files changed, 108 insertions(+), 61 deletions(-) create mode 100644 device/archived/device-ouya-ouya-downstream/APKBUILD create mode 100644 device/archived/device-ouya-ouya-downstream/deviceinfo rename device/{testing/device-ouya-ouya => archived/device-ouya-ouya-downstream}/fb.modes (100%) create mode 100644 device/archived/device-ouya-ouya-downstream/initfs-hook.sh rename device/{testing/device-ouya-ouya => archived/device-ouya-ouya-downstream}/networkmanager.conf (100%) rename device/{testing/linux-ouya-ouya => archived/linux-ouya-ouya-downstream}/00_fix_return_address.patch (100%) rename device/{testing/linux-ouya-ouya => archived/linux-ouya-ouya-downstream}/APKBUILD (89%) rename device/{testing/linux-ouya-ouya => archived/linux-ouya-ouya-downstream}/config-ouya-ouya.armv7 (100%) rename device/{testing/linux-ouya-ouya => archived/linux-ouya-ouya-downstream}/gcc10-extern_YYLOC_global_declaration.patch (100%) diff --git a/device/archived/device-ouya-ouya-downstream/APKBUILD b/device/archived/device-ouya-ouya-downstream/APKBUILD new file mode 100644 index 000000000..68420eb42 --- /dev/null +++ b/device/archived/device-ouya-ouya-downstream/APKBUILD @@ -0,0 +1,52 @@ +# Archived: Downstream port, only for testing. Use mainline port! +# Reference: +pkgname=device-ouya-ouya-downstream +pkgver=1 +pkgrel=0 +pkgdesc="Ouya (Downstream)" +url="https://postmarketos.org" +arch="armv7" +license="MIT" +options="!check !archcheck" +depends=" + firmware-ouya-ouya + linux-ouya-ouya + mkbootimg + postmarketos-base + " +makedepends="devicepkg-dev" +subpackages=" + $pkgname-x11 + " +source=" + deviceinfo + fb.modes + initfs-hook.sh + networkmanager.conf + " + +build() { + devicepkg_build $startdir $pkgname +} + +package() { + devicepkg_package $startdir $pkgname + + install -D -m644 "$srcdir"/fb.modes \ + "$pkgdir"/etc/fb.modes + install -D -m644 "$srcdir"/networkmanager.conf \ + "$pkgdir"/etc/NetworkManager/conf.d/10-ouya.conf +} + +x11() { + install_if="$pkgname xorg-server" + depends="xf86-video-opentegra libvdpau-tegra" + mkdir "$subpkgdir" +} + +sha512sums=" +22348f355ed662124ea8d5ab0ca32f33fb038ec8e8a2b0f05e72b62a52cb8cafe874cef537518e5ab04dd808a4d06badf57e6b59fdf110e66312fa2a9042492a deviceinfo +bf442fac4dc0594e055ed7a7d8232b5c884e2e77543273e8c4f32b5fe3c199561c86d8a5f665e17406057ca7863fabb93e789fe5e168fcd89d2982e0046232ad fb.modes +c7253d5d6f53b7acbb1c2358e95ecba86ccbaa2bb5e99ad8db9f59e453209ddad55b13d8c1dc67f634cc4f997283b4079fa1b5b60f6d1440b13f39e5b1646d81 initfs-hook.sh +b0737a8fb7a60b2d24e4e124dbeb7044832a683a78887454d13d4078039338fb04579ce9066140733222409e7f53255bfde2c6725bd3848752a27e112717c28c networkmanager.conf +" diff --git a/device/archived/device-ouya-ouya-downstream/deviceinfo b/device/archived/device-ouya-ouya-downstream/deviceinfo new file mode 100644 index 000000000..f8e0a5e23 --- /dev/null +++ b/device/archived/device-ouya-ouya-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="Ouya" +deviceinfo_manufacturer="Ouya" +deviceinfo_codename="ouya-ouya-downstream" +deviceinfo_year="2013" +deviceinfo_chassis="embedded" +deviceinfo_keyboard="false" +deviceinfo_dtb_mainline="tegra30-ouya" +deviceinfo_append_dtb_mainline="true" +deviceinfo_external_storage="false" +deviceinfo_flash_method="fastboot" +deviceinfo_arch="armv7" + +# boot.img must be <=8MB to work with ouya_bootmenu +deviceinfo_create_initfs_extra="true" + +# Splash screen +deviceinfo_screen_width="1920" +deviceinfo_screen_height="1080" + +# Fastboot related +deviceinfo_generate_bootimg="true" +deviceinfo_bootimg_qcdt="false" +deviceinfo_flash_offset_base="0x10000000" +deviceinfo_flash_offset_kernel="0x00008000" +deviceinfo_flash_offset_ramdisk="0x01000000" +deviceinfo_flash_offset_second="0x00f00000" +deviceinfo_flash_offset_tags="0x00000100" +deviceinfo_flash_pagesize="2048" +deviceinfo_partition_blacklist="boot,recovery" diff --git a/device/testing/device-ouya-ouya/fb.modes b/device/archived/device-ouya-ouya-downstream/fb.modes similarity index 100% rename from device/testing/device-ouya-ouya/fb.modes rename to device/archived/device-ouya-ouya-downstream/fb.modes diff --git a/device/archived/device-ouya-ouya-downstream/initfs-hook.sh b/device/archived/device-ouya-ouya-downstream/initfs-hook.sh new file mode 100644 index 000000000..a8014e23a --- /dev/null +++ b/device/archived/device-ouya-ouya-downstream/initfs-hook.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# fix display for xorg +echo 0 > /sys/class/graphics/fb0/blank +echo 16 > /sys/devices/tegradc.0/graphics/fb0/bits_per_pixel +echo 0 0 > /sys/class/graphics/fb0/pan diff --git a/device/testing/device-ouya-ouya/networkmanager.conf b/device/archived/device-ouya-ouya-downstream/networkmanager.conf similarity index 100% rename from device/testing/device-ouya-ouya/networkmanager.conf rename to device/archived/device-ouya-ouya-downstream/networkmanager.conf diff --git a/device/testing/linux-ouya-ouya/00_fix_return_address.patch b/device/archived/linux-ouya-ouya-downstream/00_fix_return_address.patch similarity index 100% rename from device/testing/linux-ouya-ouya/00_fix_return_address.patch rename to device/archived/linux-ouya-ouya-downstream/00_fix_return_address.patch diff --git a/device/testing/linux-ouya-ouya/APKBUILD b/device/archived/linux-ouya-ouya-downstream/APKBUILD similarity index 89% rename from device/testing/linux-ouya-ouya/APKBUILD rename to device/archived/linux-ouya-ouya-downstream/APKBUILD index f07598889..d7bf1defb 100644 --- a/device/testing/linux-ouya-ouya/APKBUILD +++ b/device/archived/linux-ouya-ouya-downstream/APKBUILD @@ -1,8 +1,9 @@ +# Archived: Downstream port, only for testing. Use mainline port! # Kernel config based on: arch/arm/configs/cyanogenmod_ouya_defconfig -pkgname=linux-ouya-ouya +pkgname=linux-ouya-ouya-downstream pkgver=3.1.10 -pkgrel=5 +pkgrel=0 pkgdesc="Ouya kernel fork" arch="armv7" _carch="arm" @@ -45,7 +46,7 @@ package() { downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" } -sha512sums="7e29ed39c61693d85d344b6eb6180920431364124e8a261f28804585e7362ddbb3ad43c9610bed1ce83b1de7957261e450862081f53de98a5873b5a8aad1748e linux-ouya-ouya-49f035e65e689f8c227bac7a6c4ecf89ad9158af.tar.gz +sha512sums="7e29ed39c61693d85d344b6eb6180920431364124e8a261f28804585e7362ddbb3ad43c9610bed1ce83b1de7957261e450862081f53de98a5873b5a8aad1748e linux-ouya-ouya-downstream-49f035e65e689f8c227bac7a6c4ecf89ad9158af.tar.gz 03a85d594e950af5352c5cc98d42e30c17c195a3437863452e63851bce244875656707b8ead0402eeb4be476d56bcc712b221ab628081d3ce74e50fdf710c14f config-ouya-ouya.armv7 6b7ecfd0939b920f263492484e8d60ff30c55614a750f5efd813a699729e65916e31b106e18bd6ea9858b37753403a6428f3a8d993c18b2459685aa29c1f2055 00_fix_return_address.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch" diff --git a/device/testing/linux-ouya-ouya/config-ouya-ouya.armv7 b/device/archived/linux-ouya-ouya-downstream/config-ouya-ouya.armv7 similarity index 100% rename from device/testing/linux-ouya-ouya/config-ouya-ouya.armv7 rename to device/archived/linux-ouya-ouya-downstream/config-ouya-ouya.armv7 diff --git a/device/testing/linux-ouya-ouya/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-ouya-ouya-downstream/gcc10-extern_YYLOC_global_declaration.patch similarity index 100% rename from device/testing/linux-ouya-ouya/gcc10-extern_YYLOC_global_declaration.patch rename to device/archived/linux-ouya-ouya-downstream/gcc10-extern_YYLOC_global_declaration.patch diff --git a/device/testing/device-ouya-ouya/APKBUILD b/device/testing/device-ouya-ouya/APKBUILD index 60e596946..c3fc8d7d4 100644 --- a/device/testing/device-ouya-ouya/APKBUILD +++ b/device/testing/device-ouya-ouya/APKBUILD @@ -1,25 +1,22 @@ # Reference: pkgname=device-ouya-ouya -pkgver=2 -pkgdesc="Ouya" +pkgver=3 pkgrel=0 +pkgdesc="Ouya" url="https://postmarketos.org" arch="armv7" license="MIT" options="!check !archcheck" -depends="mkbootimg postmarketos-base" -makedepends="devicepkg-dev" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-kernel-downstream:kernel_downstream - $pkgname-kernel-mainline:kernel_mainline - $pkgname-x11 +depends=" + firmware-ouya-ouya + linux-ouya-ouya-mainline + mkbootimg + postmarketos-base " +makedepends="devicepkg-dev" source=" deviceinfo - fb.modes initfs-hook.sh - networkmanager.conf " build() { @@ -28,39 +25,9 @@ build() { package() { devicepkg_package $startdir $pkgname - install -D -m644 "$srcdir"/fb.modes \ - "$pkgdir"/etc/fb.modes - install -D -m644 "$srcdir"/networkmanager.conf \ - "$pkgdir"/etc/NetworkManager/conf.d/10-ouya.conf -} - -nonfree_firmware() { - pkgdesc="bcm4330 wifi firmware" - depends="firmware-ouya-ouya" - mkdir "$subpkgdir" -} - -kernel_downstream() { - pkgdesc="Downstream kernel" - depends="linux-ouya-ouya" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -kernel_mainline() { - pkgdesc="Close to mainline; work in progress" - depends="linux-ouya-ouya-mainline" - devicepkg_subpackage_kernel $startdir $pkgname $subpkgname -} - -x11() { - install_if="$pkgname xorg-server" - depends="xf86-video-opentegra libvdpau-tegra" - mkdir "$subpkgdir" } sha512sums=" -22866c785c8e14944a33852d9031713da43500d4362e65374527297022af38d36493c29e98f51df4a689932e51fe21749e13fe8222624fa7700abfe7f6018356 deviceinfo -bf442fac4dc0594e055ed7a7d8232b5c884e2e77543273e8c4f32b5fe3c199561c86d8a5f665e17406057ca7863fabb93e789fe5e168fcd89d2982e0046232ad fb.modes -d01ac1f451275b1a269aab3c8f7fe20b482c952d00c4457ea496b45780c052f8ef98a5ba22a4af009ca128858374c1d3fb97e458102b09f7c40f3d7a718326c1 initfs-hook.sh -b0737a8fb7a60b2d24e4e124dbeb7044832a683a78887454d13d4078039338fb04579ce9066140733222409e7f53255bfde2c6725bd3848752a27e112717c28c networkmanager.conf +9af48bdb258387f0e2e9c85d1c3db52838b5a2e129e58b368f99e047b14b901872194290c183b00416a6976f1f14791d216e5d6e7889fd1ecb676b05c4251a76 deviceinfo +f0d9578cb0f5fda91b83717467e5f9e143bd4a24309406d7c9b59402325cb9dbe34c7f542083ac58ced18c6fd7277eb5710eba555ad1c98c1e06e6b72b26b91d initfs-hook.sh " diff --git a/device/testing/device-ouya-ouya/deviceinfo b/device/testing/device-ouya-ouya/deviceinfo index 41f101a1a..65e378714 100644 --- a/device/testing/device-ouya-ouya/deviceinfo +++ b/device/testing/device-ouya-ouya/deviceinfo @@ -8,8 +8,8 @@ deviceinfo_codename="ouya-ouya" deviceinfo_year="2013" deviceinfo_chassis="embedded" deviceinfo_keyboard="false" -deviceinfo_dtb_mainline="tegra30-ouya" -deviceinfo_append_dtb_mainline="true" +deviceinfo_dtb="tegra30-ouya" +deviceinfo_append_dtb="true" deviceinfo_external_storage="false" deviceinfo_flash_method="fastboot" deviceinfo_arch="armv7" diff --git a/device/testing/device-ouya-ouya/initfs-hook.sh b/device/testing/device-ouya-ouya/initfs-hook.sh index eda297597..c4842aa1d 100644 --- a/device/testing/device-ouya-ouya/initfs-hook.sh +++ b/device/testing/device-ouya-ouya/initfs-hook.sh @@ -1,16 +1,4 @@ #!/bin/sh -# downstream kernel -# fix display for xorg -if [ -d /sys/devices/tegradc.0 ]; then - echo 0 > /sys/class/graphics/fb0/blank - echo 16 > /sys/devices/tegradc.0/graphics/fb0/bits_per_pixel - echo 0 0 > /sys/class/graphics/fb0/pan -fi - - -# mainline kernel # set cooling governor that is meant for simple on/off cooling fans -if [ -d /sys/class/thermal/thermal_zone0 ]; then - echo "bang_bang" | tee /sys/class/thermal/thermal_zone0/policy -fi +echo "bang_bang" | tee /sys/class/thermal/thermal_zone0/policy