From f09e056699e8f9fbef5ac385989eebac550d6764 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 13 Jun 2022 11:19:02 -0400 Subject: [PATCH] Stop installing binutils Because we use objcopy from the host, there's no need to install binutils in images anymore. --- mkosi/__init__.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 4bcd0eff9..a73bd7bb5 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2381,7 +2381,7 @@ def install_fedora(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No add_packages(args, packages, "glibc-minimal-langpack", conditional="glibc") if not do_run_build_script and args.bootable: - add_packages(args, packages, "kernel-core", "kernel-modules", "dracut", "binutils") + add_packages(args, packages, "kernel-core", "kernel-modules", "dracut") add_packages(args, packages, "systemd-udev", conditional="systemd") configure_dracut(args, packages, root) if do_run_build_script: @@ -2416,7 +2416,7 @@ def install_mageia(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No packages = {*args.packages} add_packages(args, packages, "basesystem-minimal") if not do_run_build_script and args.bootable: - add_packages(args, packages, "kernel-server-latest", "dracut", "binutils") + add_packages(args, packages, "kernel-server-latest", "dracut") configure_dracut(args, packages, root) # Mageia ships /etc/50-mageia.conf that omits systemd from the initramfs and disables hostonly. # We override that again so our defaults get applied correctly on Mageia as well. @@ -2465,7 +2465,7 @@ def install_openmandriva(args: MkosiArgs, root: Path, do_run_build_script: bool) add_packages(args, packages, "basesystem-minimal", "systemd") if not do_run_build_script and args.bootable: add_packages(args, packages, "systemd-boot", "systemd-cryptsetup", conditional="systemd") - add_packages(args, packages, "kernel-release-server", "dracut", "binutils", "timezone") + add_packages(args, packages, "kernel-release-server", "dracut", "timezone") configure_dracut(args, packages, root) if args.netdev: add_packages(args, packages, "systemd-networkd", conditional="systemd") @@ -2687,7 +2687,7 @@ def install_centos(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No packages = {*args.packages} add_packages(args, packages, "centos-release", "systemd") if not do_run_build_script and args.bootable: - add_packages(args, packages, "kernel", "dracut", "binutils") + add_packages(args, packages, "kernel", "dracut") configure_dracut(args, packages, root) if epel_release <= 7: add_packages( @@ -2739,7 +2739,7 @@ def install_rocky(args: MkosiArgs, root: Path, do_run_build_script: bool) -> Non packages = {*args.packages} add_packages(args, packages, "rocky-release", "systemd") if not do_run_build_script and args.bootable: - add_packages(args, packages, "kernel", "dracut", "binutils") + add_packages(args, packages, "kernel", "dracut") configure_dracut(args, packages, root) add_packages(args, packages, "systemd-udev", conditional="systemd") @@ -2771,7 +2771,7 @@ def install_alma(args: MkosiArgs, root: Path, do_run_build_script: bool) -> None packages = {*args.packages} add_packages(args, packages, "almalinux-release", "systemd") if not do_run_build_script and args.bootable: - add_packages(args, packages, "kernel", "dracut", "binutils") + add_packages(args, packages, "kernel", "dracut") configure_dracut(args, packages, root) add_packages(args, packages, "systemd-udev", conditional="systemd") @@ -2857,7 +2857,7 @@ def install_debian_or_ubuntu(args: MkosiArgs, root: Path, *, do_run_build_script extra_packages.update(args.build_packages) if not do_run_build_script and args.bootable: - add_packages(args, extra_packages, "dracut", "binutils") + add_packages(args, extra_packages, "dracut") configure_dracut(args, extra_packages, root) if args.distribution == Distribution.ubuntu: @@ -3103,7 +3103,7 @@ def install_arch(args: MkosiArgs, root: Path, do_run_build_script: bool) -> None if args.get_partition(PartitionIdentifier.bios): add_packages(args, packages, "grub") - add_packages(args, packages, "dracut", "binutils") + add_packages(args, packages, "dracut") configure_dracut(args, packages, root) packages.update(args.packages) @@ -3173,7 +3173,7 @@ def install_opensuse(args: MkosiArgs, root: Path, do_run_build_script: bool) -> add_packages(args, packages, "patterns-base-minimal_base") if not do_run_build_script and args.bootable: - add_packages(args, packages, "kernel-default", "dracut", "binutils") + add_packages(args, packages, "kernel-default", "dracut") configure_dracut(args, packages, root) if args.get_partition(PartitionIdentifier.bios): -- 2.47.2