diff options
| -rw-r--r-- | packages/alsa/alsa-lib_1.0.11.bb | 12 | ||||
| -rw-r--r-- | packages/alsa/alsa-lib_1.0.13.bb | 12 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 5 |
3 files changed, 22 insertions, 7 deletions
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 5192e420a3..b9169e608f 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r3" +PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, @@ -25,9 +25,17 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev" +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" FILES_libasound = "${libdir}/libasound.so*" FILES_alsa-server = "${bindir}/*" FILES_alsa-conf = "${datadir}/alsa/" FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb index 276067c27f..78df6dfe02 100644 --- a/packages/alsa/alsa-lib_1.0.13.bb +++ b/packages/alsa/alsa-lib_1.0.13.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "r2" +PR = "r3" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, @@ -26,9 +26,17 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev" +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" FILES_libasound = "${libdir}/libasound.so.*" FILES_alsa-server = "${bindir}/*" FILES_alsa-conf = "${datadir}/alsa/" FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index fdbf9f75d2..1faf3e948e 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r17" +PR = "r18" PACKAGES = "task-base \ task-base-minimal \ @@ -161,8 +161,7 @@ task-base-ext2-rdepends = "\ task-base-alsa-rdepends = "\ alsa-utils-alsactl \ - alsa-utils-alsamixer \ - alsa-conf" + alsa-utils-alsamixer" task-base-alsa-rrecommends = "\ kernel-module-snd-mixer-oss \ |