From 9be2e5ec7b5b816d0c9c1c56f15384db6a28a403 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sat, 31 Mar 2018 10:46:46 +0200 Subject: fixed issues in stage1 --- src/stage1/stage1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stage1/stage1.sh b/src/stage1/stage1.sh index 2bf3bc5..81ea904 100755 --- a/src/stage1/stage1.sh +++ b/src/stage1/stage1.sh @@ -49,7 +49,7 @@ check_cross_toolchain() { stage1_makepkg() { # produce pkgfiles - for f in "$SRCDIR"/toolchain-pkgbuilds/$pkg/*.in; do + for f in "$SRCDIR"/toolchain-pkgbuilds/$1/*.in; do sed "s#@CHOST@#$CHOST#g; \ s#@CARCH@#$CARCH#g; \ s#@LINUX_ARCH@#$LINUX_ARCH#g; \ @@ -63,7 +63,7 @@ stage1_makepkg() { "$f" > ./"$(basename "${f%.in}")" done - import_keys || return + package_import_keys "$1" || return runas "$SUDO_USER" makepkg -LC --config "$BUILDDIR"/makepkg.conf || return } -- cgit v1.2.2