From bbb941640c6eeb6c585a4e90efe5f4345bc4c134 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Thu, 14 Jul 2022 16:46:21 -0400
Subject: [PATCH] Fixes.

---
 .../systemd/{config => }/hwdb.d/60-osh-pb-controller.hwdb    | 0
 packages/tools/luajit/package.mk                             | 5 +++++
 scripts/build_distro                                         | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename packages/sysutils/systemd/{config => }/hwdb.d/60-osh-pb-controller.hwdb (100%)

diff --git a/packages/sysutils/systemd/config/hwdb.d/60-osh-pb-controller.hwdb b/packages/sysutils/systemd/hwdb.d/60-osh-pb-controller.hwdb
similarity index 100%
rename from packages/sysutils/systemd/config/hwdb.d/60-osh-pb-controller.hwdb
rename to packages/sysutils/systemd/hwdb.d/60-osh-pb-controller.hwdb
diff --git a/packages/tools/luajit/package.mk b/packages/tools/luajit/package.mk
index 995c188f7..c56a1ce05 100644
--- a/packages/tools/luajit/package.mk
+++ b/packages/tools/luajit/package.mk
@@ -19,6 +19,11 @@ post_patch() {
   mkdir -p ${PKG_BUILD}/.${HOST_NAME} && cp -r ${PKG_BUILD}/* $PKG_BUILD/.${HOST_NAME}
 }
 
+
+pre_make_host() {
+  unset TARGET_CFLAGS
+}
+
 makeinstall_host() {
   cd .${HOST_NAME}
   make amalg
diff --git a/scripts/build_distro b/scripts/build_distro
index bdbaa6437..964924260 100755
--- a/scripts/build_distro
+++ b/scripts/build_distro
@@ -23,7 +23,7 @@ echo "Building ${DISTRO} for ${DEVICE}"
 # If ROOT is defined make sure that the build folder is a link to root rather than
 # a folder and take additional clean steps to ensure everything is built properly.
 
-if [ -z "${ROOT-set}" ]
+if [ -n "${ROOT}" ]
 then
   # Ensure there isn't a left over build directory.
   if [ -d "build.${DISTRO}-${DEVICE}.${ARCH}" ]