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

More work on --source

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-29 15:44:17 -05:00
parent 489988c16d
commit 66639d832c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
openwrtbuilder
View File

@@ -627,17 +627,28 @@ fromSource() {
pushd "$GITWORKTREEDIR" &>/dev/null || return 1 pushd "$GITWORKTREEDIR" &>/dev/null || return 1
# TODO for now remove the SEED_FILE, see notes below
[[ -f $SEED_FILE ]] && rm -f "$SEED_FILE"
# Update package feed
# ./scripts/feeds install will create defaults (make defconfig)
# for an exiting .config so make sure it doesn't exist first
./scripts/feeds update -a &&
./scripts/feeds install -a
# Grab the release seed config # Grab the release seed config
if ! curl -so "$SEED_FILE" "$SEED_URL"; then if ! curl -so "$SEED_FILE" "$SEED_URL"; then
echo "Could not obtain .config seed from $SEED_FILE" echo "Could not obtain $SEED_FILE from $SEED_URL"
return 1 return 1
fi fi
# Add custom packages # Add custom packages
for pkg in ${P_ARR[packages]:+}; do for pkg in ${P_ARR[packages]:+}; do
if [[ $pkg == -* ]]; then if [[ $pkg == -* ]]; then
debug "Removing package ${pkg#-}"
config_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package config_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package
else else
debug "Adding package $pkg"
config_opts+=("CONFIG_PACKAGE_$pkg=y") # add package config_opts+=("CONFIG_PACKAGE_$pkg=y") # add package
fi fi
done done
@@ -658,15 +669,12 @@ fromSource() {
# Write options to config seed file # Write options to config seed file
for opt in "${config_opts[@]}"; do for opt in "${config_opts[@]}"; do
debug "Writing $opt to $SEED_FILE"
echo "$opt" >> "$SEED_FILE" echo "$opt" >> "$SEED_FILE"
done done
# Update package feed
./scripts/feeds update -a &&
./scripts/feeds install -a
# normalize .config and remove dupes # normalize .config and remove dupes
# make defconfig # TODO make defconfig # TODO
# TODO for now symlink clang for qosify # TODO for now symlink clang for qosify
[[ -d "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" ]] || mkdir -p "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" [[ -d "$GITSRCDIR/staging_dir/host/llvm-bpf/bin" ]] || mkdir -p "$GITSRCDIR/staging_dir/host/llvm-bpf/bin"