Archived
1
0
Fork 0

[Patches] Notify of config changes in menuconfig patch

This commit is contained in:
Ryze 2023-10-06 21:03:35 +03:00
parent 4e26f22015
commit d50bf3d5c8
Signed by: ryze
GPG key ID: 9B296C5CEAEAAAC1

View file

@ -30,12 +30,53 @@ diff --git a/trunk/build_firmware.sh b/trunk/build_firmware.sh
index aed97190d0..f681f1bca7 100755 index aed97190d0..f681f1bca7 100755
--- a/trunk/build_firmware.sh --- a/trunk/build_firmware.sh
+++ b/trunk/build_firmware.sh +++ b/trunk/build_firmware.sh
@@ -72,6 +72,20 @@ func_disable_busybox_param()
fi
}
+func_print_config_changes()
+{
+ echo $1
+ echo "---------"
+ diff --changed-group-format='%>' --unchanged-group-format='' "$2" "$3"
+ echo "---------"
+}
+
+func_wait_for_user()
+{
+ read -s -n 1 -p "Press any key to continue..."
+ echo
+}
+
if [ ! -f "$ROOTDIR/.config" ] ; then
echo "Project config file .config not found! Terminate."
exit 1
@@ -535,5 +535,7 @@ fi @@ -535,5 +535,7 @@ fi
####################################################################### #######################################################################
echo --------------------------MAKE-DEP-------------------------------- echo --------------------------MAKE-DEP--------------------------------
make dep make dep
+
+echo --------------------------MAKE-MENUCONFIG------------------------- +echo --------------------------MAKE-MENUCONFIG-------------------------
+echo "Please review the changes and make sure they don't conflict with router config."
+func_wait_for_user
+
+orig_kernel_tf="${ROOTDIR}/kernel.orig"
+orig_busybox_tf="${ROOTDIR}/busybox.orig"
+
+cp "$kernel_tf" "$orig_kernel_tf"
+cp "$busybox_tf" "$orig_busybox_tf"
+
+make menuconfig +make menuconfig
+
+func_print_config_changes "Kernel changes:" "$orig_kernel_tf" "$kernel_tf"
+func_wait_for_user
+
+func_print_config_changes "Busybox changes:" "$orig_busybox_tf" "$busybox_tf"
+func_wait_for_user
+
+rm "$orig_kernel_tf"
+rm "$orig_busybox_tf"
+
echo --------------------------MAKE-ALL-------------------------------- echo --------------------------MAKE-ALL--------------------------------
make make
diff --git a/trunk/libc/Makefile b/trunk/libc/Makefile diff --git a/trunk/libc/Makefile b/trunk/libc/Makefile