This commit is contained in:
2023-02-16 15:20:16 -05:00
parent 5867c8111e
commit ad76c9cc6b

View File

@@ -538,6 +538,7 @@ 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 seed_file="$SOURCEDIR/.config"
declare pkg kopt opt commit seed_file wt_cmd declare pkg kopt opt commit seed_file wt_cmd
declare -a make_opts config_opts declare -a make_opts config_opts
@@ -550,9 +551,6 @@ fromSource() {
fi fi
git -C "$GITDIR" pull git -C "$GITDIR" pull
debug "Current commit:"
(( DEBUG )) && git -C "$GITDIR" log -1
(( DEBUG )) && git -C "$GITDIR" describe
wt_cmd=(git -C "$GITDIR" wt_cmd=(git -C "$GITDIR"
worktree add worktree add
@@ -566,12 +564,13 @@ fromSource() {
execute "${wt_cmd[@]}" "origin/openwrt-${RELEASE%.*}" execute "${wt_cmd[@]}" "origin/openwrt-${RELEASE%.*}"
fi fi
# Print commit information
commit=$(git -C "$SOURCEDIR" rev-parse HEAD) commit=$(git -C "$SOURCEDIR" rev-parse HEAD)
debug "Current commit hash: $commit" echo "Current commit hash: $commit"
(( DEBUG )) && git -C "$SOURCEDIR" log -1
seed_file="$SOURCEDIR/.config" (( DEBUG )) && git -C "$SOURCEDIR" describe
debug "seed_file: $seed_file"
# Enter worktree
pushd "$SOURCEDIR" || return 1 pushd "$SOURCEDIR" || return 1
# Update package feed # Update package feed
@@ -601,7 +600,7 @@ fromSource() {
config_opts+=("$kopt") config_opts+=("$kopt")
done done
Only compile selected fs # Only compile selected fs
sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file" sed -i '/CONFIG_TARGET_ROOTFS_/d' "$seed_file"
config_opts+=("CONFIG_TARGET_PER_DEVICE_ROOTFS=n") config_opts+=("CONFIG_TARGET_PER_DEVICE_ROOTFS=n")
if [[ $FILESYSTEM == "squashfs" ]]; then if [[ $FILESYSTEM == "squashfs" ]]; then