diff --git a/device/testing/device-amediatech-x96-mini/APKBUILD b/device/testing/device-amediatech-x96-mini/APKBUILD index 6a2dbd722..212142747 100644 --- a/device/testing/device-amediatech-x96-mini/APKBUILD +++ b/device/testing/device-amediatech-x96-mini/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: exkc pkgname=device-amediatech-x96-mini pkgver=3 -pkgrel=1 +pkgrel=2 pkgdesc="Amediatech X96 mini" url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-amediatech-x96-mini soc-amlogic-s905 linux-postmarketos-amlogic" +depends="postmarketos-base u-boot-amlogic-amediatech-x96-mini soc-amlogic-aarch64 linux-postmarketos-amlogic" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="asound.state deviceinfo modules-initfs" diff --git a/device/testing/device-amlogic-tvbox/APKBUILD b/device/testing/device-amlogic-tvbox/APKBUILD index 16a39a8f1..871ffae15 100644 --- a/device/testing/device-amlogic-tvbox/APKBUILD +++ b/device/testing/device-amlogic-tvbox/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-amlogic-tvbox pkgdesc="Amlogic TV box" pkgver=8 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,7 +11,7 @@ options="!check !archcheck" depends=" dtc postmarketos-base - soc-amlogic-s905 + soc-amlogic-aarch64 u-boot-tools " makedepends="devicepkg-dev" @@ -86,7 +86,7 @@ kernel_videostrong_kii_pro() { kernel_xiaomi_aquaman() { pkgdesc="Kernel for Xiaomi Mi TV Stick (S805Y)" - depends="linux-postmarketos-amlogic soc-amlogic-s905-boot linux-firmware-meson linux-firmware-brcm linux-firmware-rtl_bt" + depends="linux-postmarketos-amlogic soc-amlogic-aarch64-boot linux-firmware-meson linux-firmware-brcm linux-firmware-rtl_bt" aml_boot_prep "meson-gxl-s805y-xiaomi-aquaman.dtb" "$subpkgdir" devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } diff --git a/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD b/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD index 768faac72..e431e8d02 100644 --- a/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD +++ b/device/testing/device-bananapi-bpi-cm4-cm4io/APKBUILD @@ -3,12 +3,12 @@ pkgname=device-bananapi-bpi-cm4-cm4io pkgdesc="BananaPi BPI-CM4IO Baseboard with BPI-CM4" pkgver=1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-bananapi-bpi-cm4-cm4io soc-amlogic-s905 linux-postmarketos-amlogic" +depends="postmarketos-base u-boot-amlogic-bananapi-bpi-cm4-cm4io soc-amlogic-aarch64 linux-postmarketos-amlogic" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo modules-initfs" diff --git a/device/testing/device-beelink-gt1/APKBUILD b/device/testing/device-beelink-gt1/APKBUILD index 67dc55661..ee9696a8c 100644 --- a/device/testing/device-beelink-gt1/APKBUILD +++ b/device/testing/device-beelink-gt1/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=device-beelink-gt1 pkgver=3 -pkgrel=0 +pkgrel=1 pkgdesc="Beelink gt1 (Ultimate)" url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-beelink-gt1 soc-amlogic-s905 linux-postmarketos-amlogic" +depends="postmarketos-base u-boot-amlogic-beelink-gt1 soc-amlogic-aarch64 linux-postmarketos-amlogic" makedepends="devicepkg-dev" provides="$pkgname-kernel-amlogic=$pkgver-r$pkgrel $pkgname-kernel-alpine=$pkgver-r$pkgrel" replaces="$pkgname-kernel-amlogic=$pkgver-r$pkgrel $pkgname-kernel-alpine=$pkgver-r$pkgrel" diff --git a/device/testing/device-khadas-vim3/APKBUILD b/device/testing/device-khadas-vim3/APKBUILD index 1aa484300..d68896c23 100644 --- a/device/testing/device-khadas-vim3/APKBUILD +++ b/device/testing/device-khadas-vim3/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-khadas-vim3 pkgdesc="Khadas VIM3 Amlogic A311D" pkgver=1 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,7 +11,7 @@ options="!check !archcheck" depends=" linux-postmarketos-amlogic postmarketos-base - soc-amlogic-s905 + soc-amlogic-aarch64 " makedepends="devicepkg-dev" source=" diff --git a/device/testing/device-librecomputer-lafrite/APKBUILD b/device/testing/device-librecomputer-lafrite/APKBUILD index df17adf73..431d90bad 100644 --- a/device/testing/device-librecomputer-lafrite/APKBUILD +++ b/device/testing/device-librecomputer-lafrite/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-librecomputer-lafrite pkgdesc="Libre Computer AML-S805X-AC-V1.0" pkgver=3 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,7 +11,7 @@ options="!check !archcheck" depends=" linux-postmarketos-amlogic postmarketos-base - soc-amlogic-s905 + soc-amlogic-aarch64 " makedepends="devicepkg-dev" source=" diff --git a/device/testing/device-librecomputer-lepotato/APKBUILD b/device/testing/device-librecomputer-lepotato/APKBUILD index cfdb30095..cf6ca6c28 100644 --- a/device/testing/device-librecomputer-lepotato/APKBUILD +++ b/device/testing/device-librecomputer-lepotato/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-librecomputer-lepotato pkgdesc="Libre Computer AML-S905X-CC-V1.0" pkgver=3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -11,7 +11,7 @@ options="!check !archcheck" depends=" linux-postmarketos-amlogic postmarketos-base - soc-amlogic-s905 + soc-amlogic-aarch64 u-boot-amlogic-librecomputer-lepotato " makedepends="devicepkg-dev" diff --git a/device/testing/device-odroid-c4/APKBUILD b/device/testing/device-odroid-c4/APKBUILD index bcb58f1cb..bff954382 100644 --- a/device/testing/device-odroid-c4/APKBUILD +++ b/device/testing/device-odroid-c4/APKBUILD @@ -3,12 +3,12 @@ pkgname=device-odroid-c4 pkgdesc="ODROID C4" pkgver=1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-odroid-c4 soc-amlogic-s905 linux-postmarketos-amlogic" +depends="postmarketos-base u-boot-amlogic-odroid-c4 soc-amlogic-aarch64 linux-postmarketos-amlogic" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo modules-initfs" diff --git a/device/testing/device-odroid-n2plus/APKBUILD b/device/testing/device-odroid-n2plus/APKBUILD index 50ca82336..60b82b443 100644 --- a/device/testing/device-odroid-n2plus/APKBUILD +++ b/device/testing/device-odroid-n2plus/APKBUILD @@ -3,12 +3,12 @@ pkgname=device-odroid-n2plus pkgdesc="ODROID N2+" pkgver=1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base u-boot-amlogic-odroid-n2plus soc-amlogic-s905 linux-postmarketos-amlogic" +depends="postmarketos-base u-boot-amlogic-odroid-n2plus soc-amlogic-aarch64 linux-postmarketos-amlogic" makedepends="devicepkg-dev" subpackages="$pkgname-nonfree-firmware:nonfree_firmware" source="deviceinfo modules-initfs" diff --git a/device/testing/soc-amlogic-s905/APKBUILD b/device/testing/soc-amlogic-aarch64/APKBUILD similarity index 83% rename from device/testing/soc-amlogic-s905/APKBUILD rename to device/testing/soc-amlogic-aarch64/APKBUILD index 4ecd0602b..e1d0007b4 100644 --- a/device/testing/soc-amlogic-s905/APKBUILD +++ b/device/testing/soc-amlogic-aarch64/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Ferass El Hafidi # Co-Maintainer: exkc -pkgname=soc-amlogic-s905 -pkgdesc="Common package for devices using the Amlogic S905 SoC" +pkgname=soc-amlogic-aarch64 +pkgdesc="Common package for devices using an Amlogic AArch64 SoC" pkgver=3 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -17,13 +17,15 @@ source=" s905_autoscript.cmd xorg.conf " +provides="soc-amlogic-s905=$pkgver-r$pkgrel" +replaces="soc-amlogic-s905" package() { mkdir -p "$pkgdir" } boot() { - pkgdesc="Script for chainloading modern U-Boot from legacy U-Boot on Amlogic TV Boxes." + pkgdesc="Script for chainloading modern U-Boot from legacy U-Boot on Amlogic TV Boxes" mkdir -p "$subpkgdir/boot" # Required if installing to an SD card mkimage -A arm64 -O linux -T script -C none -a 0 -e 0 -n "S905 autoscript" \ @@ -33,6 +35,7 @@ boot() { } x11() { + pkgdesc="X11 configuration for Amlogic AArch64-based devices" # Shamelessly taken from Armbian. # https://github.com/armbian/build/blob/master/config/sources/families/include/meson64_common.inc install_if="$pkgname xorg-server" diff --git a/device/testing/soc-amlogic-s905/s905_autoscript.cmd b/device/testing/soc-amlogic-aarch64/s905_autoscript.cmd similarity index 100% rename from device/testing/soc-amlogic-s905/s905_autoscript.cmd rename to device/testing/soc-amlogic-aarch64/s905_autoscript.cmd diff --git a/device/testing/soc-amlogic-s905/xorg.conf b/device/testing/soc-amlogic-aarch64/xorg.conf similarity index 100% rename from device/testing/soc-amlogic-s905/xorg.conf rename to device/testing/soc-amlogic-aarch64/xorg.conf diff --git a/device/testing/u-boot-amlogic-s905-tv/APKBUILD b/device/testing/u-boot-amlogic-s905-tv/APKBUILD index 03c4a237c..4d78332da 100644 --- a/device/testing/u-boot-amlogic-s905-tv/APKBUILD +++ b/device/testing/u-boot-amlogic-s905-tv/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Ferass El Hafidi pkgname=u-boot-amlogic-s905-tv pkgver=2020.07 -pkgrel=0 +pkgrel=1 pkgdesc="U-Boot for devices using the Amlogic S905 SoC" url="https://www.denx.de/wiki/U-Boot/" arch="aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" options="!check" -depends="soc-amlogic-s905-boot" +depends="soc-amlogic-aarch64-boot" makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev py3-setuptools linux-headers u-boot-tools" source=" diff --git a/device/testing/u-boot-amlogic-s905x-tv/APKBUILD b/device/testing/u-boot-amlogic-s905x-tv/APKBUILD index dcfda7d6f..3c84c1ae4 100644 --- a/device/testing/u-boot-amlogic-s905x-tv/APKBUILD +++ b/device/testing/u-boot-amlogic-s905x-tv/APKBUILD @@ -2,14 +2,14 @@ # Co-Maintainer: Ferass El Hafidi pkgname=u-boot-amlogic-s905x-tv pkgver=2020.07 -pkgrel=0 +pkgrel=1 pkgdesc="U-Boot for devices using the Amlogic S905X SoC" url="https://www.denx.de/wiki/U-Boot/" arch="aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" options="!check" -depends="soc-amlogic-s905-boot" +depends="soc-amlogic-aarch64-boot" makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev py3-setuptools linux-headers u-boot-tools" source=" diff --git a/device/testing/u-boot-amlogic-s905x2-tv/APKBUILD b/device/testing/u-boot-amlogic-s905x2-tv/APKBUILD index 39a2dd570..c0a0d0201 100644 --- a/device/testing/u-boot-amlogic-s905x2-tv/APKBUILD +++ b/device/testing/u-boot-amlogic-s905x2-tv/APKBUILD @@ -2,14 +2,14 @@ # Co-Maintainer: Ferass El Hafidi pkgname=u-boot-amlogic-s905x2-tv pkgver=2024.01 -pkgrel=0 +pkgrel=1 pkgdesc="U-Boot for devices using the Amlogic S905X2 SoC" url="https://www.denx.de/wiki/U-Boot/" arch="aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" options="!check" -depends="soc-amlogic-s905-boot" +depends="soc-amlogic-aarch64-boot" makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev py3-setuptools linux-headers u-boot-tools" source="