diff options
author | Christopher Larson <chris_larson@mentor.com> | 2015-08-31 12:12:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-03 12:43:18 +0100 |
commit | 16bda74e85f5fead22a22fdba5e2741f5e1380a9 (patch) | |
tree | 90784ccd88c53ea6b29b9a6c2a28db7a34cb9213 /meta/recipes-multimedia/pulseaudio | |
parent | 7e11e81a4ffad2644cce2a79d5fb8877c8eb3f3f (diff) | |
download | poky-16bda74e85f5fead22a22fdba5e2741f5e1380a9.tar.gz |
pulseaudio: add 'autospawn-for-root' PACKAGECONFIG
Since many embedded systems don't have non-root users, it's useful to be able
to use pulseaudio autospawn for root as well.
(From OE-Core rev: 9ad34098907be1e5a997c176eb25e1c2b3c87d13)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index a90e5168d4..27e05d39b0 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -49,6 +49,9 @@ PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enabl | |||
49 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" | 49 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" |
50 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 50 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" |
51 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | 51 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" |
52 | # Since many embedded systems don't have non-root users, it's useful to be | ||
53 | # able to use pulseaudio autospawn for root as well. | ||
54 | PACKAGECONFIG[autospawn-for-root] = ",,," | ||
52 | 55 | ||
53 | EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" | 56 | EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" |
54 | EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" | 57 | EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" |
@@ -61,6 +64,19 @@ export TARGET_PFPU = "${TARGET_FPU}" | |||
61 | OE_LT_RPATH_ALLOW = "any" | 64 | OE_LT_RPATH_ALLOW = "any" |
62 | OE_LT_RPATH_ALLOW[export]="1" | 65 | OE_LT_RPATH_ALLOW[export]="1" |
63 | 66 | ||
67 | set_cfg_value () { | ||
68 | sed -i -e "s/\(; *\)\?$2 =.*/$2 = $3/" "$1" | ||
69 | if ! grep -q "^$2 = $3\$" "$1"; then | ||
70 | die "Use of sed to set '$2' to '$3' in '$1' failed" | ||
71 | fi | ||
72 | } | ||
73 | |||
74 | do_compile_append () { | ||
75 | if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then | ||
76 | set_cfg_value src/client.conf allow-autospawn-for-root yes | ||
77 | fi | ||
78 | } | ||
79 | |||
64 | do_install_append() { | 80 | do_install_append() { |
65 | install -d ${D}${sysconfdir}/default/volatiles | 81 | install -d ${D}${sysconfdir}/default/volatiles |
66 | install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse | 82 | install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse |