sony-leo: Working touch,screen and wifi

device/testing/device-sony-leo/90-android-touch-dev.rules

+# use 'weston-calibrator' to calibrate the touchscreen!
+SUBSYSTEM=="input", ATTRS{name}=="clearpad", \
+ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1" \
+ENV{WL_CALIBRATION}="0.982113 -0.006129 1.983124 -0.002560 1.000800 -6.012451"
+

device/device-sony-leo/APKBUILD → device/testing/device-sony-leo/APKBUILD

@@ -9,9 +9,14 @@ url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
 options="!check !archcheck"
-depends="postmarketos-base linux-sony-leo mkbootimg mesa-dri-swrast firmware-sony-leo msm-fb-refresher"
+depends="postmarketos-base mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
+source="deviceinfo
+90-android-touch-dev.rules"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,7 +24,21 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
+}
+
+kernel_downstream() {
+	pkgdesc="Weston and wifi works (see device table for details)"
+	depends="linux-sony-leo"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+nonfree_firmware() {
+	pkgdesc="Wifi and touchscreen firmware"
+	depends="firmware-sony-leo"
+	mkdir "$subpkgdir"
 }
 
 
-sha512sums="e2703f794db58f55239586d5b96788e396829cb9199936817888301bd750b69cbfe5b9083189228233d162666a31a0cca42d18ecce2645de8e233b3202fe714d  deviceinfo"
+sha512sums="6cfab52e1c9fa4b8e0b6e5f2689201846abc3a713e7380c9b22f0bfceaf0de27ee71ba3153e25baa2ecffdb9c91d995ac3484d7dac4f00127b612deef26833a8  deviceinfo
+0fbbc5ef5b303431a0f1a9b9ef939f03aef6f1774765089102ce95e57dc5edb692c685a6c11adcada40db608998b714029d12a05c9364bd0445ce8fda7bf5fde  90-android-touch-dev.rules"

device/device-sony-leo/deviceinfo → device/testing/device-sony-leo/deviceinfo

@@ -5,7 +5,7 @@ deviceinfo_format_version="0"
 deviceinfo_name="Sony Z3"
 deviceinfo_manufacturer="Sony"
 deviceinfo_codename="sony-leo"
-deviceinfo_date=""
+deviceinfo_year=""
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armhf"
@@ -17,7 +17,6 @@ deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 deviceinfo_dev_touchscreen=""
 deviceinfo_dev_touchscreen_calibration=""
-deviceinfo_dev_keyboard=""
 
 # Bootloader related
 deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y vmalloc=300M buildvariant=userdebug"

device/linux-sony-leo/APKBUILD → device/testing/linux-sony-leo/APKBUILD

@@ -13,7 +13,7 @@ _flavor="sony-leo"
 url="https://github.com/LineageOS/android_kernel_sony_msm8974"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz"
 
 # Compiler: latest GCC from Alpine
 HOSTCC="${CC:-gcc}"
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
@@ -44,27 +44,11 @@ build() {
 }
 
 package() {
-	# kernel.release
-	install -D "$builddir/include/config/kernel.release" \
-		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
-
-	# zImage (find the right one)
-	cd "$builddir/arch/$_carch/boot"
-	_target="$pkgdir/boot/vmlinuz-$_flavor"
-	for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
-		[ -e "$_zimg" ] || continue
-		msg "zImage found: $_zimg"
-		install -Dm644 "$_zimg" "$_target"
-		break
-	done
-	if ! [ -e "$_target" ]; then
-		error "Could not find zImage in $PWD!"
-		return 1
-	fi
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
 sha512sums="baf5e90b83abd8d9630563144faae13c72df50b9d1867325061f78738e0c6a8b5cbd0086f96359cea79f1cd8cd87aab8f8a8149daca6466ae2c08881c6a57447  linux-sony-leo-bd06661fef846ee569888a27f3d12db9cf1d8741.tar.gz
-31b717da6983a636f8ab6295581cba0d9214e88553c1b7f8989015929d6f41cf61771c5cb9e8564c0c5a8444ed8e996abbe1113d86af6e5544a82bc6e8c30137  config-sony-leo.armhf
+93092ba3786ab7f2c46e8e09ca48cf7fabd994593df58542aea51ab4dcede612b94e48ac80f68aa84bdbea5e5bfdf9ca60c9891b26f83fa295ca0c0b8dde4aff  config-sony-leo.armhf
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 a48336bbfead6ad0c84d2fce0c40a3f5530aebdff356a6835cceaf59a50a6f860d2f8027703a92927955fbb18857ba78788e010d017bf67730f069b36e96fe87  00_fix-video-argb-setting.patch"

device/linux-sony-leo/config-sony-leo.armhf → device/testing/linux-sony-leo/config-sony-leo.armhf

@@ -48,9 +48,9 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
@@ -114,7 +114,7 @@ CONFIG_RT_GROUP_SCHED=y
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
+CONFIG_IPC_NS=y
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 CONFIG_NET_NS=y
@@ -170,7 +170,6 @@ CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -197,12 +196,7 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULES is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
@@ -706,8 +700,8 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 CONFIG_USE_OF=y
 CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
 CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES=""
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
 # CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
@@ -1185,7 +1179,6 @@ CONFIG_XPS=y
 # CONFIG_NETPRIO_CGROUP is not set
 CONFIG_BQL=y
 CONFIG_HAVE_BPF_JIT=y
-# CONFIG_BPF_JIT is not set
 # CONFIG_SOCKEV_NLMCAST is not set
 
 #
@@ -1446,7 +1439,6 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1895,7 +1887,6 @@ CONFIG_I2C_QUP=y
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -2273,7 +2264,6 @@ CONFIG_MSM_VIDC_V4L2=y
 CONFIG_MSM_WFD=y
 # CONFIG_MSM_WFD_DEBUG is not set
 # CONFIG_MSM_VCAP is not set
-# CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 CONFIG_MEDIA_TUNER_SIMPLE=y
@@ -3086,15 +3076,12 @@ CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_ASUS_OLED is not set
-# CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_LINE6_USB is not set
-# CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
 # CONFIG_FB_SM7XX is not set
-# CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_FT1000 is not set
 
@@ -3466,7 +3453,6 @@ CONFIG_ARM_UNWIND=y
 # CONFIG_FREE_PAGES_RDONLY is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_PID_IN_CONTEXTIDR=y
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
 
 #
 # Security options
@@ -3525,7 +3511,6 @@ CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_TEST is not set
 
 #
 # Authenticated Encryption with Associated Data