Commit graph

153 commits

Author SHA1 Message Date
Luca Weiss
f60539ea18
main/postmarketos-mkinitfs: rename usb_rndis_function variable (MR 3669)
The variable describes the configfs function name to use, no matter if
it's rndis, ncm, ecm or any other function. So change the name of the
variable, the string we write to the configuration file and some
comments.
2022-11-27 17:29:37 +01:00
alikates
e38db6e4de
main/postmarketos-mkinitfs: don't use uevent helper (MR 3351)
Instead of using the uevent helper binary, mdev daemon listens for kernel
events using the netlink interface. Then the requirement of enabling
UEVENT_HELPER for pmOS kernels can be dropped, as it's use is discouraged.

From CONFIG_UEVENT_HELPER kernel config help:

> This should not be used today, because usual systems create many events
> at bootup or device discovery in a very short time frame. One forked
> process per event can create so many processes that it creates a high
> system load, or on smaller systems it is known to create out-of-memory
> situations during bootup.

Support for running mdev as a daemon was added in 2019 with commit [1].

From that same commit:

> Adds the -d option to run mdev in daemon mode handling hotplug events
> from the kernel like udev. If the system generates many hotplug events
> this mode of operation will consume less resources than registering
> mdev as hotplug helper or using the uevent applet.

[1] https://git.busybox.net/busybox/commit/?id=498cec202adbf69a7a72af5e204260682d614183
[ci:skip-build]: already built successfully in CI
2022-11-11 08:11:19 +01:00
Clayton Craft
02198dccdd
postmarketos-mkinitfs: upgrade to 1.5.1
Fixes a crash due to the path for kpartx changing in a multipath update
in Alpine Edge.
2022-11-03 12:05:23 -07:00
Anjandev Momi
7270f472e3
treewide: fix tabs, final newline, trailing whitespace (MR 3530) 2022-10-16 16:27:22 +02:00
Clayton Craft
d28d2e4a96
main/postmarketos-mkinitfs: upgrade to 1.5 (MR 3445) 2022-09-27 09:09:15 +02:00
Bobby The Builder
b341018d89
main/posmarketos-mkinitfs: add -f parameter to parted (MR 3355)
[ci:skip-build]: already built successfully in CI
2022-08-15 17:42:39 +02:00
Anton Bambura
feb91937c1
main/postmarketos-mkinitfs: support mounting with UUIDs (MR 3298) 2022-07-24 16:58:55 +02:00
Laar3
fca17c6e08 postmarketos-mkinitfs: add option to disable splash (MR 3305)
Add PMOS_NOSPLASH as a kernel command line option to disable
the splash screen to show the logs on the screen for debugging.

See https://wiki.postmarketos.org/wiki/Initramfs_development
on how to use it.
2022-07-23 17:51:37 +00:00
Richard Acayan
20c7501b50
main/postmarketos-mkinitfs: resize_root_partition: resize dm-* devices (MR 3216)
Prior to this commit, the initramfs was unable to resize the root
partition if it was on a device backed by the device mapper. This commit
fixes that now that it is possible for the root partition to lie on a
device mapper device.
2022-06-16 10:12:07 +02:00
Pablo Correa Gómez
f4783d4c88
main/postmarketos-mkinitfs: provide only a virtual package (MR 3228)
Fixes 02dfe83c4b

The previous `provides="mkinifs=3.6.0"` was a requirement because alpine's
kernels had a minimum dependency in `mkinitfs>=3.6.0` to make sure that
support for compressed modules existed. That requirement is no longer
in place[1], since the dependency is now on the `initramfs-generator`
virtual package. Also, since `initramfs-generator` is a virtual package
and not a real package, versioning it might mess up APK. The documentation
explictly states that virtual packages are those with unversioned provides
and a provider_priority. So to avoid having problems in the future, let's
strictly stick to it.

[1] 4fac61c826
2022-06-14 09:54:04 +02:00
Clayton Craft
c5c0e0f061
main/postmarketos-mkinitfs: add missing ascii nls module (MR 3229)
This is required by fat32, fixes #1555
2022-06-12 10:26:16 -07:00
Clayton Craft
02dfe83c4b
main/postmarketos-mkinitfs: provide initramfs-generator (MR 3219)
Alpine provides a 'initramfs-generator' thing now that the alpine
linux-* depend on explicitly. This sets postmarketos-mkinitfs to be the
preferred provider of that virtual package.

Fixes:
        ERROR: unable to select packages:
          postmarketos-mkinitfs-1.4.1-r5:
            conflicts: mkinitfs-3.6.1-r2[mkinitfs=3.6.0]
            satisfies: postmarketos-base-20-r1[postmarketos-mkinitfs]
                       postmarketos-base-nofde-20-r1[postmarketos-mkinitfs]
                       .pmbootstrap-20220610.215815[postmarketos-mkinitfs]
                       .pmbootstrap-20220610.215815[mkinitfs]
          mkinitfs-3.6.1-r2:
            conflicts: postmarketos-mkinitfs-1.4.1-r5
            satisfies: .pmbootstrap-20220610.215815[mkinitfs]
                       linux-rpi-5.15.45-r1[initramfs-generator]
          .pmbootstrap-20220610.215815:
            masked in: cache
            satisfies: world[.pmbootstrap=20220610.215815]

Also see:
        30d7b88324 (aports) main/mkinitfs: provide initramfs-generator
        4fac61c826 (aports) main/linux-lts: replace mkinitfs with initramfs-generator
2022-06-12 15:33:57 +02:00
Minecrell
16c9892a8f
main/postmarketos-mkinitfs: load file system modules dynamically (MR 3166)
At the moment, mkinitfs loads some file system modules always (ext4),
some dynamically (brtfs) and some not at all (f2fs, vfat), expecting
them to be built-in.

To support generic kernels (e.g. from Alpine) properly, use the
partition type detection for both boot and root partition and always
load the necessary modules before mounting.
2022-06-06 10:11:51 +02:00
Johannes Marbach
aa0f96edb9
main/postmarketos-mkinitfs: Correctly set up udev (MR 3146)
This replaces the previous `udevadm test` hack with a combination of
`udevd`, `udevadm trigger` and `udevadm settle` in order to coldplug all
available devices and make them available for use via libinput / unl0kr.

Relates to: #1411

[ci:skip-build] already built successfully in CI
2022-05-29 12:03:04 -07:00
Richard Acayan
36ff86f895
main/postmarketos-mkinitfs: dynamic partitioning support (MR 3088) 2022-05-12 09:43:57 +02:00
Newbyte
10de8847fd
main/postmarketos-mkinitfs: provide mkinitfs 3.6.0
linux-lts started requiring mkinitfs version 3.6.0 5 days ago as of
writing, and this package only provides mkinitfs 0.0.1, so bump
this to fix installation.

See f2ae372e8b

Closes https://gitlab.com/postmarketOS/pmaports/-/issues/1517
2022-05-04 09:33:23 +02:00
Johannes Marbach
26c2085d81
main/postmarketos-mkinitfs: support unl0kr (MR 2687)
[ci:skip-build] already built successfully in CI
2022-02-03 15:59:13 -08:00
Marian Stramm
0922ff0fdd
main/postmarketos-mkinitfs: basic support for btrfs, upgrade to 1.4.1 (MR 2841)
[ci:skip-build] already built successfully in CI
2022-01-24 21:34:24 -08:00
Clayton Craft
9248465f62
main/postmarketos-mkinitfs: upgrade to 1.3 (MR 2829)
[ci:skip-build]: already built successfully in CI
2022-01-09 10:23:14 +01:00
Clayton Craft
d1a6daca20
main/postmarketos-mkinitfs: replace udhcpd with unudhcpd (MR 2698)
unudhcpd is a lightweight dhcp server that effectively implements static
assignment of a single IP on an interface regardless of client MAC, with
no lease. The end result is that a system connected to a pmOS device via
usb networking should always get an IP, and always get one very quickly.

This adds a new dependency on this dhcp server, and starts it in initfs.

Fixes #1199

[ci:skip-build] already built successfully in CI
2022-01-04 22:22:49 -08:00
Johannes Marbach
955f5cb391
main/postmarketos-mkinitfs: remove modprobe pkgs (MR 2788)
This reverts 5fa1755fba. Bundling
/sbin/modprobe is no longer necessary because Alpine switched back to gz
for LTS kernels with [1].

Relates: !2693
Relates: #1294

[1]: 12243ca822
2021-12-28 00:29:56 +03:00
Johannes Marbach
5fa1755fba
main/postmarketos-mkinitfs: add modprobe subpkgs (MR 2693)
This adds two new subpackages postmarketos-mkinitfs-modprobe-lts and
postmarketos-mkinitfs-modprobe-edge that include /sbin/modprobe in the
initfs when one of the Alpine kernels (linux-lts or linux-edge) are also
installed.

Fixes: #1294

[ci:skip-build] already built successfully in CI
2021-11-22 09:48:39 -08:00
Nikita Travkin
316745a171
main/postmarketos-mkinitfs: Center splash images on the screen (MR 2662)
Alpine patches busybox to support image alignment in [1].
So far we don't need to align the spalshes in postmarketOS as those are
generated per device. However with generic images it becomes impossible
to support multiple resolutions with this approach.
Set the alignment to "Center" in fbsplash config so generic system
images can reuse the splash on multiple resolutions.

[1] - https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch

[ci:skip-build] already built successfully in CI
2021-11-07 19:33:56 -08:00
DolphinChips
df9d656df5
main/postmarketos-mkinitfs: fix showing custom splash after running osk-sdl (MR 2647)
Support for custom "Loading..." splashes was added in MR 1776, but
`unlock_root_partition` function is still hardcoding default "Loading..."
splash. Fix this behaviour by replacing usage of `show_splash` function with
`show_splash_loading`, which accounts for presence of custom splash.

Closes #759
2021-11-01 15:34:39 +05:00
Clayton Craft
931a460c14
main/postmarketos-mkinitfs: upgrade to 1.1.2 (MR 2528) 2021-10-31 10:00:43 +01:00
Jami Kettunen
ea7d9007a4
main/postmarketos-mkinitfs: support more modular kernels (MR 2590)
* xts, libaes & aes are required for root partition FDE unlocking
* evdev is required by osk-sdl for input

[ci:skip-build] already built successfully in CI
2021-10-23 14:03:28 -07:00
Clayton Craft
45e07704df
main/postmarketos-mkinitfs: upgrade to 1.1.1 (MR 2540) 2021-09-21 10:40:54 +02:00
Clayton Craft
5963a970d5
main/postmarketos-mkinitfs: upgrade to 1.1 (MR 2516)
Changelog: https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/tags/1.1

Fixes #1234
2021-09-16 10:38:00 +02:00
Oliver Smith
e048839588
main/postmarketos-mkinitfs: don't rm vmlinuz-* (MR 2501)
Adjust post-upgrade script to not remove vmlinuz-*. This causes problems
with devices using kernels from Alpine, where the kernel is not
installed to /boot/vmlinuz, as it is now the case in postmarketOS, but
e.g. in /boot/vmlinuz-rpi. The intention was to clean up files when
migrating from the old postmarketos-mkinitfs to the new one (>= 1.0.0).
However, the /boot/vmlinuz* files are managed by apk, so they should
already get removed.

Add -v, so it prints a message when removing a file from /boot.
2021-09-08 23:40:13 +02:00
Clayton Craft
667f158e8d
postmarketos-mkinitfs: upgrade to 1.0.2 (MR 2489)
[ci:skip-build] already built successfully in CI
2021-09-05 15:29:59 -07:00
Clayton Craft
1bbb98347d
main/postmarketos-mkinitfs: use new mkinitfs (MR 2426)
This replaces the mkinitfs script with a re-write (in Go). The
re-written mkinitfs will atomically replace the initfs in /boot, check
for free space before doing so, and try to do whatever it can to not
leave the system in an unbootable state by botching the initfs
creation/installation.

pmb:cross-native with go cross compiling doesn't work exactly, it makes
the correct binary, but on Alpine go uses -buildmode=pie which creates a
dynamic thing, and the interpreter is wrong (e.g. it it set to use the
host arch's interpreter, like /lib/ld-musl-x86_64 even though
GOARCH=arm64)

The init.sh script is no longer a template, "initramfs-extra" is used.

Fixes https://gitlab.com/postmarketOS/pmaports/-/issues/1019
fixes https://gitlab.com/postmarketOS/pmaports/-/issues/660
2021-09-03 10:08:34 -07:00
Caleb Connolly
34623c4a0a
postmarketos-mkinitfs: fix charging-sdl for kmsdrm devices (MR 2098)
This fix was pending since before charging-sdl was deprecated and still
provides value should anyone wish to pickup and improve charging-sdl
again.

charging-sdl currently does not check for devices using mesa, even
though it supports it in the same way as osk-sdl. Check for msa support
and set SDL_VIDEODRIVER in that case.

Also fix the font path, as it was reading both keyboard-font and
keyboard-font-size from osk.conf.
2021-09-01 11:41:50 +03:00
Luca Weiss
58eaa90874
main/postmarketos-mkinitfs: change wait for subpartitions (MR 2432)
Previously it was assumed that with the counter and the sleep 0.1 the
process would take about 10 seconds to complete. On newer devices with
tens or even hundreds of partitions going through all partitions already
takes a significant amount of time, so change the logic to measure the
time elapsed instead.
2021-08-22 20:15:40 +02:00
Clayton Craft
2283190a93
main/postmarketos-mkinitfs: move dev node creation to initfs (MR 2407)
There should be no reason that this has to be done by mkinitfs, and
moving it to initfs simplifies mkinitfs (and the creation of a
replacement)
2021-08-16 19:04:38 +02:00
Caleb Connolly
3e86acc9d9
postmarketos-mkinitfs: flashing: fix wrong flavor (MR 2401)
The flavor string was naively parsed using sed by removing everything
before the first hyphen, this breaks for -rc kernels. Instead lets glob
/usr/share/kernel for the installed kernel flavor. This will also
prevent the kernel being flashed if the running kernel has a different
localversion than the updated one.

[ci:skip-build] already built successfully in CI
2021-08-10 00:09:34 -07:00
Oliver Smith
7139a82837
main/postmarketos-mkinitfs: support pmOS_i_boot (MR 2337)
Support the shorter label for the installer's boot partition, that works
with the 11 character limit of fat32 partitions.
2021-07-12 07:34:56 +02:00
Clayton Craft
0f1c765e10
postmarketos-mkinitfs: don't depend on osk-sdl, add to initfs conditionally (MR 2242)
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:
https://gitlab.com/postmarketOS/pmbootstrap/-/merge_requests/2066
2021-06-26 16:33:35 -07:00
Clayton Craft
c6a5e885c0
postmarketos-mkinitfs: disable correct shellcheck test (MR 2260)
Shellcheck 0.7.2 has a change that gives many error conditions their own
SC30** codes, instead of including them in SC2039. This updates the
scripts in this package that "disable SC2039" to disable the new code.

New codes added in shellcheck: cfd68ee0c2ebfd0ab08a1d4bf628162b454dc207
2021-06-17 18:09:44 -07:00
Caleb Connolly
70b0cf24e5
postmarketos-mkinitfs: flash new boot image (MR 2215)
On Android devices that support kernel updates (marked by the deviceinfo
variable "deviceinfo_flash_kernel_on_update") lets flash the kernel and
initramfs automatically!
2021-06-08 10:44:41 -07:00
Caleb Connolly
48e8b93ac6
postmarketos-mkinitfs: use variable for bootimg (MR 2215)
Use a variable for "bootimg" in create_bootimg rather than repeat the
same pattern replacement.
2021-06-08 10:44:41 -07:00
Clayton Craft
9088fbb6b9
postmarketos-mkinitfs: disable ps2mouse module when running directfb (MR 2201)
On my librem 5 when using directfb in initfs, touch input is really
inconsistent... the cursor seems to jump around and it's hard to enter
keys in osk-sdl. This is completely 'fixed' by disabling the ps2mouse
input module in dfb.

I guess this might cause mice to stop working (?), but I can't think of
any situation where someone would run osk-sdl in initfs on a device that
has a ps2 mouse but no keyboard (which would make more sense to use for
entry than the mouse..)
2021-05-27 22:28:57 +02:00
Martijn Braam
e0136b2abc
main/postmarketos-mkinitfs: allow osk-sdl user overrides (MR 2184) 2021-05-27 22:24:00 +02:00
Bart Ribbers
27b8ef368f
*/*: replace uboot-tools dependency for u-boot-tools (MR 2141)
uboot-tools is provided by u-boot-tools but sometimes apk still gets
confused. This change prevents errors such as

pine64-pinephone:~$ sudo apk upgrade --verbose
WARNING: Failed to perform initial self-upgrade, continuing with full upgrade.
ERROR: unable to select packages:
  uboot-tools (virtual):
	    provided by: u-boot-tools
			    required by: device-pine64-pinephone-0.25-r1[uboot-tools]
[ci:ignore-count]
[ci:skip-build]: already built in CI successfully
2021-04-27 22:01:06 +02:00
Luca Weiss
70173bde87
main/postmarketos-mkinitfs: disable charging-sdl (MR 2111)
See also #1064
2021-04-17 22:53:10 -07:00
Bobby The Builder
9ea2e7e828
main/postmarketos-mkinitfs: show resizefs splash (MR 1996)
[ci:ignore-count] [ci:skip-build]
2021-04-11 20:03:33 +02:00
Oliver Smith
a61cae84a5
main/postmarketos-mkinitfs: add sync before exit (MR 1850)
[ci:skip-vercheck]
2021-04-11 19:44:54 +02:00
Bobby The Builder
c4f050ffcd
main/postmarketos-mkinitfs: add f2fs (MR 1850) 2021-04-11 19:43:23 +02:00
kekzoz
4e4230093c
main/postmarketos-mkinitfs: add postprocess scripts (MR 2056)
[ci:skip-build]: already built successfully in CI
2021-04-05 09:32:19 +02:00
Oliver Smith
31ed6f21ef
main/postmarketos-mkinitfs: fix space issues (MR 2051)
In order to have hardware acceleration in osk-sdl, we have included mesa
for some devices (like the PinePhone) in initfs-extra. Mesa drags in
libLLVM, which got a size increase of 27 MB in the last version. This
leads to running out of space on the boot partition:

  ==> initramfs: creating /boot/initramfs-postmarketos-allwinner-extra
  gzip: write error: No space left on device
  cpio: write error: Broken pipe

Improve the situation by not directly writing initfs-extra to /boot
(next to the old version), but to a temporary directory first. Replace
the old version with the new version afterwards (like before).

This is a rather minimal fix for this specific issue. The mkinitfs
script needs more fixing (it's one of the oldest pieces of code in
postmarketOS and could use a rewrite...), but that's out of scope for
this patch.
2021-03-21 17:22:44 +01:00
Clayton Craft
4243b95bd0
main/postmarketos-mkinitfs: refactor osk-sdl config/running (MR 1870)
- Simplified logic for setup/running osk-sdl in initfs
- include libGLESv2 when running osk-sdl w/ mesa
- depends on osk-sdl >=0.62
2021-02-22 15:40:44 +03:00