Skip to contentSkip to conversation

Add alsa-state configuration for Beagleboard

PATCH Applied Joshua Lock 2 participants 4 messages Jan 10, 2012 – Jan 17, 2012

lore
Share & tools
lore
#0 lore raw

cover Add alsa-state configuration for Beagleboard

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

This change set drops the BSP-specific beagleboard-audio recipe in favour of extending the common alsa-state recipe for alsa configuration.

Note: the beagleboard-audio recipe was not working in any stock image as the amixer package is not included by default.

The following changes since commit 6ccf3fe442a2f7b2d330c749c66b3227bc47c3d6:

task-base: add alsa-state to task-base-alsa (2012-01-10 08:34:20 -0800)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib josh/devices
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=josh/devices

Joshua Lock (2):
alsa-state: add beagleboard specific asound.state
beagleboard-audio: drop in favour of alsa-state

 meta-yocto/conf/machine/beagleboard.conf           |    3 -
 .../recipes-bsp/alsa-state/alsa-state.bbappend     |    1 +
 .../alsa-state/alsa-state/beagleboard/asound.state |  656 ++++++++++++++++++++
 .../beagleboard-audio/beagleboard-audio.bb         |   33 -
 .../beagleboard-audio/beagleboard-audio            |   44 --
 5 files changed, 657 insertions(+), 80 deletions(-)
 create mode 100644 meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend
 create mode 100644 meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
 delete mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
 delete mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
Signature · 1 line
1.7.7.5
#1 lore raw

PATCH 1/2 alsa-state: add beagleboard specific asound.state

---
 .../recipes-bsp/alsa-state/alsa-state.bbappend     |    1 +
 .../alsa-state/alsa-state/beagleboard/asound.state |  656 ++++++++++++++++++++
 2 files changed, 657 insertions(+), 0 deletions(-)
 create mode 100644 meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend
 create mode 100644 meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state
meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend new file +1 -0
new file mode 100644
index 0000000..72d991c
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state new file +656 -0

656 lines not on this page · raw message

Signature · 1 line
1.7.7.5
#2 lore raw

PATCH 2/2 beagleboard-audio: drop in favour of alsa-state

In reply to Joshua Lock
---
 meta-yocto/conf/machine/beagleboard.conf           |    3 -
 .../beagleboard-audio/beagleboard-audio.bb         |   33 ---------------
 .../beagleboard-audio/beagleboard-audio            |   44 --------------------
 3 files changed, 0 insertions(+), 80 deletions(-)
 delete mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb
 delete mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio
meta-yocto/conf/machine/beagleboard.conf +0 -3
index dd549d0..fa2f8e7 100644
@@ -12,9 +12,6 @@ XSERVER = "xserver-xorg-lite \
 # Ship all kernel modules by default
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-# Setup sane default mixer settings
-MACHINE_EXTRA_RRECOMMENDS += "beagleboard-audio"
-
 # Allow for MMC booting (required by the NAND-less Beagleboard XM)
 EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb deleted +0 -33
deleted file mode 100644
index 0bfd7dc..0000000
@@ -1,33 +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 = "r5"
-
-inherit update-rc.d
-
-RDEPENDS_${PN} = "alsa-utils-amixer"
-
-SRC_URI = "file://beagleboard-audio"
-
-INITSCRIPT_NAME = "beagleboard-audio"
-INITSCRIPT_PARAMS = "defaults 90"
-
-COMPATIBLE_MACHINE = "beagleboard"
-INHIBIT_DEFAULT_DEPS = "1"
-
-do_install() {
-	install -d ${D}${sysconfdir} \
-	           ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/beagleboard-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}
-}
-
meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio deleted +0 -44

44 lines not on this page · raw message

Signature · 1 line
1.7.7.5
Applied
#3 lore raw
In reply to Joshua Lock
Quoted 27 lines · Joshua Lock

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

This change set drops the BSP-specific beagleboard-audio recipe in favour of extending the common alsa-state recipe for alsa configuration.

Note: the beagleboard-audio recipe was not working in any stock image as the amixer package is not included by default.

The following changes since commit 6ccf3fe442a2f7b2d330c749c66b3227bc47c3d6:

   task-base: add alsa-state to task-base-alsa (2012-01-10 08:34:20 -0800)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib josh/devices
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=josh/devices

Joshua Lock (2):
alsa-state: add beagleboard specific asound.state
beagleboard-audio: drop in favour of alsa-state

  meta-yocto/conf/machine/beagleboard.conf           |    3 -
  .../recipes-bsp/alsa-state/alsa-state.bbappend     |    1 +
  .../alsa-state/alsa-state/beagleboard/asound.state |  656 ++++++++++++++++++++
  .../beagleboard-audio/beagleboard-audio.bb         |   33 -
  .../beagleboard-audio/beagleboard-audio            |   44 --
  5 files changed, 657 insertions(+), 80 deletions(-)
Quoted 5 lines

create mode 100644 meta-yocto/recipes-bsp/alsa-state/alsa-state.bbappend
create mode 100644 meta-yocto/recipes-bsp/alsa-state/alsa-state/beagleboard/asound.state delete mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb delete mode 100644 meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio/beagleboard-audio

Merged into Poky Master

Thanks
Sau!