From ec88e79aca7d9c8925ba4ab6f3a3bca5c16b0085 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 27 Jul 2023 08:44:55 -0500 Subject: [PATCH] Move mkroot/root to mkroot/packages. Previous name made sense under scripts, but not under mkroot. --- mkroot/mkroot.sh | 2 +- mkroot/{root => packages}/dropbear | 0 mkroot/{root => packages}/dynamic | 0 mkroot/{root => packages}/overlay | 0 mkroot/{root => packages}/plumbing | 0 mkroot/{root => packages}/tests | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename mkroot/{root => packages}/dropbear (100%) rename mkroot/{root => packages}/dynamic (100%) rename mkroot/{root => packages}/overlay (100%) rename mkroot/{root => packages}/plumbing (100%) rename mkroot/{root => packages}/tests (100%) diff --git a/mkroot/mkroot.sh b/mkroot/mkroot.sh index 70d67a19e..f6e485696 100755 --- a/mkroot/mkroot.sh +++ b/mkroot/mkroot.sh @@ -15,7 +15,7 @@ done # Set default directory locations (overrideable from command line) : ${TOP:=$PWD/root} ${BUILD:=$TOP/build} ${LOG:=$BUILD/log} -: ${AIRLOCK:=$BUILD/airlock} ${CCC:=$PWD/ccc} ${PKGDIR:=$PWD/mkroot/root} +: ${AIRLOCK:=$BUILD/airlock} ${CCC:=$PWD/ccc} ${PKGDIR:=$PWD/mkroot/packages} announce() { printf "\033]2;$CROSS $*\007" >/dev/tty; printf "\n=== $*\n";} die() { echo "$@" >&2; exit 1; } diff --git a/mkroot/root/dropbear b/mkroot/packages/dropbear similarity index 100% rename from mkroot/root/dropbear rename to mkroot/packages/dropbear diff --git a/mkroot/root/dynamic b/mkroot/packages/dynamic similarity index 100% rename from mkroot/root/dynamic rename to mkroot/packages/dynamic diff --git a/mkroot/root/overlay b/mkroot/packages/overlay similarity index 100% rename from mkroot/root/overlay rename to mkroot/packages/overlay diff --git a/mkroot/root/plumbing b/mkroot/packages/plumbing similarity index 100% rename from mkroot/root/plumbing rename to mkroot/packages/plumbing diff --git a/mkroot/root/tests b/mkroot/packages/tests similarity index 100% rename from mkroot/root/tests rename to mkroot/packages/tests