PKGBUILD

@@ -152,7 +152,9 @@ export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=${pkgbase}
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
-apply_patches() {
+prepare() {
+    cd "${_src_linux}" || exit 1
+    
     # Patch with kernel version patches
     patch -Np1 -i ../patch-${_kernel_major}.${_kernel_minor} || true
     
@@ -170,25 +172,7 @@ apply_patches() {
         
         patch -Np1 -i "${srcdir}/cl-linux/${i}" || true
     done
-}
     
-copy_defconfig() {
-    local _cur_major_ver="$(zcat /proc/config.gz | grep Linux | grep -o '[0-9]*[0-9]\.[0-9]*[0-9]')"
-    [[ ${_cur_major_ver} != ${_kernel_major} ]] &&
-        warning "Major version was updated, you should regen the defconfig"
-
-    if [[ -s /proc/config.gz ]]; then
-        # modprobe configs
-        zcat /proc/config.gz > ./.config
-        make ${BUILD_FLAGS[*]} olddefconfig
-    else
-        warning "Your kernel was not compiled with IKCONFIG_PROC."
-        warning "Unable to read kernel configuration, aborting."
-        exit
-    fi
-}
-
-create_defconfig() {
     # Copy configuration file (if found)
     if [ -f "${startdir}/kconfig" ]; then
         echo ":: Using configuration file \"${startdir}/kconfig\""
@@ -286,22 +270,18 @@ create_defconfig() {
     # Ask for subarch
     [[ -z "${_subarch}" ]] && make ${BUILD_FLAGS[*]} oldconfig
     
-    # Open configuration editors
-    [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
-    [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
-    [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
-
-    # Save configuration
-    [[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
-}
-
-prepare() {
-    cd "${_src_linux}" || exit 1
-
-    apply_patches
-    
-    [[ -n "${_use_current}" ]] && copy_defconfig
-    [[ -z "${_use_current}" ]] && create_defconfig
+    # Optionally use the configuration of the running kernel
+    # Written originally by nous, see
+    # https://web.archive.org/web/20110711231356/https://aur.archlinux.org/packages.php?ID=40191 (package doesn't exist anymore)
+    [[ -n "${_use_current}" ]] &&
+        if [[ -s /proc/config.gz ]]; then
+            # modprobe configs
+            zcat /proc/config.gz > ./.config
+        else
+            warning "Your kernel was not compiled with IKCONFIG_PROC."
+            warning "Unable to read kernel configuration, aborting."
+            exit
+        fi
     
     # Read and apply modprobed database
     # See https://aur.archlinux.org/packages/modprobed-db
@@ -314,6 +294,14 @@ prepare() {
     
     # Write kernel version
     make -s kernelrelease > version
+    
+    # Open configuration editors
+    [[ -n "$_makemenuconfig" ]] && make ${BUILD_FLAGS[*]} menuconfig
+    [[ -n "$_makexconfig" ]] && make ${BUILD_FLAGS[*]} xconfig
+    [[ -n "$_makenconfig" ]] && make ${BUILD_FLAGS[*]} nconfig
+
+    # Save configuration
+    [[ -n "${_copyfinalconfig}" ]] && cp -Tf ./.config "${startdir}/kconfig-new" || true
 }
 
 build() {