bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: bryan:aeead798c381c7b5147c417547dde3ac9dc7b3e9
Branches Tags
bryan:master bryan:dev
...
compare: bryan:18929109a2b10e4a6989155d4083ff7a610af31c
Branches Tags
bryan:dev bryan:master

4 Commits
aeead798c3 ... 18929109a2

Author SHA1 Message Date
bryan
18929109a2 Omit oldconfig step 2025-10-18 21:17:35 -04:00
bryan
8d24cb96a9 Switch to canonical make order 2025-10-18 12:27:40 -04:00
bryan
9be43af11a Make olddefconfig non-interactive 2025-10-18 11:33:04 -04:00
bryan
ce2e85d197 Attempt one step olddefconfig 2025-10-18 11:30:42 -04:00
2 changed files with 7 additions and 9 deletions
Expand all files Collapse all files

14
openwrtbuilder
View File

@@ -530,7 +530,7 @@ from_source() {
# Pull or clone source repo # Pull or clone source repo
if [[ -d "$SRC_DIR" ]]; then if [[ -d "$SRC_DIR" ]]; then
execute git -C "$SRC_DIR" fetch --all --prune --tags execute git -C "$SRC_DIR" pull --all --tags --prune
else else
execute mkdir -p "$SRC_DIR" execute mkdir -p "$SRC_DIR"
execute git clone "$src_url" "$SRC_DIR" execute git clone "$src_url" "$SRC_DIR"
@@ -628,9 +628,6 @@ from_source() {
config_opts+=("CONFIG_SDK_LLVM_BPF=n") config_opts+=("CONFIG_SDK_LLVM_BPF=n")
config_opts+=("CONFIG_IB=n") config_opts+=("CONFIG_IB=n")
config_opts+=("CONFIG_MAKE_TOOLCHAIN=n") config_opts+=("CONFIG_MAKE_TOOLCHAIN=n")
# Serial make prep is more reliable
execute make "${make_opts[@]}" "-j1" defconfig
# Write options to config seed file # Write options to config seed file
for config in "${config_opts[@]}"; do for config in "${config_opts[@]}"; do
@@ -638,7 +635,8 @@ from_source() {
echo "$config" >> "$seed_file" echo "$config" >> "$seed_file"
done done
execute bash -c "yes '' | make ${make_opts[*]} -j1 oldconfig" # Expand seed into full config
execute make "${make_opts[@]}" "-j1" defconfig
# make_opts+=("-j$(($(nproc)-2))") # make_opts+=("-j$(($(nproc)-2))")
((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-2))") ((DEBUG)) && make_opts+=("-j1") || make_opts+=("-j$(($(nproc)-2))")
@@ -791,8 +789,8 @@ main() {
read -r release ref < <(normalize_and_ref "$raw_release" "$mode") read -r release ref < <(normalize_and_ref "$raw_release" "$mode")
declare -g SRC_DIR="$BUILD_ROOT/src/.openwrt" declare -g SRC_DIR="$BUILD_ROOT/src/.openwrt"
declare -g BUILD_DIR="$BUILD_ROOT/src/$profile/$mode-$ref" declare -g BUILD_DIR="$BUILD_ROOT/src/$profile/$ref-$mode"
declare -g BIN_DIR="$BUILD_ROOT/bin/$profile/$mode-$ref" declare -g BIN_DIR="$BUILD_ROOT/bin/$profile/$ref-$mode"
if [[ "$release" == "snapshot" ]]; then if [[ "$release" == "snapshot" ]]; then
local url_prefix="https://downloads.openwrt.org/snapshots/targets/$TARGET" local url_prefix="https://downloads.openwrt.org/snapshots/targets/$TARGET"
@@ -816,7 +814,7 @@ main() {
declare -g SYSUPGRADEIMGGZ="$BUILD_DIR/$img_fname-sysupgrade.img.gz" declare -g SYSUPGRADEIMGGZ="$BUILD_DIR/$img_fname-sysupgrade.img.gz"
fi fi
backup "$SYSUPGRADEIMGGZ" "$BACKUP_DIR/$profile/$mode-$ref" backup "$SYSUPGRADEIMGGZ" "$BACKUP_DIR/$profile/$ref-$mode"
if [[ "$mode" == "source" ]]; then if [[ "$mode" == "source" ]]; then
from_source "$seed_url" "$profile" "$ref" || return $? from_source "$seed_url" "$profile" "$ref" || return $?

2
profiles
View File

@@ -27,7 +27,7 @@ declare -Ag r4s=(
CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \ CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y CONFIG_BTRFS_PROGS_ZSTD=y \
CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32" CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=32"
[files]="/mnt/backup" [files]="/mnt/backup"
# for 24.10 branch (Linux 6.6) # For 24.10 branch (Linux 6.6)
# [cherrypicks]="wurzerj:59d6e31 wurzerj:bb251b8" # fix inconsistent reboot # [cherrypicks]="wurzerj:59d6e31 wurzerj:bb251b8" # fix inconsistent reboot
) )