From 954f4e2ab3d28b1bc6021bce7cf5c919f54d5e18 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 1 May 2020 10:14:12 -0500 Subject: Fix and document make run_root. --- Makefile | 3 +-- scripts/help.txt | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 316df2f8..3ee66ea6 100644 --- a/Makefile +++ b/Makefile @@ -80,8 +80,7 @@ root: scripts/mkroot.sh $(MAKEFLAGS) run_root: - C=$$(basename "$$CROSS_COMPILE" | sed 's/-.*//'); \ - cd root/"$${C:-host}" && ./qemu-*.sh $(MAKEFLAGS) || exit 1 + cd root/"$${CROSS:-host}" && ./qemu-*.sh help:: @cat scripts/help.txt diff --git a/scripts/help.txt b/scripts/help.txt index 4d07370e..5bf0d613 100644 --- a/scripts/help.txt +++ b/scripts/help.txt @@ -20,7 +20,8 @@ root - Build/package root filesystem under root/ controlled by CROSS= cross compile (see scripts/mcm-buildall.sh) LINUX= build kernel from this source, configured for qemu + run_root - boot toyroot under qemu, I.E. cd root/$CROSS && ./qemu-*.sh example: make defconfig toybox install CFLAGS="--static" CROSS_COMPILE=armv5l- -or : make root CROSS=sh4 LINUX=~/linux && (cd root/sh4; ./qemu-*.sh) +or : make root run_root CROSS=sh4 LINUX=~/linux -- cgit v1.2.3