fairphone-fp2: split downstream into separate package (MR 6491)

device/archived/device-fairphone-fp2-downstream/APKBUILD

@@ -0,0 +1,48 @@
+# Archived: Downstream port, only for testing. Use mainline port!
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@lucaweiss.eu>
+pkgname=device-fairphone-fp2-downstream
+pkgdesc="Fairphone 2 (Downstream)"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	adsp-audio
+	firmware-fairphone-fp2-adsp
+	firmware-fairphone-fp2-modem
+	firmware-fairphone-fp2-wcnss
+	linux-fairphone-fp2-downstream
+	lk2nd-msm8974
+	mkbootimg
+	msm-modem-downstream
+	postmarketos-base
+	soc-qcom-msm8974
+	wcnss-wlan
+	"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	FP2.conf
+	hifi
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	mkdir -p "$pkgdir"/usr/share/alsa/ucm/FP2
+	install -Dm644 "$srcdir"/FP2.conf "$pkgdir"/usr/share/alsa/ucm/FP2/
+	install -Dm644 "$srcdir"/hifi "$pkgdir"/usr/share/alsa/ucm/FP2/
+}
+
+sha512sums="
+4607ef7ae4ec302a4ac231fc13e230b976b649506d7bdfd642a5f60f6a4ee5510b7cfdacbaa1ba1c51cc0b2a272d6811e6e23e95fbc4ceba24bc1907a75f24fd  deviceinfo
+55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
+b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
+"

device/archived/device-fairphone-fp2-downstream/deviceinfo

@@ -0,0 +1,33 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Fairphone 2"
+deviceinfo_manufacturer="Fairphone"
+deviceinfo_codename="fairphone-fp2-downstream"
+deviceinfo_year="2015"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyHSL0;115200"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
+deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_qcdt="true"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"

device/archived/linux-fairphone-fp2-downstream/APKBUILD

@@ -1,10 +1,11 @@
+# Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 # Kernel config based on: arch/arm/configs/lineageos_FP2_defconfig
 
-pkgname=linux-fairphone-fp2
+pkgname=linux-fairphone-fp2-downstream
 pkgver=3.4.0
-pkgrel=14
+pkgrel=0
 pkgdesc="Fairphone 2 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -64,7 +65,7 @@ package() {
 }
 
 sha512sums="
-6b440c5d087b790894606d4736af815204d9e6f682b7c1ba78f5852fa7aecd74cb276f4953d270f14c96d5418f4e2a83c5179c54d50e2e5afc9084f83ab54200  linux-fairphone-fp2-284400aea4b9f8a3c97a34408f48d0971897ae02.tar.gz
+6b440c5d087b790894606d4736af815204d9e6f682b7c1ba78f5852fa7aecd74cb276f4953d270f14c96d5418f4e2a83c5179c54d50e2e5afc9084f83ab54200  linux-fairphone-fp2-downstream-284400aea4b9f8a3c97a34408f48d0971897ae02.tar.gz
 a19a14847492ea383ddffa01f1b8344ca8084ad610b4290e24e5074619295bc5473db186f724211a35a7f0f445a2d0b35e730e7953a3b3ad2f4f70893f07139d  config-fairphone-fp2.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch

device/testing/device-fairphone-fp2/30-gpu-firmware.files

@@ -1,2 +0,0 @@
-/lib/firmware/qcom/a330_pfp.fw
-/lib/firmware/qcom/a330_pm4.fw

device/testing/device-fairphone-fp2/APKBUILD

@@ -2,36 +2,33 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
+	firmware-fairphone-fp2-adsp
+	firmware-fairphone-fp2-modem
+	firmware-fairphone-fp2-wcnss
+	firmware-qcom-adreno-a330
+	linux-postmarketos-qcom-msm8974
 	lk2nd-msm8974
+	mesa-egl
 	mkbootimg
+	msm-modem
+	msm-modem-uim-selection
 	postmarketos-base
 	soc-qcom-msm8974
 	"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	modules-initfs.mainline
-	FP2.conf
-	hifi
+	modules-initfs
 	phoc.ini
-	30-gpu-firmware.files
-"
-subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-downstream-firmware:downstream_firmware
-	$pkgname-mainline-firmware:mainline_firmware
-	$pkgname-alsa
-	$pkgname-phosh
 "
+subpackages="$pkgname-phosh"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -41,49 +38,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_downstream() {
-	pkgdesc="Downstream kernel"
-	depends="linux-fairphone-fp2"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel"
-	depends="linux-postmarketos-qcom-msm8974 mesa-egl"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for WiFi, Audio, etc."
-	depends="firmware-fairphone-fp2-adsp firmware-fairphone-fp2-modem firmware-fairphone-fp2-wcnss"
-	mkdir "$subpkgdir"
-}
-
-downstream_firmware() {
-	pkgdesc="Firmware support packages for downstream kernel"
-	depends="$pkgname-alsa adsp-audio msm-modem-downstream wcnss-wlan"
-	install_if="$pkgname-kernel-downstream $pkgname-nonfree-firmware"
-	mkdir "$subpkgdir"
-}
-
-mainline_firmware() {
-	pkgdesc="Firmware support packages for mainline kernel"
-	depends="msm-modem msm-modem-uim-selection firmware-qcom-adreno-a330"
-	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
-	mkdir "$subpkgdir"
-
-	install -Dm644 "$srcdir/30-gpu-firmware.files" \
-		"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
-}
-
-alsa() {
-	pkgdesc="Audio configuration files"
-
-	mkdir -p "$subpkgdir"/usr/share/alsa/ucm/FP2
-	install -Dm644 "$srcdir"/FP2.conf "$subpkgdir"/usr/share/alsa/ucm/FP2/
-	install -Dm644 "$srcdir"/hifi "$subpkgdir"/usr/share/alsa/ucm/FP2/
-}
-
 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/phoc.ini \
@@ -91,10 +45,7 @@ phosh() {
 }
 
 sha512sums="
-2fd9f84b2ac67774c276af13d47bf79ba2eed5d636742d4af030922cd02334dad96cee2ab0a8a3510176de6227b755e0893b804b8965412f7902875539782233  deviceinfo
-1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910  modules-initfs.mainline
-55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
-b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
+2301e2c8b66fda1d4262bd221dbd812112ffd92a31b7f5289292958981ae214e99dcce0d4e591fa7cb4fd0cbe7f560cf876dc49dd90346d1cc0419a96cefdbf5  deviceinfo
+1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910  modules-initfs
 cef2fd633cddbcf4ac9b4d2fa6bf3a1e3e8d810a2ea8050767fe649d289db753662821d5e41e2c8d20fb9c765c1babcb6a4d95e4c9345f5ea32d1b1d2b1e5126  phoc.ini
-bbe6d6f530a9fa1934dd065dd4f6da48450e2115e4656b219d7f3aebc8b6a2775c02a2e5ffb5790950bb8183fca4677fbeaf9d8a267089c9f0d08461fc8ed45d  30-gpu-firmware.files
 "

device/testing/device-fairphone-fp2/deviceinfo

@@ -6,8 +6,8 @@ deviceinfo_name="Fairphone 2"
 deviceinfo_manufacturer="Fairphone"
 deviceinfo_codename="fairphone-fp2"
 deviceinfo_year="2015"
-deviceinfo_dtb_mainline="qcom-msm8974pro-fairphone-fp2"
-deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb="qcom-msm8974pro-fairphone-fp2"
+deviceinfo_append_dtb="true"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -16,18 +16,15 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
-deviceinfo_getty_downstream="ttyHSL0;115200"
-deviceinfo_getty_mainline="ttyMSM0;115200"
-deviceinfo_mesa_driver_mainline="msm"
+deviceinfo_getty="ttyMSM0;115200"
+deviceinfo_mesa_driver="msm"
 deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
-deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 msm.vram=192m msm.allow_vram_carveout=1"
+deviceinfo_kernel_cmdline="earlycon=msm_serial_dm,0xf991e000 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_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"