diff options
-rwxr-xr-x | kernel.spec | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/kernel.spec b/kernel.spec index 66080da8b..006ada077 100755 --- a/kernel.spec +++ b/kernel.spec @@ -119,6 +119,8 @@ Summary: The Linux kernel %endif # define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.1 %if 0%{?fedora} @@ -126,6 +128,8 @@ Summary: The Linux kernel %else %define primary_target rhel %endif +%define fedorabase 5.16.3 + # The kernel tarball/base version %define kversion 5.16 @@ -138,7 +142,7 @@ Summary: The Linux kernel %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 200%{?buildid}%{?dist} +%define specrelease 225%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -155,7 +159,7 @@ Summary: The Linux kernel # kernel PAE (only valid for ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug -%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} # kernel-zfcpdump (s390 specific kernel for zfcpdump) %define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1} # kernel-doc @@ -206,7 +210,7 @@ Summary: The Linux kernel %define with_cross %{?_with_cross: 1} %{?!_with_cross: 0} # # build a release kernel on rawhide -%define with_release %{?_with_release: 1} %{?!_with_release: 0} +%define with_release %{?_without_release: 0} %{?!_without_release: 1} # verbose build, i.e. no silent rules and V=1 %define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} @@ -224,7 +228,7 @@ Summary: The Linux kernel %define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1} # Want to build a vanilla kernel build without any non-upstream patches? -%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} +%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -831,8 +835,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{fedorabase}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{fedorabase}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -1390,7 +1394,7 @@ ApplyOptionalPatch() mv linux-5.16.4 linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1401,6 +1405,8 @@ ApplyOptionalPatch linux-kernel-test.patch # END OF PATCH APPLICATIONS +head Makefile + # Any further pre-build tree manipulations happen here. chmod +x scripts/checkpatch.pl @@ -1735,7 +1741,6 @@ BuildKernel() { (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) # dirs for additional modules per module-init-tools, kbuild/modules.txt mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of # testing so just delete find . -name *.h.s -delete @@ -2675,12 +2680,6 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ -%if 0%{!?fedora:1}\ -if [ -x %{_sbindir}/weak-modules ]\ -then\ - %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ -fi\ -%endif\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2710,10 +2709,6 @@ fi}\ %define kernel_variant_preun() \ %{expand:%%preun %{?1:%{1}-}core}\ /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ -if [ -x %{_sbindir}/weak-modules ]\ -then\ - %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ -fi\ %{nil} %kernel_variant_preun @@ -2928,7 +2923,6 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/build\ /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ -/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/crashkernel.default\ /lib/modules/%{KVERREL}%{?3:+%{3}}/systemtap\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ @@ -4213,6 +4207,14 @@ fi - redhat: bump RHEL_MAJOR and add the changelog file for it (Herton R. Krzesinski) - redhat: add documentation about the os-build rebase process (Herton R. Krzesinski) +* Sat Oct 20 2012 Thorsten Leemhuis <fedora@leemhuis.info> +- add buildid ".vanilla.knurd.1" +- switch defines to build + - a vanilla kernel without debuging + - no debug kernel and no debuginfo packages, to big to handle for me right now +- disable the variant macro as that adds "-vanilla" to %%name, which confuses + fedpkg and prevents installonly handling of packages in yum + # The following bit is important for automation so please do not remove # END OF CHANGELOG |