From patchwork Thu Aug 11 16:38:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5859 Return-Path: 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M3XYY6SX0z3wbx for ; Thu, 11 Aug 2022 16:38:25 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M3XYX1VVfz1VV; Thu, 11 Aug 2022 16:38:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M3XYX04dKz2yp9; Thu, 11 Aug 2022 16:38:24 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M3XYV2nSMz2xHG for ; Thu, 11 Aug 2022 16:38:22 +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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M3XYT3Xw1zZN; Thu, 11 Aug 2022 16:38:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660235901; 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; bh=+EcB5cFM1A65RfEnrY6G4g7w3YzMKe6gNik+ciVx+RQ=; b=8DZn4SBiivbmGjtiDPJeB/XkJu5HiePJZWh4n8HjRZEb8b5W7L6jaIUumC1BIiHzZWrAaG cMqAby8vkyK4fRDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660235901; 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; bh=+EcB5cFM1A65RfEnrY6G4g7w3YzMKe6gNik+ciVx+RQ=; b=HcPm6MgBLdqoPYtHxJFUGlA5XasrCX68WOnzrNEp+mTGB24abltkz3oVsEJsQ0THaRJrBd WvY6YPxUIp3QCPEB8uTUBCm2sSCaiaz0nqLBMzG071FNFoRplAvIS/rybwSGUSf9M/kR5u 09TSvqF671atqoE53nDGytMpWSlfv7sC2EnT+x1093i7jJTD1C7outXHZZ5CLSE3nQvKfO A+IwqtfGs1cdh2xiWuQyG0xjDYdQLLgO6gm6A53EW9jp4cSQRyv+whkbsU5ZrceQCkAk/d FVpxwj4/5oNGHIpiytvjVC7ph419OVDOKLAKr5udeTW95jU61cKLRX1M1eEVYw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] cdrom: Rename ISO file Date: Thu, 11 Aug 2022 16:38:17 +0000 Message-Id: <20220811163817.1503583-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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. Signed-off-by: Michael Tremer Reviewed-by: Peter Müller --- lfs/cdrom | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 = \ true \ usb_keyboard +ISO_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso + ############################################################################### # Top-level Rules ############################################################################### @@ -246,9 +248,8 @@ endif xargs md5sum > md5sum.txt mkdir -p /install/images - cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \ - -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso . + cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) . ifeq "$(HAS_ISOLINUX)" "1" - isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso + isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE) endif