From 14078e67646c59cf03ba6dee3eb66dd11f78aa77 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 12 Feb 2017 21:45:42 +0100 Subject: fix help text, make bootup work for grub-pc --- package/grub/Makefile | 1 + target/x86_64/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/grub/Makefile b/package/grub/Makefile index 1e7a2625f..803511ac1 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -137,6 +137,7 @@ else ${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH} \ $(IDIR_GRUB)/$(GRUB_DIR) $(CP) ./files/$(GRUB_CFG) $(IDIR_GRUB)/$(GRUB_DIR)/grub.cfg + $(SED) "s/@@ROOTDEV@@/$(ADK_TARGET_ROOTDEV)/g" $(IDIR_GRUB)/$(GRUB_DIR)/grub.cfg endif $(STAGING_HOST_DIR)/usr/bin/grub-mkimage \ -d $(WRKINST)/usr/lib/grub/$(GRUB_ARCH) \ diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 6445cff6c..e4b53e1b0 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -90,10 +90,10 @@ endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: @echo "The disk image is: $(FW_DIR)/disk.img" - @echo "Use following command to install it on SD card:" ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img' else + @echo "Use following command to install it on SD card:" @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' endif endif -- cgit v1.2.3