2 files changed, 39 insertions, 0 deletions
diff --git a/chapter6/bash.sh b/chapter6/bash.sh
index 1c53aad..54c10a7 100644
--- a/chapter6/bash.sh
+++ b/chapter6/bash.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash
 set -e
 
@@ -10,3 +11,17 @@ make &&
 make DESTDIR="${LFS}" -j1 install &&
 mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&
 ln -sv bash "${LFS}"/bin/sh
+=======
+#!/bin/bash
+set -e
+
+patch -Np1 -i ../bash-"${VERSION}"-fixes-2.patch &&
+./configure --prefix=/usr \
+            --build="$(support/config.guess)" \
+            --host="${LFS_TGT}" \
+            --without-bash-malloc &&
+make &&
+make DESTDIR="${LFS}" -j1 install &&
+mv "${LFS}"/usr/bin/bash "${LFS}"/bin/bash &&
+ln -sv bash "${LFS}"/bin/sh
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
diff --git a/chapter6/file.sh b/chapter6/file.sh
index 065bf6d..8baa055 100644
--- a/chapter6/file.sh
+++ b/chapter6/file.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash
 set -e
 
@@ -19,3 +20,26 @@ make DESTDIR="${LFS}" -j1 install &&
 
 mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib &&
 ln -sfv ../../lib/"$(readlink /usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so
+=======
+#!/bin/bash
+set -e
+
+mkdir build
+pushd build > /dev/null || exit 1
+
+../configure --disable-bzlib \
+             --disable-libseccomp \
+             --disable-xzlib \
+             --disable-zlib &&
+make &&
+popd > /dev/null || exit 1
+
+./configure --prefix=/usr \
+            --host="${LFS_TGT}" \
+            --build="$(./config.guess)" &&
+make FILE_COMPILE="$(pwd)"/build/src/file &&
+make DESTDIR="${LFS}" -j1 install &&
+
+mv -v "${LFS}"/usr/lib/libmagic.so.* "${LFS}"/lib &&
+ln -sfv ../../lib/"$(readlink "${LFS}"/usr/lib/libmagic.so)" "${LFS}"/usr/lib/libmagic.so
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28