From 5e82d2632a006b355ca0330545d608822c54a1ac Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Tue, 17 Oct 2023 09:01:33 +0530 Subject: [PATCH] "cleanup" --- master.inc | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/master.inc b/master.inc index 03b0da6..13ee88a 100644 --- a/master.inc +++ b/master.inc @@ -95,17 +95,13 @@ export LLVM=1 AR=llvm-ar CC=clang HOSTAR=llvm-ar HOSTCC=clang HOSTCXX=clang++ HO [ -f .config ] && rm -vf .config* %{make} distclean -cp %{SOURCE3} .config +%{make} defconfig tar -xf %{SOURCE2} -C . cp -vr kernel-tfg/{configure-linux.sh,extra-configs} . rm -rf kernel-tfg/ ./configure-linux.sh -%{make} savedefconfig -cp defconfig arch/%{build_arch}/configs/defconfig -%{make} defconfig - %build %{make} PYTHON=%{__python3} %{make_targets} @@ -150,15 +146,13 @@ mkdir -p %{buildroot}/usr/src/kernels/%{KVERREL} if [ -f scripts/package/install-extmod-build ]; then %{make} run-command KBUILD_RUN_COMMAND='%{_builddir}/%{src_dir}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KVERREL}' else - touch %{buildroot}/usr/src/kernels/%{KVERREL}/MAYBE_THIS_WORKS + touch %{buildroot}/usr/src/kernels/%{KVERREL}/EMPTY fi %clean rm -rf %{buildroot} %post -set -xeuf -o pipefail - if [ -x /sbin/installkernel -a -r /boot/vmlinuz-%{KVERREL} -a -r /boot/System.map-%{KVERREL} ]; then cp /boot/vmlinuz-%{KVERREL} /boot/.vmlinuz-%{KVERREL}-rpm cp /boot/System.map-%{KVERREL} /boot/.System.map-%{KVERREL}-rpm @@ -167,24 +161,7 @@ if [ -x /sbin/installkernel -a -r /boot/vmlinuz-%{KVERREL} -a -r /boot/System.ma rm -f /boot/.vmlinuz-%{KVERREL}-rpm /boot/.System.map-%{KVERREL}-rpm fi -# we pushd into /boot because we want our symlinks to be -# vmlinuz -> vmlinuz-6.6.0-20231004.6.el9.aarch64 -# and not -# vmlinuz -> /boot/vmlinuz-6.6.0-20231004.6.el9.aarch64 -pushd /boot -rm -rvf dtb initramfs.img System.map vmlinuz -ln -s dtb-%{KVERREL} dtb -ln -s initramfs-%{KVERREL}.img initramfs.img -ln -s System.map-%{KVERREL} System.map -ln -s vmlinuz-%{KVERREL} vmlinuz -popd - %preun -# remove symlinks -rm -vf /boot/initramfs.img -rm -vf /boot/System.map -rm -vf /boot/vmlinuz - if [ -x /sbin/new-kernel-pkg ]; then new-kernel-pkg --remove %{KVERREL} --rminitrd --initrdfile=/boot/initramfs-%{KVERREL}.img elif [ -x /usr/bin/kernel-install ]; then