From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Zx3Br4S02z33Bf for ; Mon, 12 May 2025 15:17:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Zx3Bn0rtsz30N0 for ; Mon, 12 May 2025 15:17:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Zx3Bm2WQVz8Y; Mon, 12 May 2025 15:17:52 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747063072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3+/G8n2PZFBa7K7/teLVVh+LqhkEvFJQCeWsr5hf6Z0=; b=K6AIxo3cqfr8V526q1U2no++RrtRfrfj5FWYciIoKrmdVBwx9wSF9bxICUspPWFaMezBPb akVifXzPT7GOqDCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747063072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3+/G8n2PZFBa7K7/teLVVh+LqhkEvFJQCeWsr5hf6Z0=; b=uQm5UMiACqUYnMD2isGZYmD76qdtPM2KoTR8IW1yARSX15XJskkjd1IY/Z7+7mSs+nM09b mk3KSwUZdPksjj5Ci8E/Y/YGF9AmQE1c/uOn62jwxFdtcUd8zb3wQSrYv5MEqsOXU2Cjoi il89jyDzwJo2FU7saI3W6lMVyIFLToJN2zZ+CVyg325Ju/tyVNGpnJsjNtpfC0Y+AxqWkb L9vo2a45kTPvwfb2QZdMzM+6CZ8kJlYAhjAJonEyVxEq+tDInGdEakH10AcQMzEgeCb6CR YjAC1Tx217waTPMqEzAD2lkivkWysUYEbIQs9zoaGXQijd0ode3Y6308RllTQA== Content-Type: text/plain; charset=us-ascii Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: Mime-Version: 1.0 Subject: Re: [PATCH 4/9] xorriso: Package to replace cdrkit From: Michael Tremer In-Reply-To: <20250511101311.7315-4-adolf.belka@ipfire.org> Date: Mon, 12 May 2025 16:17:52 +0100 Cc: development@lists.ipfire.org Content-Transfer-Encoding: quoted-printable Message-Id: <62337F24-60D8-4BEE-A096-F7076B6953CB@ipfire.org> References: <20250511101311.7315-1-adolf.belka@ipfire.org> <20250511101311.7315-4-adolf.belka@ipfire.org> To: Adolf Belka Thank you for all of this. I removed the cdrkit package with all patches and files, too. -Michael > On 11 May 2025, at 11:12, Adolf Belka wrote: >=20 > - 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. >=20 > Tested-by: Adolf Belka > Signed-off-by: Adolf Belka > --- > config/rootfiles/common/xorriso | 17 +++++++ > lfs/xorriso | 83 +++++++++++++++++++++++++++++++++ > make.sh | 2 +- > 3 files changed, 101 insertions(+), 1 deletion(-) > create mode 100644 config/rootfiles/common/xorriso > create mode 100644 lfs/xorriso >=20 > diff --git a/config/rootfiles/common/xorriso = b/config/rootfiles/common/xorriso > new file mode 100644 > index 000000000..23bbd47ad > --- /dev/null > +++ b/config/rootfiles/common/xorriso > @@ -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 > index 000000000..8b33765f0 > --- /dev/null > +++ b/lfs/xorriso > @@ -0,0 +1,83 @@ > = +#########################################################################= ###### > +# = # > +# IPFire.org - A linux based firewall = # > +# Copyright (C) 2025-2025 IPFire Team = # > +# = # > +# 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 = . # > +# = # > = +#########################################################################= ###### > + > = +#########################################################################= ###### > +# Definitions > = +#########################################################################= ###### > + > +include Config > + > +VER =3D 1.5.6 > + > +THISAPP =3D xorriso-$(VER) > +DL_FILE =3D $(THISAPP).pl02.tar.gz > +DL_FROM =3D $(URL_IPFIRE) > +DIR_APP =3D $(DIR_SRC)/$(THISAPP) > +TARGET =3D $(DIR_INFO)/$(THISAPP) > + > +CFLAGS +=3D -fcommon > + > = +#########################################################################= ###### > +# Top-level Rules > = +#########################################################################= ###### > + > +objects =3D $(DL_FILE) > + > +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > + > +$(DL_FILE)_BLAKE2 =3D = 5f453cb3b1583865c71947c3ce95d87ea138b87605429fa756e34f0ddedb34037381ef8189= 3bb69ecac9a2bd4302648f22f4cc930bf5567d509d1e26e6530f6b > + > +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=3D/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 61921fee6..29fd44b17 100755 > --- 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 > --=20 > 2.49.0 >=20 >=20