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 4Zx4Hs1v87z3393 for ; Mon, 12 May 2025 16:07:21 +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 4Zx4Hn5Wjwz2ykN for ; Mon, 12 May 2025 16:07:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Zx4Hn10jjzlf; Mon, 12 May 2025 16:07:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747066037; 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=MT9JqAb63iDdfS0mp3KfmQ1dFqdKP0EAHvrzWZoIyI4=; b=4kVMFlBsB5c6BAaOitw9Jy9jZ74nRMddiHUl7ALhbtqx/7hSc5aOnEF0dfHWGkeFkojmOA W3rUB6uNaTU22TBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747066037; 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=MT9JqAb63iDdfS0mp3KfmQ1dFqdKP0EAHvrzWZoIyI4=; b=AAOezhslXLRvDrjzJeUvhyvEDlA9yrBHP10VCNozjj4tREI/Bl7Til1SQojbV8Sc17eVSK 1hzcB19KUSl7OTDZtJ3WhQDwGPTu3Huwg0H188nZJ6l+OdVYgczs7EWe7xvO8K2wv5PY8r lkc+n9nRmNvskE8VQHpyvbEmh7iooNB5cqQ/sF9L0mde3ZV6AshBSqwxDH9UlKaXGkhyhI av8xwacV6vDY71ig6XKQcddyTNbARz/s0DsoncJV4CSQvm4V2JO5URkRaeXA6AFg9AoGMq ePlWoafvrWPTolVoC1qGkj+MR7PM4RGvZgoxn04aliwSTxDzvP+OdfgnPQ1h1A== Message-ID: Date: Mon, 12 May 2025 18:07:12 +0200 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 To: Michael Tremer Cc: development@lists.ipfire.org References: <20250511101311.7315-1-adolf.belka@ipfire.org> <20250511101311.7315-4-adolf.belka@ipfire.org> <62337F24-60D8-4BEE-A096-F7076B6953CB@ipfire.org> Content-Language: en-GB From: Adolf Belka In-Reply-To: <62337F24-60D8-4BEE-A096-F7076B6953CB@ipfire.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Michael, On 12/05/2025 17:17, Michael Tremer wrote: > Thank you for all of this. > > I removed the cdrkit package with all patches and files, too. Patch 3/9 did the removal of cdrkit. It is in the dev mailing list but looking in Patchwork, for some reason it missed picking up that one patch out of the 9 for some reason. Anyway, as long as it has been removed that is fine. Regards, Adolf. > > -Michael > >> On 11 May 2025, at 11:12, Adolf Belka wrote: >> >> - 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 >> 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 >> >> 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 = 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 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 >> -- >> 2.49.0 >> >> >