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

Use make envs

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-20 17:57:52 -05:00
parent bc37d9c0b9
commit b80f31b911
1 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
openwrtbuilder
View File

@@ -527,7 +527,8 @@ fromSource() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
declare src_url="https://github.com/openwrt/openwrt.git" declare src_url="https://github.com/openwrt/openwrt.git"
declare pkg kopt declare pkg kopt
declare -a make_opts
echo "Building from source is under development" echo "Building from source is under development"
@@ -544,12 +545,14 @@ fromSource() {
git checkout "v$RELEASE" git checkout "v$RELEASE"
fi fi
# git pull # TODO, necessary? git pull
# Update package feed # Update package feed
./scripts/feeds update -a && ./scripts/feeds update -a &&
./scripts/feeds install -a ./scripts/feeds install -a
make defconfig # normalize .config and remove dupes
# Grab the release seed config # Grab the release seed config
if [[ -f "$SEED_FILE" ]]; then if [[ -f "$SEED_FILE" ]]; then
if askOk "$SEED_FILE exists. Re-download?"; then if askOk "$SEED_FILE exists. Re-download?"; then
@@ -564,38 +567,52 @@ fromSource() {
fi fi
fi fi
# Override default .config seed with profile packages
for pkg in ${P_ARR[packages]:+${P_ARR[packages]}}; do for pkg in ${P_ARR[packages]:+${P_ARR[packages]}}; do
if [[ $pkg == -* ]]; then if [[ $pkg == -* ]]; then
echo "CONFIG_PACKAGE_${pkg#-}=n" >> "$SEED_FILE" # remove package make_opts+=("CONFIG_PACKAGE_${pkg#-}=n") # remove package
else else
echo "CONFIG_PACKAGE_$pkg=y" >> "$SEED_FILE" # add package make_opts+=("CONFIG_PACKAGE_$pkg=y") # add package
fi fi
done done
# Add custom kernel config options
for kopt in ${P_ARR[kopts]:+${P_ARR[kopts]}}; do for kopt in ${P_ARR[kopts]:+${P_ARR[kopts]}}; do
echo "$kopt" >> "$SEED_FILE" make_opts+=("$kopt")
done done
make defconfig # normalize .config and remove dupes make_opts+=("CONFIG_TARGET_MULTI_PROFILE=n")
make_opts+=("CONFIG_TARGET_DEVICE_${P_ARR[target]//\//_}_DEVICE_${P_ARR[profile]}=y")
make_opts+=("CONFIG_BINARY_FOLDER=\"$THIS_BINDIR\"")
# Override default .config seed with profile packages
# for pkg in ${P_ARR[packages]:+${P_ARR[packages]}}; do
# if [[ $pkg == -* ]]; then
# echo "CONFIG_PACKAGE_${pkg#-}=n" >> "$SEED_FILE" # remove package
# else
# echo "CONFIG_PACKAGE_$pkg=y" >> "$SEED_FILE" # add package
# fi
# done
# Add custom kernel config options
# for kopt in ${P_ARR[kopts]:+${P_ARR[kopts]}}; do
# echo "$kopt" >> "$SEED_FILE"
# done
# Only compile our target # Only compile our target
# TODO causes a "configuration is out of sync" error w/o defconfig # TODO causes a "configuration is out of sync" error w/o defconfig
echo "CONFIG_TARGET_MULTI_PROFILE=n" >> "$SEED_FILE" # sed -i '/CONFIG_TARGET_DEVICE_/d' "$SEED_FILE"
sed -i '/CONFIG_TARGET_DEVICE_/d' "$SEED_FILE" # echo "CONFIG_TARGET_DEVICE_${P_ARR[target]//\//_}_DEVICE_${P_ARR[profile]}=y" >> "$SEED_FILE"
echo "CONFIG_TARGET_DEVICE_${P_ARR[target]//\//_}_DEVICE_${P_ARR[profile]}=y" >> "$SEED_FILE"
# output to bindir instead of builddir # output to bindir instead of builddir
echo "CONFIG_BINARY_FOLDER=\"$THIS_BINDIR\"" >> "$SEED_FILE" # echo "CONFIG_BINARY_FOLDER=\"$THIS_BINDIR\"" >> "$SEED_FILE"
# TODO symlink clang for qosify # TODO 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"
ln -s "$(which clang)" "$GITSRCDIR/staging_dir/host/llvm-bpf/bin/clang" ln -s "$(which clang)" "$GITSRCDIR/staging_dir/host/llvm-bpf/bin/clang"
make targetclean make targetclean
make download && make "${make_opts[@]}" download &&
make -j"$(nproc)" world make "${make_opts[@]}" -j"$(nproc)" world
popd &>/dev/null || return 1 popd &>/dev/null || return 1
exit # TODO exit here for fromSource() testing exit # TODO exit here for fromSource() testing
@@ -783,3 +800,12 @@ main() {
main "$@" main "$@"
exit exit
# VM setup (for testing)
# sudo sgdisk -N 0 /dev/vda &&
# sudo mkfs.ext4 /dev/vda1
# mkdir ~/mnt
# sudo mount /dev/vda1 ~/mnt
# sudo chown liveuser:liveuser -R ~/mnt