diff --git a/.gitignore b/.gitignore index 24b051f..11294af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/kernel-rt-3.10.0-327.10.1.rt56.211.tar.xz +SOURCES/kernel-rt-3.10.0-327.13.1.rt56.216.tar.xz SOURCES/rheldup3.x509 SOURCES/rhelkpatch1.x509 diff --git a/.kernel-rt.metadata b/.kernel-rt.metadata index 65b1bb8..66daf19 100644 --- a/.kernel-rt.metadata +++ b/.kernel-rt.metadata @@ -1,3 +1,3 @@ -2c99997eb09d6ef71e4baa10351639b6582cd7ac SOURCES/kernel-rt-3.10.0-327.10.1.rt56.211.tar.xz +4b97157134d556d56cff2c9b5c4be1109540aea6 SOURCES/kernel-rt-3.10.0-327.13.1.rt56.216.tar.xz 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec index 94bce1e..f91a488 100644 --- a/SPECS/kernel-rt.spec +++ b/SPECS/kernel-rt.spec @@ -8,10 +8,10 @@ Summary: The Linux Realtime kernel %global __spec_install_pre %{___build_pre} # realtimeN -%global rtbuild 211 +%global rtbuild 216 # RHEL7 build number -%global rhel_build 327.10.1 +%global rhel_build 327.13.1 # The preempt RT patch level %global rttag rt56 @@ -52,7 +52,7 @@ Summary: The Linux Realtime kernel # Verbose output? -#%global verbose V=1 +#%%global verbose V=1 # use dracut or mkinitrd? %global use_dracut %{with dracut} @@ -64,12 +64,12 @@ Summary: The Linux Realtime kernel # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -# % define buildid .local +# %%define buildid .local %global rhel 1 %if %{rhel} %global distro_build 0 -### %global signmodules 1 +### %%global signmodules 1 %global signmodules 1 %else # fedora_build defines which build revision of this kernel version we're @@ -122,7 +122,7 @@ Summary: The Linux Realtime kernel %global pkg_release_simple %{rhel_build}.%{rttag}.%{rtbuild} -%global pkg_release %{pkg_release_simple}%{?dist}%{?buildid} +%global pkg_release %{pkg_release_simple}%{?buildid}%{?dist} %global KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu} @@ -212,7 +212,7 @@ Summary: The Linux Realtime kernel %define listnewconfig_fail 1 # To temporarily exclude an architecture from being built, add it to -# %nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we +# %%nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we # don't build kernel-headers then the new build system will no longer let # us use the previous build of that package -- it'll just be completely AWOL. # Which is a BadThing(tm). @@ -398,9 +398,9 @@ BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root # Override find_provides to use a script that provides "kernel(symbol) = hash". # Pass path of the RPM temp dir containing kabideps to find-provides script. -# %global _use_internal_dependency_generator 0 -# %global __find_provides %_sourcedir/find-provides %{_tmppath} -# %global __find_requires /usr/lib/rpm/redhat/find-requires kernel +# %%global _use_internal_dependency_generator 0 +# %%global __find_provides %_sourcedir/find-provides %{_tmppath} +# %%global __find_requires /usr/lib/rpm/redhat/find-requires kernel %description The kernel-rt package contains the Linux kernel (vmlinuz), the core of any @@ -481,6 +481,7 @@ Summary: KVM modules for package %{name}%{?1:-%{1}}\ Group: System Environment/Kernel\ Requires: %{name} = %{version}-%{release}\ AutoReq: no\ +Provides: %{name}%{?1:-%{1}}-kvm = %{version}-%{release}\ %description -n %{name}%{?1:-%{1}}-kvm\ This package provides KVM modules for package %{name}%{?1:-%{1}}.\ %{nil} @@ -493,7 +494,7 @@ This package provides KVM modules for package %{name}%{?1:-%{1}}.\ %package %{?1:%{1}-}kvm-debuginfo\ Summary: Debug information for package %{name}%{?1:-%{1}}-kvm\ Group: Development/Debug\ -Provides: %{name}%{?1:-%{1}}-kvm-debuginfo-%{_target_cpu} = %{version}-%{release}\ +Provides: %{name}%{?1:-%{1}}-kvm-debuginfo = %{version}-%{release}\ AutoReqProv: no\ %description -n %{name}%{?1:-%{1}}-kvm-debuginfo\ This package provides debug information for package %{name}%{?1:-%{1}}.\ @@ -1043,7 +1044,7 @@ cd linux-%{kversion}.%{_target_cpu} # variables set in the specfile during the RPM build process. # # Commit 32b3809 was reverted and the new solution will be applying -# those changes at the %build section of the specfile. +# those changes at the %%build section of the specfile. patch -p1 < $RPM_SOURCE_DIR/avoid-debuginfo-hash-collision-scripts.patch > /dev/null %if %{builddebug} @@ -1058,7 +1059,6 @@ BuildKernel %make_target %kernel_image trace BuildKernel %make_target %kernel_image vanilla %endif -# maybe %if %{buildrt} %if %{buildrt} BuildKernel %make_target %kernel_image %endif @@ -1333,7 +1333,7 @@ depmod %{KVERREL}%{?1:.%{1}} || exit $?\ %kernel_kvm_variant_postun %if %{with debug} -# kernel-rt-debug %post script +# kernel-rt-debug %%post script %kernel_variant_preun debug %kernel_variant_post -v debug %kernel_kvm_variant_post debug @@ -1341,7 +1341,7 @@ depmod %{KVERREL}%{?1:.%{1}} || exit $?\ %endif %if %{with trace} -# kernel-rt-trace %post script +# kernel-rt-trace %%post script %kernel_variant_preun trace %kernel_variant_post -v trace %kernel_kvm_variant_post trace @@ -1349,7 +1349,7 @@ depmod %{KVERREL}%{?1:.%{1}} || exit $?\ %endif %if %{with vanilla} -# kernel-rt-vanilla %post script +# kernel-rt-vanilla %%post script %kernel_variant_preun vanilla %kernel_variant_post -v vanilla %kernel_kvm_variant_post vanilla @@ -1490,6 +1490,23 @@ fi %endif %changelog +* Mon Feb 29 2016 Luis Claudio R. Goncalves [3.10.0-327.13.1.rt56.216.el7_2] +- [rt] merged kernel-3.10.0-327.13.1.el7 [1311476] + +* Fri Feb 26 2016 Luis Claudio R. Goncalves [3.10.0-327.12.1.rt56.215.el7_2] +- [rt] softirq: split timer softirqs out of ksoftirqd (1306962) + +* Wed Feb 24 2016 Luis Claudio R. Goncalves [3.10.0-327.12.1.rt56.214.el7_2] +- [rt] merged kernel-3.10.0-327.12.1.el7 [1311476] +- [rt] fix: scheduling while in atomic on mount rootfs (Daniel Bristot)[1304862] +- [rt] fcoe: fix mismatch of get_cpu() and put_cpu_light() (Steven Rostedt) [1306958] + +* Fri Jan 29 2016 Luis Claudio R. Goncalves [3.10.0-327.11.1.rt56.213.el7_2] +- [rt] merged kernel-3.10.0-327.11.1.el7 [1282591] + +* Tue Jan 26 2016 Luis Claudio R. Goncalves [3.10.0-327.10.2.rt56.212.el7_2] +- [rt] merged kernel-3.10.0-327.10.2.el7 [1282591] + * Mon Jan 25 2016 Luis Claudio R. Goncalves [3.10.0-327.10.1.rt56.211.el7_2] - [rt] merged kernel-3.10.0-327.10.1.el7 [1282591]