]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
xorriso: Package to replace cdrkit
authorAdolf Belka <adolf.belka@ipfire.org>
Sun, 11 May 2025 10:12:59 +0000 (12:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 May 2025 14:41:27 +0000 (14:41 +0000)
- This package is the command line standalong package from the libburnia project.
- Build successfully created an iso package and this was used to install IPFire onto
   a vm on my testbed system. This worked successfully so xorriso successfully
   craeted a bootable iso image.
- The build was also tested on a Core Update 193 repo and installed and it successfully
   created a bootable iso image with the backupiso process.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/xorriso [new file with mode: 0644]
lfs/xorriso [new file with mode: 0644]
make.sh

diff --git a/config/rootfiles/common/xorriso b/config/rootfiles/common/xorriso
new file mode 100644 (file)
index 0000000..23bbd47
--- /dev/null
@@ -0,0 +1,17 @@
+usr/bin/mkisofs
+#usr/bin/osirrox
+#usr/bin/xorrecord
+usr/bin/xorriso
+#usr/bin/xorriso-dd-target
+#usr/bin/xorriso-tcltk
+usr/bin/xorrisofs
+#usr/share/info/xorrecord.info
+#usr/share/info/xorriso-dd-target.info
+#usr/share/info/xorriso-tcltk.info
+#usr/share/info/xorriso.info
+#usr/share/info/xorrisofs.info
+#usr/share/man/man1/xorrecord.1
+#usr/share/man/man1/xorriso-dd-target.1
+#usr/share/man/man1/xorriso-tcltk.1
+#usr/share/man/man1/xorriso.1
+#usr/share/man/man1/xorrisofs.1
diff --git a/lfs/xorriso b/lfs/xorriso
new file mode 100644 (file)
index 0000000..8b33765
--- /dev/null
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2025-2025  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.5.6
+
+THISAPP    = xorriso-$(VER)
+DL_FILE    = $(THISAPP).pl02.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+CFLAGS    += -fcommon
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 5f453cb3b1583865c71947c3ce95d87ea138b87605429fa756e34f0ddedb34037381ef81893bb69ecac9a2bd4302648f22f4cc930bf5567d509d1e26e6530f6b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+                                       --prefix=/usr \
+                                       --disable-static \
+                                       --disable-external-filters
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       ln -svf /usr/bin/xorrisofs /usr/bin/mkisofs
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 3c7cfe1fbed750a1e16691a2215ed5babca184b2..25489a2f18dfc50d34eb6d0f2383882101f0d9c5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1696,7 +1696,7 @@ build_system() {
        lfsmake2 beep
        lfsmake2 libssh
        lfsmake2 libinih
-       lfsmake2 cdrkit
+       lfsmake2 xorriso
        lfsmake2 dosfstools
        lfsmake2 exfatprogs
        lfsmake2 reiserfsprogs