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

Put .config in var

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-13 16:49:13 -05:00
parent 37b1355d46
commit 86fc9f3170
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
openwrtbuilder
View File

@@ -337,7 +337,7 @@ installDependencies() {
getImageBuilder() { getImageBuilder() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
declare dl_tool declare dl_tool checksum
if [[ -f "$IB_ARCHIVE" ]]; then if [[ -f "$IB_ARCHIVE" ]]; then
echo "Image Builder $IB_ARCHIVE exists" echo "Image Builder $IB_ARCHIVE exists"
@@ -370,14 +370,13 @@ getImageBuilder() {
return 1 return 1
fi fi
if hash sha256sum &>/dev/null; then
# if hash sha256sum &>/dev/null; then
# echo "Verifying checksums" # echo "Verifying checksums"
# debug "$dl_tool -s "${P_ARR[sha256_url]}" | grep $filename | cut -f1 -d' '" # debug "$dl_tool -s "${P_ARR[sha256_url]}" | grep $filename | cut -f1 -d' '"
# sha256sum=$($dl_tool -s "${P_ARR[sha256_url]}" |grep "$filename" |cut -f1 -d' ') if ! $dl_tool -o "$BUILDDIR" "$SHA256_URL"; then
# debug "Downloaded sha256sum: $sha256sum" debug "Downloaded sha256sums: $checksum"
# fi fi
echo "Extracting Image Builder archive" echo "Extracting Image Builder archive"
@@ -531,17 +530,16 @@ 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 src_dir="$SRCDIR/openwrt"
declare -a pkg_list declare -a pkg_list
echo "Building from source is under development" echo "Building from source is under development"
if [[ ! -d "$src_dir" ]]; then if [[ ! -d "$GITSRCDIR" ]]; then
mkdir -p "$src_dir" mkdir -p "$GITSRCDIR"
git clone "$src_url" "$src_dir" git clone "$src_url" "$GITSRCDIR"
fi fi
pushd "$src_dir" || return 1 pushd "$GITSRCDIR" || return 1
if [[ ${P_ARR[release]} == "snapshot" ]]; then if [[ ${P_ARR[release]} == "snapshot" ]]; then
git checkout master git checkout master
@@ -554,34 +552,34 @@ fromSource() {
./scripts/feeds install -a ./scripts/feeds install -a
# Grab the release seed config # Grab the release seed config
if [[ -f .config ]]; then if [[ -f "$SEED_FILE" ]]; then
echo ".config already exists" echo "$SEED_FILE already exists"
if askOk "Replace?"; then if askOk "Replace?"; then
if ! curl -so .config "$SEED_URL"; then if ! curl -so "$SEED_FILE" "$SEED_URL"; then
echo "Could not obtain seed config" echo "Could not obtain seed config"
fi fi
fi fi
else else
echo "Reusing existing .config" echo "Reusing existing "$SEED_FILE""
fi fi
# Update .config with profile packages # Update .config with profile packages
for package in ${P_ARR[packages]}; do for package in ${P_ARR[packages]}; do
if [[ $package == -* ]]; then if [[ $package == -* ]]; then
echo "CONFIG_PACKAGE_${package#-}=n" >> .config echo "CONFIG_PACKAGE_${package#-}=n" >> "$SEED_FILE"
else else
echo "CONFIG_PACKAGE_$package=y" >> .config echo "CONFIG_PACKAGE_$package=y" >> "$SEED_FILE"
fi fi
done done
# Only compile our target # Only compile our target
echo "CONFIG_TARGET_MULTI_PROFILE=n" >> .config echo "CONFIG_TARGET_MULTI_PROFILE=n" >> "$SEED_FILE"
make defconfig # normalize .config and remove dupes make defconfig # normalize .config and remove dupes
# make defconfig will add these back # Causes a "configuration is out of sync" error
sed -i '/CONFIG_TARGET_DEVICE_/d' .config sed -i '/CONFIG_TARGET_DEVICE_/d' "$SEED_FILE"
echo "CONFIG_TARGET_DEVICE_${P_ARR[target]//\//_}_DEVICE_${P_ARR[profile]}=y" >> .config 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\"" >> .config echo "CONFIG_BINARY_FOLDER=\"$THIS_BINDIR\"" >> "$SEED_FILE"
make targetclean make targetclean
make download && make download &&
make -j"$(nproc)" world make -j"$(nproc)" world
@@ -643,6 +641,7 @@ main() {
declare -g FILESDIR="${FILESDIR:=$BUILDROOT/src/files}" declare -g FILESDIR="${FILESDIR:=$BUILDROOT/src/files}"
declare -g SRCDIR="$BUILDROOT/src" # input/build declare -g SRCDIR="$BUILDROOT/src" # input/build
declare -g BINDIR="$BUILDROOT/bin" # output declare -g BINDIR="$BUILDROOT/bin" # output
declare -g GITSRCDIR="$SRCDIR/openwrt"
for dir in "$SRCDIR" "$BINDIR"; do for dir in "$SRCDIR" "$BINDIR"; do
[[ -d "$dir" ]] || mkdir -p "$dir" [[ -d "$dir" ]] || mkdir -p "$dir"
@@ -690,7 +689,9 @@ main() {
declare -g IB_URL="$url_prefix/$url_filename" declare -g IB_URL="$url_prefix/$url_filename"
declare -g SHA256_URL="$url_prefix/sha256sums" declare -g SHA256_URL="$url_prefix/sha256sums"
declare -g SHA256_FILE="$BUILDDIR/sha256sums"
declare -g SEED_URL="$url_prefix/config.buildinfo" declare -g SEED_URL="$url_prefix/config.buildinfo"
declare -g SEED_FILE="$GITSRCDIR/.config"
declare -g FACTORYIMG="$img_prefix-factory.img" declare -g FACTORYIMG="$img_prefix-factory.img"
declare -g FACTORYIMGGZ="$img_prefix-factory.img.gz" declare -g FACTORYIMGGZ="$img_prefix-factory.img.gz"
@@ -708,6 +709,7 @@ main() {
BUILDDIR: $BUILDDIR BUILDDIR: $BUILDDIR
SRCDIR: $SRCDIR SRCDIR: $SRCDIR
BINDIR: $BINDIR BINDIR: $BINDIR
GITSRCDIR: $GITSRCDIR
THIS_BINDIR: $THIS_BINDIR THIS_BINDIR: $THIS_BINDIR
TARGET: ${P_ARR[target]} TARGET: ${P_ARR[target]}
PROFILE: ${P_ARR[profile]} PROFILE: ${P_ARR[profile]}
@@ -715,6 +717,10 @@ main() {
FILESYSTEM: $FILESYSTEM FILESYSTEM: $FILESYSTEM
IB_URL: $IB_URL IB_URL: $IB_URL
IB_ARCHIVE: $IB_ARCHIVE IB_ARCHIVE: $IB_ARCHIVE
SEED_URL: $SEED_URL
SEED_FILE: $SEED_FILE
SHA256_URL: $SHA256_URL
SHA256_FILE: $SHA256_FILE
EOF EOF
fi fi