commit 2ab65856e31615961771d3a3f9ec60b3ef0e6eec

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=316
This commit is contained in:
Michal Marek 2014-09-04 06:03:33 +00:00 committed by Git OBS Bridge
parent 4e5b6f969b
commit 1c2d25572f
30 changed files with 278 additions and 40 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -27,9 +27,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -47,9 +47,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -38,9 +38,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -38,9 +38,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -32,9 +32,9 @@ License: GPL-2.0
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 @@ Group: Development/Sources
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 @@ Vanilla Linux kernel sources with minor build fixes.
%source_timestamp
%prep
echo "Symbol(s): %symbols"
@ -199,16 +212,18 @@ fi
%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 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
%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

View File

@ -132,13 +132,25 @@ Group: Development/Sources
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 @@ Vanilla Linux kernel sources with minor build fixes.
%source_timestamp
%prep
echo "Symbol(s): %symbols"
@ -199,16 +212,18 @@ fi
%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 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
%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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -27,9 +27,9 @@ Group: Development/Sources
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)

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Sep 3 13:37:45 CEST 2014 - mmarek@suse.cz
- 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 - mmarek@suse.cz
- rpm/kernel-source.spec.in: Install doc files in a versioned directory (bnc#867595)
- commit deb25bc
-------------------------------------------------------------------
Wed Aug 27 16:45:38 CEST 2014 - mmarek@suse.cz

View File

@ -61,9 +61,9 @@ License: GPL-2.0
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

View File

@ -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