From 9399e914c55de06f9bc5d37c50a87ae02648dc24 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul@crapouillou.net>
Date: Fri, 15 Mar 2024 18:13:00 +0100
Subject: [PATCH] od: Disable top-level concurrency

Building with top-level concurrency is faster, but makes it near
impossible to understand a build failure by looking at the CI or even
when building manually.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
 build.sh                       | 3 +--
 configs/od_gcw0_defconfig      | 1 -
 configs/od_installer_defconfig | 1 -
 configs/od_lepus_defconfig     | 1 -
 configs/od_rs90_defconfig      | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index 03c2e04e6a62..7bbd70432c19 100755
--- a/build.sh
+++ b/build.sh
@@ -37,9 +37,8 @@ fi
 
 # Perform the build.
 echo "Starting build..."
-PARALLELISM=$(getconf _NPROCESSORS_ONLN)
 for target in $TARGETS; do
-	nice ${TOP_MAKE_COMMAND} "$target" BR2_SDK_PREFIX=${CONFIG}-toolchain O=output/${CONFIG} -j $PARALLELISM
+	nice ${TOP_MAKE_COMMAND} "$target" BR2_SDK_PREFIX=${CONFIG}-toolchain O=output/${CONFIG}
 done
 
 if [ "${TARGETS}" = sdk ] ; then
diff --git a/configs/od_gcw0_defconfig b/configs/od_gcw0_defconfig
index d9406aba6f90..b4596c603e56 100644
--- a/configs/od_gcw0_defconfig
+++ b/configs/od_gcw0_defconfig
@@ -14,7 +14,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/gcw0"
 BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
-BR2_PER_PACKAGE_DIRECTORIES=y
 # BR2_PIC_PIE is not set
 BR2_RELRO_NONE=y
 BR2_ROOTFS_SKELETON_CUSTOM=y
diff --git a/configs/od_installer_defconfig b/configs/od_installer_defconfig
index 9a4fbc738424..dfdfbdafe878 100644
--- a/configs/od_installer_defconfig
+++ b/configs/od_installer_defconfig
@@ -53,4 +53,3 @@ 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
index 46ea90b492ec..6f0040ddfdfa 100644
--- a/configs/od_lepus_defconfig
+++ b/configs/od_lepus_defconfig
@@ -14,7 +14,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/lepus"
 BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
-BR2_PER_PACKAGE_DIRECTORIES=y
 # BR2_PIC_PIE is not set
 BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
diff --git a/configs/od_rs90_defconfig b/configs/od_rs90_defconfig
index 39825eee59ec..e81815e71b54 100644
--- a/configs/od_rs90_defconfig
+++ b/configs/od_rs90_defconfig
@@ -10,7 +10,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/output/ccache/rs90"
 BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/board/opendingux/patches"
-BR2_PER_PACKAGE_DIRECTORIES=y
 # BR2_PIC_PIE is not set
 BR2_SSP_NONE=y
 BR2_RELRO_NONE=y