opendingux: enable top-level parallel build

Signed-off-by: Gleb Mazovetskiy <[email protected]>
citral23 · Oct 30, 2022 · 9bbc7cd · 9bbc7cd
1 parent fbb6dfe
commit 9bbc7cd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/board/opendingux/package/gmenu2x/gmenu2x.mk b/board/opendingux/package/gmenu2x/gmenu2x.mk
@@ -29,6 +29,7 @@ GMENU2X_DEPENDENCIES += libxdgmime
 endif
 
 define GMENU2X_INSTALL_WRAPPER
+	mkdir -p $(TARGET_DIR)/usr/libexec
 	mv $(TARGET_DIR)/usr/bin/gmenu2x $(TARGET_DIR)/usr/libexec/gmenu2x
 	$(INSTALL) -D -m 0755 board/opendingux/package/gmenu2x/gmenu2x.sh $(TARGET_DIR)/usr/bin/gmenu2x
 endef

diff --git a/board/opendingux/package/wlan-scan/wlan-scan.mk b/board/opendingux/package/wlan-scan/wlan-scan.mk
@@ -4,6 +4,8 @@
 #
 #############################################################
 
+WLAN_SCAN_DEPENDENCIES = libnl
+
 define WLAN_SCAN_BUILD_CMDS
 	mkdir -p $(@D)
 	$(TARGET_CC) $(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include/libnl3 \

diff --git a/build.sh b/build.sh
@@ -23,16 +23,19 @@ echo "Copy .config to target"
 mkdir output/${CONFIG}/host && cp output/${CONFIG}/.config output/${CONFIG}/host/
 
 if [ "${CONFIG}" = "installer" ] ; then
-	TARGET="all host-odbootd"
+	TARGETS="all host-odbootd"
 else
-	TARGET=sdk
+	TARGETS=sdk
 fi
 
 # Perform the build.
 echo "Starting build..."
-nice make ${TARGET} BR2_SDK_PREFIX=${CONFIG}-toolchain O=output/${CONFIG}
+PARALLELISM=$(getconf _NPROCESSORS_ONLN)
+for target in $TARGETS; do
+	nice make "$target" BR2_SDK_PREFIX=${CONFIG}-toolchain O=output/${CONFIG} -j $PARALLELISM
+done
 
-if [ "${TARGET}" = sdk ] ; then
+if [ "${TARGETS}" = sdk ] ; then
 	echo "Recompressing SDK to XZ..."
 	ARCHIVE_NAME=opendingux-${CONFIG}-toolchain.`date +'%Y-%m-%d'`
 	gzip -d -c output/${CONFIG}/images/${CONFIG}-toolchain.tar.gz | xz -T0 -9 > output/${CONFIG}/images/$ARCHIVE_NAME.tar.xz

diff --git a/configs/od_gcw0_defconfig b/configs/od_gcw0_defconfig
@@ -229,3 +229,4 @@ BR2_PACKAGE_SPARROW3D=y
 BR2_PACKAGE_UBIBOOT=y
 BR2_PACKAGE_UBIBOOT_BOARDNAME="gcw0"
 BR2_PACKAGE_UNLOCKVT=y
+BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/configs/od_installer_defconfig b/configs/od_installer_defconfig
@@ -53,3 +53,4 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_MKPASSWD=y
 BR2_PACKAGE_ODBOOTD=y
+BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/configs/od_lepus_defconfig b/configs/od_lepus_defconfig
@@ -149,3 +149,4 @@ BR2_PACKAGE_PYCLOCK=y
 BR2_PACKAGE_SALSAD=y
 BR2_PACKAGE_UBIBOOT=y
 BR2_PACKAGE_UBIBOOT_BOARDNAME="lepus"
+BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/configs/od_rs90_defconfig b/configs/od_rs90_defconfig
@@ -139,3 +139,4 @@ BR2_PACKAGE_OD_PASSWD_CONFIG=y
 BR2_PACKAGE_SALSAD=y
 BR2_PACKAGE_UBIBOOT=y
 BR2_PACKAGE_UBIBOOT_BOARDNAME="rs90"
+BR2_PER_PACKAGE_DIRECTORIES=y