mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
Subject: Do not check for installed packages, they are pulled as Requires of livecd-tools
|
|
From: Andrey Grigorev <survolog@yandex.ru>
|
|
|
|
diff -ur livecd-tools-livecd-tools-28.0/imgcreate/live.py livecd-tools-livecd-tools-28.0_patched/imgcreate/live.py
|
|
--- livecd-tools-livecd-tools-28.0/imgcreate/live.py 2021-05-20 15:59:48.525926000 +0300
|
|
+++ livecd-tools-livecd-tools-28.0_patched/imgcreate/live.py 2021-05-20 18:24:08.064137756 +0300
|
|
@@ -399,10 +399,7 @@
|
|
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 ""
|
|
@@ -853,8 +850,7 @@
|
|
"-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
|
|
@@ -1056,8 +1052,7 @@
|
|
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"
|