From 7ccb58b5071900f291cde602ca1bbe0feb9de1fa Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 3 Jul 2019 23:18:28 +0100
Subject: [PATCH 1/4] buildsystem: don't dereference LINK_NAME when fixing up
 sym links

---
 scripts/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build b/scripts/build
index f8e2aa9db7..d6dd36db1a 100755
--- a/scripts/build
+++ b/scripts/build
@@ -431,7 +431,7 @@ done
 for i in $(find "${SYSROOT_PREFIX}" -type l 2>/dev/null); do
   _tmp="$(readlink -m "${i}")"
   if [[ ${_tmp} =~ ^${SYSROOT_PREFIX}/ ]]; then
-    ln -sf "${_tmp/${SYSROOT_PREFIX}\//${PKG_ORIG_SYSROOT_PREFIX}\/}" "${i}"
+    ln -sfn "${_tmp/${SYSROOT_PREFIX}\//${PKG_ORIG_SYSROOT_PREFIX}\/}" "${i}"
   fi
 done
 

From 88a07bdda2595abc66eb9886d74c46865dee388b Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 3 Jul 2019 23:19:21 +0100
Subject: [PATCH 2/4] bcm2835-driver: modify SYSROOT_PREFIX only during install

---
 packages/graphics/bcm2835-driver/package.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index d2ed5d43ee..3c9d1d9d06 100644
--- a/packages/graphics/bcm2835-driver/package.mk
+++ b/packages/graphics/bcm2835-driver/package.mk
@@ -19,7 +19,7 @@ else
   PKG_FLOAT="hardfp"
 fi
 
-make_target() {
+makeinstall_target() {
   # Install vendor header files
   mkdir -p ${SYSROOT_PREFIX}/usr/include
     if [ "${OPENGLES}" = "bcm2835-driver" ]; then
@@ -57,9 +57,7 @@ make_target() {
   mkdir -p ${SYSROOT_PREFIX}/opt/vc
     ln -sf ${SYSROOT_PREFIX}/usr/lib     ${SYSROOT_PREFIX}/opt/vc/lib
     ln -sf ${SYSROOT_PREFIX}/usr/include ${SYSROOT_PREFIX}/opt/vc/include
-}
 
-makeinstall_target() {
   # Install EGL, OpenGL ES and other vendor libs
   mkdir -p ${INSTALL}/usr/lib
     if [ "${OPENGLES}" = "bcm2835-driver" ]; then

From 58ccd760b379f83563ed01a8c52daeadc2a6690b Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 3 Jul 2019 23:19:57 +0100
Subject: [PATCH 3/4] serdisplib: modify SYSROOT_PREFIX only during install

---
 .../addons/addon-depends/lcdd-depends/serdisplib/package.mk   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
index fec99e9f33..f8ac9f198b 100644
--- a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
+++ b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
@@ -26,16 +26,14 @@ pre_configure_target() {
   export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config
 }
 
-post_make_target() {
+makeinstall_target() {
   # copy necessary libs and headers to build serdisplib support
   # into the driver glcd from lcdproc
   mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib
   cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib
   mkdir -p $SYSROOT_PREFIX/usr/lib
   cp lib/libserdisp.so* $SYSROOT_PREFIX/usr/lib
-}
 
-makeinstall_target() {
   mkdir -p $INSTALL/usr/lib
   cp lib/libserdisp.so* $INSTALL/usr/lib
 }

From 622c11872d553b2ce25d8f824899cb95b178b3f9 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 4 Jul 2019 20:00:29 +0100
Subject: [PATCH 4/4] buildsystem: fix /usr targets

---
 scripts/build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/build b/scripts/build
index d6dd36db1a..7eed9b8959 100755
--- a/scripts/build
+++ b/scripts/build
@@ -430,6 +430,7 @@ for i in $(find "${SYSROOT_PREFIX}/usr"/{lib,share} -type f -name "*.cmake" 2>/d
 done
 for i in $(find "${SYSROOT_PREFIX}" -type l 2>/dev/null); do
   _tmp="$(readlink -m "${i}")"
+  [[ ${_tmp} =~ ^/usr ]] && _tmp="${SYSROOT_PREFIX}${_tmp}"
   if [[ ${_tmp} =~ ^${SYSROOT_PREFIX}/ ]]; then
     ln -sfn "${_tmp/${SYSROOT_PREFIX}\//${PKG_ORIG_SYSROOT_PREFIX}\/}" "${i}"
   fi