samsung-loganrelte: boot mainline (MR 6142)

This replaces the downstream kernel with a near-to-mainline kernel, and also adds a msm8930-specific mainline package. While this removes some functionality (screen, touchscreen), this makes the boot more stable (boots no matter if charging or not). To flash this, you first need to flash lk2nd, and then flash to the userdata partition with pmbootstrap flasher flash_rootfs --partition userdata. You might need to wipe the system partition. The boot finishes, but to get USB networking, you might need to dis- and re-connect the device ca. 10 seconds after (re-)booting. SSH and internet-over-USB works fully.

device/testing/device-samsung-loganrelte/APKBUILD

@@ -2,18 +2,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-loganrelte
 pkgdesc="Samsung Galaxy Ace 3 LTE"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
-	linux-samsung-loganrelte
-	mkbootimg
-	msm-fb-refresher
+	linux-postmarketos-qcom-msm8930
 	postmarketos-base
-	postmarketos-base-downstream
 "
 makedepends="devicepkg-dev"
 source="
@@ -29,5 +26,5 @@ package() {
 }
 
 sha512sums="
-0e1551bd994886968e466bce4e0328a281667f06d1e863137397aac4692bb7c80363517d70c73b6ebdd6912b303646792151352d4a5b350182881c208b7caf9b  deviceinfo
+081543d99e9981c0ae81bbe98f28bf49e07c859cff6dbe11d7d52c99e97b818932efdc85dcc07f8c8e10a136ee3a5208b8ead04a3c040b6434bb72946f612e2e  deviceinfo
 "

device/testing/device-samsung-loganrelte/deviceinfo

@@ -2,6 +2,8 @@
 # Please use double quotes only. You can source this file in shell
 # scripts.
 
+deviceinfo_dtb="qcom-msm8930-samsung-loganrelte"
+
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy Ace 3 LTE"
 deviceinfo_manufacturer="Samsung"
@@ -12,22 +14,14 @@ deviceinfo_arch="armv7"
 # Device related
 deviceinfo_chassis="handset"
 deviceinfo_external_storage="true"
-deviceinfo_dev_touchscreen="/dev/input/event1"
-deviceinfo_screen_width="800"
-deviceinfo_screen_height="480"
+# deviceinfo_screen_width="800"
+# deviceinfo_screen_height="480"
+deviceinfo_no_framebuffer="true" # Screen not mainlined yet.
 deviceinfo_keyboard="false"
 
 # Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_generate_bootimg="true"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_flash_offset_base="0x80200000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x02000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-
-# InitFS related
-deviceinfo_create_initfs_extra="true"
+deviceinfo_generate_bootimg="false"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_flash_method="fastboot"
+deviceinfo_partition_type="msdos"

device/testing/linux-postmarketos-qcom-msm8930/APKBUILD

+# Maintainer: User0 <user0thenyancat@proton.me>
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on qcom_msm8930_defconfig which is based on qcom_apq8064_defconfig
+
+_flavor="postmarketos-qcom-msm8930"
+pkgname=linux-$_flavor
+pkgver=6.11_rc6
+pkgrel=0
+pkgdesc="Close-to-mainline kernel fork for Qualcomm MSM8930 devices"
+arch="armv7"
+_carch="arm"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+makedepends="
+	bash
+	bc
+	bison
+	devicepkg-dev
+	findutils
+	flex
+	gmp-dev
+	lzop
+	mpc1-dev
+	mpfr-dev
+	openssl-dev
+	perl
+	postmarketos-installkernel
+	python3
+"
+
+# Source
+_repository="linux-msm8930"
+_config="config-$_flavor.$arch"
+_tag="e72efc8220c988c710b4c4f5962ba567da37b6e0"
+source="
+	$pkgname-$_tag.tar.gz::https://github.com/user0-07161/$_repository/archive/$_tag.tar.gz
+	$_config
+"
+builddir="$srcdir/$_repository-$_tag"
+
+prepare() {
+	default_prepare
+	cp -v "$srcdir"/$_config .config
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	mkdir -p "$pkgdir"/boot
+	make zinstall modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_PATH="$pkgdir"/boot \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
+	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
+}
+
+sha512sums="
+ccb3757c128f6427c77f999899e08732b4187279db7130967c7d7a02cee2e92bfd8ea4eb45fcf611a3c7d3f57db44cfeaedb513c190b792a0e5e474fc4569022  linux-postmarketos-qcom-msm8930-e72efc8220c988c710b4c4f5962ba567da37b6e0.tar.gz
+5db55e262fd4b39ea97ab9ad4fc6c1ed9e545902fecf5facdb81a64100d2cf58fcd697e1e097bfafb854148bd49f8ac5a3a40672400a454e89d3b4f261fa08e0  config-postmarketos-qcom-msm8930.armv7
+"

device/testing/linux-samsung-loganrelte/01_msm-fix-perf_trace_counters.patch

-../../../device/testing/linux-samsung-serranolte/01_msm-fix-perf_trace_counters.patch
\ No newline at end of file

device/testing/linux-samsung-loganrelte/02_gpu-msm-fix-gcc5-compile.patch

-../../../device/testing/linux-samsung-serranolte/02_gpu-msm-fix-gcc5-compile.patch
\ No newline at end of file

device/testing/linux-samsung-loganrelte/03_fix-video-argb-setting.patch

-../../../device/testing/linux-samsung-serranolte/03_fix-video-argb-setting.patch
\ No newline at end of file

device/testing/linux-samsung-loganrelte/APKBUILD

-# Maintainer: User0 <user0thenyancat@proton.me>
-# Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config extracted from: https://androidfilehost.com/?fid=24052804347795607
-
-pkgname=linux-samsung-loganrelte
-pkgver=3.4.113
-pkgrel=1
-pkgdesc="Samsung Galaxy Ace 3 LTE kernel fork"
-arch="armv7"
-_carch="arm"
-_flavor="samsung-loganrelte"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="
-	bash
-	bc
-	devicepkg-dev
-	elfutils-dev
-	gcc6
-	gmp-dev
-	installkernel
-	linux-headers
-	perl
-	sed
-	xz
-"
-
-# Source
-_repository="android_kernel_samsung_msm8930-common"
-_commit="0a35d79cc544b24168450e46216dd649c7fd339b"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/MSM8930-Samsung/$_repository/archive/$_commit.tar.gz
-	$_config
-	01_msm-fix-perf_trace_counters.patch
-	02_gpu-msm-fix-gcc5-compile.patch
-	03_fix-video-argb-setting.patch
-	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-"
-builddir="$srcdir/$_repository-$_commit"
-_outdir="out"
-
-# Strictily use GCC6
-# This kernel hasn't been tested with other compilers than GCC6
-if [ "${CC:0:5}" != "gcc6-" ]; then
-	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
-	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
-fi
-
-
-prepare() {
-	default_prepare
-	. downstreamkernel_prepare
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
-		"$_flavor" "$_outdir"
-}
-
-sha512sums="
-06ac698b5689c823e985b27895c39cb9bc5e2a5af27d4910bc5bb95d90d71a7c8cfa55856d070404b69683d35d8c1011ea7a0eb4b47678b5ec585129d258529d  linux-samsung-loganrelte-0a35d79cc544b24168450e46216dd649c7fd339b.tar.gz
-b04dfffd8b8903415c4ed32fb12d562defde6e5c94bd3e2a6ab808344f2fff28066de9631222f8869eeaa438867c0f3630c148066ef5c8b97fc70997213615be  config-samsung-loganrelte.armv7
-f85ced49ee2f2461adea68dac0a10452aa809a7d41d869092d94eb085344919a9a385dec0c48011f4601ca4f441700f7fe49075c7eca4fb2d66b01f7d413ccb7  01_msm-fix-perf_trace_counters.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
-e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd  03_fix-video-argb-setting.patch
-9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-"

device/testing/linux-samsung-loganrelte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
\ No newline at end of file