| Message ID | 20250511101311.7315-4-adolf.belka@ipfire.org |
|---|---|
| State | Staged |
| Commit | f8020292c0a82f13d9896617b2629f55ac2c904e |
| Headers |
Return-Path: <development+bounces-371-patchwork=ipfire.org@lists.ipfire.org> 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 web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZwJV66Xk8z3x4T for <patchwork@web04.haj.ipfire.org>; Sun, 11 May 2025 10:13:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZwJV62Rsmz15p for <patchwork@ipfire.org>; Sun, 11 May 2025 10:13:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZwJTy05RBz377n for <patchwork@ipfire.org>; Sun, 11 May 2025 10:13:26 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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 4ZwJTv0G4fz34Kl for <development@lists.ipfire.org>; Sun, 11 May 2025 10:13:23 +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 4ZwJTs3ZMCz6QG; Sun, 11 May 2025 10:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746958401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kJZjiX6UfGjwUFYjLDymPOQxIhqT4X54pGTWa8l50k8=; b=bKqVNUftPed//FvrAKWjeWgpPRqgIuH/jx1QqDHG+tf9L6b2ZFmVR8asCasPP188k6d5wM 9Mf0WIXUbXKZ0nBXUq+gcqz9LWV6dvlD1RtlhPLRCzRHN+FtfxPgtPRn1EREHByFOYexzi 5Le1pcyBz/Rysw9RkaARS7eRIni9DkTzX4nMK/5r2vvhO08dUtgDoeLibkO/KPXP9X3pXU rlrSvSOoVnVPYWc8erHNhfloihVbed6quBZvS/BmC3uta5tFh1WJhwQHXHA3hDFHkz5raP aQcE0hIevtNBQ3bF2jcqBPofF0o1CYhcLsyR7pyev9+xfTzARp2nDGscU6FrEg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746958401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kJZjiX6UfGjwUFYjLDymPOQxIhqT4X54pGTWa8l50k8=; b=piQ8lqKdtv8RJy0tdWJLea5bJu1PC+MwHtIWj0WlCXPWwDtb8N+MOfkWyNFXSzzKcv9ldZ 5gHu/KmEG2H6pSCA== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Cc: Adolf Belka <adolf.belka@ipfire.org> Subject: [PATCH 4/9] xorriso: Package to replace cdrkit Date: Sun, 11 May 2025 12:12:59 +0200 Message-ID: <20250511101311.7315-4-adolf.belka@ipfire.org> In-Reply-To: <20250511101311.7315-1-adolf.belka@ipfire.org> References: <20250511101311.7315-1-adolf.belka@ipfire.org> Precedence: list List-Id: <development.lists.ipfire.org> List-Subscribe: <https://lists.ipfire.org/>, <mailto:development+subscribe@lists.ipfire.org?subject=subscribe> List-Unsubscribe: <https://lists.ipfire.org/>, <mailto:development+unsubscribe@lists.ipfire.org?subject=unsubscribe> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development+help@lists.ipfire.org?subject=help> Sender: <development@lists.ipfire.org> Mail-Followup-To: <development@lists.ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit |
| Series |
[1/9] curl: Update to version 8.13.0
|
|
Commit Message
Adolf Belka
May 11, 2025, 10:12 a.m. UTC
- 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> --- 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
Comments
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 <adolf.belka@ipfire.org> 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 <adolf.belka@ipfire.org> > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > 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 <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 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 > >
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 <adolf.belka@ipfire.org> 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 <adolf.belka@ipfire.org> >> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >> --- >> 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 <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 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 >> >> >
Hello Adolf, Ah. I did not even notice that there was a patch missing. Did you get a bounce email? -Michael > On 12 May 2025, at 17:07, Adolf Belka <adolf.belka@ipfire.org> wrote: > > 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 <adolf.belka@ipfire.org> 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 <adolf.belka@ipfire.org> >>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>> --- >>> 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 <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 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 >>> >>> > >
Hi Michael, On 12/05/2025 18:08, Michael Tremer wrote: > Hello Adolf, > > Ah. I did not even notice that there was a patch missing. > > Did you get a bounce email? Yes, I got an email for all 9 patches. Regards, Adolf. > > -Michael > >> On 12 May 2025, at 17:07, Adolf Belka <adolf.belka@ipfire.org> wrote: >> >> 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 <adolf.belka@ipfire.org> 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 <adolf.belka@ipfire.org> >>>> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >>>> --- >>>> 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 <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 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 >>>> >>>> >> >> > >
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 <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 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