From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] cdrom: Rename ISO file
Date: Thu, 11 Aug 2022 18:27:57 +0000
Message-ID: <68d5c1f2-70f6-c852-5684-35de228032d3@ipfire.org>
In-Reply-To: <20220811163817.1503583-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2416192920434787388=="
List-Id: <development.lists.ipfire.org>

--===============2416192920434787388==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

> This is cosmetic change to have the name of the ISO file similar to the
> flash image and also have all parts of it in a reasonable order.
>=20
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>  lfs/cdrom | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>=20
> diff --git a/lfs/cdrom b/lfs/cdrom
> index ff4821fb5..a47faa49e 100644
> --- a/lfs/cdrom
> +++ b/lfs/cdrom
> @@ -123,6 +123,8 @@ GRUB_EFI_MODULES =3D \
>  	true \
>  	usb_keyboard
> =20
> +ISO_FILE =3D /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH)=
.iso
> +
>  ##########################################################################=
#####
>  # Top-level Rules
>  ##########################################################################=
#####
> @@ -246,9 +248,8 @@ endif
>  						xargs md5sum > md5sum.txt
> =20
>  	mkdir -p /install/images
> -	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
> -		-o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).is=
o .
> +	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) .
> =20
>  ifeq "$(HAS_ISOLINUX)" "1"
> -	isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_A=
RCH)-full-core$(CORE).iso
> +	isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE)
>  endif

--===============2416192920434787388==--