refactoring and more progress

1 files changed, 7 insertions, 6 deletions

diff --git a/create.sh b/create.sh
index 105afb1..f870abe 100755
--- a/create.sh
+++ b/create.sh
@@ -22,7 +22,7 @@ set -euo pipefail
 
 # target options
 export CARCH=riscv64
-export CHOST=riscv64-linux-gnu
+export CHOST=riscv64-unknown-linux-gnu
 export LINUX_ARCH=riscv
 export GCC_MARCH=rv64gc
 export GCC_MABI=lp64d
@@ -38,8 +38,8 @@ export startdir="$(pwd)"
 export topbuilddir="$startdir"/build
 export topsrcdir="$startdir"/src
 
-# output control
-. src/feedback.sh
+. "$topsrcdir"/shared/feedback.sh
+. "$topsrcdir"/shared/common.sh
 
 [ $(id -u) -ne 0 ] && die "must be root"
 [ -z "${SUDO_USER:-}" ] && die "SUDO_USER must be set in environment"
@@ -48,12 +48,13 @@ mkdir -p "$topbuilddir"
 chown $SUDO_USER "$topbuilddir"
 
 # Stage 1: prepare cross toolchain
-./src/stage1/stage1.sh
+. "$topsrcdir"/stage1/stage1.sh
 
 # Stage 2: cross-compile base-devel
-./src/stage2/stage2.sh
+. "$topsrcdir"/stage2/stage2.sh
 
 # Stage 3: libremakepkg native base-devel
-./src/stage3/stage3.sh
+. "$topsrcdir"/stage3/stage3.sh
 
 msg "all done."
+notify --text "*Bootstrap Finished*"