From 2b35e1e01770beee7675256e083240fb4c912908 Mon Sep 17 00:00:00 2001 From: bryan Date: Mon, 11 Aug 2025 17:10:20 -0400 Subject: [PATCH] Re-enable multicore make --- README.md | 6 +++--- openwrtbuilder | 6 +++--- profiles | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2eddc91..7f387fc 100755 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Build and deploy OpenWRT images using shell-style device profiles, via source co --release,-r,--version,-v RELEASE ("snapshot", "22.03.3") --buildroot,-b PATH (Default: script directory) --source - Build image from source code, not from Image Builder - Allows make config options to be passed in profile - Uses git worktree for multi-profile deduplication + Build image from source code, not from Image Builder. + Allows make config options to be passed in profile. + Uses git worktree for multi-profile deduplication. --ssh-upgrade HOST Example: root@192.168.1.1 --ssh-backup SSH_PATH diff --git a/openwrtbuilder b/openwrtbuilder index 5e56a13..82a38c8 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -2,7 +2,7 @@ # Build and deploy OpenWRT images using shell-style device profiles, via source code or the official Image Builder. # Copyright 2022-25 Bryan C. Roessler # Apache 2.0 License -# See README and profiles for device configuration +# See README and ./profiles for device configuration # Set default release : "${RELEASE:="24.10.2"}" @@ -637,8 +637,8 @@ from_source() { execute bash -c "yes '' | make ${make_opts[*]} -j1 oldconfig" - # make_opts+=("-j$(($(nproc)-2))") - ((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-2))") + make_opts+=("-j$(($(nproc)-2))") + #((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-2))") # Make image if ! execute ionice -c 3 chrt --idle 0 nice -n19 make "${make_opts[@]}" download world; then diff --git a/profiles b/profiles index 37a3b95..849892f 100644 --- a/profiles +++ b/profiles @@ -6,10 +6,10 @@ default_packages=(nano htop diffutils tar iperf3 zsh rsync curl openssh-sftp-server luci luci-ssl luci-proto-wireguard luci-app-statistics collectd-mod-sensors collectd-mod-thermal collectd-mod-conntrack collectd-mod-cpu - -libpfring) # unmaintained and causes compilation issues 8/11/25 + -libpfring -kmod-pf-ring) # unmaintained and causes compilation issues 8/11/25 # Default (but optional) kernel configs -default_configs=("CONFIG_BUILDBOT=n") +default_configs=("CONFIG_BUILDBOT=n" "CONFIG_PACKAGE_kmod-pf-ring=n") # Current devices declare -Ag r4s=(