From 80ab1432d04183af1b61eb565d1a6b86e4697452 Mon Sep 17 00:00:00 2001
From: bauen1 <j2468h@gmail.com>
Date: Tue, 4 Jul 2017 23:23:21 +0200
Subject: [PATCH] moved sysroot to work/sysroot this temporarily breaks
 everything

---
 src/05_prepare_glibc.sh   | 53 ---------------------------------------
 src/05_prepare_sysroot.sh | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 53 deletions(-)
 delete mode 100755 src/05_prepare_glibc.sh
 create mode 100755 src/05_prepare_sysroot.sh

diff --git a/src/05_prepare_glibc.sh b/src/05_prepare_glibc.sh
deleted file mode 100755
index d82603b8d..000000000
--- a/src/05_prepare_glibc.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-echo "*** PREPARE GLIBC BEGIN ***"
-
-SRC_DIR=$(pwd)
-
-# Save the kernel installation directory.
-KERNEL_INSTALLED=$(pwd)/work/kernel/kernel_installed
-
-cd work/glibc
-
-echo "Preparing glibc. This may take a while..."
-
-rm -rf glibc_prepared
-cp -r glibc_installed glibc_prepared
-
-cd glibc_prepared
-
-# Create custom 'usr' area and link it with some of the kernel header directories.
-# BusyBox compilation process uses these linked directories. The following
-# directories are affected:
-#
-# usr (glibc)
-# |
-# +--include (glibc)
-# |  |
-# |  +--asm (kernel)
-# |  |
-# |  +--asm-generic (kernel)
-# |  |
-# |  +--linux (kernel)
-# |  |
-# |  +--mtd (kernel)
-# |
-# +--lib (glibc)
-
-mkdir -p usr
-cd usr
-
-ln -s ../include include
-ln -s ../lib lib
-
-cd ../include
-
-ln -s $KERNEL_INSTALLED/include/linux linux
-ln -s $KERNEL_INSTALLED/include/asm asm
-ln -s $KERNEL_INSTALLED/include/asm-generic asm-generic
-ln -s $KERNEL_INSTALLED/include/mtd mtd
-
-cd $SRC_DIR
-
-echo "*** PREPARE GLIBC END ***"
-
diff --git a/src/05_prepare_sysroot.sh b/src/05_prepare_sysroot.sh
new file mode 100755
index 000000000..8ea51839c
--- /dev/null
+++ b/src/05_prepare_sysroot.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+echo "*** PREPARE SYSROOT BEGIN ***"
+
+SRC_DIR=$(pwd)
+
+cd work
+
+echo "Cleaning existing sysroot. This may take a while..."
+rm -rf sysroot
+
+echo "Preparing glibc. This may take a while..."
+cp -r glibc/glibc_installed sysroot
+cd sysroot
+
+# Create custom 'usr' area and link it with some of the kernel header directories.
+# BusyBox compilation process uses these linked directories. The following
+# directories are affected:
+#
+# usr (glibc)
+# |
+# +--include (glibc)
+# |  |
+# |  +--asm (kernel)
+# |  |
+# |  +--asm-generic (kernel)
+# |  |
+# |  +--linux (kernel)
+# |  |
+# |  +--mtd (kernel)
+# |
+# +--lib (glibc)
+
+mkdir -p usr
+
+ln -s ../include usr/include
+ln -s ../lib usr/lib
+
+ln -s ../../kernel/kernel_installed/include/linux include/linux
+ln -s ../../kernel/kernel_installed/include/asm include/asm
+ln -s ../../kernel/kernel_installed/include/asm-generic include/asm-generic
+ln -s ../../kernel/kernel_installed/include/mtd include/mtd
+
+cd $SRC_DIR
+
+echo "*** PREPARE SYSROOT END ***"
+