Alsa enhancements

CAVEAT: This series requires the alsa-state series recently submitted to the OE-Core mailing list.

This series enables alsa as a MACHINE_FEATURE by default in the ia32-base so that alsa is enabled for all current BSP's.

Following that the series drops the BSP-specific n450-audio recipe in favour of extending the common alsa-state recipe for alsa configuration.

Note: the n450-audio recipe was not working in any stock image as alsa was not a listed MACHINE_FEATURE and the amixer package is not included by default.

The following changes since commit 38f2b670bc37515bcb0fa7f98e338e5242d70386:

meta-cedartrail: Create new layer for cedartrail System. (2012-01-09 17:55:07 -0600)

are available in the git repository at:
git://github.com/incandescant/meta-intel master
https://github.com/incandescant/meta-intel/tree/master

Joshua Lock (3):
ia32-base: add alsa to MACHINE_FEATURES
alsa-state: add alsa state for n450
n450-audio: drop this machine specific recipe in favour of alsa-state

 conf/machine/include/ia32-base.inc                 |    2 +-
 meta-n450/conf/machine/n450.conf                   |    2 -
 .../recipes-bsp/alsa-state/alsa-state.bbappend     |    1 +
 .../alsa-state/alsa-state/n450/asound.state        |  450 ++++++++++++++++++++
 meta-n450/recipes-bsp/n450-audio/n450-audio.bb     |   30 --
 .../recipes-bsp/n450-audio/n450-audio/n450-audio   |   42 --
 6 files changed, 452 insertions(+), 75 deletions(-)
 create mode 100644 meta-n450/recipes-bsp/alsa-state/alsa-state.bbappend
 create mode 100644 meta-n450/recipes-bsp/alsa-state/alsa-state/n450/asound.state
 delete mode 100644 meta-n450/recipes-bsp/n450-audio/n450-audio.bb
 delete mode 100644 meta-n450/recipes-bsp/n450-audio/n450-audio/n450-audio

1.7.7.5

---
 conf/machine/include/ia32-base.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 84693e2..8556d6e 100644
@@ -6,7 +6,7 @@
 # common settings for Intel-based machines
 #
 MACHINE_FEATURES += "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                     acpi serial usbgadget"
+                     acpi serial usbgadget alsa"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules eee-acpi-scripts"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "grub"

1.7.7.5

Add a custom asound.state for the n450 so that the alsa-state init script sets (and restores) sound configuration appropriately.

---
 .../recipes-bsp/alsa-state/alsa-state.bbappend     |    1 +
 .../alsa-state/alsa-state/n450/asound.state        |  450 ++++++++++++++++++++
 2 files changed, 451 insertions(+), 0 deletions(-)
 create mode 100644 meta-n450/recipes-bsp/alsa-state/alsa-state.bbappend
 create mode 100644 meta-n450/recipes-bsp/alsa-state/alsa-state/n450/asound.state

new file mode 100644
index 0000000..72d991c
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

1.7.7.5

---
 meta-n450/conf/machine/n450.conf                   |    2 -
 meta-n450/recipes-bsp/n450-audio/n450-audio.bb     |   30 --------------
 .../recipes-bsp/n450-audio/n450-audio/n450-audio   |   42 --------------------
 3 files changed, 0 insertions(+), 74 deletions(-)
 delete mode 100644 meta-n450/recipes-bsp/n450-audio/n450-audio.bb
 delete mode 100644 meta-n450/recipes-bsp/n450-audio/n450-audio/n450-audio

index 3e6a541..6ffdce9 100644
@@ -14,5 +14,3 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0" 
 APPEND += "console=ttyS0,115200 console=tty0" 
-
-MACHINE_EXTRA_RRECOMMENDS += "n450-audio"

deleted file mode 100644
index 27904e3..0000000
@@ -1,30 +0,0 @@
-SUMMARY = "Provide a basic init script to enable audio"
-DESCRIPTION = "Set the volume and unmute the Front mixer setting during boot."
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-PR = "r4"
-
-inherit update-rc.d
-
-RDEPENDS = "alsa-utils-amixer"
-
-SRC_URI = "file://n450-audio"
-
-INITSCRIPT_NAME = "n450-audio"
-INITSCRIPT_PARAMS = "defaults 90"
-
-do_install() {
-	install -d ${D}${sysconfdir} \
-	           ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/n450-audio ${D}${sysconfdir}/init.d
-        cat ${WORKDIR}/${INITSCRIPT_NAME} | \
-            sed -e 's,/etc,${sysconfdir},g' \
-                -e 's,/usr/sbin,${sbindir},g' \
-                -e 's,/var,${localstatedir},g' \
-                -e 's,/usr/bin,${bindir},g' \
-                -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        chmod 755 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-}
-

1.7.7.5

Nice. Thanks for finally resolving this. When the other patches hit oe-core, I'll pull these in...

Tom

FYI the alsa-state recipe has hit master.

Joshua

Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre

Boot-tested on n450 and pulled into meta-intel/master.

Thanks,

Tom