GIT Revision: ac568039358d552b509603fb1653f2aac95087e0

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7179
This commit is contained in:
Michal Marek 2011-12-15 06:01:30 +00:00 committed by Git OBS Bridge
parent e4b0b07d4d
commit 0c698e99ba
33 changed files with 139 additions and 20 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -135,7 +135,7 @@ Provides: kernel-kdump
Obsoletes: kernel-kdump
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -151,7 +151,7 @@ Provides: smp kernel-smp
Obsoletes: smp kernel-smp
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -135,7 +135,7 @@ Provides: kernel-bigsmp
Obsoletes: kernel-bigsmp
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -139,7 +139,7 @@ Provides: kernel-kdump
Obsoletes: kernel-kdump
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -135,7 +135,7 @@ Provides: kernel-32bit
Obsoletes: kernel-32bit
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -41,7 +41,7 @@ Requires(post): coreutils sed
Provides: multiversion(kernel)
Provides: linux
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -41,7 +41,7 @@ Requires(post): coreutils sed
Provides: multiversion(kernel)
Provides: linux
Provides: %name = %version-%source_rel
Source0: http://www.kernel.org/@FTP_DIRECTORY@/linux-%srcversion.tar.bz2
Source0: @TARBALL_URL@linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -143,7 +143,7 @@ Provides: kernel-64bit
Obsoletes: kernel-64bit
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -139,7 +139,7 @@ Provides: kernel-64bit
Obsoletes: kernel-64bit
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz
- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and
do not generate any URL for linux-next and vanilla snapshots.
- commit 1548daf
-------------------------------------------------------------------
Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz

View File

@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh

13
mkspec
View File

@ -65,15 +65,22 @@ my $unpack_patches = join(" ", map { "-a $_" } @tarballs);
my $scripts = join(",", grep { is_script($_) }
($sources =~ /\nSource\d+:\s*([^\s]*)/mg));
(my $major_version = $srcversion) =~ s/\..*//;
my $ftp_directory = "pub/linux/kernel/v$major_version.x";
my $tarball_url;
if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) {
$tarball_url = "http://www.kernel.org/pub/linux/kernel/v$1.x/";
$tarball_url .= "testing/" if $2;
} else {
# kernel.org has no tarballs for linux-next or vanilla snapshots
$tarball_url = "";
}
my %macros = (
VARIANT => $variant,
VANILLA_ONLY => $vanilla_only,
SRCVERSION => $srcversion,
PATCHVERSION => $patchversion,
RPMVERSION => $rpmversion,
FTP_DIRECTORY => $ftp_directory,
TARBALL_URL => $tarball_url,
RELEASE => $rpmrelease,
SOURCES => $sources,
NOSOURCE => $nosource,

View File

@ -1,3 +1,3 @@
2011-12-13 23:03:29 +0100
GIT Revision: d20736defed598704cae363f805d7eb26f280384
2011-12-14 13:52:37 +0100
GIT Revision: ac568039358d552b509603fb1653f2aac95087e0
GIT Branch: master