remove diffing and use target "olddefconfig" to prevent "Restart config ..."
This commit is contained in:
parent
ee145ff218
commit
93a52b3a39
15
master.inc
15
master.inc
@ -24,12 +24,12 @@ Requires: linux-firmware
|
|||||||
|
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
%global build_arch arm64
|
%global build_arch arm64
|
||||||
%global make_targets Image.gz modules dtbs
|
%global make_targets olddefconfig Image.gz modules dtbs
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch riscv64
|
%ifarch riscv64
|
||||||
%global build_arch riscv64
|
%global build_arch riscv64
|
||||||
%global make_targets Image.gz modules dtbs
|
%global make_targets olddefconfig Image.gz modules dtbs
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global make make -j$(( $(nproc) + 2 )) KERNELRELEASE=%{KVERREL}
|
%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/
|
rm -rf kernel-tfg/
|
||||||
./configure-linux.sh
|
./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
|
if [[ "%{name}" =~ 'opi5' ]]; then
|
||||||
sed -i 's@KBUILD_IMAGE := $(boot)/Image.gz@KBUILD_IMAGE := $(boot)/Image@' arch/arm64/Makefile
|
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
|
fi
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
Loading…
Reference in New Issue
Block a user