Djam/livecd-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/livecd-tools.git synced 2025-02-24 08:02:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upd: 28.0 -> 28.1, drop patch which exists in upstream

Browse source
This commit is contained in:
Mikhail Novosyolov 2021-05-25 16:23:20 +03:00
parent b900410812
commit d428d14604
4 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
livecd-tools-livecd-tools-28.0.tar.gz: ee06139441df55ca1b946b3892cf49dd17b8838f
livecd-tools-livecd-tools-28.1.tar.gz: 8f61641e89965f3e4f799ecda685f7dfbbf738dd

2
0012-replace-images-isolinux-path.patch
View file

@ -18,7 +18,7 @@ diff -ur livecd-tools-livecd-tools-28.0/imgcreate/live.py livecd-tools-livecd-to
- options += ["-eltorito-alt-boot", "-e", "images/efiboot.img",
+ if os.path.exists(os.path.join(isodir, "isolinux/efiboot.img")):
+ options += ["-eltorito-alt-boot", "-e", "isolinux/efiboot.img",
"-no-emul-boot", "-isohybrid-gpt-basdat"
"-no-emul-boot", "-isohybrid-gpt-basdat",
"-isohybrid-mbr", "/usr/share/syslinux/isohdpfx.bin",
"-eltorito-boot", "isolinux/isolinux.bin",
"-boot-load-size", "4", "-boot-info-table",

12
0013-fix-typo.patch
View file

@ -1,12 +0,0 @@
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 22:52:53.313469795 +0300
+++ livecd-tools-livecd-tools-28.0_patched/imgcreate/live.py 2021-05-21 00:03:33.454528122 +0300
@@ -387,7 +387,7 @@
options = []
if os.path.exists(os.path.join(isodir, "isolinux/efiboot.img")):
options += ["-eltorito-alt-boot", "-e", "isolinux/efiboot.img",
- "-no-emul-boot", "-isohybrid-gpt-basdat"
+ "-no-emul-boot", "-isohybrid-gpt-basdat",
"-isohybrid-mbr", "/usr/share/syslinux/isohdpfx.bin",
"-eltorito-boot", "isolinux/isolinux.bin",
"-boot-load-size", "4", "-boot-info-table",

3
livecd-tools.spec
View file

@ -9,7 +9,7 @@
Name: livecd-tools
Summary: Tools for building live CDs
Epoch: 1
Version: 28.0
Version: 28.1
Release: 1
License: GPLv2
Group: System/Base
@ -34,7 +34,6 @@ Patch9: 0009-Leave-etc-vconsole.conf-not-changed.patch
Patch10: 0010-Off-sss-hack.patch
Patch11: 0011-clear-get-required-packages-lists.patch
Patch12: 0012-replace-images-isolinux-path.patch
Patch13: 0013-fix-typo.patch
BuildRequires: python3-devel
# pod2man comes from perl