Support different values in deviceinfo for upstream and downstream kernels

Created by: ollieparanoid

PR #1363 will make it possible to choose between upstream (official kernel.org ones, possibly slightly patched) and downstream kernels (the Android kernel forks) for devices.

As @drebrez and @z3ntu pointed out, we will need different values for the deviceinfo variables for upstream kernels.

@drebrez proposed the following solution which I quite like:

[...] having both lines in deviceinfo, e.g.:

deviceinfo_kernel_cmdline_mainline="cma=64m msm.vram=16m"
deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8"

but in the subpackage installation just remove all the other lines and rename the variable to deviceinfo_kernel_cmdline? That way we can have a common logic between all the APKBUILDs

I would recommend to name the suffix upstream instead of mainline though, because we have linux-postmarketos-mainline, linux-postmarketos-stable etc. We could implement the logic to create the kernel-specific deviceinfo file in the devicepkg-dev package we already have and use.

So as I understand it, the devicepkg-dev script should go through all deviceinfo lines, remove the suffix from the correct kernel config variables and remove (or leave - doesn't really matter) the others?

By Luca Weiss on 2018-03-28T10:47:05

@z3ntu right, that was the idea, and do it for every kernel_* subpackage to remove the suffix of that subpackage. This is to avoid changing everywhere in the code to use one variable instead of the other. In this way it will always be the same variable, and it gets solved at packaging level.

By Daniele Debernardi on 2018-03-28T17:36:41

@ollieparanoid while adding the downstream/mainline choice for the samsung klte kernel I noticed that the downstream uses deviceinfo_bootimg_qcdt="true" but the mainline kernel works with the dtb appended to the kernel itself (zImage-dtb). Should we just consider that every mainline kernel doesn't need the qcdt and just remove that line? (or set to false)

By Daniele Debernardi on 2018-05-07T21:53:19

draft:

kernel="downstream"      # or upstream
if grep -q "deviceinfo_kernel_cmdline_$kernel" "$srcdir/deviceinfo"; then
	sed "s/deviceinfo_kernel_cmdline_$kernel/deviceinfo_kernel_cmdline/g" "$srcdir/deviceinfo" | \
		sed -E "N;s/deviceinfo_kernel_cmdline_.*\n//g" > "$srcdir/deviceinfo_$kernel"
	install -Dm644 "$srcdir/deviceinfo_$kernel" \
		"$pkgdir/etc/deviceinfo"
fi

By Daniele Debernardi on 2018-05-07T23:07:12

Created by: ollieparanoid

Should we just consider that every mainline kernel doesn't need the qcdt and just remove that line? (or set to false)

@opendata26 found a way to let the bootloader initialize the display, and that needs QCDT. He enabled it for linux-postmarketos-qcom in https://github.com/postmarketOS/pmbootstrap/commit/6fe1917f78d19f5af2cdf217fd411eb2ed283255. From https://github.com/postmarketOS/pmbootstrap/pull/1457#issue-185245453:

Generates a dt.img with qcom kernel, this is needed as to make the bootloader initialize display as cant read the display setting if dtb is appended.

The draft looks like it should work from a quick look

By * postmarketOS Bot on 2018-05-08T00:32:49

I'm working on this since for the samsung-klte I need 2 different cmdline for downstream and mainline. Now that #1474 is merged and we properly install the device kernel subpackage I have another issue: Currently the deviceinfo is installed with the device package during the devicepkg_package $startdir $pkgname of the devicepkg-dev. The devicepkg_package function also install other stuff, so we can not remove it from the base package. If we add both the variables (deviceinfo_kernel_cmdline_mainline/downstream) in the deviceinfo should we still install it in the base package? I was thinking about updating the devicepkg_package script to install the deviceinfo file only if it contains the exact variable deviceinfo_kernel_cmdline (to not break other devices), and add a new devicepkg_subpackage script (or with a different name) that will install the deviceinfo with the proper replace of the variables. What you think @ollieparanoid ?

By Daniele Debernardi on 2018-05-09T17:11:57

Created by: ollieparanoid

If we add both the variables (deviceinfo_kernel_cmdline_mainline/downstream) in the deviceinfo should we still install it in the base package?

I think we should not, as this would lead to a conflict between the device package and its kernel subpackages.

I was thinking about updating the devicepkg_package script to install the deviceinfo file only if it contains the exact variable deviceinfo_kernel_cmdline (to not break other devices), and add a new devicepkg_subpackage script (or with a different name) that will install the deviceinfo with the proper replace of the variables.

I like the idea! Though checking for deviceinfo_kernel_cmdline does not seem to be that obvious from a user's perspective (what if another variable needs to be changed between upstream and downstream, but kernel_cmdline is the same for whichever reason?).

Here's a proof of concept for a slightly modified version that always installs the deviceinfo file, but the subpackage then clears it from the package in case it will get installed in the kernel subpackages. (this workflow is used commonly in APKBUILDs: run make install to $pkgdir, then move the dev, doc, ... files to their own subpackages afterwards.)

# Reference: <https://postmarketos.org/devicepkg>
pkgname="device-test-test"
pkgdesc="test"
pkgver=0.1
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="noarch"
options="!check"
depends=""
makedepends="devicepkg-dev"
source="deviceinfo"
subpackages="
	$pkgname-kernel-downstream:kernel_downstream
	$pkgname-kernel-mainline:kernel_mainline
"

build() {
	devicepkg_build $startdir $pkgname
}

# this would be part of devicepkg-dev
devicepkg_subpackage_kernel() {
	startdir=$1
	pkgname=$2
	subpkgname=$3

	if [ -z "$startdir" ] || [ -z "$pkgname" ] || [ -z "$subpkgname" ]; then
		echo "ERROR: missing argument!"
		echo "Please call devicepkg_subpackage_kernel() with \$startdir \$pkgname \$subpkgname as arguments."
		exit 1
	fi

	srcdir="$startdir/src"
	pkgdir="$startdir/pkg/$pkgname"
	subpkgdir="$startdir/pkg/$subpkgname"

	if [ -e "$pkgdir/etc/deviceinfo" ]; then
		rm -v "$pkgdir/etc/deviceinfo"
	fi

	# TODO: find out the kernel from the subpkgname
	# TODO: install adjusted deviceinfo (from $srcdir/deviceinfo) to subpackage
	mkdir -p "$subpkgdir"
}

package() {
	devicepkg_package $startdir $pkgname
}


kernel_mainline() {
	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}

kernel_downstream() {
	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
}

sha512sums="62c7e7c0b6c7fc54d67883c6b948ce4ecfbab1031e2bb28274429e08eba004aed9bdd39c6cd38b75a6ebb75e2e9fed21265f92e2a97dacb9b34c28d6c9542a16  deviceinfo"

EDIT: I wrote this before realizing you've already made a PR. I'm curious what you think of it anyway.

By * postmarketOS Bot on 2018-05-09T21:35:50

mentioned in merge request !1491 (closed)

By Martijn Braam on 2018-06-30T13:11:35

mentioned in merge request pmaports!23 (merged)

By Daniele Debernardi on 2018-09-28T00:13:49

closed via merge request pmaports!23 (merged)

By Oliver Smith on 2018-10-15T19:54:16