From ca7ec24a78f9bd8824da23be1c24a98a3c764f5f Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Mon, 19 Apr 2021 02:01:33 +0000
Subject: Make adjustments for Odroid N2+ aarch64 build.

---
 lfs.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lfs.sh')

diff --git a/lfs.sh b/lfs.sh
index 9a8a4f1..6f46443 100755
--- a/lfs.sh
+++ b/lfs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 set -u
 
 clear
@@ -51,7 +52,7 @@ printf "%b" "${GRN}Creating LFS directory at ${YLW}${LFS}${GRN}${RST}... "
 if [[ -d "${LFS}" ]]; then
 	success "EXISTS"
 else
-	if ! mkdir "${LFS}" >/dev/null 2>&1; then
+	if ! sudo mkdir "${LFS}" >/dev/null 2>&1; then
 		fail "FAILED!"
 		exit 1
 	fi
@@ -85,7 +86,7 @@ if [[ ! -f "${LFS}"/sources/limited ]]; then
 fi
 
 case $(uname -m) in
-    x86_64) mkdir -p "${LFS}"/lib64 ;;
+    x86_64 | aarch64) mkdir -p "${LFS}"/lib64 ;;
 esac
 
 # Will use normal user and not special lfs user
@@ -140,7 +141,7 @@ done
 printf "%b" "\n${IWHT}======= ${IYLW}Chapter 6 ${IGRN}Cleanup and Backup \
 ${IWHT}=======${RST}\n"
 source chapter6/cleanup.sh
-source chapter6/backup.sh
+#source chapter6/backup.sh
 
 # Prepare chroot scripts to be executable for owner, group and others
 chmod ugo+x preparechroot.sh
@@ -180,7 +181,7 @@ ${IWHT}=======${RST}\n"
 	# shellcheck source=chapter7/cleanup.sh
 	source "${LFS}"/sources/chapter7/cleanup.sh
 	# shellcheck source=chapter7/backup.sh
-	source "${LFS}"/sources/chapter7/backup.sh
+	#source "${LFS}"/sources/chapter7/backup.sh
 else
 	exit "$retval"
 fi
@@ -217,7 +218,7 @@ ${IWHT}=======${RST}\n"
 	# shellcheck source=chapter8/cleanup.sh
 	source "${LFS}"/sources/chapter8/cleanup.sh
 	# shellcheck source=chapter8/backup.sh
-	source "${LFS}"/sources/chapter8/backup.sh
+	#source "${LFS}"/sources/chapter8/backup.sh
 else
 	exit "$retval"
 fi
-- 
cgit v1.2.3-54-g00ecf