commit 365ad31eea2fd4a94ea93938aec13a3223efc1fd

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7631
This commit is contained in:
Michal Marek 2013-10-01 06:01:14 +00:00 committed by Git OBS Bridge
parent 779ef5f8eb
commit b089510d9a
33 changed files with 472 additions and 18 deletions

View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Mon Sep 30 14:34:41 UTC 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
CONFIG_FB_UDL=n
-------------------------------------------------------------------
Mon Sep 30 12:39:40 UTC 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted via
/etc/modprobe.d/50-blacklist.conf for a long time:
CONFIG_FB_ATY=n
CONFIG_FB_ATY128=n
CONFIG_FB_CYBER2000=n
CONFIG_FB_MATROX=n (and dependent options)
CONFIG_FB_HGA=n
CONFIG_FB_I810=n
CONFIG_MDA_CONSOLE=n
CONFIG_FB_NEOMAGIC=n
CONFIG_FB_PM2=n
CONFIG_FB_PM3=n
CONFIG_FB_RADEON=n
CONFIG_FB_RIVA=n
CONFIG_FB_SIS=n
CONFIG_FB_VOODOO1=n
CONFIG_FB_3DFX=n
CONFIG_FB_TRIDENT=n
CONFIG_FB_VGA16=n
CONFIG_FB_KYRO=n
CONFIG_FB_ARC=n
CONFIG_FB_CIRRUS=n
CONFIG_FB_GEODE_LX=n
CONFIG_FB_GEODE_GX=n
CONFIG_FB_GEODE_GX1=n
CONFIG_FB_NVIDIA=n
CONFIG_FB_S1D13XXX=n
CONFIG_FB_SAVAGE=n
CONFIG_FB_ARK=n
CONFIG_FB_CARMINE=n
CONFIG_FB_N411=n
CONFIG_FB_HECUBA=n
CONFIG_FB_S3=n
CONFIG_FB_SM501=n
CONFIG_FB_VIA=n
CONFIG_CONFIG_FB_LE80578=n
CONFIG_FB_VT8623=n
-------------------------------------------------------------------
Fri Sep 27 10:26:33 CEST 2013 - jdelvare@suse.de

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd78d99424bd7698dfa196241789a83925cec2bc83f53bd3ae010d7ab41dd385
size 258494
oid sha256:ff1c260cc2d4eb88f36f3947aa3df490980dfb85cb7db3ea2dca22260f8681c8
size 257398

View File

@ -60,7 +60,11 @@
Name: kernel-@FLAVOR@
Summary: @SUMMARY@
Version: @RPMVERSION@
%if 0%{?is_kotd}
Release: <RELEASE>.g@COMMIT@
%else
Release: @RELEASE@
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -25,7 +25,11 @@
Name: kernel-docs
Summary: Kernel Documentation
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-exynos
Summary: Kernel for Samsung's Exynos SoC
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-lpae
Summary: Kernel for LPAE enabled systems
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -30,7 +30,11 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: Development/Sources
Url: http://www.kernel.org/

View File

@ -30,7 +30,11 @@
Name: kernel-source@VARIANT@
Summary: The Linux Kernel Sources
Version: @RPMVERSION@
%if 0%{?is_kotd}
Release: <RELEASE>.g@COMMIT@
%else
Release: @RELEASE@
%endif
License: GPL-2.0
Group: Development/Sources
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -25,7 +25,11 @@ Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 3.12.rc2
%if %using_buildservice
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
Release: %kernel_source_release

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Sep 30 17:08:45 CEST 2013 - mmarek@suse.cz
- Always include the git commit in KOTD builds
This allows us not to set it explicitly in builds submitted to the
official distribution (bnc#821612, bnc#824171).
- commit a80e5ef
-------------------------------------------------------------------
Mon Sep 30 16:35:24 CEST 2013 - mmarek@suse.cz
- Do not build udlfb, to avoid conflict with udl (fate#316407)
- commit 678681d
-------------------------------------------------------------------
Mon Sep 30 16:21:15 CEST 2013 - mmarek@suse.cz
- Disable fb drivers that have been blacklisted for a long time
via /etc/modprobe.d/50-blacklist.conf.
- commit b34e737
-------------------------------------------------------------------
Mon Sep 30 13:53:44 CEST 2013 - dsterba@suse.cz
- Btrfs: relocate csums properly with prealloc extents.
- commit 6cf855e
-------------------------------------------------------------------
Sat Sep 28 11:51:54 CEST 2013 - ohering@suse.de

View File

@ -60,7 +60,11 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 3.12.rc2
Release: <RELEASE>.g9e0a852
%if 0%{?is_kotd}
Release: <RELEASE>.g365ad31
%else
Release: <RELEASE>.g365ad31
%endif
License: GPL-2.0
Group: System/Kernel
Url: http://www.kernel.org/

24
mkspec
View File

@ -67,6 +67,8 @@ if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) {
$tarball_url = "";
}
my $commit = get_commit();
my %macros = (
VARIANT => $variant,
VANILLA_ONLY => $vanilla_only,
@ -75,6 +77,7 @@ my %macros = (
RPMVERSION => $rpmversion,
TARBALL_URL => $tarball_url,
RELEASE => $rpmrelease,
COMMIT => $commit,
SOURCES => $sources,
NOSOURCE => $nosource,
UNPACK_PATCHES => $unpack_patches,
@ -303,6 +306,27 @@ sub provides_obsoletes {
return $res;
}
sub get_commit {
my ($commit, $fh);
if (!open($fh, '<', "source-timestamp")) {
print STDERR "warning: source-timestamp: $!\n";
print STDERR "warning: Cannot determine commit id\n";
return "0000000";
}
while (<$fh>) {
if (/^GIT Revision: ([0-9a-f]{7})/) {
$commit = $1;
}
}
close($fh);
if (!$commit) {
print STDERR "warning: Commit id missing in source-timestamp file\n";
return "0000000";
}
return $commit;
}
sub do_spec {
my $template = shift;
my $specfile = shift;

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb858f408ef1fcabfefc9c0a3a1221131bc864cb12b943d305921c913cf5c06d
size 127758
oid sha256:316490905ecf500484d0888820e8adb0596f486fbbeb91658ae35a3a8520308b
size 128493

View File

@ -252,6 +252,7 @@
patches.suse/btrfs-use-correct-device-for-maps.patch
patches.suse/btrfs-check-index-in-extent_buffer_page
patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch
patches.suse/btrfs-use-end-trans-in-label-ioctl
patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl
patches.suse/introduce-kobj_completion

View File

@ -252,6 +252,7 @@
patches.suse/btrfs-use-correct-device-for-maps.patch
patches.suse/btrfs-check-index-in-extent_buffer_page
patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch
patches.suse/btrfs-use-end-trans-in-label-ioctl
patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl
patches.suse/introduce-kobj_completion

View File

@ -1,3 +1,3 @@
2013-09-28 11:51:54 +0200
GIT Revision: 9e0a852e76e9f8ae9f5c54b027710f5615a4a87d
2013-09-30 17:12:38 +0200
GIT Revision: 365ad31eea2fd4a94ea93938aec13a3223efc1fd
GIT Branch: master