From 19da0b7d5745f18a5d3293e5bd7bf7d0d76b0b54 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sun, 6 Dec 2015 13:42:22 +0100 Subject: [PATCH] buildscript: remove kernel config This part was broken, as the stored .config doesn't contain the arch/version anymore. Signed-off-by: Tim Niemeyer Reviewed-by: Steffen Pankratz --- buildscript | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/buildscript b/buildscript index 30164f6..d103a69 100755 --- a/buildscript +++ b/buildscript @@ -175,12 +175,6 @@ prebuild() { cp -r ./bsp/"$machine"/root_file_system/* "$target"/files/ cp ./bsp/"$machine"/.config "$target"/.config - arch=$(awk -F= '/^CONFIG_TARGET_BOARD/{print gsub(/"/,"",$2); print $2;}' ./bsp/"$machine"/.config) - version=$(awk '/^CONFIG_LINUX/ { sub(/CONFIG_LINUX_/,""); sub(/=y/,""); gsub(/_/,"."); print; }' ./bsp/"$machine"/.config) - test -f ./bsp/"$machine"/.kernelconfig-"$version" && \ - cp ./bsp/"$machine"/.kernelconfig-"$version" \ - "$target"/target/linux/"$arch"/config-"$version" - board_prebuild shopt -s globstar nullglob @@ -247,9 +241,6 @@ config() { "openwrt") make menuconfig ;; - "kernel") - make kernel_menuconfig - ;; esac save="" @@ -266,11 +257,6 @@ config() { echo "#" >> "$opath"/bsp/"$machine"/.config ./scripts/diffconfig.sh >> "$opath"/bsp/"$machine"/.config ;; - "kernel") - arch=$(awk -F= '/^CONFIG_TARGET_BOARD/{gsub(/"/,"",$2); print $2;}' "$opath"/bsp/"$machine"/.config) - version=$(awk '/^CONFIG_LINUX/ { sub(/CONFIG_LINUX_/,""); sub(/=y/,""); gsub(/_/,"."); print; }' "$opath"/bsp/"$machine"/.config) - grep '^CON\|^# CON' target/linux/"$arch"/config-"$version" | sort > "$opath"/bsp/"$machine"/.kernelconfig-"$version" - ;; esac fi @@ -383,13 +369,10 @@ case "$1" in openwrt) config openwrt ;; - kernel) - config kernel - ;; *) echo "This open the OpenWRT menuconfig dialog" echo - echo "Usage: $0 $1 openwrt|kernel" + echo "Usage: $0 $1 openwrt" ;; esac ;; @@ -418,7 +401,7 @@ case "$1" in echo " selectcommunity [communityfile]" echo " selectbsp [bsp file]" echo " prepare" - echo " config " + echo " config " echo " build []" echo " buildall []" echo " clean"