File conflicts between alsa-firmware and kernel-firmware
by Tim Jackson
I maintain alsa-firmware and the following bug regarding file conflicts
between recent versions of kernel-firmware and alsa-firmware got raised today:
https://bugzilla.redhat.com/show_bug.cgi?id=487873
I'm not really familiar with the kernel package maintenance, nor who/what
governs what firmware goes into kernel-firmware (and indeed how that is
related to the upstream kernel). I had a cursory look at the kernel spec
in CVS but that didn't appear to have any relevant recent changes that
were obvious.
I did a diff between the firmware in alsa-firmware and in
kernel-firmware-2.6.29-0.172.rc6.git4.fc11 and it's clear that although
there are some overlaps, much of the audio firmware in alsa-firmware isn't
in kernel-firmware.
The current conflicting files are:
ess/*
korg/*
sb16/*
yamaha/ds1_ctrl.fw
yamaha/ds1_dsp.fw
yamaha/ds1e_ctrl.fw
Things that are in alsa-firmware but NOT in the above version of
kernel-firmware are:
asihpi/*
digiface*
3g*
ea/*
emu/*
mixart/*
multiface*
pcxhr/*
vx/*
yamaha/yss225_registers.bin
[usx2y, which does something funky so it's not in /lib/firmware]
Either way, it looks like we need to work together on this.
- I'm happy to just drop the conflicting files from alsa-firmware - is
that the right thing to do?
- Are the above audio firmware files in kernel-firmware there to stay?
- Is there a long term goal to bring all the firmware from alsa-firmware
upstream into the kernel-firmware package?
Thanks
Tim
14 years, 2 months
arch fun.
by Dave Jones
As per the discussion in #fedora-meeting today,
we're killing off kernel-i686, and just shipping..
* kernel.i586
* kernel-PAE.686
Patch below seems to dtrt.. comments?
Looking at the generated config files, the biggest difference
seems to be that kernel-PAE enables Xen and all it's related
dependancies.
Dave
Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile.config
--- Makefile.config 26 Jan 2009 07:19:13 -0000 1.69
+++ Makefile.config 5 Feb 2009 20:09:20 -0000
@@ -6,7 +6,7 @@ CFG = kernel-$(VERSION)
CONFIGFILES = \
$(CFG)-i586.config \
- $(CFG)-i686.config $(CFG)-i686-PAE.config \
+ $(CFG)-i686-PAE.config \
$(CFG)-i686-debug.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config $(CFG)-arm.config \
@@ -63,9 +63,6 @@ temp-s390-generic: config-s390x temp-gen
temp-ia64-generic: config-ia64-generic temp-generic
perl merge.pl $^ > $@
-kernel-$(VERSION)-i686.config: config-i686 temp-x86-generic
- perl merge.pl $^ i386 > $@
-
kernel-$(VERSION)-i686-debug.config: config-i686 temp-x86-debug-generic
perl merge.pl $^ i386 > $@
Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i586,v
retrieving revision 1.5
diff -u -p -r1.5 config-i586
--- config-i586 14 Feb 2008 19:56:06 -0000 1.5
+++ config-i586 5 Feb 2009 20:09:20 -0000
@@ -6,4 +6,3 @@ CONFIG_HIGHMEM4G=y
CONFIG_X86_POWERNOW_K6=m
-# CONFIG_KVM is not set
Index: config-i686
===================================================================
RCS file: config-i686
diff -N config-i686
--- config-i686 12 Jul 2007 19:15:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-CONFIG_M686=y
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.63
diff -u -p -r1.63 config-x86-generic
--- config-x86-generic 30 Jan 2009 00:08:01 -0000 1.63
+++ config-x86-generic 5 Feb 2009 20:09:20 -0000
@@ -205,9 +205,9 @@ CONFIG_NVRAM=y
CONFIG_IBM_ASM=m
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_TWOFISH_586=m
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
-# CONFIG_CRYPTO_DEV_PADLOCK_AES is not set
-# CONFIG_CRYPTO_DEV_PADLOCK_SHA is not set
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
CONFIG_GENERIC_ISA_DMA=y
CONFIG_SCHED_SMT=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1263
diff -u -p -r1.1263 kernel.spec
--- kernel.spec 5 Feb 2009 18:55:52 -0000 1.1263
+++ kernel.spec 5 Feb 2009 20:09:20 -0000
@@ -241,6 +241,11 @@ Summary: The Linux kernel
%define with_kdump 0
#endif
+# We only build -PAE for 686 as of Fedora 11.
+%ifarch i686
+%define with_up 0
+%endif
+
# don't do debug builds on anything but i686 and x86_64
%ifnarch i686 x86_64
%define with_debug 0
@@ -522,8 +527,7 @@ Source24: config-rhel-generic
Source30: config-x86-generic
Source31: config-i586
-Source32: config-i686
-Source33: config-i686-PAE
+Source32: config-i686-PAE
Source40: config-x86_64-generic
@@ -1477,7 +1481,9 @@ mkdir -p $RPM_BUILD_ROOT/boot
cd linux-%{kversion}.%{_target_cpu}
%if %{with_debug}
+%ifnarch i686
BuildKernel %make_target %kernel_image debug
+%endif
%if %{with_pae}
BuildKernel %make_target %kernel_image PAEdebug
%endif
--
http://www.codemonkey.org.uk
14 years, 3 months
Re: rpms/kernel/devel kernel.spec,1.1311,1.1312
by Kyle McMartin
On Thu, Feb 19, 2009 at 02:07:27AM +0000, Kyle McMartin wrote:
> Modified Files:
> kernel.spec
> Log Message:
> go away docs. we hates you.
>
And here's a patch to turn them back on once per -rc. I think. My shell
isn't what it used to be.
The idea is we don't build docs other than on the first rebase to an
-rc. Which is what the else bit accomplished. I think.
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile 5 Feb 2009 18:55:52 -0000 1.97
+++ Makefile 19 Feb 2009 02:28:32 -0000
@@ -114,6 +114,7 @@ release:
@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
+ @perl -pi -e 's/^%define with_doc 0/#% define with_doc 0/' kernel.spec
rhel:
@perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' config-powerpc64
Index: scripts/rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.24
diff -u -p -r1.24 rebase.sh
--- scripts/rebase.sh 14 Jan 2009 00:55:01 -0000 1.24
+++ scripts/rebase.sh 19 Feb 2009 02:28:32 -0000
@@ -72,14 +72,24 @@ echo "NEW kernel is $NEW BASE=$NEWBASE
if [ "$OLDRC" -eq 0 -a "$OLDGIT" -eq 0 -a "$OLDGIT" -ne "$NEWGIT" ]; then
echo "Rebasing from a stable release to a new git snapshot"
perl -p -i -e 's/^%define\ released_kernel\ 1/\%define\ released_kernel\ 0/' kernel.spec
+ perl -p -i -e 's/^%define\ with_doc\ 0/\#\%\ define\ with_doc\ 0/' kernel.spec
# force these to zero in this case, they may not have been when we rebased to stable
perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
fi
+# make sure we build docs at least once per -rc kernel, shut it off otherwise
+if [ "$OLDRC" -ne 0 -a "$NEWRC" -gt "$OLDRC" ]; then
+ perl -p -i -e 's/^%define\ with_doc\ 0/\#\%\ define\ with_doc\ 0/' kernel.spec
+else if [ "$NEWRC" -eq "$OLDRC" -a "$NEWGIT" -gt "$OLDGIT" ]; then
+ # common case, same -rc, new -git, make sure docs are off.
+ perl -p -i -e 's/^\#%\ define\ with_doc\ 0/\%define\ with_doc\ 0/' kernel.spec
+endif
+
if [ "$NEWRC" -eq 0 -a "$NEWGIT" -eq 0 ]; then
echo "Rebasing from -rc to final release."
perl -p -i -e 's/^%define\ released_kernel\ 0/\%define\ released_kernel\ 1/' kernel.spec
+ perl -p -i -e 's/^%define\ with_doc\ 0/\#\%\ define\ with_doc\ 0/' kernel.spec
export OLD_TARBALL_BASE=$(($OLDBASE-1))
perl -p -i -e 's/^%define\ base_sublevel\ $ENV{OLD_TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
14 years, 3 months
config changes
by Bill Nottingham
Here's some proposed config changes.
Bill
14 years, 3 months
Xen Dom0 kernels on branch
by Mark McLoughlin
Hey,
Michael Young has been building some test kernels using Jeremy
Fitzhardinge's dom0 patch set.
I suggested that he use a private branch in CVS and scratch builds in
Koji to make the task a bit easier. I've sponsored his FAS account and
I'll help him out with getting started.
Can someone approve his commit ACL for devel?
https://admin.fedoraproject.org/pkgdb/packages/name/kernel
Thanks,
Mark.
14 years, 3 months
[PATCH 0/2] NFS: lockd fails to load causing mounts to fail.
by Steve Dickson
In the current rawhide kernels, when a NFS mount is done,
and then an unmount and then another NFS mount, the second
mount will fail with:
mount.nfs: access denied by server while mounting <server>:<export>
The problem is the kernel lockd thread, which is started on
the first NFS mount and stopped on the last NFS mount, was
failing to start up again on the second mount.
The failure was caused by lockd doing IPV6 service
registrations on the way up and then failing to unregister
those services on the way down. The next time lockd tried to
register those services, rpcbind failed them since they
already existed...
These two patches fixes this problem.
Note: These patches will be in upstream very shortly....
steved.
14 years, 3 months
[PATCH] drm: disable gem on i8xx
by Kyle McMartin
In an IRC conversation, you mentioned that GEM was not to be used on
8xx yet... But there didn't seem to be anything explicitly disabling
this. Add code to turn off GEM on i8xx series chips. This didn't turn
out to be the problem with X on my i830, but at least it kills the
lockdep warning.
Should this go upstream as well?
Signed-off-by: Kyle McMartin <kyle(a)redhat.com>
---
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index cc0adb4..9303063 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1108,8 +1108,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
dev_priv->has_gem = 0;
#else
- /* enable GEM by default */
- dev_priv->has_gem = 1;
+ /* enable GEM by default, except on I8xx */
+ dev_priv->has_gem = !IS_I8XX(dev) ? 1 : 0;
#endif
i915_gem_load(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a70bf77..84664fe 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -750,6 +750,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define IS_I855(dev) ((dev)->pci_device == 0x3582)
#define IS_I865G(dev) ((dev)->pci_device == 0x2572)
+#define IS_I8XX(dev) (IS_I830(dev) || IS_845G(dev) || IS_I85X(dev) || \
+ IS_I855(dev) || IS_I865G(dev))
+
#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
#define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
#define IS_I945G(dev) ((dev)->pci_device == 0x2772)
14 years, 3 months
[RFC] disable OSS sound support
by drago01
Currently we have:
CONFIG_SOUND_OSS_CORE=y
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
this cause the OSS compat modules to be loaded on every system (that
has sound), even thought most people do not require this (pure oss
apps aren't used that often).
If its really needed we have aoss and padsp to run such apps for
people that really needs them, without having this modules loaded on
every system running fedora.
Besides apps that just open /dev/dsp are unlikely to "just work" in a
default setup due to pulseaudio.
So my proposal is: Disable this options in rawhide (and those F11) and
add a note to the release notes that people can use padsp/aoss to make
oss apps working.
14 years, 3 months
