Skip to content

WIP: Add support to different deviceinfo variables in mainline/downstream subpackages

Daniele Debernardi requested to merge feature/1368-devicepkg-support-different-values into master

Unfortunately, this merge request was not correctly imported from GitHub:

Something went wrong while fetching comments. Please try again.

@drebrez or anyone else: if you have updated the code for another review, please open up a new merge request. Sorry for the trouble.

Changes:

How to test:

pmbootstrap -y zap
pmbootstrap build devicepkg-dev --force --arch armhf

# Test device with both cmdlines
pmbootstrap build device-samsung-klte --force --arch armhf

pmbootstrap chroot -b -- find /home/pmos/build/pkg/
# output should contain the deviceinfo file in both subpackages and not in the device package

pmbootstrap chroot -b -- cat /home/pmos/build/pkg/device-samsung-klte-kernel-downstream/etc/deviceinfo
# output should contain the line: deviceinfo_kernel_cmdline="androidboot.boot_recovery=1"

pmbootstrap chroot -b -- cat /home/pmos/build/pkg/device-samsung-klte-kernel-mainline/etc/deviceinfo
# output should contain the line: deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 PMOS_NO_OUTPUT_REDIRECT"


# Test device with normal cmdline
pmbootstrap build device-samsung-maguro --force --arch armhf

pmbootstrap chroot -b -- find /home/pmos/build/pkg/
# output should contain the deviceinfo file in the device package as usual

pmbootstrap chroot -b -- cat /home/pmos/build/pkg/device-samsung-maguro/etc/deviceinfo
# output should contain the exact content as the source file


# Test device without cmdline
pmbootstrap build device-samsung-i9070 --force --arch armhf

pmbootstrap chroot -b -- find /home/pmos/build/pkg/
# output should contain the deviceinfo file in the device package as usual

pmbootstrap chroot -b -- cat /home/pmos/build/pkg/device-samsung-i9070/etc/deviceinfo
# output should contain the exact content as the source file

Closes: #1368 (closed)

[x] Merge on GitHub (see https://postmarketos.org/merge)

Edited by Oliver Smith

Merge request reports