Bug#982244: debian-installer: please stop using genisoimage
Control: tags -1 + patch
* Chris Hofstaedtler <zeha@debian.org> [210207 16:17]:
> As far as I can tell, debian-installer uses genisoimage only for
> alpha and hppa. It _looks_ like the genisoimage invocations could
> be trivially replaced with xorriso, but I do not have any systems to
> test this.
Untested patch below:
>From 63dc1eea2e458c79dbe8439f3f437dbb4f72f92d Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <zeha@debian.org>
Date: Sun, 7 Feb 2021 16:16:18 +0000
Subject: [PATCH] Replace genisoimage with xorriso
---
build/config/alpha/miniiso.cfg | 2 +-
build/config/hppa/miniiso.cfg | 3 +--
debian/changelog | 3 +++
debian/control | 2 --
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build/config/alpha/miniiso.cfg b/build/config/alpha/miniiso.cfg
index d53a64da9..740c92e10 100644
--- a/build/config/alpha/miniiso.cfg
+++ b/build/config/alpha/miniiso.cfg
@@ -20,7 +20,7 @@ arch_miniiso:
ln -f $(BASE_TMP)netboot/initrd.gz $(TEMP_CD_TREE)/boot/root.bin
cp boot/alpha/aboot.conf $(TEMP_CD_TREE)/etc/
cp /boot/bootlx $(TEMP_CD_TREE)/boot
- genisoimage -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
+ xorriso -as mkisofs -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
# make bootable for SRM
isomarkboot $(TEMP_MINIISO) /boot/bootlx
diff --git a/build/config/hppa/miniiso.cfg b/build/config/hppa/miniiso.cfg
index 5c6cde9d2..25502e6f3 100644
--- a/build/config/hppa/miniiso.cfg
+++ b/build/config/hppa/miniiso.cfg
@@ -14,8 +14,7 @@ arch_miniiso:
install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc $(TEMP_CD_TREE)/boot/vmlinux-parisc
install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*parisc64 $(TEMP_CD_TREE)/boot/vmlinux-parisc64
install -m 644 -D /usr/share/palo/iplboot $(TEMP_CD_TREE)/boot/iplboot
-
- genisoimage -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
+ xorriso -as mkisofs -r -J -o $(TEMP_MINIISO) $(TEMP_CD_TREE)
palo -f /dev/null $(foreach kern,$(TEMP_KERNEL),-k $(kern) ) \
-r $(TEMP_INITRD) -b $(TEMP_CD_TREE)/boot/iplboot \
-c "0/linux initrd=0/ramdisk" \
diff --git a/debian/changelog b/debian/changelog
index 3ce445fac..bb835f531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ debian-installer (20201203) UNRELEASED; urgency=medium
* On hurd-i386, mips, and powerpc, add debian-ports-archive-keyring-udeb also
in the monolithic images for bootstraping from debian-ports' unreleased.
+ [ Chris Hofstaedtler ]
+ * Replace genisoimage with xorriso
+
-- Shawn Guo <shawn.guo@linaro.org> Sat, 12 Dec 2020 12:11:26 +0000
debian-installer (20201202) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e58e6cdd9..a153d5ddb 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,6 @@ Build-Depends:
# them.
# Lintian: Yes, we know it's essential. We prefer not to
# count on it remaining so.
- genisoimage [!s390 !s390x],
-# For making mini isos.
genromfs [sparc sparc64],
# Used for creating sparc floppies (which are not built by
# default.)
--
2.30.0
Reply to: