google-crosshatch: fix build with downstream kernel

The downstream kernel doesn't provide a separate dtb file, but the experimental mainline kernel does.

Previously, the deviceinfo specified a dtb file for both kernels, and pmbootstrap ignored the missing file for downstream kernel.

pmbootstrap now errors when the dtb file is missing, so this fixes the downstream kernel by specifying a dtb file only for the upstream kernel.

changed the description

By Zhuowei Zhang on 2020-03-01T04:05:21

approved this merge request

By Alexey Min on 2020-03-01T04:09:08

Look who is back!

I can confirm bug:

Executing postmarketos-mkinitfs-0.10.0-r0.trigger
==> initramfs: creating /boot/initramfs-google-crosshatch-extra
==> initramfs: creating /boot/initramfs-google-crosshatch
Scanning kernel module dependencies...
NOTE: ** modprobe warnings below can be ignored ** if your device does not run the
mainline kernel yet (most devices!) or if the related kernel options are enabled
with 'y' instead of 'm' (module).
modprobe: WARNING: Module dm_crypt not found in directory /lib/modules/4.9.96
modprobe: WARNING: Module ext4 not found in directory /lib/modules/4.9.96
modprobe: WARNING: Module usb_f_rndis not found in directory /lib/modules/4.9.96
==> kernel: device-tree blob operations
ERROR: File not found: /usr/share/dtb/qcom/sdm845-crosshatch.dtb
ERROR: postmarketos-mkinitfs-0.10.0-r0.trigger: script exited with error 1
Executing dbus-1.12.16-r2.trigger
Executing ca-certificates-20191127-r1.trigger
Executing glib-2.62.5-r1.trigger
Executing postmarketos-base-3-r32.trigger
OK: 254 MiB in 189 packages
(515004) [07:12:13] (rootfs_google-crosshatch) % apk --no-progress add postmarketos-base device-google-crosshatch device-google-crosshatch-kernel-downstream
1 error; 254 MiB in 189 packages
(515004) [07:12:14] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

And fix confirmed too.

By Alexey Min on 2020-03-01T04:17:24

marked as a Work In Progress

By Zhuowei Zhang on 2020-03-01T04:18:39

added 1 commit

• 0feff592 - google-crosshatch: fix build with downstream kernel

Compare with previous version

By Zhuowei Zhang on 2020-03-01T04:25:28

unmarked as a Work In Progress

By Zhuowei Zhang on 2020-03-01T04:25:52

added category::device + 1 deleted label

added 1 deleted label

approved this merge request

By Bart Ribbers on 2020-03-01T08:23:34

approved this merge request

By Alexey Min on 2020-03-01T12:57:16

added 3 commits

• 0feff592...73e8627e - 2 commits from branch postmarketOS:master
• 4fe8ceee - google-crosshatch: fix build with downstream kernel (!1016 (merged))

Compare with previous version

By Alexey Min on 2020-03-01T12:57:41

merged

By Alexey Min on 2020-03-01T13:03:18

mentioned in commit 4fe8ceee

By Zhuowei Zhang on 2020-03-03T18:40:25