Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-09-07 11:08:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2014-08-30 16:04:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-09-07 11:08:25.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Sep 3 13:37:45 CEST 2014 - [email protected] + +- rpm/kernel-source.spec.in: Create a kernel-macros package with the KMP macros + This package does not have multiversion(kernel) and is not built in the + -rt tree (bnc#867595). +- commit 9b6a6fe + +------------------------------------------------------------------- +Wed Sep 3 10:56:44 CEST 2014 - [email protected] + +- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595) +- commit deb25bc + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -27,9 +27,9 @@ Group: Documentation/Man Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif BuildRequires: docbook-toys BuildRequires: docbook-utils ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -47,9 +47,9 @@ Group: SLES Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif %description kernel-obs-qa-xen.spec: same change kernel-obs-qa.spec: same change ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif Url: http://www.kernel.org/ BuildRequires: bc ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -32,9 +32,9 @@ Group: Development/Sources Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif Url: http://www.kernel.org/ AutoReqProv: off @@ -132,13 +132,25 @@ AutoReqProv: off Provides: kernel-devel%variant = %version-%source_rel Provides: multiversion(kernel) +Requires: kernel-macros %description -n kernel-devel%variant Kernel-level headers and Makefiles required for development of external kernel modules. +%source_timestamp + +%package -n kernel-macros +Summary: RPM macros for building Kernel Module Packages +Group: Development/Sources +# Note: This does not provide multiversion(kernel) nor is its name decorated +# with the variant (-rt) + +%description -n kernel-macros +This package provides the rpm macros and templates for Kernel Module Pakcages %source_timestamp + %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. Group: Development/Sources @@ -151,6 +163,7 @@ %source_timestamp + %prep echo "Symbol(s): %symbols" @@ -199,16 +212,18 @@ %install %if ! %vanilla_only # Install the documentation and example Kernel Module Package. -DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name -mkdir -p $DOC -cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt $DOC -ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/ +DOC=/usr/share/doc/packages/%name-%kernelrelease +mkdir -p %buildroot/$DOC +cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt %buildroot/$DOC +ln -s $DOC/README.SUSE %buildroot/%src_install_dir/ +%if "%variant" == "" install -m 755 -d $RPM_BUILD_ROOT/etc/rpm install -m 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/ install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm install -m 644 %_sourcedir/kernel-{module,cert}-subpackage \ $RPM_BUILD_ROOT/usr/lib/rpm/ +%endif for script in post; do sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ @@ -240,11 +255,17 @@ %files -n kernel-devel%variant -f devel.files %defattr(-,root,root) %ghost /usr/src/linux%variant -/usr/share/doc/packages/%name +%doc /usr/share/doc/packages/* + +%if "%variant" == "" +%files -n kernel-macros +%defattr(-,root,root) /etc/rpm/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage %endif +%endif + %if %do_vanilla %files vanilla ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -27,9 +27,9 @@ Version: 3.16.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -61,9 +61,9 @@ Group: System/Kernel Version: 3.16.1 %if 0%{?is_kotd} -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %else -Release: <RELEASE>.g90bc0f1 +Release: <RELEASE>.g2ab6585 %endif Url: http://www.kernel.org/ BuildRequires: bc kernel-xen.spec: same change ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:30.000000000 +0200 @@ -132,13 +132,25 @@ AutoReqProv: off Provides: kernel-devel%variant = %version-%source_rel Provides: multiversion(kernel) +Requires: kernel-macros %description -n kernel-devel%variant Kernel-level headers and Makefiles required for development of external kernel modules. +%source_timestamp + +%package -n kernel-macros +Summary: RPM macros for building Kernel Module Packages +Group: Development/Sources +# Note: This does not provide multiversion(kernel) nor is its name decorated +# with the variant (-rt) + +%description -n kernel-macros +This package provides the rpm macros and templates for Kernel Module Pakcages %source_timestamp + %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. Group: Development/Sources @@ -151,6 +163,7 @@ %source_timestamp + %prep echo "Symbol(s): %symbols" @@ -199,16 +212,18 @@ %install %if ! %vanilla_only # Install the documentation and example Kernel Module Package. -DOC=$RPM_BUILD_ROOT/usr/share/doc/packages/%name -mkdir -p $DOC -cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt $DOC -ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/ +DOC=/usr/share/doc/packages/%name-%kernelrelease +mkdir -p %buildroot/$DOC +cp %_sourcedir/README.SUSE %_sourcedir/config-options.changes.txt %buildroot/$DOC +ln -s $DOC/README.SUSE %buildroot/%src_install_dir/ +%if "%variant" == "" install -m 755 -d $RPM_BUILD_ROOT/etc/rpm install -m 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/ install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm install -m 644 %_sourcedir/kernel-{module,cert}-subpackage \ $RPM_BUILD_ROOT/usr/lib/rpm/ +%endif for script in post; do sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ @@ -240,11 +255,17 @@ %files -n kernel-devel%variant -f devel.files %defattr(-,root,root) %ghost /usr/src/linux%variant -/usr/share/doc/packages/%name +%doc /usr/share/doc/packages/* + +%if "%variant" == "" +%files -n kernel-macros +%defattr(-,root,root) /etc/rpm/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage %endif +%endif + %if %do_vanilla %files vanilla ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.wx3XCL/_old 2014-09-07 11:08:31.000000000 +0200 +++ /var/tmp/diff_new_pack.wx3XCL/_new 2014-09-07 11:08:31.000000000 +0200 @@ -1,3 +1,3 @@ -2014-08-27 16:52:25 +0200 -GIT Revision: 90bc0f1c2238b9aec5a78d9c76dc9663e8fa0316 +2014-09-03 16:16:22 +0200 +GIT Revision: 2ab65856e31615961771d3a3f9ec60b3ef0e6eec GIT Branch: stable -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
