Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

export: drop support for flavor in export

Browse source 
Official mkinitfs flavors were dropped long ago. v23.12 already
released with "supported_mkinitfs_without_flavors=True". So there is
no need to keep this around anymore. When we have initramfs and
kernels that have suffixes (e.g: from alpine), we already deal with
them.

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/merge_requests/2621
This commit is contained in:
Pablo Correa Gómez 2025-06-09 18:01:26 +02:00
parent d9560962ac
commit 527fc9359f
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pmb/export/frontend.py
View file

@ -38,4 +38,4 @@ def frontend(args: PmbArgs) -> None: # FIXME: ARGS_REFACTOR
logging.info(f"Export symlinks to: {target}") logging.info(f"Export symlinks to: {target}")
if args.odin_flashable_tar: if args.odin_flashable_tar:
pmb.export.odin(config.device, flavor, target) pmb.export.odin(config.device, flavor, target)
pmb.export.symlinks(flavor, target) pmb.export.symlinks(target)

28
pmb/export/symlinks.py
View file

@ -6,14 +6,12 @@ from pathlib import Path
import pmb.build import pmb.build
import pmb.chroot.apk import pmb.chroot.apk
import pmb.config
import pmb.config.pmaports
import pmb.flasher import pmb.flasher
import pmb.helpers.file import pmb.helpers.file
from pmb.core import Chroot, ChrootType from pmb.core import Chroot, ChrootType
def symlinks(flavor: str, folder: Path) -> None: def symlinks(folder: Path) -> None:
""" """
Create convenience symlinks to the rootfs and boot files. Create convenience symlinks to the rootfs and boot files.
""" """
@ -21,21 +19,15 @@ def symlinks(flavor: str, folder: Path) -> None:
device = get_context().config.device device = get_context().config.device
arch = pmb.parse.deviceinfo(device).arch arch = pmb.parse.deviceinfo(device).arch
# Backwards compatibility with old mkinitfs (pma#660)
suffix = f"-{flavor}"
pmaports_cfg = pmb.config.pmaports.read_config()
if pmaports_cfg.get("supported_mkinitfs_without_flavors", False):
suffix = ""
# File descriptions # File descriptions
info = { info = {
f"boot.img{suffix}": ("Fastboot compatible boot.img file, contains initramfs and kernel"), "boot.img": ("Fastboot compatible boot.img file, contains initramfs and kernel"),
"dtbo.img": "Fastboot compatible dtbo image", "dtbo.img": "Fastboot compatible dtbo image",
f"initramfs{suffix}": "Initramfs", "initramfs": "Initramfs",
f"initramfs{suffix}-extra": "Extra initramfs files in /boot", "initramfs-extra": "Extra initramfs files in /boot",
f"uInitrd{suffix}": "Initramfs, legacy u-boot image format", "uInitrd": "Initramfs, legacy u-boot image format",
f"uImage{suffix}": "Kernel, legacy u-boot image format", "uImage": "Kernel, legacy u-boot image format",
f"vmlinuz{suffix}": "Linux kernel", "vmlinuz": "Linux kernel",
f"{device}.img": "Rootfs with partitions for /boot and /", f"{device}.img": "Rootfs with partitions for /boot and /",
f"{device}-boot.img": "Boot partition image", f"{device}-boot.img": "Boot partition image",
f"{device}-root.img": "Root partition image", f"{device}-root.img": "Root partition image",
@ -48,9 +40,9 @@ def symlinks(flavor: str, folder: Path) -> None:
path_boot = Chroot(ChrootType.ROOTFS, device) / "boot" path_boot = Chroot(ChrootType.ROOTFS, device) / "boot"
chroot_buildroot = Chroot.buildroot(arch) chroot_buildroot = Chroot.buildroot(arch)
files: list[Path] = [ files: list[Path] = [
path_boot / f"boot.img{suffix}", path_boot / "boot.img",
path_boot / f"uInitrd{suffix}", path_boot / "uInitrd",
path_boot / f"uImage{suffix}", path_boot / "uImage",
path_boot / "dtbo.img", path_boot / "dtbo.img",
chroot_native / "home/pmos/rootfs" / f"{device}.img", chroot_native / "home/pmos/rootfs" / f"{device}.img",
chroot_native / "home/pmos/rootfs" / f"{device}-boot.img", chroot_native / "home/pmos/rootfs" / f"{device}-boot.img",