From cd561ffb0ec9908375928f695aea3f2a7dec43e3 Mon Sep 17 00:00:00 2001
From: Jens Maus <mail@jens-maus.de>
Date: Tue, 15 Sep 2020 12:47:40 +0200
Subject: [PATCH] move/copy all 32bit OCCU libraries to /lib32 instead. In
 addition, cleaned up all installation routines to only copy relevant,
 non-obsolete binaries/libraries and to keep hands of some non required ones.
 This refs #903.

---
 .../configs/raspmatic_ova_defconfig           |  2 ++
 buildroot-external/package/occu/Makefile      | 24 +++++++++++++++----
 buildroot-external/package/occu/occu.mk       |  5 ++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/buildroot-external/configs/raspmatic_ova_defconfig b/buildroot-external/configs/raspmatic_ova_defconfig
index ee127f9f77..25006b18c7 100644
--- a/buildroot-external/configs/raspmatic_ova_defconfig
+++ b/buildroot-external/configs/raspmatic_ova_defconfig
@@ -9,6 +9,8 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_GLIBC_UTILS=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_ROOTFS_LIB_DIR="lib"
+BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_TARGET_GENERIC_HOSTNAME=""
 BR2_TARGET_GENERIC_ISSUE="Welcome to RaspberryMatic"
 BR2_TARGET_GENERIC_PASSWD_SHA512=y
diff --git a/buildroot-external/package/occu/Makefile b/buildroot-external/package/occu/Makefile
index eea3c87a4d..9c4738e84d 100644
--- a/buildroot-external/package/occu/Makefile
+++ b/buildroot-external/package/occu/Makefile
@@ -7,11 +7,13 @@ OCCU_ROOT=
 install_rfd_arch:
 	mkdir -p $(TARGET_DIR)/bin
 	mkdir -p $(TARGET_DIR)/lib
+	mkdir -p $(TARGET_DIR)/$(OCCU_LIBDIR)
 	mkdir -p $(TARGET_DIR)/etc/config_templates
 	mkdir -p $(TARGET_DIR)/www/config
 	mkdir -p $(TARGET_DIR)/firmware
+	rm -f $(OCCU_ARCH)/packages-eQ-3/RFD/bin/avrprog
 	cp -R $(OCCU_ARCH)/packages-eQ-3/RFD/bin/* $(TARGET_DIR)/bin/
-	cp -R $(OCCU_ARCH)/packages-eQ-3/RFD/lib/* $(TARGET_DIR)/lib/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/RFD/lib/* $(TARGET_DIR)/$(OCCU_LIBDIR)/
 	cp -a $(OCCU_ARCH)/packages-eQ-3/RFD/etc/init.d/S61rfd $(TARGET_DIR)/etc/init.d/
 	cp -R $(OCCU_ARCH)/packages-eQ-3/RFD/etc/config_templates/* $(TARGET_DIR)/etc/config_templates/
 	cp -R $(OCCU_ARCH)/packages-eQ-3/RFD/www/config/* $(TARGET_DIR)/www/config/
@@ -23,21 +25,33 @@ ifneq (,$(filter $(OCCU_RF_PROTOCOL), HM_HMIP HMIP))
 endif
 
 install_hs485d_arch:
-	cp -R $(OCCU_ARCH)/packages-eQ-3/HS485D/* $(TARGET_DIR)/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/HS485D/bin/* $(TARGET_DIR)/bin/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/HS485D/etc/* $(TARGET_DIR)/etc/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/HS485D/lib/* $(TARGET_DIR)/$(OCCU_LIBDIR)/
 
 install_webui_arch:
 	rm -f $(OCCU_ARCH)/packages-eQ-3/WebUI/config
+	rm -f $(OCCU_ARCH)/packages-eQ-3/WebUI/bin/ReGaHss.normal
+	rm -f $(OCCU_ARCH)/packages-eQ-3/WebUI/bin/eq3-uds-services
+	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI/bin/* $(TARGET_DIR)/bin/
 	rm -rf $(OCCU_ARCH)/packages-eQ-3/WebUI/etc/config
-	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI/* $(TARGET_DIR)/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI/etc/* $(TARGET_DIR)/etc/
+	rm -f $(OCCU_ARCH)/packages-eQ-3/WebUI/lib/libeq3udss.so
+	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI/lib/*.so $(TARGET_DIR)/$(OCCU_LIBDIR)/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI/lib/tcl8.2 $(TARGET_DIR)/lib/
+	ln -sf /lib32/tclrega.so $(TARGET_DIR)/lib/
+	ln -sf /lib32/tclrpc.so $(TARGET_DIR)/lib/
+	ln -sf /lib32/tclticks.so $(TARGET_DIR)/lib/
 	cp -R WebUI/* $(TARGET_DIR)/
 	mv $(TARGET_DIR)/bin/ReGaHss.community $(TARGET_DIR)/bin/ReGaHss
 ifeq ($(OCCU_WEBUI_REGAHSS_BETA), y)
-	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI-Beta/* $(TARGET_DIR)/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI-Beta/bin/* $(TARGET_DIR)/bin/
+	cp -R $(OCCU_ARCH)/packages-eQ-3/WebUI-Beta/lib/* $(TARGET_DIR)/$(OCCU_LIBDIR)/
 endif
 
 install_linuxbasis_arch:
 	cp -av $(OCCU_ARCH)/packages-eQ-3/LinuxBasis/bin/* $(TARGET_DIR)/bin/
-	cp -av $(OCCU_ARCH)/packages-eQ-3/LinuxBasis/lib/* $(TARGET_DIR)/lib/
+	cp -av $(OCCU_ARCH)/packages-eQ-3/LinuxBasis/lib/* $(TARGET_DIR)/$(OCCU_LIBDIR)/
 
 install_lighttpd_arch:
 	mkdir -p $(TARGET_DIR)/etc/lighttpd
diff --git a/buildroot-external/package/occu/occu.mk b/buildroot-external/package/occu/occu.mk
index c9a93aba7d..feeb450b76 100644
--- a/buildroot-external/package/occu/occu.mk
+++ b/buildroot-external/package/occu/occu.mk
@@ -93,19 +93,24 @@ endif
 
 ifeq ($(BR2_arm),y)
 	OCCU_ARCH=arm-gnueabihf-gcc8
+	OCCU_LIBDIR=lib
 endif
 
 ifeq ($(BR2_i386),y)
 	OCCU_ARCH=X86_32_GCC8
+	OCCU_LIBDIR=lib
 endif
 
 ifeq ($(BR2_x86_64),y)
 	OCCU_ARCH=X86_32_GCC8
+	OCCU_LIBDIR=$(BR2_ROOTFS_LIB32_DIR)
 endif
 
 define OCCU_INSTALL_TARGET_CMDS
 		$(MAKE) OCCU_RF_PROTOCOL=$(OCCU_RF_PROTOCOL) \
 			OCCU_ARCH=$(OCCU_ARCH) \
+			OCCU_LIBDIR=$(OCCU_LIBDIR) \
+			OCCU_WEBUI_REGAHSS_BETA=$(OCCU_WEBUI_REGAHSS_BETA) \
 			OCCU_WEBUI_REGAHSS_BETA=$(OCCU_WEBUI_REGAHSS_BETA) \
 			-C $(@D) install 
 endef