From 93a52b3a39750d99295aa9cddfd5491cf1e30ad9 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Sun, 8 Oct 2023 21:20:09 +0530 Subject: [PATCH] remove diffing and use target "olddefconfig" to prevent "Restart config ..." --- master.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/master.inc b/master.inc index bb9de6b..71572be 100644 --- a/master.inc +++ b/master.inc @@ -24,12 +24,12 @@ Requires: linux-firmware %ifarch aarch64 %global build_arch arm64 -%global make_targets Image.gz modules dtbs +%global make_targets olddefconfig Image.gz modules dtbs %endif %ifarch riscv64 %global build_arch riscv64 -%global make_targets Image.gz modules dtbs +%global make_targets olddefconfig Image.gz modules dtbs %endif %global make make -j$(( $(nproc) + 2 )) KERNELRELEASE=%{KVERREL} @@ -102,18 +102,9 @@ cp -vr kernel-tfg/{configure-linux.sh,extra-configs} . rm -rf kernel-tfg/ ./configure-linux.sh -# "remake" the .config since './scripts/config' does not handle dependencies at all -make olddefconfig - -# diff for viewing later :) -# 0 means no diff /diff [1/4] -# 1 means diff -# 2 means trouble -diff .config .config.%{target_config} || echo "Diffing done" - if [[ "%{name}" =~ 'opi5' ]]; then sed -i 's@KBUILD_IMAGE := $(boot)/Image.gz@KBUILD_IMAGE := $(boot)/Image@' arch/arm64/Makefile - %global make_targets Image modules dtbs + %global make_targets olddefconfig Image modules dtbs fi %build