mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
From a3fc0865ceed29dce940d0adce3f8c049ed1005b Mon Sep 17 00:00:00 2001
|
|
From: Andrey Grigorev <survolog@yandex.ru>
|
|
Date: Sat, 26 Jun 2021 14:35:15 +0300
|
|
Subject: [PATCH 06/12] Do not check for installed packages, they are pulled as
|
|
Requires of livecd-tools
|
|
|
|
---
|
|
imgcreate/live.py | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
index 7e08a32..e6e8121 100644
|
|
--- a/imgcreate/live.py
|
|
+++ b/imgcreate/live.py
|
|
@@ -398,10 +398,7 @@ class x86LiveImageCreator(LiveImageCreatorBase):
|
|
return options
|
|
|
|
def _get_required_packages(self):
|
|
- return ["grub2-efi-x64", "grub2-efi-x64-cdboot", "shim-x64"] \
|
|
- + ["grub2-efi-ia32", "grub2-efi-ia32-cdboot", "shim-ia32"] \
|
|
- + ["syslinux"] \
|
|
- + LiveImageCreatorBase._get_required_packages(self)
|
|
+ return LiveImageCreatorBase._get_required_packages(self)
|
|
|
|
def _get_isolinux_stanzas(self, isodir):
|
|
return ""
|
|
@@ -846,8 +843,7 @@ class ppcLiveImageCreator(LiveImageCreatorBase):
|
|
"-hfs-bless", isodir + "/ppc/mac"]
|
|
|
|
def _get_required_packages(self):
|
|
- return ["yaboot"] + \
|
|
- LiveImageCreatorBase._get_required_packages(self)
|
|
+ return LiveImageCreatorBase._get_required_packages(self)
|
|
|
|
def _get_excluded_packages(self):
|
|
# kind of hacky, but exclude memtest86+ on ppc so it can stay in cfg
|
|
@@ -1049,8 +1045,7 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
|
|
return options
|
|
|
|
def _get_required_packages(self):
|
|
- return ["grub2-efi-aa64", "grub2-efi-aa64-cdboot", "shim-aa64"] \
|
|
- + LiveImageCreatorBase._get_required_packages(self)
|
|
+ return LiveImageCreatorBase._get_required_packages(self)
|
|
|
|
def __copy_kernel_and_initramfs(self, isodir, version, index):
|
|
bootdir = self._instroot + "/boot"
|
|
--
|
|
2.31.1
|
|
|