bump rel_ver to 3

This commit is contained in:
Pratham Patel 2023-09-13 05:44:25 +05:30
parent 5d94f622be
commit 4db5ca3a1b
No known key found for this signature in database
6 changed files with 22 additions and 21 deletions

View File

@ -1,6 +1,6 @@
# change version here # change version here
%global fake_ver 1 %global fake_ver 1
%global rel_ver 2 %global rel_ver 3
%global commit_id b034abfca55f329be85c37a84768775c60f52885 %global commit_id b034abfca55f329be85c37a84768775c60f52885
%global short_commit_id b034abfc %global short_commit_id b034abfc

View File

@ -1,5 +1,5 @@
# change version here # change version here
%global rel_ver 2 %global rel_ver 3
%global major_ver 6 %global major_ver 6
%global minor_ver 1 %global minor_ver 1
%global patch_ver 52 %global patch_ver 52

View File

@ -1,5 +1,5 @@
# change version here # change version here
%global rel_ver 2 %global rel_ver 3
%global next_snapshot_date 20230911 %global next_snapshot_date 20230911
Name: kernel-next-tfg Name: kernel-next-tfg

View File

@ -1,5 +1,5 @@
# change version here # change version here
%global rel_ver 2 %global rel_ver 3
%global major_ver 6 %global major_ver 6
%global minor_ver 6 %global minor_ver 6
%global rc_ver 1 %global rc_ver 1

View File

@ -1,5 +1,5 @@
# change version here # change version here
%global rel_ver 2 %global rel_ver 3
%global major_ver 6 %global major_ver 6
%global minor_ver 5 %global minor_ver 5
%global patch_ver 2 %global patch_ver 2

View File

@ -29,7 +29,6 @@ Requires: linux-firmware
%global make_targets Image.gz modules dtbs %global make_targets Image.gz modules dtbs
%endif %endif
%global kernel_image $(make -s image_name)
%global make make KERNELRELEASE=%{KVERREL} %global make make KERNELRELEASE=%{KVERREL}
Source2: https://git.thefossguy.com/enterprise-linux/kernel-tfg/archive/master.tar.gz Source2: https://git.thefossguy.com/enterprise-linux/kernel-tfg/archive/master.tar.gz
@ -106,13 +105,16 @@ verify_config
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/boot mkdir -p $RPM_BUILD_ROOT/boot
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KVERREL} mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KVERREL}
mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/systemtap mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/systemtap
# install the kernel
cp $(%{make} -s image_name) $RPM_BUILD_ROOT/boot/vmlinuz-%{KVERREL}
chmod 755 $RPM_BUILD_ROOT/boot/vmlinuz-%{KVERREL}
cp $RPM_BUILD_ROOT/boot/vmlinuz-%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/vmlinuz
# install DTBs # install DTBs
%ifarch aarch64 || riscv64 %ifarch aarch64 || riscv64
%{make} %{?_smp_mflags} dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/boot/dtb-%{KVERREL} %{make} %{?_smp_mflags} dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/boot/dtb-%{KVERREL}
@ -130,28 +132,25 @@ find arch/%{build_arch}/boot/dts -name '*.dtb' -type f -delete
%{make} %{?_smp_mflags} headers_install INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr %{make} %{?_smp_mflags} headers_install INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr
# install other key files too # install other key files too
cp System.map $RPM_BUILD_ROOT/boot/System.map-%{KVERREL} install -m 644 .config $RPM_BUILD_ROOT/boot/config-%{KVERREL}
cp .config $RPM_BUILD_ROOT/boot/config-%{KVERREL} install -m 644 .config $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/config
install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KVERREL}
install -m 644 System.map $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/System.map
# install the kernel # fix links
cp %{kernel_image} $RPM_BUILD_ROOT/boot/vmlinuz-%{KVERREL} rm -rf $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
chmod 755 $RPM_BUILD_ROOT/boot/vmlinuz-%{KVERREL} rm -rf $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/source
cp $RPM_BUILD_ROOT/boot/vmlinuz-%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/vmlinuz ln -fns /usr/src/kernels/%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
ln -fns /usr/src/kernels/%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/source
# cleanup of sorts # install actual Linux src to /usr/src/kernels/%{KVERREL}
EXCLUDES="--exclude=SCCS --exclude=BitKeeper --exclude=.svn \ EXCLUDES="--exclude=SCCS --exclude=BitKeeper --exclude=.svn \
--exclude=CVS --exclude=.pc --exclude=.hg --exclude=.git \ --exclude=CVS --exclude=.pc --exclude=.hg --exclude=.git \
--exclude=*vmlinux* --exclude=*.mod \ --exclude=*vmlinux* --exclude=*.mod \
--exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation \ --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation \
--exclude=.config.old --exclude=.missing-syscalls.d --exclude=*.s" --exclude=.config.old --exclude=.missing-syscalls.d --exclude=*.s"
rm -rf $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
rm -rf $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/source
mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL} mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}
tar cf - $EXCLUDES . | tar xf - -C $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL} tar cf - $EXCLUDES . | tar xf - -C $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}
pushd $RPM_BUILD_ROOT/lib/modules/%{KVERREL}
ln -fns /usr/src/kernels/%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
ln -fns /usr/src/kernels/%{KVERREL} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/source
popd
%{make} run-command KBUILD_RUN_COMMAND='${RPM_BUILD_DIR}/%{src_dir}/scripts/package/install-extmod-build $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}' %{make} run-command KBUILD_RUN_COMMAND='${RPM_BUILD_DIR}/%{src_dir}/scripts/package/install-extmod-build $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}'
%clean %clean
@ -190,5 +189,7 @@ fi
%files %files
%defattr (-, root, root) %defattr (-, root, root)
%exclude /lib/modules/%{KVERREL}/build
%exclude /lib/modules/%{KVERREL}/source
/lib/modules/%{KVERREL} /lib/modules/%{KVERREL}
/boot/* /boot/*