kernel: Remove usage of oldnoconfig

This is going to be dropped with 4.19

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index b6a82dcb2b7f05aa305478746f88b2562148868b..d79dd8b77a2bb3b13388800aceac7adc8fc9f599 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -165,7 +165,7 @@ build
                        cat .config
 
                        # Run the build.
-                       make ARCH=%{kernel_arch} oldnoconfig >/dev/null
+                       make ARCH=%{kernel_arch} olddefconfig >/dev/null
                        make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \
                                %{kernel_build_flags} %{PARALLELISMFLAGS}
 

diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 7ce8ed5625d0d03d7c7ad39cb25f96f6b7f19fdb..11954c8f4a0b2043d097f4cf7d24f49704df8672 100755 (executable)
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -84,7 +84,7 @@ function merge_config() {
                fi
        done
 
-       local config_mode="oldnoconfig"
+       local config_mode="olddefconfig"
        local extra_configs
        while [ $# -gt 0 ]; do
                case "${1}" in
@@ -138,7 +138,7 @@ function merge_config() {
        done
 
        if [ "${config_mode}" != "none" ]; then
-               echo "Running 'make oldnoconfig' for ${arch} (${flavour})..."
+               echo "Running 'make olddefconfig' for ${arch} (${flavour})..."
                local kernel_arch="$(get_kernel_arch "${arch}")"
                (
                        cd ${KERNEL_DIR}
@@ -171,9 +171,9 @@ function make_oldconfig() {
                echo "You may now edit the configuration..."
 
                local option
-               select option in oldconfig menuconfig oldnoconfig startover quit; do
+               select option in oldconfig menuconfig olddefconfig startover quit; do
                        case "${option}" in
-                               oldconfig|menuconfig|oldnoconfig)
+                               oldconfig|menuconfig|olddefconfig)
                                        make ARCH=${kernel_arch} ${option}
                                        ;;
                                startover)