postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally

This replaces the dependency on osk-sdl with a dependency on a postmarketos-fde-unlocker virt. package

osk-sdl and its dependencies are also added contitionally to the initfs, based on whether the osk-sdl exe is installed in the rootfs

Also see: pmbootstrap!2066 (merged)

added type::feature label

added 1 commit

• 540b1b9d - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally

Compare with previous version

By clayton craft on 2021-06-10T06:56:58

mentioned in merge request pmbootstrap!2066 (merged)

By clayton craft on 2021-06-10T06:59:20

mentioned in issue #1104 (closed)

By clayton craft on 2021-06-10T07:00:44

approved this merge request

By Alexey Min on 2021-06-10T19:05:29

code looks simple enough

By Alexey Min on 2021-06-10T19:05:37

approved this merge request

By Bart Ribbers on 2021-06-11T09:55:58

Indeed, looks simple and good. @craftyguy should we wait with merging this till pmbootstrap!2066 (merged) is merged or does it not have to wait?

By Bart Ribbers on 2021-06-11T16:32:16

added 13 commits

• 540b1b9d...ee581e5f - 12 commits from branch master
• 722d1be0 - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally

Compare with previous version

By clayton craft on 2021-06-11T16:33:01

added 1 commit

• 0bef0c8b - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)

Compare with previous version

By clayton craft on 2021-06-11T16:33:12

added 6 commits

• 0bef0c8b...407ea85f - 5 commits from branch master
• b0bba2db - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)

Compare with previous version

By clayton craft on 2021-06-14T03:53:42

resolved all threads

By Luca Weiss on 2021-06-16T19:47:20

added 12 commits

• b0bba2db...99c95f57 - 11 commits from branch master
• 5eb7c395 - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)

Compare with previous version

By clayton craft on 2021-06-16T23:02:47

resolved all threads

By clayton craft on 2021-06-16T23:02:48

Tested on the Librem 5 (which has deviceinfo_mesa_driver set):

With FDE enabled (pmb install --fde):

$ ls /boot/*extra
-rw-r--r--    1 root     root       44.7M Jun 16  2021 initramfs-purism-librem5-extra 

Without FDE enabled:

$ ls /boot/*extra
-rw-r--r--    1 root     root        1.2M Jun 16  2021 initramfs-purism-librem5-extra

By clayton craft on 2021-06-16T23:06:58

Need to test that the ondev image has fde support (with pmbootstrap!2066 (merged))

By clayton craft on 2021-06-16T23:07:46

marked this merge request as draft

By clayton craft on 2021-06-17T00:07:32

Oh, this is bad. Removing the osk-sdl dependency from postmarketos-mkinitfs means that apk will purge osk-sdl from existing installs. This obviously needs to be resolved before this can be merged...

By clayton craft on 2021-06-17T00:09:40

added 6 commits

• 5eb7c395...595f3dcb - 2 commits from branch master
• d1266138 - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)
• cc3a973f - postmarketos-base: add nofde subpackage
• 12ef9240 - osk-sdl: provide postmarketos-fde-unlocker virtual package
• 671b6bb7 - postmarketos-mkinitfs: depend on postmarketos-fde-unlocker virt. package

Compare with previous version

By clayton craft on 2021-06-18T23:56:51

mentioned in issue postmarketos-ondev#49

By Oliver Smith on 2021-06-19T13:16:50

Needs pmaports.cfg guard and documentation in https://wiki.postmarketos.org/wiki/Pmaports.cfg_reference (see pmbootstrap MR review comment)

Diff looks good!

Please make sure you are confident that it won't break existing installations before merging (but so far it looks really good).

By Oliver Smith on 2021-06-19T13:42:48

approved this merge request

By Oliver Smith on 2021-06-19T13:42:19

added 38 commits

• 671b6bb7...13c34b97 - 34 commits from branch master
• 1d78b5cb - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)
• 6af80789 - postmarketos-base: add nofde subpackage (MR 2242)
• 4db9af41 - osk-sdl: provide postmarketos-fde-unlocker virtual package (MR 2242)
• 87fc5a31 - postmarketos-mkinitfs: depend on postmarketos-fde-unlocker virt. package (MR 2242)

Compare with previous version

By clayton craft on 2021-06-25T16:11:26

marked this merge request as ready

By clayton craft on 2021-06-25T17:42:45

added 1 commit

• d1a50f23 - pmaports.cfg: add option for "supported_base_nofde" (MR 2242)

Compare with previous version

By clayton craft on 2021-06-26T01:48:44

unapproved this merge request

By Alexey Min on 2021-06-26T02:43:28

Seems to work

By Alexey Min on 2021-06-26T06:17:13

approved this merge request

By Alexey Min on 2021-06-26T06:12:25

suggestion is to split last 2 commits to a separate MR to not confuse builder/CI.

pmbootstrap reorders postmarketos-mkinitfs before postmarketos-base, because -mkinitfs is a dependency of -base) and it turns out that -mkinitfs depends on yet unknown postmarketos-fde-unlocker (which is part of -base, but -base it to be built later)

If we merge first 3 commits first, then -base will be built before last change to -mkinitfs. So when next 2 commits will be built, postmarketos-fde-unlocker will be found successfully

By Alexey Min on 2021-06-26T07:45:25

mentioned in merge request !2278 (merged)

By clayton craft on 2021-06-26T23:19:24

resolved all threads

By clayton craft on 2021-06-26T23:31:29

added 17 commits

• d1a50f23...ac63e3c7 - 16 commits from branch master
• 0f1c765e - postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)

Compare with previous version

By clayton craft on 2021-06-26T23:33:53

changed the description

By clayton craft on 2021-06-26T23:34:30

merged