aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-04-18 22:27:57 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-04-18 22:47:09 +0200
commit523790db6f5307719d5609fb354430772e8d5aca (patch)
tree26332a05a90a3ed77a3b858fb8c9ba6d69a4a0b4
parentfdaa0a396ccaa5def33628d6a76450cb33af24cc (diff)
downloadopenembedded-523790db6f5307719d5609fb354430772e8d5aca.tar.gz
openembedded-523790db6f5307719d5609fb354430772e8d5aca.tar.bz2
openembedded-523790db6f5307719d5609fb354430772e8d5aca.zip
mpd,mpd-alsa : fix init script(start and stop were swaped in restart),bump all PR
In the mpd init script,in the restart case,it first started then stopped. Thanks to jconnolly for having noticed that it didn't restart at all
-rw-r--r--recipes/musicpd/mpd-alsa_0.11.5.bb2
-rw-r--r--recipes/musicpd/mpd-alsa_0.14.2.bb2
-rw-r--r--recipes/musicpd/mpd/mpd.init4
-rw-r--r--recipes/musicpd/mpd_0.14.2.bb2
-rw-r--r--recipes/musicpd/mpd_0.15.bb2
5 files changed, 7 insertions, 5 deletions
diff --git a/recipes/musicpd/mpd-alsa_0.11.5.bb b/recipes/musicpd/mpd-alsa_0.11.5.bb
index be02984cbd..47a6ada62d 100644
--- a/recipes/musicpd/mpd-alsa_0.11.5.bb
+++ b/recipes/musicpd/mpd-alsa_0.11.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libao-alsa zlib libmikmod flac audiofile virtual/libiconv \
${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
RDEPENDS = "libao-alsa"
-PR = "r4"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb
index adbf430e67..c9c71bb3ca 100644
--- a/recipes/musicpd/mpd-alsa_0.14.2.bb
+++ b/recipes/musicpd/mpd-alsa_0.14.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
file://mpd/mpd.conf \
file://mpd/mpd.init"
-PR = "r3"
+PR = "r4"
S = "${WORKDIR}/mpd-${PV}"
inherit autotools update-rc.d
diff --git a/recipes/musicpd/mpd/mpd.init b/recipes/musicpd/mpd/mpd.init
index 98a75d0af7..2820ce7add 100644
--- a/recipes/musicpd/mpd/mpd.init
+++ b/recipes/musicpd/mpd/mpd.init
@@ -19,9 +19,9 @@ case "$1" in
;;
restart|force-reload)
echo -n "Restarting music player daemon: mpd"
- start-stop-daemon --start --quiet --exec /usr/bin/mpd
- sleep 2
start-stop-daemon --stop --quiet --exec /usr/bin/mpd
+ sleep 2
+ start-stop-daemon --start --quiet --exec /usr/bin/mpd
echo "."
;;
*)
diff --git a/recipes/musicpd/mpd_0.14.2.bb b/recipes/musicpd/mpd_0.14.2.bb
index 4f84dc83bd..f4ba6e570e 100644
--- a/recipes/musicpd/mpd_0.14.2.bb
+++ b/recipes/musicpd/mpd_0.14.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
file://mpd/mpd.conf \
file://mpd/mpd.init"
-PR = "r4"
+PR = "r5"
inherit autotools update-rc.d
INITSCRIPT_NAME = "mpd"
diff --git a/recipes/musicpd/mpd_0.15.bb b/recipes/musicpd/mpd_0.15.bb
index a10be212cc..0f6295da93 100644
--- a/recipes/musicpd/mpd_0.15.bb
+++ b/recipes/musicpd/mpd_0.15.bb
@@ -12,6 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
inherit autotools update-rc.d
INITSCRIPT_NAME = "mpd"
+PR = "r1"
+
# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
# be built, instead we use the OE built versions which should be installed
# in staging - remove the --with and replace with --enable to use the local