diff --git a/guards b/guards index 77644bcf..c8c34387 100644 --- a/guards +++ b/guards @@ -36,20 +36,6 @@ sub files_in($$); sub parse($$); sub help(); -#sub strip_ext($) { -# local ($_) = @_; -# s/\.(diff?|patch)$//; -#} - -#sub try_ext($) { -# my ($path) = @_; -# for my $p in (($path, "$path.diff", "$path.dif", "$path.patch")) { -# return $p -# if (-f $p); -# } -# return undef; -#} - sub slashme($) { my ($dir) = @_; $dir =~ s#([^/])$#$&/#; # append a slash if necessary @@ -260,7 +246,6 @@ F [--prefix=F] [--path=F] [--default=<0|1>] [--check|--list] [--invert-match] [--with-guards] [--config=] I ... - =head1 DESCRIPTION The script reads a configuration file that may contain so-called guards, file @@ -293,10 +278,10 @@ The I<--check> option is used to compare the specification file against the file system. If files are referenced in the specification that do not exist, or if files are not enlisted in the specification file warnings are printed. The I<--path> option can be used to specify which directory or directories to scan. -Multiple directories are eparated by a colon (C<:>) character. The +Multiple directories are separated by a colon (C<:>) character. The I<--prefix> option specifies the location of the files. -Use I<--list> to list all files independend of any rules. Use I<--invert-match> +Use I<--list> to list all files independent of any rules. Use I<--invert-match> to list only the excluded patches. Use I<--with-guards> to also include all inclusion and exclusion rules. diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index b6468415..e5875f7e 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -223,7 +223,7 @@ Provides: ath3k-firmware = 1.0 %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-cubox.changes b/kernel-cubox.changes index a38e4529..6e40752a 100644 --- a/kernel-cubox.changes +++ b/kernel-cubox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-cubox.spec b/kernel-cubox.spec index 00fee909..0dfbbf8c 100644 --- a/kernel-cubox.spec +++ b/kernel-cubox.spec @@ -61,7 +61,7 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -146,9 +146,10 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -299,7 +300,7 @@ the SolidRun Cubox. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-debug.changes b/kernel-debug.changes index a38e4529..6e40752a 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index d39686fd..1d987a0c 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -61,7 +61,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -149,9 +149,10 @@ Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -302,7 +303,7 @@ Only use this kernel when investigating problems. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-default.changes b/kernel-default.changes index a38e4529..6e40752a 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 692fe4fa..ff466dfa 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -61,7 +61,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -161,9 +161,10 @@ Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -313,7 +314,7 @@ The standard kernel for both uniprocessor and multiprocessor systems. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-desktop.changes b/kernel-desktop.changes index a38e4529..6e40752a 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 019adf18..c0db815e 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -61,7 +61,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -146,9 +146,10 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -311,7 +312,7 @@ that support it, regardless of the amount of main memory. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-docs.changes b/kernel-docs.changes index a38e4529..6e40752a 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index a66a9759..ed3fb1af 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -26,7 +26,7 @@ Name: kernel-docs Summary: Kernel Documentation Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif diff --git a/kernel-exynos.changes b/kernel-exynos.changes index a38e4529..6e40752a 100644 --- a/kernel-exynos.changes +++ b/kernel-exynos.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-exynos.spec b/kernel-exynos.spec index c4fc8551..a13e2941 100644 --- a/kernel-exynos.spec +++ b/kernel-exynos.spec @@ -61,7 +61,7 @@ Name: kernel-exynos Summary: Kernel for Samsung's Exynos SoC Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -146,9 +146,10 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -298,7 +299,7 @@ The standard kernel for Samsung's Exynos 4 & 5 SoC, as found in the Origen board %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-lpae.changes b/kernel-lpae.changes index a38e4529..6e40752a 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 2abaf46f..2c0a379d 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -61,7 +61,7 @@ Name: kernel-lpae Summary: Kernel for LPAE enabled systems Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -146,9 +146,10 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -299,7 +300,7 @@ Cortex A15 based SoCs, like the Exynos5, OMAP5 or Calxeda ECX-2000. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-pae.changes b/kernel-pae.changes index a38e4529..6e40752a 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 98efdc27..059accfd 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -61,7 +61,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -151,9 +151,10 @@ Provides: kernel-vmi = 2.6.38 Obsoletes: kernel-vmi <= 2.6.38 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -310,7 +311,7 @@ that support it, regardless of the amount of main memory. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-source.changes b/kernel-source.changes index a38e4529..6e40752a 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 4a4acfc8..c118dcb1 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -45,9 +45,10 @@ Requires(post): coreutils sed Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -148,10 +149,6 @@ Vanilla Linux kernel sources with minor build fixes. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then - echo "Please get a copy of linux-%srcversion.tar.bz2 from" \ - "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/." -fi echo "Symbol(s): %symbols" @@ -163,7 +160,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/src cd $RPM_BUILD_ROOT/usr/src # Unpack the vanilla kernel sources -tar -xjf %_sourcedir/linux-%srcversion.tar.bz2 +tar -xf %{S:0} if test "%srcversion" != "%kernelrelease%variant"; then mv linux-%srcversion linux-%kernelrelease%variant fi diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 6d476a2f..2c3821e7 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -45,9 +45,10 @@ Requires(post): coreutils sed Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: @TARBALL_URL@linux-%srcversion.tar.bz2 +Source0: @TARBALL_URL@linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -148,10 +149,6 @@ Vanilla Linux kernel sources with minor build fixes. %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then - echo "Please get a copy of linux-%srcversion.tar.bz2 from" \ - "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/." -fi echo "Symbol(s): %symbols" @@ -163,7 +160,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/src cd $RPM_BUILD_ROOT/usr/src # Unpack the vanilla kernel sources -tar -xjf %_sourcedir/linux-%srcversion.tar.bz2 +tar -xf %{S:0} if test "%srcversion" != "%kernelrelease%variant"; then mv linux-%srcversion linux-%kernelrelease%variant fi diff --git a/kernel-syms.changes b/kernel-syms.changes index a38e4529..6e40752a 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index bb2953be..cb15ac1e 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -26,7 +26,7 @@ Summary: Kernel Symbol Versions (modversions) Version: 3.13.rc6 %if %using_buildservice %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif diff --git a/kernel-trace.changes b/kernel-trace.changes index a38e4529..6e40752a 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index 8ad5d544..5ff78264 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -61,7 +61,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -149,9 +149,10 @@ Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -301,7 +302,7 @@ This kernel has different tracing features enabled (e.g. utrace, ftrace). %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index a38e4529..6e40752a 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 3 11:40:27 CET 2014 - mmarek@suse.cz + +- Switch to linux-*.tar.xz +- commit cdd7212 + +------------------------------------------------------------------- +Fri Jan 3 11:01:58 CET 2014 - mmarek@suse.cz + +- Add support for linux-*.tar.xz to the spec files +- commit d12c880 + ------------------------------------------------------------------- Thu Jan 2 17:01:46 CET 2014 - agraf@suse.de @@ -137,6 +149,24 @@ Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de Already included since kernel 3.11 (WARN calls dump_stack.) - commit 8e04564 +------------------------------------------------------------------- +Wed Dec 11 18:55:53 CET 2013 - jdelvare@suse.de + +- rpm/guards: Spelling fix +- commit 2e074cb + +------------------------------------------------------------------- +Wed Dec 11 18:55:24 CET 2013 - jdelvare@suse.de + +- rpm/guards: Delete dead code +- commit 98077a9 + +------------------------------------------------------------------- +Wed Dec 11 18:24:25 CET 2013 - jdelvare@suse.de + +- rpm/guards: Typo fix from upstream +- commit ce654f8 + ------------------------------------------------------------------- Wed Dec 11 02:46:26 CET 2013 - stefan.bruens@rwth-aachen.de @@ -165,6 +195,12 @@ Sun Dec 8 20:02:23 CET 2013 - jeffm@suse.com - Update to 3.13-rc3. - commit 82b4383 +------------------------------------------------------------------- +Fri Dec 6 16:56:31 CET 2013 - mmarek@suse.cz + +- rpm/kernel-source.spec.in: Add the OBS _constraints file as source +- commit 17282e4 + ------------------------------------------------------------------- Wed Dec 4 20:20:22 CET 2013 - jeffm@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index fc130bbd..9450efa7 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -61,7 +61,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 3.13.rc6 %if 0%{?is_kotd} -Release: .g0d77ece +Release: .gcdd7212 %else Release: 0 %endif @@ -146,9 +146,10 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc +Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -298,7 +299,7 @@ The standard kernel - without any SUSE patches %source_timestamp %prep -if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then +if ! [ -e %{S:0} ]; then echo "The %name-%version.nosrc.rpm package does not contain the" \ "complete sources. Please install kernel-source-%version.src.rpm." exit 1 diff --git a/linux-3.13-rc6.tar.xz b/linux-3.13-rc6.tar.xz new file mode 100644 index 00000000..7eb75699 --- /dev/null +++ b/linux-3.13-rc6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c34ee17df9a98adcfe8e043ac3cb2cc63ea3500d973c16a161636a188e186411 +size 79643636 diff --git a/mkspec b/mkspec index d6aab7b1..4f698185 100644 --- a/mkspec +++ b/mkspec @@ -47,9 +47,9 @@ $rpmversion =~ s/-/./g; $rpmrelease =~ s/-/./g; my $sources = join("", $templates{source} =~ /\nSource\d+:[^\n]*/mg); -# Find all SourceN: foo.tar.bz2 lines and generate the NoSource: +# Find all SourceN: foo.tar.(bz2|xz) lines and generate the NoSource: # lines and the %setup line -my @tarballs = ($sources =~ /\nSource(\d+):[^\n]*\.tar\.bz2/mg); +my @tarballs = ($sources =~ /\nSource(\d+):[^\n]*\.tar\.(?:bz2|xz)/mg); my $nosource = join("\n", map { "NoSource: $_" } @tarballs); # Source0 (the linux tarball) is unpacked manually @tarballs = grep { $_ > 0 } @tarballs; diff --git a/source-timestamp b/source-timestamp index 26da9b7a..1ac247b0 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2014-01-02 17:02:09 +0100 -GIT Revision: 0d77ece0e0932f610f58aed14f65b92005af4444 +2014-01-03 11:40:27 +0100 +GIT Revision: cdd7212d933e0700ee8df2cece48208e6347e905 GIT Branch: master