Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by 57269a166aaa with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Sun, 26 Jan 2020 13:53:08 +0000 (GMT)
Received: from 4e0d9c617c68 ([172.29.0.2])
	by sv1.famkaufmann.info (Dovecot) with LMTP id gFPVIKSZLV6GXwAAM0Xwgw
	for <mlmmj-tyndur-devel>; Sun, 26 Jan 2020 13:52:36 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from faunus.fritz.box (p200300F3F7228500AFEE4A56EAA43362.dip0.t-ipconnect.de [IPv6:2003:f3:f722:8500:afee:4a56:eaa4:3362])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPSA id 52410a3f
	TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO
	for <tyndur-devel@tyndur.org>;
	Sun, 26 Jan 2020 13:52:36 +0000 (UTC)
From: Kevin Wolf <kevin@tyndur.org>
To: tyndur-devel@tyndur.org
Subject: [PATCH] =?UTF-8?q?Buildsystem:=20CD-Image=20f=C3=BCr=20BIOS=20sta?= =?UTF-8?q?tt=20EFI=20bauen?=
Date: Sun, 26 Jan 2020 14:52:32 +0100
Message-Id: <20200126135232.31387-1-kevin@tyndur.org>
X-Mailer: git-send-email 2.16.4
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

! image_cdrom_grub2: Auf einem EFI-Host baut grub2-mkrescue
  standardmäßig ein EFI-CD-Image. Das zeichnet sich in Hinsicht auf
  tyndur vor allem dadurch aus, dass es ein System/-Verzeichnis hat und
  tyndur ein system/-Verzeichnis. Auf reinem iso9660 wird daraus dann
  system0 und system1 und tyndur findet seine Dateien nicht mehr.

  Wenn wir grub2-mkrescue unser $LOST_GRUB2_MODULESDIR übergeben, dann
  ist das immer für i386-pc, hat diesen ganzen Kram nicht dabei und
  führt auch nicht zum Namenskonflikt. Damit bootet das CD-Image wieder.

Signed-off-by: Kevin Wolf <kevin@tyndur.org>
---
 build/scripts/image_cdrom_grub2 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/scripts/image_cdrom_grub2 b/build/scripts/image_cdrom_grub2
index 6b8b35dd6..14fc61740 100755
--- a/build/scripts/image_cdrom_grub2
+++ b/build/scripts/image_cdrom_grub2
@@ -33,6 +33,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+export LOST_BUILDMK_ROOT="`pwd`"
+source build/config/image_cdrom.sh
+source config.sh
+
 # grub-mkrescue finden
 if (which grub-mkrescue > /dev/null 2>&1); then
     GRUB2_BIN_PREFIX=grub
@@ -55,7 +59,7 @@ cp -r build/root-cdrom/config build/root/
 cp -r build/root-common/config build/root/
 
 #CD Image erstellen
-$GRUB2_BIN_PREFIX-mkrescue --output=build/images/cdrom.img build/root/
+$GRUB2_BIN_PREFIX-mkrescue --directory="$LOST_GRUB2_MODULESDIR" --output="$IMAGE_PATH" build/root/
 
 #Konfigurationsdateien wieder löschen
 rm -r build/root/config
-- 
2.16.4

