openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2010
- 1 participants
- 1069 discussions
Hello community,
here is the log from the commit of package libdrm for openSUSE:Factory
checked in at Wed Dec 29 00:14:12 CET 2010.
--------
--- libdrm/libdrm.changes 2010-12-11 22:03:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/libdrm/libdrm.changes 2010-12-20 16:28:06.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Dec 20 15:26:43 UTC 2010 - sndirsch(a)novell.com
+
+- removed revert-09b1062.diff; due to Mesa 7.10-pre update no longer
+ required/useful
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
revert-09b1062.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libdrm.spec ++++++
--- /var/tmp/diff_new_pack.TxsRrI/_old 2010-12-29 00:13:41.000000000 +0100
+++ /var/tmp/diff_new_pack.TxsRrI/_new 2010-12-29 00:13:41.000000000 +0100
@@ -25,7 +25,7 @@
Group: System/Libraries
AutoReqProv: on
Version: 2.4.23
-Release: 1
+Release: 2
Provides: libdrm23 = %{version}
Obsoletes: libdrm23 < %{version}
# bug437293
@@ -38,7 +38,6 @@
Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
Patch: enable_test_tools.diff
-Patch1: revert-09b1062.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -65,7 +64,6 @@
%prep
%setup -q -n %{name}-%{version}
%patch
-%patch1 -p1
%build
autoreconf -fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Wed Dec 29 00:13:01 CET 2010.
--------
--- kernel-source/kernel-debug.changes 2010-12-09 16:26:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-12-28 16:02:39.000000000 +0100
@@ -1,0 +2,125 @@
+Tue Dec 28 07:01:24 CET 2010 - mgalbraith(a)suse.de
+
+- sched: fix autogroup /proc interface race.
+- commit fd7019c
+
+-------------------------------------------------------------------
+Mon Dec 27 23:28:19 CET 2010 - jeffm(a)suse.com
+
+- scripts/wd-functions.sh: Re-added support for finding tarball in $MIRROR.
+- commit c8014fb
+
+-------------------------------------------------------------------
+Mon Dec 27 23:24:08 CET 2010 - jeffm(a)suse.com
+
+- sched, cgroup: Use exit hook to avoid use-after-free crash.
+- commit 59c0581
+
+-------------------------------------------------------------------
+Mon Dec 27 23:09:38 CET 2010 - jeffm(a)suse.com
+
+- Update to 2.6.37-rc7.
+ - Eliminated 9 patches.
+- commit d38591c
+
+-------------------------------------------------------------------
+Mon Dec 20 12:48:45 CET 2010 - jslaby(a)suse.cz
+
+- Revert "x86: allocate space within a region top-down"
+ (bnc#655048).
+ Backport to XEN.
+- commit 92c0965
+
+-------------------------------------------------------------------
+Mon Dec 20 11:33:32 CET 2010 - jslaby(a)suse.cz
+
+- Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive
+ decode" (bnc#655048).
+- Revert "x86: allocate space within a region top-down"
+ (bnc#655048).
+- Revert "x86/PCI: allocate space from the end of a region,
+ not the beginning" (bnc#655048).
+- Revert "PCI: allocate bus resources from the top down"
+ (bnc#655048).
+- Revert "resources: support allocating space within a region
+ from the top down" (bnc#655048).
+- resources: add arch hook for preventing allocation in reserved
+ areas (bnc#655048).
+- x86: avoid low BIOS area when allocating address space
+ (bnc#655048).
+- x86: avoid E820 regions when allocating address space
+ (bnc#655048).
+- x86: avoid high BIOS area when allocating address space
+ (bnc#655048).
+- Refresh patches.xen/xen3-patch-2.6.34.
+- commit 7bbbf27
+
+-------------------------------------------------------------------
+Mon Dec 20 11:29:01 CET 2010 - jslaby(a)suse.cz
+
+- Revert "- resources: add arch hook for preventing allocation in reserved"
+ This reverts commit 7e253537787f4fb057e12a166356169c5adb9665. It was unintended to be pushed as the patches are obsoleted.
+- commit 6f3bdf8
+
+-------------------------------------------------------------------
+Mon Dec 20 11:19:41 CET 2010 - jslaby(a)suse.cz
+
+- Delete
+ patches.fixes/res-0010-PCI-fix-pci_bus_alloc_resource-hang-prefer-positive-.patch.
+ It's unreferenced and wrong.
+- commit 9e6fc50
+
+-------------------------------------------------------------------
+Thu Dec 16 23:21:40 CET 2010 - mmarek(a)suse.cz
+
+- rpm/kernel-source.spec.in: Define %kernelrelease
+- commit 1d67b13
+
+-------------------------------------------------------------------
+Thu Dec 16 22:31:42 CET 2010 - jeffm(a)suse.com
+
+- Linux: 2.6.37-rc6.
+- Update config files.
+- Refresh patches.suse/SoN-23-mm-swapfile.patch.
+- Refresh patches.suse/SoN-26-nfs-swapper.patch.
+- Refresh patches.xen/xen3-fixup-xen.
+- Refresh patches.xen/xen3-patch-2.6.24.
+- commit 5650f90
+
+-------------------------------------------------------------------
+Mon Dec 13 12:17:49 CET 2010 - jbeulich(a)novell.com
+
+- Update Xen config files (XEN_NETDEV_LOOPBACK=n).
+- supported.conf: Update.
+- commit d385dff
+
+-------------------------------------------------------------------
+Mon Dec 13 09:12:36 CET 2010 - tiwai(a)suse.de
+
+- Refresh patches.suse/bootsplash-scaler: Fix crash when bootsplash animation is used (bnc#646908)
+- commit c5eced1
+
+-------------------------------------------------------------------
+Fri Dec 10 09:23:46 CET 2010 - jslaby(a)suse.cz
+
+- resources: add arch hook for preventing allocation in reserved
+ areas (bnc#655048).
+- x86: avoid BIOS area when allocating address space (bnc#655048).
+- x86: avoid PNP resources when allocating address space
+ (bnc#655048).
+- Refresh patches.xen/xen3-patch-2.6.34.
+- commit 7e25353
+
+-------------------------------------------------------------------
+Fri Dec 10 09:20:34 CET 2010 - jbeulich(a)novell.com
+
+- Update Xen config files (CONFIG_XEN_COMPAT=0x040000).
+- commit 5343e5f
+
+-------------------------------------------------------------------
+Fri Dec 10 09:11:01 CET 2010 - jbeulich(a)novell.com
+
+- Update Xen patches to 2.6.37-rc5.
+- commit bef1a0d
+
+-------------------------------------------------------------------
@@ -4,0 +130 @@
+- rpm/kernel-binary.spec.in: Fix timestamp of /usr/src/linux-obj/.../.config
@@ -454,0 +581,8 @@
+
+-------------------------------------------------------------------
+Thu Sep 23 23:33:54 CEST 2010 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: Fix for kernel release strings like
+ 2.6.36-rc5-73-g57aebd7-vanilla.
+- rpm/kernel-spec-macros: Cleanup.
+- commit 0926a18
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-net.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-vmi.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.36
-%define patchversion 2.6.37-rc5
+%define kernelrelease 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -56,7 +56,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.37
-Release: 6
+Release: 7
%if %using_buildservice
%else
%endif
@@ -302,8 +302,14 @@
else
cp ../config/%cpu_arch_flavor .config
fi
+
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+
+krel=%kernelrelease-%build_flavor
+kver=$(make -s kernelversion $MAKE_ARGS)
+# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION ${krel#$kver} \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -312,7 +318,6 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -17,7 +17,7 @@
# norootforbuild
-%define patchversion 2.6.37-rc5
+%define patchversion 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -25,7 +25,7 @@
Name: kernel-docs
Summary: Kernel Documentation
Version: 2.6.37
-Release: 6
+Release: 7
%if %using_buildservice
%else
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.36
-%define patchversion 2.6.37-rc5
+%define kernelrelease 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -56,7 +56,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.37
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -300,8 +300,14 @@
else
cp ../config/%cpu_arch_flavor .config
fi
+
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+
+krel=%kernelrelease-%build_flavor
+kver=$(make -s kernelversion $MAKE_ARGS)
+# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION ${krel#$kver} \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -310,7 +316,6 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
++++++ kernel-net.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.36
-%define patchversion 2.6.37-rc5
+%define kernelrelease 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -56,7 +56,7 @@
Name: kernel-net
Summary: Minimal kernel with disk and net support
Version: 2.6.37
-Release: 6
+Release: 7
%if %using_buildservice
%else
%endif
@@ -299,8 +299,14 @@
else
cp ../config/%cpu_arch_flavor .config
fi
+
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+
+krel=%kernelrelease-%build_flavor
+kver=$(make -s kernelversion $MAKE_ARGS)
+# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION ${krel#$kver} \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -309,7 +315,6 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
kernel-pae.spec: same change
kernel-ppc64.spec: same change
kernel-ps3.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 2.6.36
-%define patchversion 2.6.37-rc5
+%define kernelrelease 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,7 +31,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.37
-Release: 6
+Release: 7
%if %using_buildservice
%else
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -24,7 +24,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.37
-Release: 6
+Release: 7
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.36
-%define patchversion 2.6.37-rc5
+%define kernelrelease 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -56,7 +56,7 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
Version: 2.6.37
-Release: 6
+Release: 7
%if %using_buildservice
%else
%endif
@@ -309,8 +309,14 @@
else
cp ../config/%cpu_arch_flavor .config
fi
+
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+
+krel=%kernelrelease-%build_flavor
+kver=$(make -s kernelversion $MAKE_ARGS)
+# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION ${krel#$kver} \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -319,7 +325,6 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
kernel-vanilla.spec: same change
kernel-vmi.spec: same change
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 2.6.36
-%define patchversion 2.6.37-rc5
+%define kernelrelease 2.6.37-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -56,7 +56,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.37
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -300,8 +300,14 @@
else
cp ../config/%cpu_arch_flavor .config
fi
+
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+
+krel=%kernelrelease-%build_flavor
+kver=$(make -s kernelversion $MAKE_ARGS)
+# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION ${krel#$kver} \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -310,7 +316,6 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
++++++ config-options.changes.txt ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:21.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:21.000000000 +0100
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Mon Dec 13 12:17:15 CEST 2010 - jbeulich(a)novell.com
+
+- */xen: XEN_NETDEV_LOOPBACK=n (no longer needed/supported).
+
+-------------------------------------------------------------------
+Fri Dec 10 09:20:36 CEST 2010 - jbeulich(a)novell.com
+
+- */xen: CONFIG_XEN_COMPAT=0x040000.
+
+-------------------------------------------------------------------
Tue Nov 16 20:18:04 CET 2010 - jeffm(a)suse.de
- Updated to 2.6.36-rc2:
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/debug 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2671,6 +2671,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default
--- old/config/i386/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/default 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2643,6 +2643,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop
--- old/config/i386/desktop 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/desktop 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2566,6 +2566,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2
--- old/config/i386/ec2 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/ec2 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/pae 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2568,6 +2568,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace
--- old/config/i386/trace 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/trace 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2568,6 +2568,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla
--- old/config/i386/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2625,6 +2625,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vmi new/config/i386/vmi
--- old/config/i386/vmi 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/vmi 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2568,6 +2568,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2010-12-07 16:32:30.000000000 +0100
+++ new/config/i386/xen 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 2.6.37-rc5 Kernel Configuration
+# Linux/i386 2.6.37-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2415,6 +2415,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
@@ -4472,7 +4473,7 @@
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_NETDEV_TX_SHIFT=10
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-CONFIG_XEN_NETDEV_LOOPBACK=m
+# CONFIG_XEN_NETDEV_LOOPBACK is not set
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
@@ -4498,11 +4499,11 @@
# CONFIG_XEN_COMPAT_030004_AND_LATER is not set
# CONFIG_XEN_COMPAT_030100_AND_LATER is not set
# CONFIG_XEN_COMPAT_030200_AND_LATER is not set
-CONFIG_XEN_COMPAT_030300_AND_LATER=y
+# CONFIG_XEN_COMPAT_030300_AND_LATER is not set
# CONFIG_XEN_COMPAT_030400_AND_LATER is not set
-# CONFIG_XEN_COMPAT_040000_AND_LATER is not set
+CONFIG_XEN_COMPAT_040000_AND_LATER=y
# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
-CONFIG_XEN_COMPAT=0x030300
+CONFIG_XEN_COMPAT=0x040000
CONFIG_XEN_VCPU_INFO_PLACEMENT=y
CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ia64/debug 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 2.6.37-rc5 Kernel Configuration
+# Linux/ia64 2.6.37-rc7 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ia64/default 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 2.6.37-rc5 Kernel Configuration
+# Linux/ia64 2.6.37-rc7 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace
--- old/config/ia64/trace 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ia64/trace 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 2.6.37-rc5 Kernel Configuration
+# Linux/ia64 2.6.37-rc7 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
# CONFIG_ENTERPRISE_SUPPORT is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla
--- old/config/ia64/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ia64/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/ia64 2.6.37-rc5 Kernel Configuration
+# Linux/ia64 2.6.37-rc6 Kernel Configuration
#
CONFIG_SUSE_KERNEL=y
CONFIG_SPLIT_PACKAGE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default
--- old/config/ppc/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc/default 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -2034,6 +2034,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64
--- old/config/ppc/ppc64 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc/ppc64 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2020,6 +2020,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ps3 new/config/ppc/ps3
--- old/config/ppc/ps3 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc/ps3 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
CONFIG_PPC64=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla
--- old/config/ppc/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc6 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -2025,6 +2025,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug
--- old/config/ppc64/debug 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc64/debug 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2037,6 +2037,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default
--- old/config/ppc64/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc64/default 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2026,6 +2026,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64
--- old/config/ppc64/ppc64 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc64/ppc64 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2078,6 +2078,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace
--- old/config/ppc64/trace 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc64/trace 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2078,6 +2078,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla
--- old/config/ppc64/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/ppc64/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/powerpc 2.6.37-rc5 Kernel Configuration
+# Linux/powerpc 2.6.37-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -2015,6 +2015,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/s390 new/config/s390/s390
--- old/config/s390/s390 2010-12-07 16:32:30.000000000 +0100
+++ new/config/s390/s390 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 2.6.37-rc5 Kernel Configuration
+# Linux/s390 2.6.37-rc7 Kernel Configuration
#
CONFIG_SCHED_MC=y
CONFIG_MMU=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/trace new/config/s390/trace
--- old/config/s390/trace 2010-12-07 16:32:30.000000000 +0100
+++ new/config/s390/trace 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 2.6.37-rc5 Kernel Configuration
+# Linux/s390 2.6.37-rc7 Kernel Configuration
#
CONFIG_SCHED_MC=y
CONFIG_MMU=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/vanilla new/config/s390/vanilla
--- old/config/s390/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/s390/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 2.6.37-rc5 Kernel Configuration
+# Linux/s390 2.6.37-rc6 Kernel Configuration
#
CONFIG_SCHED_MC=y
CONFIG_MMU=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default
--- old/config/s390x/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/s390x/default 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 2.6.37-rc5 Kernel Configuration
+# Linux/s390 2.6.37-rc7 Kernel Configuration
#
CONFIG_SCHED_MC=y
CONFIG_MMU=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/trace new/config/s390x/trace
--- old/config/s390x/trace 2010-12-07 16:32:30.000000000 +0100
+++ new/config/s390x/trace 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 2.6.37-rc5 Kernel Configuration
+# Linux/s390 2.6.37-rc7 Kernel Configuration
#
CONFIG_SCHED_MC=y
CONFIG_MMU=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla
--- old/config/s390x/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/s390x/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/s390 2.6.37-rc5 Kernel Configuration
+# Linux/s390 2.6.37-rc6 Kernel Configuration
#
CONFIG_SCHED_MC=y
CONFIG_MMU=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/default new/config/sparc64/default
--- old/config/sparc64/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/sparc64/default 2010-12-27 23:10:04.000000000 +0100
@@ -4801,3 +4801,4 @@
CONFIG_LEDS_LP5523=m
# CONFIG_SECURITY_DMESG_RESTRICT is not set
# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_KEYBOARD_GPIO_POLLED=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/sparc64/net new/config/sparc64/net
--- old/config/sparc64/net 2010-12-07 16:32:30.000000000 +0100
+++ new/config/sparc64/net 2010-12-27 23:10:04.000000000 +0100
@@ -2021,3 +2021,4 @@
CONFIG_LEDS_LP5523=m
# CONFIG_SECURITY_DMESG_RESTRICT is not set
# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_KEYBOARD_GPIO_POLLED=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/debug 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2512,6 +2512,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/default 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2503,6 +2503,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop
--- old/config/x86_64/desktop 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/desktop 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2501,6 +2501,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2
--- old/config/x86_64/ec2 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/ec2 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace
--- old/config/x86_64/trace 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/trace 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2503,6 +2503,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla
--- old/config/x86_64/vanilla 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/vanilla 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc6 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2483,6 +2483,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2010-12-07 16:32:30.000000000 +0100
+++ new/config/x86_64/xen 2010-12-27 23:10:04.000000000 +0100
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37-rc5 Kernel Configuration
+# Linux/x86_64 2.6.37-rc7 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -2367,6 +2367,7 @@
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_TCA6416=m
CONFIG_KEYBOARD_MATRIX=m
CONFIG_KEYBOARD_LM8323=m
@@ -4396,7 +4397,7 @@
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_NETDEV_TX_SHIFT=10
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-CONFIG_XEN_NETDEV_LOOPBACK=m
+# CONFIG_XEN_NETDEV_LOOPBACK is not set
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
@@ -4422,11 +4423,11 @@
# CONFIG_XEN_COMPAT_030004_AND_LATER is not set
# CONFIG_XEN_COMPAT_030100_AND_LATER is not set
# CONFIG_XEN_COMPAT_030200_AND_LATER is not set
-CONFIG_XEN_COMPAT_030300_AND_LATER=y
+# CONFIG_XEN_COMPAT_030300_AND_LATER is not set
# CONFIG_XEN_COMPAT_030400_AND_LATER is not set
-# CONFIG_XEN_COMPAT_040000_AND_LATER is not set
+CONFIG_XEN_COMPAT_040000_AND_LATER=y
# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
-CONFIG_XEN_COMPAT=0x030300
+CONFIG_XEN_COMPAT=0x040000
CONFIG_XEN_VCPU_INFO_PLACEMENT=y
CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y
CONFIG_ARCH_HAS_WALK_MEMORY=y
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:22.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:22.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion @SRCVERSION@
-%define patchversion @PATCHVERSION@
+%define kernelrelease @PATCHVERSION@
%define variant @VARIANT@%{nil}
%include %_sourcedir/kernel-spec-macros
@@ -227,8 +227,14 @@
else
cp ../config/%cpu_arch_flavor .config
fi
+
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+
+krel=%kernelrelease-%build_flavor
+kver=$(make -s kernelversion $MAKE_ARGS)
+# We need to store krel minus the kver prefix to CONFIG_LOCALVERSION
%build_src_dir/scripts/config \
- --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --set-str CONFIG_LOCALVERSION ${krel#$kver} \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
@@ -237,7 +243,6 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:22.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:22.000000000 +0100
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion @SRCVERSION@
-%define patchversion @PATCHVERSION@
+%define kernelrelease @PATCHVERSION@
%define variant @VARIANT@%{nil}
%include %_sourcedir/kernel-spec-macros
++++++ kernel-spec-macros ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:23.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:23.000000000 +0100
@@ -11,9 +11,6 @@
%define source_rel %(release=%release; echo ${release%.*})
%endif
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
-
%define my_builddir %_builddir/%{name}-%{version}
# macro to add the source timestamp to package descriptions
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:26.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:26.000000000 +0100
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:26.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:26.000000000 +0100
@@ -1 +1 @@
-6000
+6144
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash new/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash
--- old/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash 2010-12-28 07:01:24.000000000 +0100
@@ -0,0 +1,55 @@
+Subject: sched, cgroup: Use exit hook to avoid use-after-free crash
+From: Peter Zijlstra <peterz(a)infradead.org>
+Date: Fri, 24 Dec 2010 16:59:13 +0100
+Patch-mainline: Maybe 2.6.37, see discussion at
+ http://groups.google.com/group/linux.kernel/browse_thread/thread/549060f231…
+
+By not notifying the controller of the on-exit move back to
+init_css_set, we fail to move the task out of the previous cgroup's
+cfs_rq. This leads to an opportunity for a cgroup-destroy to come in and
+free the cgroup (there are no active tasks left in it after all) to
+which the not-quite dead task is still enqueued.
+
+Cc: stable(a)kernel.org
+Reported-by: Miklos Vajna <vmiklos(a)frugalware.org>
+Signed-off-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
+Acked-by: Jeff Mahoney <jeffm(a)suse.com>
+---
+ kernel/sched.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Index: linux-2.6.37.git/kernel/sched.c
+===================================================================
+--- linux-2.6.37.git.orig/kernel/sched.c
++++ linux-2.6.37.git/kernel/sched.c
+@@ -613,6 +613,9 @@ static inline struct task_group *task_gr
+ struct task_group *tg;
+ struct cgroup_subsys_state *css;
+
++ if (p->flags & PF_EXITING)
++ return &root_task_group;
++
+ css = task_subsys_state_check(p, cpu_cgroup_subsys_id,
+ lockdep_is_held(&task_rq(p)->lock));
+ tg = container_of(css, struct task_group, css);
+@@ -9187,6 +9190,12 @@ cpu_cgroup_attach(struct cgroup_subsys *
+ }
+ }
+
++static void
++cpu_cgroup_exit(struct cgroup_subsys *ss, struct task_struct *task)
++{
++ sched_move_task(task);
++}
++
+ #ifdef CONFIG_FAIR_GROUP_SCHED
+ static int cpu_shares_write_u64(struct cgroup *cgrp, struct cftype *cftype,
+ u64 shareval)
+@@ -9259,6 +9268,7 @@ struct cgroup_subsys cpu_cgroup_subsys =
+ .destroy = cpu_cgroup_destroy,
+ .can_attach = cpu_cgroup_can_attach,
+ .attach = cpu_cgroup_attach,
++ .exit = cpu_cgroup_exit,
+ .populate = cpu_cgroup_populate,
+ .subsys_id = cpu_cgroup_subsys_id,
+ .early_init = 1,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/sched-fix-autogroup-proc-interface-race new/patches.fixes/sched-fix-autogroup-proc-interface-race
--- old/patches.fixes/sched-fix-autogroup-proc-interface-race 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/sched-fix-autogroup-proc-interface-race 2010-12-28 07:01:24.000000000 +0100
@@ -0,0 +1,85 @@
+Subject: sched: fix autogroup /proc interface race
+From: Mike Galbraith <efault(a)gmx.de>
+Date: Tue Dec 28 06:20:05 CET 2010
+Patch-mainline: submitted/queued
+References:
+
+sched: autogroup, fix proc interface race
+
+Oleg pointed out that the /proc interface kref_get() useage may race with
+the final put during autogroup_move_group(). A signal->autogroup assignment
+may be in flight when the /proc interface dereference, leaving them taking
+a reference to an already dead group.
+
+Acked-by: Mike Galbraith <mgalbraith(a)suse.de>
+Reported-by: Oleg Nesterov <oleg(a)redhat.com>
+Signed-off-by: Mike Galbraith <efault(a)gmx.de>
+
+---
+ kernel/sched_autogroup.c | 25 +++++++++++++++++--------
+ 1 file changed, 17 insertions(+), 8 deletions(-)
+
+Index: linux-2.6.36-master/kernel/sched_autogroup.c
+===================================================================
+--- linux-2.6.36-master.orig/kernel/sched_autogroup.c
++++ linux-2.6.36-master/kernel/sched_autogroup.c
+@@ -41,6 +41,20 @@ static inline struct autogroup *autogrou
+ return ag;
+ }
+
++static inline struct autogroup *autogroup_task_get(struct task_struct *p)
++{
++ struct autogroup *ag;
++ unsigned long flags;
++
++ if (!lock_task_sighand(p, &flags))
++ return autogroup_kref_get(&autogroup_default);
++
++ ag = autogroup_kref_get(p->signal->autogroup);
++ unlock_task_sighand(p, &flags);
++
++ return ag;
++}
++
+ static inline struct autogroup *autogroup_create(void)
+ {
+ struct autogroup *ag = kzalloc(sizeof(*ag), GFP_KERNEL);
+@@ -149,11 +163,7 @@ EXPORT_SYMBOL(sched_autogroup_detach);
+
+ void sched_autogroup_fork(struct signal_struct *sig)
+ {
+- struct task_struct *p = current;
+-
+- spin_lock_irq(&p->sighand->siglock);
+- sig->autogroup = autogroup_kref_get(p->signal->autogroup);
+- spin_unlock_irq(&p->sighand->siglock);
++ sig->autogroup = autogroup_task_get(current);
+ }
+
+ void sched_autogroup_exit(struct signal_struct *sig)
+@@ -172,7 +182,6 @@ __setup("noautogroup", setup_autogroup);
+
+ #ifdef CONFIG_PROC_FS
+
+-/* Called with siglock held. */
+ int proc_sched_autogroup_set_nice(struct task_struct *p, int *nice)
+ {
+ static unsigned long next = INITIAL_JIFFIES;
+@@ -194,7 +203,7 @@ int proc_sched_autogroup_set_nice(struct
+ return -EAGAIN;
+
+ next = HZ / 10 + jiffies;
+- ag = autogroup_kref_get(p->signal->autogroup);
++ ag = autogroup_task_get(p);
+
+ down_write(&ag->lock);
+ err = sched_group_set_shares(ag->tg, prio_to_weight[*nice + 20]);
+@@ -209,7 +218,7 @@ int proc_sched_autogroup_set_nice(struct
+
+ void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m)
+ {
+- struct autogroup *ag = autogroup_kref_get(p->signal->autogroup);
++ struct autogroup *ag = autogroup_task_get(p);
+
+ down_read(&ag->lock);
+ seq_printf(m, "/autogroup-%ld nice %d\n", ag->id, ag->nice);
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SoN-23-mm-swapfile.patch new/patches.suse/SoN-23-mm-swapfile.patch
--- old/patches.suse/SoN-23-mm-swapfile.patch 2010-12-07 09:40:37.000000000 +0100
+++ new/patches.suse/SoN-23-mm-swapfile.patch 2010-12-16 22:31:42.000000000 +0100
@@ -48,7 +48,7 @@
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
-@@ -176,6 +176,10 @@ prototypes:
+@@ -177,6 +177,10 @@ prototypes:
int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
loff_t offset, unsigned long nr_segs);
int (*launder_page) (struct page *);
@@ -58,9 +58,9 @@
+ int (*swap_in) (struct file *, struct page *);
locking rules:
- All except set_page_dirty may block
-@@ -195,6 +199,10 @@ invalidatepage: no yes
- releasepage: no yes
+ All except set_page_dirty and freepage may block
+@@ -197,6 +201,10 @@ releasepage: no yes
+ freepage: no yes
direct_IO: no
launder_page: no yes
+swapon no
@@ -70,7 +70,7 @@
->write_begin(), ->write_end(), ->sync_page() and ->readpage()
may be called from the request handler (/dev/loop).
-@@ -294,6 +302,20 @@ cleaned, or an error value if not. Note
+@@ -299,6 +307,20 @@ cleaned, or an error value if not. Note
getting mapped back in and redirtied, it needs to be kept locked
across the entire operation.
@@ -93,7 +93,7 @@
of contention. Normally they are calling library functions (in fs/buffer.c)
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
-@@ -542,6 +542,11 @@ struct address_space_operations {
+@@ -543,6 +543,11 @@ struct address_space_operations {
int (*migratepage) (struct page *, struct page *);
int (*launder_page) (struct page *);
int (*error_remove_page) (struct mapping *mapping, struct page *page);
@@ -105,7 +105,7 @@
};
writepage: called by the VM to write a dirty page to backing store.
-@@ -706,6 +711,19 @@ struct address_space_operations {
+@@ -712,6 +717,19 @@ struct address_space_operations {
unless you have them locked or reference counts increased.
@@ -127,7 +127,7 @@
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
-@@ -333,6 +333,7 @@ static inline int inode_has_buffers(stru
+@@ -330,6 +330,7 @@ static inline int inode_has_buffers(stru
static inline void invalidate_inode_buffers(struct inode *inode) {}
static inline int remove_inode_buffers(struct inode *inode) { return 1; }
static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
@@ -137,7 +137,7 @@
#endif /* _LINUX_BUFFER_HEAD_H */
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -621,6 +621,15 @@ struct address_space_operations {
+@@ -622,6 +622,15 @@ struct address_space_operations {
int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
unsigned long);
int (*error_remove_page)(struct address_space *, struct page *);
@@ -155,7 +155,7 @@
/*
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
-@@ -147,6 +147,7 @@ enum {
+@@ -148,6 +148,7 @@ enum {
SWP_SOLIDSTATE = (1 << 4), /* blkdev seeks are cheap */
SWP_CONTINUED = (1 << 5), /* swap_map has count continuation */
SWP_BLKDEV = (1 << 6), /* its a block device */
@@ -163,7 +163,7 @@
/* add others here before... */
SWP_SCANNING = (1 << 8), /* refcount in scan_swap_map */
};
-@@ -292,6 +293,8 @@ extern void swap_unplug_io_fn(struct bac
+@@ -303,6 +304,8 @@ extern void swap_unplug_io_fn(struct bac
/* linux/mm/page_io.c */
extern int swap_readpage(struct page *);
extern int swap_writepage(struct page *page, struct writeback_control *wbc);
@@ -172,7 +172,7 @@
extern void end_swap_bio_read(struct bio *bio, int err);
/* linux/mm/swap_state.c */
-@@ -327,6 +330,7 @@ extern int swap_type_of(dev_t, sector_t,
+@@ -339,6 +342,7 @@ extern int swap_type_of(dev_t, sector_t,
extern unsigned int count_swap_pages(int, int);
extern sector_t map_swap_page(struct page *, struct block_device **);
extern sector_t swapdev_block(int, pgoff_t);
@@ -282,7 +282,7 @@
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
-@@ -1405,6 +1405,14 @@ static void destroy_swap_extents(struct
+@@ -1373,6 +1373,14 @@ static void destroy_swap_extents(struct
list_del(&se->list);
kfree(se);
}
@@ -297,7 +297,7 @@
}
/*
-@@ -1486,7 +1494,9 @@ add_swap_extent(struct swap_info_struct
+@@ -1454,7 +1462,9 @@ add_swap_extent(struct swap_info_struct
*/
static int setup_swap_extents(struct swap_info_struct *sis, sector_t *span)
{
@@ -308,7 +308,7 @@
unsigned blocks_per_page;
unsigned long page_no;
unsigned blkbits;
-@@ -1497,13 +1507,22 @@ static int setup_swap_extents(struct swa
+@@ -1465,13 +1475,22 @@ static int setup_swap_extents(struct swa
int nr_extents = 0;
int ret;
@@ -332,7 +332,7 @@
blkbits = inode->i_blkbits;
blocks_per_page = PAGE_SIZE >> blkbits;
-@@ -2280,6 +2299,13 @@ int swapcache_prepare(swp_entry_t entry)
+@@ -2290,6 +2309,13 @@ int swapcache_prepare(swp_entry_t entry)
return __swap_duplicate(entry, SWAP_HAS_CACHE);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SoN-26-nfs-swapper.patch new/patches.suse/SoN-26-nfs-swapper.patch
--- old/patches.suse/SoN-26-nfs-swapper.patch 2010-12-07 09:40:37.000000000 +0100
+++ new/patches.suse/SoN-26-nfs-swapper.patch 2010-12-16 22:31:42.000000000 +0100
@@ -19,12 +19,12 @@
Signed-off-by: Suresh Jayaraman <sjayaraman(a)suse.de>
---
fs/nfs/inode.c | 6 ++++
- fs/nfs/write.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++----------
- 2 files changed, 65 insertions(+), 12 deletions(-)
+ fs/nfs/write.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 67 insertions(+), 14 deletions(-)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
-@@ -865,6 +865,12 @@ int nfs_revalidate_mapping(struct inode
+@@ -868,6 +868,12 @@ int nfs_revalidate_mapping(struct inode
struct nfs_inode *nfsi = NFS_I(inode);
int ret = 0;
@@ -39,7 +39,7 @@
|| NFS_STALE(inode)) {
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
-@@ -109,25 +109,64 @@ static void nfs_context_set_write_error(
+@@ -107,25 +107,64 @@ static void nfs_context_set_write_error(
set_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
}
@@ -110,7 +110,7 @@
spin_unlock(&inode->i_lock);
return req;
}
-@@ -230,7 +269,7 @@ static struct nfs_page *nfs_find_and_loc
+@@ -228,7 +267,7 @@ static struct nfs_page *nfs_find_and_loc
spin_lock(&inode->i_lock);
for (;;) {
@@ -119,10 +119,11 @@
if (req == NULL)
break;
if (nfs_set_page_tag_locked(req))
-@@ -395,8 +434,14 @@ static int nfs_inode_add_request(struct
+@@ -391,9 +430,15 @@ static int nfs_inode_add_request(struct
if (nfs_have_delegation(inode, FMODE_WRITE))
nfsi->change_attr++;
}
+- set_bit(PG_MAPPED, &req->wb_flags);
- SetPagePrivate(req->wb_page);
- set_page_private(req->wb_page, (unsigned long)req);
+ /*
@@ -130,26 +131,29 @@
+ * with invalidate/truncate.
+ */
+ if (likely(!PageSwapCache(req->wb_page))) {
++ set_bit(PG_MAPPED, &req->wb_flags);
+ SetPagePrivate(req->wb_page);
+ set_page_private(req->wb_page, (unsigned long)req);
+ }
nfsi->npages++;
kref_get(&req->wb_kref);
radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index,
-@@ -418,8 +463,10 @@ static void nfs_inode_remove_request(str
+@@ -415,9 +460,11 @@ static void nfs_inode_remove_request(str
BUG_ON (!NFS_WBACK_BUSY(req));
spin_lock(&inode->i_lock);
- set_page_private(req->wb_page, 0);
- ClearPagePrivate(req->wb_page);
+- clear_bit(PG_MAPPED, &req->wb_flags);
+ if (likely(!PageSwapCache(req->wb_page))) {
+ set_page_private(req->wb_page, 0);
+ ClearPagePrivate(req->wb_page);
++ clear_bit(PG_MAPPED, &req->wb_flags);
+ }
radix_tree_delete(&nfsi->nfs_page_tree, req->wb_index);
nfsi->npages--;
if (!nfsi->npages) {
-@@ -588,7 +635,7 @@ static struct nfs_page *nfs_try_to_updat
+@@ -585,7 +632,7 @@ static struct nfs_page *nfs_try_to_updat
spin_lock(&inode->i_lock);
for (;;) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/bootsplash-scaler new/patches.suse/bootsplash-scaler
--- old/patches.suse/bootsplash-scaler 2010-12-07 09:40:37.000000000 +0100
+++ new/patches.suse/bootsplash-scaler 2010-12-16 22:31:42.000000000 +0100
@@ -19,12 +19,12 @@
Acked-by: Michal Marek <mmarek(a)suse.cz>
---
- drivers/video/bootsplash/bootsplash.c | 858 +++++++++++++++++++++++++++++++---
+ drivers/video/bootsplash/bootsplash.c | 855 +++++++++++++++++++++++++++++++---
drivers/video/bootsplash/decode-jpg.c | 4
drivers/video/bootsplash/render.c | 16
drivers/video/console/fbcon.h | 11
include/linux/fb.h | 3
- 5 files changed, 810 insertions(+), 82 deletions(-)
+ 5 files changed, 807 insertions(+), 82 deletions(-)
--- a/drivers/video/bootsplash/bootsplash.c
+++ b/drivers/video/bootsplash/bootsplash.c
@@ -36,7 +36,7 @@
*
* Ideas & SuSE screen work by Ken Wimer, <wimer(a)suse.de>
*
-@@ -55,7 +56,9 @@ static unsigned char *jpg_errors[] = {
+@@ -55,7 +56,9 @@
"wrong marker",
"no EOI",
"bad tables",
@@ -47,7 +47,7 @@
};
static struct jpeg_decdata *decdata = 0; /* private decoder data */
-@@ -64,7 +67,9 @@ static int splash_registered = 0;
+@@ -64,7 +67,9 @@
static int splash_usesilent = 0; /* shall we display the silentjpeg? */
int splash_default = 0xf01;
@@ -58,7 +58,7 @@
static int __init splash_setup(char *options)
{
-@@ -120,7 +125,8 @@ static int boxextract(unsigned char *buf
+@@ -120,7 +125,8 @@
return 12;
}
@@ -68,7 +68,7 @@
{
int x, y, p, doblend, r, g, b, a, add;
unsigned int i = 0;
-@@ -245,7 +251,7 @@ static void boxit(unsigned char *pic, in
+@@ -245,7 +251,7 @@
}
add = (xs & 1);
add ^= (add ^ y) & 1 ? 1 : 3; /* 2x2 ordered dithering */
@@ -77,7 +77,7 @@
for (x = xs; x <= xe; x++) {
if (!(sti & 0x80000000)) {
sti <<= 1;
-@@ -310,19 +316,172 @@ static void boxit(unsigned char *pic, in
+@@ -310,19 +316,172 @@
}
}
@@ -253,7 +253,7 @@
if ((err = jpeg_decode(jpeg, mem, ((width + 15) & ~15), ((height + 15) & ~15), depth, decdata)))
printk(KERN_INFO "bootsplash: error while decompressing picture: %s (%d)\n",jpg_errors[err - 1], err);
vfree(mem);
-@@ -337,6 +496,7 @@ static void splash_free(struct vc_data *
+@@ -337,6 +496,7 @@
for (sd = vc->vc_splash_data; sd; sd = next) {
next = sd->next;
vfree(sd->splash_sboxes);
@@ -261,7 +261,7 @@
vfree(sd);
}
vc->vc_splash_data = 0;
-@@ -432,6 +592,11 @@ static void splash_pivot_current(struct
+@@ -432,6 +592,11 @@
state = sd->splash_state;
percent = sd->splash_percent;
silent = sd->splash_dosilent;
@@ -273,7 +273,7 @@
for (; sd->next; sd = sd->next) {
if (sd->next == new) {
sd->next = new->next;
-@@ -441,6 +606,17 @@ static void splash_pivot_current(struct
+@@ -441,6 +606,17 @@
new->splash_state = state;
new->splash_percent = percent;
new->splash_dosilent = silent;
@@ -291,7 +291,7 @@
return;
}
}
-@@ -459,7 +635,7 @@ static int splash_getraw(unsigned char *
+@@ -459,7 +635,7 @@
int palcnt;
int i, len;
const int *offsets;
@@ -300,7 +300,7 @@
struct fb_info *info;
struct splash_data *sd;
struct splash_data *splash_found = NULL;
-@@ -489,7 +665,16 @@ static int splash_getraw(unsigned char *
+@@ -489,7 +665,16 @@
vc_allocate(unit);
}
vc = vc_cons[unit].d;
@@ -317,17 +317,7 @@
width = info->var.xres;
height = info->var.yres;
splash_size = splash_geti(ndata, SPLASH_OFF_SIZE);
-@@ -539,6 +724,9 @@ static int splash_getraw(unsigned char *
- }
- if (update)
- *update = up;
-+ vfree(sd->splash_pic);
-+ sd->splash_pic = NULL;
-+ sd->splash_pic_size = 0;
- }
- return unit;
- }
-@@ -579,6 +767,12 @@ static int splash_getraw(unsigned char *
+@@ -579,6 +764,12 @@
memset(sd, 0, sizeof(*sd));
jpeg_get_size(ndata + len + boxcnt * 12 + palcnt,
&sd->splash_width, &sd->splash_height);
@@ -340,7 +330,7 @@
if (silentsize) {
sd->splash_silentjpeg = vmalloc(silentsize);
if (sd->splash_silentjpeg) {
-@@ -596,6 +790,8 @@ static int splash_getraw(unsigned char *
+@@ -596,6 +787,8 @@
sd->splash_text_yo = splash_gets(ndata, SPLASH_OFF_YO);
sd->splash_text_wi = splash_gets(ndata, SPLASH_OFF_WI);
sd->splash_text_he = splash_gets(ndata, SPLASH_OFF_HE);
@@ -349,7 +339,7 @@
sd->splash_percent = oldpercent == -1 ? splash_gets(ndata, SPLASH_OFF_PERCENT) : oldpercent;
if (version == 1) {
sd->splash_text_xo *= 8;
-@@ -606,6 +802,9 @@ static int splash_getraw(unsigned char *
+@@ -606,6 +799,9 @@
sd->splash_fg_color = (splash_default >> 4) & 0x0f;
sd->splash_state = splash_default & 1;
}
@@ -359,7 +349,7 @@
/* fake penguin box for older formats */
if (version == 1)
boxcnt = splash_mkpenguin(sd, sd->splash_text_xo + 10, sd->splash_text_yo + 10, sd->splash_text_wi - 20, sd->splash_text_he - 20, 0xf0, 0xf0, 0xf0);
-@@ -627,15 +826,6 @@ static int splash_getraw(unsigned char *
+@@ -627,15 +823,6 @@
ndata += len + splash_size - 1;
continue;
}
@@ -375,7 +365,7 @@
printk(KERN_INFO "bootsplash: ...found (%dx%d, %d bytes, v%d).\n", width, height, splash_size, version);
if (version == 1) {
printk(KERN_WARNING "bootsplash: Using deprecated v1 header. Updating your splash utility recommended.\n");
-@@ -649,6 +839,16 @@ static int splash_getraw(unsigned char *
+@@ -649,6 +836,16 @@
if (splash_found) {
splash_pivot_current(vc, splash_found);
return unit_found;
@@ -392,7 +382,7 @@
}
printk(KERN_ERR "bootsplash: ...no good signature found.\n");
-@@ -715,27 +915,71 @@ int splash_verbose(void)
+@@ -715,27 +912,71 @@
return 0;
}
@@ -473,7 +463,7 @@
return -1;
}
-@@ -743,13 +987,14 @@ int splash_prepare(struct vc_data *vc, s
+@@ -743,13 +984,14 @@
{
int err;
int width, height, depth, octpp, size, sbytes;
@@ -489,7 +479,7 @@
return -1;
}
-@@ -759,52 +1004,62 @@ int splash_prepare(struct vc_data *vc, s
+@@ -759,52 +1001,62 @@
octpp = (depth + 1) >> 3;
if (depth == 24 || depth < 15) { /* Other targets might need fixing */
@@ -568,7 +558,7 @@
info->var.yres,
info->var.xres,
info->fix.line_length, sbytes,
-@@ -813,27 +1068,43 @@ int splash_prepare(struct vc_data *vc, s
+@@ -813,27 +1065,43 @@
} else
vc->vc_splash_data->splash_dosilent = 0;
@@ -624,7 +614,7 @@
return -5;
}
return 0;
-@@ -856,12 +1127,16 @@ static struct proc_dir_entry *proc_splas
+@@ -856,12 +1124,16 @@
static int splash_recolor(struct vc_data *vc)
{
@@ -642,7 +632,7 @@
if (fg_console == vc->vc_num) {
update_region(vc,
vc->vc_origin + vc->vc_size_row * vc->vc_top,
-@@ -884,10 +1159,6 @@ static int splash_status(struct vc_data
+@@ -884,10 +1156,6 @@
splash_prepare(vc, info);
if (vc->vc_splash_data && vc->vc_splash_data->splash_state) {
if (info->splash_data) {
@@ -653,7 +643,7 @@
if (fg_console == vc->vc_num) {
update_region(vc,
vc->vc_origin + vc->vc_size_row * vc->vc_top,
-@@ -895,11 +1166,9 @@ static int splash_status(struct vc_data
+@@ -895,11 +1163,9 @@
splash_clear_margins(vc, info, 0);
}
}
@@ -668,7 +658,7 @@
return 0;
}
-@@ -956,10 +1225,9 @@ void splash_set_percent(struct vc_data *
+@@ -956,10 +1222,9 @@
|| pe < oldpe) {
if (splash_hasinter(vc->vc_splash_data->splash_boxes,
vc->vc_splash_data->splash_boxcount)) {
@@ -682,7 +672,7 @@
} else {
int octpp = (info->var.bits_per_pixel + 1) >> 3;
if (info->splash_data) {
-@@ -970,6 +1238,8 @@ void splash_set_percent(struct vc_data *
+@@ -970,6 +1235,8 @@
info->splash_data->splash_sboxes,
info->splash_data->splash_sboxcount,
info->splash_data->splash_percent,
@@ -691,7 +681,7 @@
1,
octpp);
#if 0
-@@ -979,6 +1249,8 @@ void splash_set_percent(struct vc_data *
+@@ -979,6 +1246,8 @@
info->splash_data->splash_boxes,
info->splash_data->splash_boxcount,
info->splash_data->splash_percent,
@@ -700,7 +690,7 @@
1,
octpp);
#endif
-@@ -1100,6 +1372,8 @@ static int splash_write_proc(struct file
+@@ -1100,6 +1369,8 @@
info->splash_data->splash_sboxes,
info->splash_data->splash_sboxcount,
info->splash_data->splash_percent,
@@ -709,7 +699,7 @@
1,
octpp);
} else if ((up & 1) != 0) {
-@@ -1108,6 +1382,8 @@ static int splash_write_proc(struct file
+@@ -1108,6 +1379,8 @@
info->splash_data->splash_boxes,
info->splash_data->splash_boxcount,
info->splash_data->splash_percent,
@@ -718,7 +708,7 @@
1,
octpp);
}
-@@ -1226,3 +1502,447 @@ void splash_init(void)
+@@ -1226,3 +1499,447 @@
return;
}
@@ -1168,7 +1158,7 @@
+}
--- a/drivers/video/bootsplash/decode-jpg.c
+++ b/drivers/video/bootsplash/decode-jpg.c
-@@ -888,9 +888,9 @@ PREC q[][64];
+@@ -888,9 +888,9 @@
#define PIC_32(yin, xin, p, xout) \
( \
y = outy[(yin) * 8 + xin], \
@@ -1182,7 +1172,7 @@
--- a/drivers/video/bootsplash/render.c
+++ b/drivers/video/bootsplash/render.c
-@@ -45,7 +45,7 @@ void splash_putcs(struct vc_data *vc, st
+@@ -45,7 +45,7 @@
transparent = sd->splash_color == bg_color;
xpos = xpos * vc->vc_font.width + sd->splash_text_xo;
ypos = ypos * vc->vc_font.height + sd->splash_text_yo;
@@ -1191,7 +1181,7 @@
dst.ub = (u8 *)(info->screen_base + ypos * info->fix.line_length + xpos * octpp);
fgx = ((u32 *)info->pseudo_palette)[fg_color];
if (transparent && sd->splash_color == 15) {
-@@ -109,10 +109,10 @@ void splash_putcs(struct vc_data *vc, st
+@@ -109,10 +109,10 @@
}
}
dst.ub += info->fix.line_length - vc->vc_font.width * octpp;
@@ -1204,7 +1194,7 @@
}
}
-@@ -136,7 +136,7 @@ static void splash_renderc(struct fb_inf
+@@ -136,7 +136,7 @@
sd = info->splash_data;
transparent = sd->splash_color == bg_color;
@@ -1213,7 +1203,7 @@
dst.ub = (u8*)(info->screen_base + ypos * info->fix.line_length + xpos * octpp);
fgx = ((u32 *)info->pseudo_palette)[fg_color];
if (transparent && sd->splash_color == 15) {
-@@ -197,7 +197,7 @@ static void splash_renderc(struct fb_inf
+@@ -197,7 +197,7 @@
}
}
dst.ub += info->fix.line_length - width * octpp;
@@ -1222,7 +1212,7 @@
}
}
-@@ -255,10 +255,11 @@ static void splashset(u8 *dst, int heigh
+@@ -255,10 +255,11 @@
static void splashfill(struct fb_info *info, int sy, int sx, int height, int width) {
int octpp = (info->var.bits_per_pixel + 1) >> 3;
@@ -1236,7 +1226,7 @@
octpp);
}
-@@ -442,6 +443,7 @@ void splash_bmove_redraw(struct vc_data
+@@ -442,6 +443,7 @@
void splash_blank(struct vc_data *vc, struct fb_info *info, int blank)
{
SPLASH_DEBUG();
@@ -1246,7 +1236,7 @@
info->var.yres, info->var.xres,
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
-@@ -34,8 +34,10 @@ struct splash_data {
+@@ -34,8 +34,10 @@
int splash_height; /* height of image */
int splash_text_xo; /* text area origin */
int splash_text_yo;
@@ -1258,7 +1248,7 @@
int splash_showtext; /* silent/verbose mode */
int splash_boxcount;
int splash_percent;
-@@ -45,12 +47,19 @@ struct splash_data {
+@@ -45,12 +47,19 @@
unsigned char *splash_boxes;
unsigned char *splash_jpeg; /* jpeg */
unsigned char *splash_palette; /* palette for 8-bit */
@@ -1280,7 +1270,7 @@
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
-@@ -877,9 +877,6 @@ struct fb_info {
+@@ -877,9 +877,6 @@
void *par;
#ifdef CONFIG_BOOTSPLASH
struct splash_data *splash_data;
++++++ patches.xen.tar.bz2 ++++++
++++ 25728 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:28.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:28.000000000 +0100
@@ -32,6 +32,8 @@
patches.kernel.org/patch-2.6.37-rc2-rc3
patches.kernel.org/patch-2.6.37-rc3-rc4
patches.kernel.org/patch-2.6.37-rc4-rc5
+ patches.kernel.org/patch-2.6.37-rc5-rc6
+ patches.kernel.org/patch-2.6.37-rc6-rc7
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -93,6 +95,14 @@
+needs_update-33 patches.suse/sched-revert-latency-defaults
patches.suse/sched-automated-per-session-task-groups
+ patches.fixes/sched-fix-autogroup-proc-interface-race
+
+ # This is not the correct fix. The check can be done at
+ # cgroup exit instead with less of an impact on performance.
+ # Once that patch is released, then this one should go away.
+ # I'm accepting it for now because it fixes the crashes that
+ # many of us have been seeing with 2.6.37-rcX. -jeffm
+ patches.fixes/sched-cgroup-use-exit-hook-to-avoid-use-after-free-crash
########################################################
# Architecture-specific patches. These used to be all
@@ -777,7 +787,9 @@
patches.xen/xen3-patch-2.6.35
patches.xen/xen3-patch-2.6.36
patches.xen/xen3-patch-2.6.37-rc3
- patches.xen/xen3-patch-2.6.37-rc3-git1
+ patches.xen/xen3-patch-2.6.37-rc3-rc4
+ patches.xen/xen3-patch-2.6.37-rc4-rc5
+ patches.xen/xen3-res-0002-Revert-x86-allocate-space-within-a-region-top-down.patch
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:28.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:28.000000000 +0100
@@ -1,3 +1,3 @@
-2010-12-09 16:04:57 +0100
-GIT Revision: 149d22bc651b3083297e17b92842c6d7affba574
+2010-12-28 07:01:24 +0100
+GIT Revision: fd7019cdfca45c51ee47e59d2d4c6cb703074e51
GIT Branch: master
++++++ supported.conf ++++++
--- /var/tmp/diff_new_pack.YYRCir/_old 2010-12-29 00:09:29.000000000 +0100
+++ /var/tmp/diff_new_pack.YYRCir/_new 2010-12-29 00:09:29.000000000 +0100
@@ -2041,6 +2041,7 @@
- kernel/drivers/watchdog/wdrtas # watchdog for RTAS on pSeries JS20
+isa kernel/drivers/watchdog/wdt
kernel/drivers/watchdog/wdt_pci # Driver for the ICS PCI-WDT500/501 watchdog cards
+ kernel/drivers/watchdog/xen_wdt # Xen pv watchdog driver
kernel/drivers/xen/blkback/blkbk # Xen block device backend
kernel/drivers/xen/blkback/blkback-pagemap
+base kernel/drivers/xen/blkfront/xenblk # Xen block device frontend
@@ -2050,17 +2051,17 @@
kernel/drivers/xen/evtchn
kernel/drivers/xen/gntdev/gntdev
kernel/drivers/xen/netback/netbk # Xen network device backend
- kernel/drivers/xen/netback/netloop # Xen network loopback device
+- kernel/drivers/xen/netback/netloop # Xen network loopback device
+base kernel/drivers/xen/netfront/xennet # Xen network device frontend
kernel/drivers/xen/pciback/pciback # Xen PCI device backend
-- kernel/drivers/xen/scsiback/xen-scsibk
-- kernel/drivers/xen/scsifront/xenscsi
+ kernel/drivers/xen/scsiback/xen-scsibk
+ kernel/drivers/xen/scsifront/xenscsi
+external kernel/drivers/xen/sfc_netback/sfc_netback
+external kernel/drivers/xen/sfc_netback/sfc_netfront
+external kernel/drivers/xen/sfc_netutil/sfc_netutil
kernel/drivers/xen/tpmback/tpmbk # Xen TPM device backend
-- kernel/drivers/xen/usbback/usbbk
-- kernel/drivers/xen/usbfront/xen-hcd
+ kernel/drivers/xen/usbback/usbbk
+ kernel/drivers/xen/usbfront/xen-hcd
kernel/drivers/xen/xenbus/xenbus_be # Xen XenBus backend driver support module
kernel/fs/9p/9p
- kernel/fs/adfs/adfs
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lcms2 for openSUSE:Factory
checked in at Wed Dec 29 00:11:46 CET 2010.
--------
--- lcms2/lcms2.changes 2010-11-10 09:57:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/lcms2/lcms2.changes 2010-12-26 19:49:47.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Dec 26 18:03:50 UTC 2010 - adrian(a)suse.de
+
+- update to version 2.1
+ * maintenance release (no further details in changelog)
+- remove obsolete patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service:recompress:download_url:lcms2-2.0a.tar.bz2
lcms-fix-return-values.patch
workaround-gcc-bug.diff
New:
----
_service:recompress:download_url:lcms2-2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lcms2.spec ++++++
--- /var/tmp/diff_new_pack.yPZuTj/_old 2010-12-29 00:11:32.000000000 +0100
+++ /var/tmp/diff_new_pack.yPZuTj/_new 2010-12-29 00:11:32.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package lcms2 (Version 2.0a)
+# spec file for package lcms2 (Version 2.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
Group: Productivity/Graphics/Other
Summary: Little CMS Engine - A color managment library and tools
Url: http://www.littlecms.com/
-Version: 2.0a
-Release: 2
+Version: 2.1
+Release: 1
%if 0%{?suse_version}
BuildRequires: libjpeg-devel libtiff-devel pkg-config zlib-devel
@@ -42,8 +42,6 @@
Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch: lcms-endian.patch
-Patch1: lcms-fix-return-values.patch
-Patch2: workaround-gcc-bug.diff
%description
Littlecms is a small speed optimized color management engine.
@@ -84,12 +82,8 @@
%prep
-%setup -q -n lcms-2.0
+%setup -q
%patch
-%patch1
-%if 0%{?suse_version} == 01110
-%patch2
-%endif
chmod a-x doc/* COPYING AUTHORS
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.yPZuTj/_old 2010-12-29 00:11:32.000000000 +0100
+++ /var/tmp/diff_new_pack.yPZuTj/_new 2010-12-29 00:11:32.000000000 +0100
@@ -1,12 +1,17 @@
+<?xml version="1.0" ?>
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">downloads.sourceforge.net</param>
- <param name="path">/project/lcms/lcms/2.0/lcms2-2.0a.tar.gz</param>
+ <param name="path">/project/lcms/lcms/2.1/lcms2-2.1.tar.gz</param>
</service>
<service name="verify_file">
- <param name="file">_service:download_url:lcms2-2.0a.tar.gz</param>
+ <param name="file">_service:download_url:lcms2-2.1.tar.gz</param>
<param name="verifier">sha256</param>
- <param name="check-sum">6deaf78611f5978ff58aa85efc37cf070b6ffb7106486b894914c4fc548d054f</param>
+ <param name="checksum">8b367bd60add7806c9aac970594dae636c24ba28dc774c00f8067644994e9c30</param>
</service>
-<service name="recompress"><param name="file">_service:download_url:lcms2-2.0a.tar.gz</param><param name="compression">bz2</param></service></services>
\ No newline at end of file
+ <service name="recompress">
+ <param name="file">*.tar.gz</param>
+ <param name="compression">bz2</param>
+ </service>
+</services>
++++++ _service:recompress:download_url:lcms2-2.0a.tar.bz2 -> _service:recompress:download_url:lcms2-2.1.tar.bz2 ++++++
++++ 8098 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Wed Dec 29 00:11:11 CET 2010.
--------
--- ksh/ksh.changes 2010-10-21 12:37:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes 2010-10-27 14:15:30.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 27 14:14:28 CEST 2010 - werner(a)suse.de
+
+- Change fix for bnc#636389 to my first approach as this
+ does not hang on x86_64
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.29B4ev/_old 2010-12-29 00:10:30.000000000 +0100
+++ /var/tmp/diff_new_pack.29B4ev/_new 2010-12-29 00:10:30.000000000 +0100
@@ -37,7 +37,7 @@
%endif
AutoReqProv: on
Version: 93t
-Release: 182
+Release: 183
Summary: Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
++++++ ksh93-ifs.dif ++++++
--- /var/tmp/diff_new_pack.29B4ev/_old 2010-12-29 00:10:31.000000000 +0100
+++ /var/tmp/diff_new_pack.29B4ev/_new 2010-12-29 00:10:31.000000000 +0100
@@ -1,10 +1,41 @@
+---
+ src/cmd/ksh93/sh/init.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
--- src/cmd/ksh93/sh/init.c
-+++ src/cmd/ksh93/sh/init.c Fri Oct 8 13:16:10 2010
-@@ -1709,6 +1709,7 @@
++++ src/cmd/ksh93/sh/init.c 2010-10-08 12:43:27.123926224 +0000
+@@ -456,6 +456,8 @@ static void put_cdpath(register Namval_t
+ }
+ #endif /* _hdr_locale */
+
++static const void* ifs_hdr;
++
+ /* Trap for IFS assignment and invalidates state table */
+ static void put_ifs(register Namval_t* np,const char *val,int flags,Namfun_t *fp)
+ {
+@@ -464,9 +466,14 @@ static void put_ifs(register Namval_t* n
+ ip->ifsnp = 0;
+ if(!val)
+ {
+- fp = nv_stack(np, NIL(Namfun_t*));
+- if(fp && !fp->nofree)
+- free((void*)fp);
++ Namfun_t *xp = nv_stack(np, NIL(Namfun_t*));
++ if(xp)
++ {
++ if(xp == ifs_hdr)
++ xp->nofree = 1;
++ if(xp->nofree == 0)
++ free((void*)xp);
++ }
+ }
+ if(val != np->nvalue.cp)
+ nv_putv(np, val, flags, fp);
+@@ -1597,6 +1604,7 @@ static Init_t *nv_init(Shell_t *shp)
ip->LANG_init.nofree = 1;
#endif /* _hdr_locale */
nv_stack(IFSNOD, &ip->IFS_init.hdr);
-+ ip->IFS_init.hdr.nofree = 1;
++ ifs_hdr = (IFSNOD)->nvfun;
nv_stack(PATHNOD, &ip->PATH_init);
nv_stack(FPATHNOD, &ip->FPATH_init);
nv_stack(CDPNOD, &ip->CDPATH_init);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package koffice2 for openSUSE:Factory
checked in at Wed Dec 29 00:10:07 CET 2010.
--------
--- KDE/koffice2/koffice2-doc.changes 2010-12-14 11:41:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-12-29 00:09:32.285077000 +0100
@@ -1,0 +2,15 @@
+Tue Dec 21 13:33:53 UTC 2010 - coolo(a)novell.com
+
+- libexif got split
+
+-------------------------------------------------------------------
+Wed Dec 15 21:06:44 UTC 2010 - tittiatcoke(a)gmail.com
+
+- Added lcms2 as dependency for Factory
+
+-------------------------------------------------------------------
+Tue Dec 14 19:34:16 UTC 2010 - tittiatcoke(a)gmail.com
+
+- Added an patch from upstream to prevent a crash (bko#259262)
+
+-------------------------------------------------------------------
koffice2.changes: same change
calling whatdependson for head-i586
New:
----
kis_preference_set_registry.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ koffice2-doc.spec ++++++
--- /var/tmp/diff_new_pack.4QfIgI/_old 2010-12-29 00:09:51.000000000 +0100
+++ /var/tmp/diff_new_pack.4QfIgI/_new 2010-12-29 00:09:51.000000000 +0100
@@ -27,7 +27,7 @@
Summary: Documentation of the KDE Office Suite
Url: http://www.koffice.org
Version: 2.2.91
-Release: 1
+Release: 2
Source0: koffice-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ koffice2.spec ++++++
--- /var/tmp/diff_new_pack.4QfIgI/_old 2010-12-29 00:09:51.000000000 +0100
+++ /var/tmp/diff_new_pack.4QfIgI/_new 2010-12-29 00:09:51.000000000 +0100
@@ -18,7 +18,7 @@
Name: koffice2
-BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz libexif libkdepimlibs4-devel
+BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz libkdepimlibs4-devel
BuildRequires: libpoppler-qt4-devel libpqxx-devel libqt4-devel-doc-data mysql-devel postgresql-devel python-devel
BuildRequires: GraphicsMagick-devel gsl-devel libwpd-devel readline-devel ruby-devel sqlite-devel wv2-devel
BuildRequires: glew-devel libeigen2-devel libexiv2-devel libgmm++-devel libqca2-devel libqimageblitz-devel pstoedit
@@ -30,12 +30,18 @@
BuildRequires: libqtgtl-devel opengtl-devel
%endif
%endif
+%if %suse_version > 1130
+BuildRequires: libexif-devel
+BuildRequires: liblcms2-devel
+%else
+BuildRequires: libexif
+%endif
License: GPLv2+ ; LGPLv2.1+
Group: Productivity/Office/Suite
Summary: Libraries and Base Files for the KDE Office Suite
Url: http://www.koffice.org
Version: 2.2.91
-Release: 1
+Release: 2
Source0: koffice-%version.tar.bz2
Source1: hi16-app-kexi.png
Source2: hi22-app-kexi.png
@@ -43,6 +49,7 @@
Source4: hi48-app-kexi.png
Source5: hisc-app-kexi.svgz
Patch2: koffice_remove_python_shebangs.diff
+Patch3: kis_preference_set_registry.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%kde4_pimlibs_requires
@@ -70,6 +77,7 @@
%prep
%setup -q -n koffice-%version
%patch2
+%patch3 -p1
cp %SOURCE1 kexi/pics
cp %SOURCE2 kexi/pics
++++++ kis_preference_set_registry.patch ++++++
--- koffice/krita/ui/kis_preference_set_registry.cpp 2010/12/03 21:04:19 1203400
+++ koffice/krita/ui/kis_preference_set_registry.cpp 2010/12/14 17:35:43 1206503
@@ -25,9 +25,9 @@
KisPreferenceSetRegistry ::~KisPreferenceSetRegistry ()
{
- foreach(QString id, keys()) {
- delete get(id);
- }
+// foreach(QString id, keys()) {
+// delete get(id);
+// }
dbgRegistry << "deleting KisPreferenceSetRegistry ";
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kipi-plugins for openSUSE:Factory
checked in at Wed Dec 29 00:08:48 CET 2010.
--------
--- KDE/kipi-plugins/kipi-plugins.changes 2010-11-23 17:56:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins.changes 2010-12-24 10:40:21.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Dec 24 09:37:34 UTC 2010 - Nico.Laus.2001(a)gmx.de
+
+- updated source tarball to the new one which includes the missing
+ translations
+
+-------------------------------------------------------------------
+Wed Dec 22 21:17:36 UTC 2010 - Nico.Laus.2001(a)gmx.de
+
+- Update to version 1.7.0
+ * new plugin to export images to Debian Screenshoots web service
+ (http://screenshots.debian.net)
+ * new plugin to export images to an instant messaging contact
+ * Bugfixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service:download_url:kipi-plugins-1.6.0.tar.bz2
buildfix.diff
New:
----
_service:download_url:kipi-plugins-1.7.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kipi-plugins.spec ++++++
--- /var/tmp/diff_new_pack.BHHnDF/_old 2010-12-29 00:08:33.000000000 +0100
+++ /var/tmp/diff_new_pack.BHHnDF/_new 2010-12-29 00:08:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kipi-plugins (Version 1.6.0)
+# spec file for package kipi-plugins (Version 1.7.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -40,9 +40,9 @@
Url: http://www.kipi-plugins.org/
Group: Productivity/Graphics/Other
Summary: KDE Plug-Ins for Image Manipulation
-Version: 1.6.0
+Version: 1.7.0
Release: 1
-%define rversion 1.6.0
+%define rversion 1.7.0
Recommends: dcraw
Requires: /usr/bin/jpegtran
Recommends: %{name}-lang = %{version}
@@ -52,7 +52,6 @@
Source1: %{name}-docs.tar.bz2
Source2: %{name}-po.tar.bz2
Patch: desktop-files.diff
-Patch1: buildfix.diff
Patch2: desktop-files-112.diff
Provides: kde4-kipi-plugins = 0.2
Obsoletes: kde4-kipi-plugins <= 0.2
@@ -122,7 +121,6 @@
%prep
%setup -q -n %name-%rversion -a 1
%patch
-%patch1 -p0
%if %suse_version < 1130 && 0%{?kde_updatedapps}
%patch2
%endif
@@ -208,6 +206,7 @@
%_kde4_modules/kipiplugin_ipodexport.so
%_kde4_modules/kipiplugin_jpeglossless.so
%_kde4_modules/kipiplugin_kioexportimport.so
+%_kde4_modules/kipiplugin_kopete.so
%_kde4_modules/kipiplugin_metadataedit.so
%_kde4_modules/kipiplugin_piwigoexport.so
%_kde4_modules/kipiplugin_picasawebexport.so
@@ -232,6 +231,7 @@
%_kde_share_dir/services/kipiplugin_ipodexport.desktop
%_kde_share_dir/services/kipiplugin_jpeglossless.desktop
%_kde_share_dir/services/kipiplugin_kioexportimport.desktop
+%_kde_share_dir/services/kipiplugin_kopete.desktop
%_kde_share_dir/services/kipiplugin_metadataedit.desktop
%_kde_share_dir/services/kipiplugin_picasawebexport.desktop
%_kde_share_dir/services/kipiplugin_piwigoexport.desktop
++++++ _service ++++++
--- /var/tmp/diff_new_pack.BHHnDF/_old 2010-12-29 00:08:33.000000000 +0100
+++ /var/tmp/diff_new_pack.BHHnDF/_new 2010-12-29 00:08:33.000000000 +0100
@@ -3,11 +3,11 @@
<service name="download_url">
<param name="protocol">http</param>
<param name="host">downloads.sourceforge.net</param>
- <param name="path">/project/kipi/kipi-plugins/1.6.0/kipi-plugins-1.6.0.tar.bz2</param>
+ <param name="path">/project/kipi/kipi-plugins/1.7.0/kipi-plugins-1.7.0.tar.bz2</param>
</service>
<service name="verify_file">
- <param name="file">_service:download_url:kipi-plugins-1.6.0.tar.bz2</param>
+ <param name="file">_service:download_url:kipi-plugins-1.7.0.tar.bz2</param>
<param name="verifier">sha256</param>
- <param name="checksum">a28462924adeb1adf8751d1c6ddede2d4340a66a97ce474d5cf5957a39243eff</param>
+ <param name="checksum">1125295f1999a25332aed22c12f84fc94e8f8df5d8710f38b21374040cb1268a</param>
</service>
</services>
++++++ _service:download_url:kipi-plugins-1.6.0.tar.bz2 -> _service:download_url:kipi-plugins-1.7.0.tar.bz2 ++++++
++++ 110995 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kernel-firmware for openSUSE:Factory
checked in at Wed Dec 29 00:07:37 CET 2010.
--------
--- kernel-firmware/kernel-firmware.changes 2010-07-01 19:13:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-firmware/kernel-firmware.changes 2010-12-15 23:44:47.000000000 +0100
@@ -0,0 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec 15 22:34:12 UTC 2010 - gregkh(a)suse.de
+
+- update to 20101214 version for 2.6.37+ kernel
+
+-------------------------------------------------------------------
+Wed Nov 24 20:02:38 UTC 2010 - coolo(a)novell.com
+
+- update to 20101113 tarball for 2.6.36+ kernel
+
+-------------------------------------------------------------------
+
calling whatdependson for head-i586
Old:
----
linux-firmware-20100617.tar.bz2
New:
----
linux-firmware-20101214.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-firmware.spec ++++++
--- /var/tmp/diff_new_pack.uideRl/_old 2010-12-29 00:07:23.000000000 +0100
+++ /var/tmp/diff_new_pack.uideRl/_new 2010-12-29 00:07:23.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-firmware (Version 20100617)
+# spec file for package kernel-firmware (Version 20101214)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: kernel-firmware
BuildRequires: fdupes kernel-default
-Version: 20100617
+Version: 20101214
Release: 1
Summary: Linux kernel firmware files
License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar)
++++++ linux-firmware-20100617.tar.bz2 -> linux-firmware-20101214.tar.bz2 ++++++
kernel-firmware/linux-firmware-20100617.tar.bz2 /mounts/work_src_done/STABLE/kernel-firmware/linux-firmware-20101214.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
28 Dec '10
Hello community,
here is the log from the commit of package gstreamer-0_10-plugin-crystalhd for openSUSE:Factory
checked in at Wed Dec 29 00:05:52 CET 2010.
--------
--- gstreamer-0_10-plugin-crystalhd/gstreamer-0_10-plugin-crystalhd.changes 2010-09-15 23:07:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugin-crystalhd/gstreamer-0_10-plugin-crystalhd.changes 2010-12-14 17:46:47.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Dec 7 08:19:28 CET 2010 - tiwai(a)suse.de
+
+- updated to v3.5.40: fix S3/S4 (bnc#639155, bnc#639156)
+- build only for x86 and x86-64
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
crystalhd-gst-plugin_3.5.36-1.tar.bz2
New:
----
crystalhd-gst-plugin_3.5.40-1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-0_10-plugin-crystalhd.spec ++++++
--- /var/tmp/diff_new_pack.D6PAST/_old 2010-12-29 00:05:35.000000000 +0100
+++ /var/tmp/diff_new_pack.D6PAST/_new 2010-12-29 00:05:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gstreamer-0_10-plugin-crystalhd (Version 3.5.36)
+# spec file for package gstreamer-0_10-plugin-crystalhd (Version 3.5.40)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,41 +15,38 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
-%define _name crystalhd-gst
-%define gst_branch 0.10
-# Skipt automatic find-provides for gstreamer010() like provides.
-# The plugin provides, amongst others, decoder-video/mpeg, which
-# is too generic and would trigger the package to be installed on nearly
# every machine even wihtout the specific hardware.
%define SKIP_GSTPROVIDES 1
Name: gstreamer-0_10-plugin-crystalhd
-Version: 3.5.36
-Release: 1
-License: LGPLv2.1+
+BuildRequires: gcc-c++
+BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+BuildRequires: libcrystalhd-devel
Summary: Gstreamer crystalhd decoder plugin
-Url: http://www.broadcom.com/support/crystal_hd/
Group: Productivity/Multimedia/Other
-Source0: %{_name}-plugin_%{version}-1.tar.bz2
+Version: 3.5.40
+Release: 1
+License: LGPLv2.1+
+Source0: crystalhd-gst-plugin_%{version}-1.tar.bz2
Source1: README
Source2: LICENSE
-BuildRequires: gcc-c++
-BuildRequires: gstreamer-0_10-devel
-BuildRequires: gstreamer-0_10-plugins-base-devel
-BuildRequires: libcrystalhd-devel
# The package had a very short life as gstreamer-plugin-crystalhd during openSUSE 11.4 development.
Provides: gstreamer-plugin-crystalhd = %{version}
Obsoletes: gstreamer-plugin-crystalhd < %{version}
+Url: http://www.broadcom.com/support/crystal_hd/
+ExclusiveArch: %ix86 x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Gstreamer crystalhd decoder plugin
+This package contains the gstreamer-plugin for Broadcom CrystalHD
+decoder chip.
%prep
-%setup -q -n %{_name}
-cp %{S:1} .
-cp %{S:2} .
+%setup -q -n crystalhd-gst
+cp %{SOURCE1} .
+cp %{SOURCE2} .
%build
%configure --disable-static
@@ -60,11 +57,11 @@
find %{buildroot}%{_libdir} -name '*.la' -delete -print
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,0755)
%doc README LICENSE
-%{_libdir}/gstreamer-%{gst_branch}/libgstbcmdec.so
+%{_libdir}/gstreamer-*/*.so
%changelog
++++++ README ++++++
--- /var/tmp/diff_new_pack.D6PAST/_old 2010-12-29 00:05:36.000000000 +0100
+++ /var/tmp/diff_new_pack.D6PAST/_new 2010-12-29 00:05:36.000000000 +0100
@@ -1,21 +1,20 @@
-Broadcom CrystalHD Linux Software Release v3.7
+Broadcom CrystalHD Linux Software Release v3.200
This is beta release of the Linux driver and application software with support for the BCM70012 and BCM70015
-This is a source release with Ubuntu 10.04 32-bit and 64-bit binary packages
+This is a source release with Ubuntu 10.10 32-bit binary packages
FEATURES SUPPORTED -
-Playback support for H.264 and other codecs using the default media players for Ubuntu and Meego. This includes support for GStreamer based applications.
+Playback support for H.264 and other codecs using the default media players for Ubuntu and Meego. This includes support for GStreamer based applications. Support for VLC and Adobe Flash Player is also in beta with this release.
Support both BCM70012 and BCM70015
FIXED ISSUES
-Fixed issue with incorrectly enabling HW scaling
-KNOWN ISSUES
+Added support to resume the HW on resume from S3/S4
-Seeking hangs the player
+KNOWN ISSUES
BUILD and INSTALL instructions for source packages
++++++ crystalhd-gst-plugin_3.5.36-1.tar.bz2 -> crystalhd-gst-plugin_3.5.40-1.tar.bz2 ++++++
++++ 2232 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/crystalhd-gst/configure.ac new/crystalhd-gst/configure.ac
--- old/crystalhd-gst/configure.ac 2010-08-18 18:50:04.000000000 +0200
+++ new/crystalhd-gst/configure.ac 2010-12-06 22:36:34.000000000 +0100
@@ -11,7 +11,7 @@
dnl when going to/from release please set the nano correctly !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-bcmdec, GST_PLUGIN_VERSION, 0, 10, 0, 36,
+AS_VERSION(gst-bcmdec, GST_PLUGIN_VERSION, 0, 10, 0, 40,
GST_PLUGIN_CVS="no", GST_PLUGIN_CVS="yes")
dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/crystalhd-gst/debian/changelog new/crystalhd-gst/debian/changelog
--- old/crystalhd-gst/debian/changelog 2010-08-18 19:34:29.000000000 +0200
+++ new/crystalhd-gst/debian/changelog 2010-12-07 00:20:38.000000000 +0100
@@ -1,4 +1,4 @@
-crystalhd-gst-plugin (3.5.36-1) unstable; urgency=low
+crystalhd-gst-plugin (3.5.40-1) unstable; urgency=low
* Initial Debian package release
* Added support for MPEG-4, DIVX, XVID
@@ -8,4 +8,8 @@
* Fixed issue with previous fix for HW scaling
- -- Narendra Sankar <nsankar@nsankar64-laptop> Wed, 18 Aug 2010 17:33:51 +0000
+ * Cleaned up GStreamer State Management code
+ * Added support to playback DVB mpeg-2 streams with no codec_data
+ * Added support to playback certain DiVX streams with no codec_data
+
+ -- Narendra Sankar <nsankar(a)broadcom.com> Mon, 06 Dec 2010 15:16:25 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/crystalhd-gst/src/gstbcmdec.c new/crystalhd-gst/src/gstbcmdec.c
--- old/crystalhd-gst/src/gstbcmdec.c 2010-08-16 22:25:28.000000000 +0200
+++ new/crystalhd-gst/src/gstbcmdec.c 2010-12-06 22:36:34.000000000 +0100
@@ -63,10 +63,9 @@
guint32 offset, GstClockTime tCurrent,
guint8 flags)
{
- BC_STATUS sts, suspend_sts = BC_STS_SUCCESS;
- gboolean suspended = FALSE;
- guint32 rll=0;
- guint32 nextPicNumFlags = 0;
+ BC_STATUS sts = BC_STS_SUCCESS;
+
+ GST_DEBUG_OBJECT(bcmdec, "Attempting to Send Buffer");
sts = decif_send_buffer(&bcmdec->decif, pbuffer, size, tCurrent, flags);
@@ -75,34 +74,7 @@
GST_ERROR_OBJECT(bcmdec, "Chain: timeStamp = %llu size = %d data = %p",
GST_BUFFER_TIMESTAMP(buf), GST_BUFFER_SIZE(buf),
GST_BUFFER_DATA (buf));
- if ((sts == BC_STS_IO_USER_ABORT) || (sts == BC_STS_ERROR)) {
- suspend_sts = decif_get_drv_status(&bcmdec->decif,&suspended, &rll, &nextPicNumFlags);
- if (suspend_sts == BC_STS_SUCCESS) {
- if (suspended) {
- GST_DEBUG_OBJECT(bcmdec, "suspend status recv");
- if (!bcmdec->suspend_mode) {
- bcmdec_suspend_callback(bcmdec);
- bcmdec->suspend_mode = TRUE;
- GST_DEBUG_OBJECT(bcmdec, "suspend done", sts);
- }
- if (bcmdec_resume_callback(bcmdec) == BC_STS_SUCCESS) {
- GST_DEBUG_OBJECT(bcmdec, "resume done", sts);
- bcmdec->suspend_mode = FALSE;
- sts = decif_send_buffer(&bcmdec->decif, pbuffer, size, tCurrent, flags);
- GST_ERROR_OBJECT(bcmdec, "proc input..2 sts = %d", sts);
- } else {
- GST_DEBUG_OBJECT(bcmdec, "resume failed", sts);
- }
- }
- else if (sts == BC_STS_ERROR) {
- GST_DEBUG_OBJECT(bcmdec, "device is not suspended");
- //gst_buffer_unref (buf);
- return GST_FLOW_ERROR;
- }
- } else {
- GST_DEBUG_OBJECT(bcmdec, "decif_get_drv_status -- failed %d", sts);
- }
- }
+ return GST_FLOW_ERROR;
}
return GST_FLOW_OK;
@@ -127,13 +99,13 @@
*
* describe the real formats here.
*/
-static GstStaticPadTemplate sink_factory_bcm70015 = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+GstStaticPadTemplate sink_factory_bcm70015 = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
GST_STATIC_CAPS("video/mpeg, " "mpegversion = (int) {2, 4}," "systemstream =(boolean) false; "
"video/x-h264;" "video/x-vc1;" "video/x-wmv, " "wmvversion = (int) {3};"
"video/x-msmpeg, " "msmpegversion = (int) {43};"
"video/x-divx, " "divxversion = (int) {3, 4, 5};" "video/x-xvid;"));
-static GstStaticPadTemplate sink_factory_bcm70012 = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+GstStaticPadTemplate sink_factory_bcm70012 = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
GST_STATIC_CAPS("video/mpeg, " "mpegversion = (int) {2}," "systemstream =(boolean) false; "
"video/x-h264;" "video/x-vc1;" "video/x-wmv, " "wmvversion = (int) {3};"));
@@ -162,10 +134,12 @@
static GstElementDetails element_details;
BC_HW_CAPS hwCaps;
+ GST_DEBUG_OBJECT(gclass, "gst_bcmdec_base_init");
+
element_details.klass = (gchar *)"Codec/Decoder/Video";
element_details.longname = (gchar *)"Generic Video Decoder";
element_details.description = (gchar *)"Decodes various Video Formats using CrystalHD Decoders";
- element_details.author = (gchar *)"BRCM";
+ element_details.author = (gchar *)"Broadcom Corp.";
GstElementClass *element_class = GST_ELEMENT_CLASS(gclass);
@@ -173,8 +147,10 @@
decif_getcaps(NULL, &hwCaps);
gst_element_class_add_pad_template(element_class, gst_static_pad_template_get (&src_factory));
- if(hwCaps.DecCaps & BC_DEC_FLAGS_M4P2)
+ if(hwCaps.DecCaps & BC_DEC_FLAGS_M4P2) {
+ GST_DEBUG_OBJECT(gclass, "Found M4P2 support");
gst_element_class_add_pad_template(element_class, gst_static_pad_template_get (&sink_factory_bcm70015));
+ }
else
gst_element_class_add_pad_template(element_class, gst_static_pad_template_get (&sink_factory_bcm70012));
gst_element_class_set_details(element_class, &element_details);
@@ -189,6 +165,8 @@
gobject_class = (GObjectClass *)klass;
gstelement_class = (GstElementClass *)klass;
+ GST_DEBUG_OBJECT(klass, "gst_bcmdec_class_init");
+
gstelement_class->change_state = gst_bcmdec_change_state;
gobject_class->set_property = gst_bcmdec_set_property;
@@ -586,7 +564,17 @@
return FALSE;
}
}
- } else {
+ }
+ else if(bcmdec->input_format == BC_MSUBTYPE_MPEG2VIDEO)
+ {
+ // For MPEG-2 don't need any additional codec_data is most cases
+ GST_DEBUG_OBJECT(bcmdec, "no codec_data for MPEG-2. Trying to decode anyway");
+ }
+ else if(bcmdec->input_format == BC_MSUBTYPE_DIVX){
+ // For DIVX don't need any additional codec_data is most cases
+ GST_DEBUG_OBJECT(bcmdec, "no codec_data for MPEG-4. Trying to decode anyway");
+ }
+ else {
GST_DEBUG_OBJECT(bcmdec, "no codec_data. Don't know how to handle");
gst_object_unref(bcmdec);
return FALSE;
@@ -675,7 +663,7 @@
} else if (!bcmdec->streaming) {
GST_DEBUG_OBJECT(bcmdec, "input while streaming is false");
gst_buffer_unref(buf);
- return GST_FLOW_OK;
+ return GST_FLOW_WRONG_STATE;
}
pbuffer = GST_BUFFER_DATA (buf);
@@ -802,8 +790,8 @@
bcInputFormat.Progressive = !(bcmdec->interlace);
bcInputFormat.mSubtype= bcmdec->input_format;
- //Use Demux Image Size for VC-1 Simple/Main
- if(bcInputFormat.mSubtype == BC_MSUBTYPE_WMV3)
+ //Use Demux Image Size for VC-1 Simple/Main and for DIVX311
+ if(bcInputFormat.mSubtype == BC_MSUBTYPE_WMV3 || bcInputFormat.mSubtype == BC_MSUBTYPE_DIVX311)
{
//VC-1 Simple/Main
bcInputFormat.width = bcmdec->frame_width;
@@ -872,6 +860,7 @@
BC_STATUS sts = BC_STS_SUCCESS;
GstClockTime clock_time;
GstClockTime base_clock_time;
+ int ret = 0;
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
@@ -891,6 +880,9 @@
return GST_STATE_CHANGE_FAILURE;
}
+ break;
+
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!bcmdec_start_recv_thread(bcmdec)) {
GST_ERROR_OBJECT(bcmdec, "GST_STATE_CHANGE_NULL_TO_READY -failed");
return GST_STATE_CHANGE_FAILURE;
@@ -904,9 +896,6 @@
return GST_STATE_CHANGE_FAILURE;
}
- break;
-
- case GST_STATE_CHANGE_READY_TO_PAUSED:
bcmdec->play_pending = TRUE;
GST_DEBUG_OBJECT(bcmdec, "GST_STATE_CHANGE_READY_TO_PAUSED");
break;
@@ -925,25 +914,12 @@
case GST_STATE_CHANGE_PAUSED_TO_READY:
GST_DEBUG_OBJECT(bcmdec, "GST_STATE_CHANGE_PAUSED_TO_READY");
bcmdec->streaming = FALSE;
+ GST_DEBUG_OBJECT(bcmdec, "Flushing\n");
sts = decif_flush_dec(&bcmdec->decif, 2);
if (sts != BC_STS_SUCCESS)
GST_ERROR_OBJECT(bcmdec, "Dec flush failed %d",sts);
- break;
-
- default:
- GST_DEBUG_OBJECT(bcmdec, "default %d", transition);
- break;
- }
- result = GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
- if (result == GST_STATE_CHANGE_FAILURE) {
- GST_ERROR_OBJECT(bcmdec, "parent calss state change failed");
- return result;
- }
-
- switch (transition) {
-
- case GST_STATE_CHANGE_PAUSED_TO_READY:
if (!bcmdec->play_pending) {
+ GST_DEBUG_OBJECT(bcmdec, "Stopping\n");
sts = decif_stop(&bcmdec->decif);
if (sts == BC_STS_SUCCESS) {
if (!bcmdec->silent)
@@ -956,16 +932,36 @@
GST_ERROR_OBJECT(bcmdec, "stop play failed %d", sts);
}
}
- break;
+ GST_DEBUG_OBJECT(bcmdec, "Stopping threads\n");
+ if (bcmdec->get_rbuf_thread) {
+ GST_DEBUG_OBJECT(bcmdec, "rbuf stop event");
+ if (sem_post(&bcmdec->rbuf_stop_event) == -1)
+ GST_ERROR_OBJECT(bcmdec, "sem_post failed");
+ GST_DEBUG_OBJECT(bcmdec, "waiting for get_rbuf_thread exit");
+ ret = pthread_join(bcmdec->get_rbuf_thread, NULL);
+ GST_DEBUG_OBJECT(bcmdec, "get_rbuf_thread exit - %d errno = %d", ret, errno);
+ bcmdec->get_rbuf_thread = 0;
+ }
+
+ if (bcmdec->recv_thread) {
+ GST_DEBUG_OBJECT(bcmdec, "quit event");
+ if (sem_post(&bcmdec->quit_event) == -1)
+ GST_ERROR_OBJECT(bcmdec, "sem_post failed");
+ GST_DEBUG_OBJECT(bcmdec, "waiting for rec_thread exit");
+ ret = pthread_join(bcmdec->recv_thread, NULL);
+ GST_DEBUG_OBJECT(bcmdec, "thread exit - %d errno = %d", ret, errno);
+ bcmdec->recv_thread = 0;
+ }
+
+ if (bcmdec->push_thread) {
+ GST_DEBUG_OBJECT(bcmdec, "waiting for push_thread exit");
+ ret = pthread_join(bcmdec->push_thread, NULL);
+ GST_DEBUG_OBJECT(bcmdec, "push_thread exit - %d errno = %d", ret, errno);
+ bcmdec->push_thread = 0;
+ }
- case GST_STATE_CHANGE_READY_TO_NULL:
- GST_DEBUG_OBJECT(bcmdec, "GST_STATE_CHANGE_READY_TO_NULL");
- sts = gst_bcmdec_cleanup(bcmdec);
- if (sts == BC_STS_SUCCESS)
- GST_DEBUG_OBJECT(bcmdec, "dev close success");
- else
- GST_ERROR_OBJECT(bcmdec, "dev close failed %d", sts);
break;
+
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
GST_DEBUG_OBJECT(bcmdec, "GST_STATE_CHANGE_PLAYING_TO_PAUSED");
break;
@@ -974,6 +970,20 @@
GST_DEBUG_OBJECT(bcmdec, "default %d", transition);
break;
}
+ result = GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
+ if (result == GST_STATE_CHANGE_FAILURE) {
+ GST_ERROR_OBJECT(bcmdec, "parent class state change failed");
+ return result;
+ }
+
+ if(transition == GST_STATE_CHANGE_READY_TO_NULL) {
+ GST_DEBUG_OBJECT(bcmdec, "GST_STATE_CHANGE_READY_TO_NULL");
+ sts = gst_bcmdec_cleanup(bcmdec);
+ if (sts == BC_STS_SUCCESS)
+ GST_DEBUG_OBJECT(bcmdec, "dev close success");
+ else
+ GST_ERROR_OBJECT(bcmdec, "dev close failed %d", sts);
+ }
return result;
}
@@ -1218,6 +1228,8 @@
int ret = 0, i = 0;
sem_t *event_list[] = { &bcmdec->play_event, &bcmdec->quit_event };
+ GST_DEBUG_OBJECT(bcmdec, "Waiting for event\n");
+
while (1) {
for (i = 0; i < 2; i++) {
@@ -1397,6 +1409,7 @@
GST_DEBUG_OBJECT(bcmdec, "wait over streaming = %d", bcmdec->streaming);
while (bcmdec->streaming && !bcmdec->last_picture_set) {
+ GST_DEBUG_OBJECT(bcmdec, "Getting Status");
// NAREN FIXME - This is HARDCODED right now till we get HW PAUSE and RESUME working from the driver
uint32_t rll;
gboolean tmp;
@@ -1413,8 +1426,12 @@
}
if(rll == 0) {
- usleep(3 * 1000);
- continue;
+ GST_DEBUG_OBJECT(bcmdec, "No Picture Found");
+ usleep(5 * 1000);
+ // Check if there was an EOS signalled
+ decif_get_eos(&bcmdec->decif, &bEOS);
+ if(!bEOS)
+ continue;
}
guint8* data_ptr;
@@ -1480,6 +1497,22 @@
continue;
}
}
+ if (bEOS) {
+ if (gstbuf) {
+ gst_buffer_unref(gstbuf);
+ gstbuf = NULL;
+ }
+ if (gst_queue_element) {
+ gst_queue_element->gstbuf = NULL;
+ bcmdec_ins_buf(bcmdec, gst_queue_element);
+ gst_queue_element = NULL;
+ } else {
+ GST_DEBUG_OBJECT(bcmdec, "queue element failed");
+ }
+ GST_DEBUG_OBJECT(bcmdec, "last picture set ");
+ bcmdec->last_picture_set = TRUE;
+ continue;
+ }
sts = DtsProcOutput(bcmdec->decif.hdev, PROC_TIMEOUT, &pout);
GST_DEBUG_OBJECT(bcmdec, "procoutput status %d", sts);
switch (sts) {
@@ -1651,16 +1684,17 @@
}
if (rx_flush) {
if (!bcmdec->flushing) {
- GST_DEBUG_OBJECT(bcmdec, "DtsFlushRxCapture called");
- sts = decif_flush_rxbuf(&bcmdec->decif, FALSE);
- if (sts != BC_STS_SUCCESS)
- GST_DEBUG_OBJECT(bcmdec, "DtsFlushRxCapture failed");
+// GST_DEBUG_OBJECT(bcmdec, "DtsFlushRxCapture called");
+// sts = decif_flush_rxbuf(&bcmdec->decif, FALSE);
+// if (sts != BC_STS_SUCCESS)
+// GST_DEBUG_OBJECT(bcmdec, "DtsFlushRxCapture failed");
}
rx_flush = FALSE;
if (bcmdec->flushing) {
if (sem_post(&bcmdec->recv_stop_event) == -1)
GST_ERROR_OBJECT(bcmdec, "recv_stop sem_post failed");
}
+ GST_DEBUG_OBJECT(bcmdec, "DtsFlushRxCapture Done");
}
}
GST_DEBUG_OBJECT(bcmdec, "Rx thread exiting ..");
@@ -1794,6 +1828,8 @@
bcmdec->streaming = TRUE;
bcmdec->rpt_pic_cnt = 0;
+ GST_DEBUG_OBJECT(bcmdec, "flush stop started");
+
if (sem_post(&bcmdec->play_event) == -1)
GST_ERROR_OBJECT(bcmdec, "sem_post failed");
@@ -1857,38 +1893,10 @@
static BC_STATUS gst_bcmdec_cleanup(GstBcmDec *bcmdec)
{
BC_STATUS sts = BC_STS_SUCCESS;
- int ret = 1;
GST_DEBUG_OBJECT(bcmdec, "gst_bcmdec_cleanup - enter");
bcmdec->streaming = FALSE;
- if (bcmdec->get_rbuf_thread) {
- GST_DEBUG_OBJECT(bcmdec, "gst_bcmdec_cleanup - post quit_event");
- if (sem_post(&bcmdec->rbuf_stop_event) == -1)
- GST_ERROR_OBJECT(bcmdec, "sem_post failed");
- GST_DEBUG_OBJECT(bcmdec, "waiting for get_rbuf_thread exit");
- ret = pthread_join(bcmdec->get_rbuf_thread, NULL);
- GST_DEBUG_OBJECT(bcmdec, "get_rbuf_thread exit - %d errno = %d", ret, errno);
- bcmdec->get_rbuf_thread = 0;
- }
-
- if (bcmdec->recv_thread) {
- GST_DEBUG_OBJECT(bcmdec, "gst_bcmdec_cleanup - post quit_event");
- if (sem_post(&bcmdec->quit_event) == -1)
- GST_ERROR_OBJECT(bcmdec, "sem_post failed");
- GST_DEBUG_OBJECT(bcmdec, "waiting for rec_thread exit");
- ret = pthread_join(bcmdec->recv_thread, NULL);
- GST_DEBUG_OBJECT(bcmdec, "thread exit - %d errno = %d", ret, errno);
- bcmdec->recv_thread = 0;
- }
-
- if (bcmdec->push_thread) {
- GST_DEBUG_OBJECT(bcmdec, "waiting for push_thread exit");
- ret = pthread_join(bcmdec->push_thread, NULL);
- GST_DEBUG_OBJECT(bcmdec, "push_thread exit - %d errno = %d", ret, errno);
- bcmdec->push_thread = 0;
- }
-
bcmdec_release_mem_buf_que_pool(bcmdec);
// bcmdec_release_mem_rbuf_que_pool(bcmdec);
@@ -2222,99 +2230,6 @@
return sts;
}
-static BC_STATUS bcmdec_suspend_callback(GstBcmDec *bcmdec)
-{
- BC_STATUS sts = BC_STS_SUCCESS;
- bcmdec_flush_gstbuf_queue(bcmdec);
-
- bcmdec->base_time = 0;
- if (bcmdec->decif.hdev)
- sts = decif_close(&bcmdec->decif);
- bcmdec->codec_params.inside_buffer = TRUE;
- bcmdec->codec_params.consumed_offset = 0;
- bcmdec->codec_params.strtcode_offset = 0;
- bcmdec->codec_params.nal_sz = 0;
- bcmdec->insert_pps = TRUE;
-
- return sts;
-}
-
-static BC_STATUS bcmdec_resume_callback(GstBcmDec *bcmdec)
-{
- BC_STATUS sts = BC_STS_SUCCESS;
- BC_INPUT_FORMAT bcInputFormat;
-
- sts = decif_open(&bcmdec->decif);
- if (sts == BC_STS_SUCCESS) {
- GST_DEBUG_OBJECT(bcmdec, "dev open success");
- } else {
- GST_ERROR_OBJECT(bcmdec, "dev open failed %d", sts);
- return sts;
- }
-
- bcInputFormat.OptFlags = 0; // NAREN - FIXME - Should we enable BD mode and max frame rate mode for LINK?
- bcInputFormat.FGTEnable = FALSE;
- bcInputFormat.MetaDataEnable = FALSE;
- bcInputFormat.Progressive = !(bcmdec->interlace);
- bcInputFormat.mSubtype= bcmdec->input_format;
-
- //Use Demux Image Size for VC-1 Simple/Main
- if(bcInputFormat.mSubtype == BC_MSUBTYPE_WMV3)
- {
- //VC-1 Simple/Main
- bcInputFormat.width = bcmdec->frame_width;
- bcInputFormat.height = bcmdec->frame_height;
- }
- else
- {
- bcInputFormat.width = bcmdec->output_params.width;
- bcInputFormat.height = bcmdec->output_params.height;
- }
-
- bcInputFormat.startCodeSz = bcmdec->codec_params.nal_size_bytes;
- bcInputFormat.pMetaData = bcmdec->codec_params.sps_pps_buf;
- bcInputFormat.metaDataSz = bcmdec->codec_params.pps_size;
- bcInputFormat.OptFlags = 0x80000000 | vdecFrameRate23_97;
-
- sts = decif_setinputformat(&bcmdec->decif, bcInputFormat);
- if (sts == BC_STS_SUCCESS) {
- GST_DEBUG_OBJECT(bcmdec, "set input format success");
- } else {
- GST_ERROR_OBJECT(bcmdec, "set input format failed");
- bcmdec->streaming = FALSE;
- return sts;
- }
-
- sts = decif_prepare_play(&bcmdec->decif);
- if (sts == BC_STS_SUCCESS) {
- GST_DEBUG_OBJECT(bcmdec, "prepare play success");
- } else {
- GST_ERROR_OBJECT(bcmdec, "prepare play failed %d", sts);
- bcmdec->streaming = FALSE;
- return sts;
- }
-
- decif_setcolorspace(&bcmdec->decif, BUF_MODE);
-
- sts = decif_start_play(&bcmdec->decif);
- if (sts == BC_STS_SUCCESS) {
- GST_DEBUG_OBJECT(bcmdec, "start play success");
- bcmdec->streaming = TRUE;
- } else {
- GST_ERROR_OBJECT(bcmdec, "start play failed %d", sts);
- bcmdec->streaming = FALSE;
- return sts;
- }
-
- if (sem_post(&bcmdec->play_event) == -1)
- GST_ERROR_OBJECT(bcmdec, "sem_post failed");
-
- if (sem_post(&bcmdec->push_start_event) == -1)
- GST_ERROR_OBJECT(bcmdec, "push_start post failed");
-
- return sts;
-}
-
static gboolean bcmdec_mul_inst_cor(GstBcmDec *bcmdec)
{
struct timespec ts;
@@ -2555,13 +2470,13 @@
if (!bcmdec->silent)
GST_DEBUG_OBJECT(bcmdec, "mbuf full == TRUE %u", bcmdec->gst_buf_que_sz);
- usleep(1000 * 1000); // Sleep for a second since we have 350 buffers queued up
+ usleep(100 * 1000); // Sleep since we have buffers queued up
continue;
}
bufSz = bcmdec->output_params.width * bcmdec->output_params.height * BUF_MULT;
- //GST_DEBUG_OBJECT(bcmdec, "process get rbuf gst_pad_alloc_buffer_and_set_caps ....");
+ GST_DEBUG_OBJECT(bcmdec, "process get rbuf gst_pad_alloc_buffer_and_set_caps ....");
ret = gst_pad_alloc_buffer_and_set_caps(bcmdec->srcpad, GST_BUFFER_OFFSET_NONE,
bufSz, GST_PAD_CAPS(bcmdec->srcpad), &gstbuf);
if (ret != GST_FLOW_OK) {
@@ -2766,7 +2681,5 @@
}
/* gstreamer looks for this structure to register bcmdec */
-GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR,
- "bcmdec", "Video decoder", plugin_init, VERSION,
- "LGPL", "bcmdec", "http://broadcom.com/")
+GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, "bcmdec", "Video decoder", plugin_init, VERSION, "LGPL", "bcmdec", "http://broadcom.com/")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/crystalhd-gst/src/gstbcmdec.h new/crystalhd-gst/src/gstbcmdec.h
--- old/crystalhd-gst/src/gstbcmdec.h 2010-07-26 17:44:28.000000000 +0200
+++ new/crystalhd-gst/src/gstbcmdec.h 2010-12-06 22:36:34.000000000 +0100
@@ -350,12 +350,6 @@
static void
bcmdec_process_flush_stop(GstBcmDec* filter);
-static BC_STATUS
-bcmdec_resume_callback(GstBcmDec* filter);
-
-static BC_STATUS
-bcmdec_suspend_callback(GstBcmDec* filter);
-
static gboolean
bcmdec_mul_inst_cor(GstBcmDec* filter);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/crystalhd-gst/src/parse.c new/crystalhd-gst/src/parse.c
--- old/crystalhd-gst/src/parse.c 2010-07-14 23:46:59.000000000 +0200
+++ new/crystalhd-gst/src/parse.c 2010-12-06 22:36:34.000000000 +0100
@@ -85,7 +85,7 @@
gint FindBSStartCode(guint8 *Buf, gint ZerosInStartcode)
{
- BOOL bStartCode = TRUE;
+ bool bStartCode = TRUE;
gint i;
for (i = 0; i < ZerosInStartcode; i++)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gimp-lqr-plugin for openSUSE:Factory
checked in at Wed Dec 29 00:05:16 CET 2010.
--------
--- GNOME/gimp-lqr-plugin/gimp-lqr-plugin.changes 2010-12-07 16:18:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/gimp-lqr-plugin/gimp-lqr-plugin.changes 2010-12-28 10:42:35.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 28 09:42:14 UTC 2010 - dimstar(a)opensuse.org
+
+- Own directory structure to fix build on Factory.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gimp-lqr-plugin.spec ++++++
--- /var/tmp/diff_new_pack.8g1sqy/_old 2010-12-29 00:03:30.000000000 +0100
+++ /var/tmp/diff_new_pack.8g1sqy/_new 2010-12-29 00:03:30.000000000 +0100
@@ -20,7 +20,7 @@
Name: gimp-lqr-plugin
Version: 0.7.1
-Release: 1
+Release: 2
License: GPLv2+
Summary: Content-aware resizing plug-in for GIMP
Url: http://liquidrescale.wikidot.com/
@@ -69,8 +69,14 @@
%files -n gimp-plugin-lqr
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
+%dir %{_libdir}/gimp/
+%dir %{_libdir}/gimp/2.0/
+%dir %{_libdir}/gimp/2.0/plug-ins/
%{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin
%{_libdir}/gimp/2.0/plug-ins/plug_in_lqr_iter
+%dir %{_datadir}/gimp/
+%dir %{_datadir}/gimp/2.0/
+%dir %{_datadir}/gimp/2.0/scripts/
%{_datadir}/gimp-lqr-plugin/
%{_datadir}/gimp/2.0/scripts/batch-gimp-lqr.scm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gst-rtsp for openSUSE:Factory
checked in at Wed Dec 29 00:05:11 CET 2010.
--------
--- GNOME/gst-rtsp/gst-rtsp.changes 2010-10-13 23:50:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/gst-rtsp/gst-rtsp.changes 2010-12-28 10:47:40.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 28 09:46:57 UTC 2010 - dimstar(a)opensuse.org
+
+- Own %{_datadir}/vala/vapi directory structure in -devel.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gst-rtsp.spec ++++++
--- /var/tmp/diff_new_pack.njVC4O/_old 2010-12-29 00:03:59.000000000 +0100
+++ /var/tmp/diff_new_pack.njVC4O/_new 2010-12-29 00:03:59.000000000 +0100
@@ -19,7 +19,7 @@
Name: gst-rtsp
Version: 0.10.7
-Release: 1
+Release: 2
# FIXME: when updating to > 0.10.7, remove --disable-introspection to build gir/typelib. Build fails in 0.10.7.
License: LGPLv2+
Summary: GStreamer based RTSP server library
@@ -99,6 +99,8 @@
%dir %{_datadir}/gst-rtsp/0.10/
# defs for python bindings
%{_datadir}/gst-rtsp/0.10/defs/
+%dir %{_datadir}/vala/
+%dir %{_datadir}/vala/vapi/
%{_datadir}/vala/vapi/gst-rtsp-server-0.10.*
%files -n python-gstreamer-0_10-plugin-rtspserver
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0