Re: [oe] [meta-oe][PATCH v2] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Andreas Oberritter 
Hi Baptiste,

thanks for your quick update. Two more things below.

On 05.03.2015 12:27, Baptiste DURAND wrote:
> Signed-off-by: Baptiste DURAND 
> Signed-off-by: Martin Jansa 
> ---
>  meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 39 
>  .../minidlna/minidlna/minidlna-daemon.init.d   | 54 
> ++
>  .../minidlna/minidlna/minidlna.service | 10 
>  .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
>  .../minidlna/minidlna/fix-makefile.patch   | 41 
>  .../search-for-headers-in-staging-dir.patch| 48 ---
>  .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
>  7 files changed, 109 insertions(+), 108 deletions(-)
>  create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
>  create mode 100644 
> meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
>  create mode 100644 
> meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
>  create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
>  delete mode 100644 
> meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
>  delete mode 100644 
> meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
>  delete mode 100644 
> meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
> 
> diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
> b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
> new file mode 100644
> index 000..49e23cc
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
> @@ -0,0 +1,39 @@
> +DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
> +being fully compliant with DLNA/UPnP-AV clients."
> +LICENSE = "GPL-2.0|BSD"
> +DEPENDS = "virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg 
> libid3tag libvorbis"

inherit gettext might be better than manually depending on
virtual/gettext, but I am no expert in this area.

> +
> +inherit autotools-brokensep update-rc.d systemd
> +
> +SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
> +file://minidlna-daemon.init.d"
> +SRC_URI =+ "${@base_contains('DISTRO_FEATURES', 'systemd', 
> 'file://minidlna.service', '', d)}"
> +
> +S = "${WORKDIR}/git"
> +
> +# This remove "--exclude=autopoint" option from autoreconf argument to avoid 
> +# configure.ac:30: error: required file './ABOUT-NLS' not found
> +EXTRA_AUTORECONF = ""
> +
> +do_install_initd() {
> + install -d ${D}${sysconfdir}/init.d
> + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
> ${D}${sysconfdir}/init.d/minidlna
> +}
> +
> +do_install_systemd() {
> + install -d ${D}${nonarch_base_libdir}/systemd/system
> + install -m 0755 ${WORKDIR}/minidlna.service 
> ${D}${nonarch_base_libdir}/systemd/system
> +}
> +
> +do_install_append(){
> + install -d ${D}${sysconfdir}
> + install -m 0755 minidlna.conf ${D}${sysconfdir}
> + do_install_initd
> + ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd', 
> '', d)}
> +}

systemd.bbclass takes care of deleting systemd units if systemd is not
set in DISTRO_FEATURES. So you can merge the three functions above into
do_install_append unconditionally. And also remove the conditional in
SRC_URI.

Regards,
Andreas

> +
> +SYSTEMD_SERVICE_${PN} = "minidlna.service"
> +
> +INITSCRIPT_NAME = "minidlna"
> +INITSCRIPT_PARAMS = "defaults 90"
> +
> diff --git 
> a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
> b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
> new file mode 100644
> index 000..61b5b54
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
> @@ -0,0 +1,54 @@
> +#!/bin/sh
> +
> +NAME="minidlna"
> +DAEMON=/usr/sbin/minidlnad
> +SCRIPTNAME=/etc/init.d/$NAME
> +PIDFILE=/var/run/$NAME.pid
> +CONF=/etc/$NAME.conf
> +ARGS="-f $CONF"
> +
> +# Exit if the package is not installed
> +[ -x "$DAEMON" ] || exit 0
> +
> +start_function() {
> +
> +export PATH=$PWD:$PATH
> +
> +if [ -f ${PIDFILE} ]; then
> +echo "$SCRIPTNAME already running with PID #`cat $PIDFILE` ( 
> according to ${PIDFILE} )";
> +exit 0
> +fi
> +
> +$DAEMON $ARGS
> + 
> +pid=$!
> +
> +if [ "$pid" != "" ]; then
> +echo -n "$pid" > ${PIDFILE}
> +fi
> +} 
> +
> +stop_function() {
> +
> +export PATH=$PWD:$PATH
> +
> +if [ ! -e "${PIDFILE}" ]; then
> +echo "${SCRIPTNAME} not running ( according to ${PIDFILE} )";
> +exit 1;
> +fi
> +PID=`cat ${PIDFILE}`
> +kill -INT ${PID}
> +rm -f ${PIDFILE}
> +}
> +
> +case $1 in
> +"start")
> +start_function
> +;;
> +"stop")
> +stop_function
> +;;
> +*)
> +echo "Usage: $0 {start | stop}"
> +
> +esac
> diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service 
> b/meta-oe/recipes-multimedia/

[oe] [meta-oe][PATCH v2] minidlna: Fix package and bump to version 1.1.4

2015-03-05 Thread Baptiste DURAND 
Signed-off-by: Baptiste DURAND 
Signed-off-by: Martin Jansa 
---
 meta-oe/recipes-multimedia/minidlna/minidlna.inc   | 39 
 .../minidlna/minidlna/minidlna-daemon.init.d   | 54 ++
 .../minidlna/minidlna/minidlna.service | 10 
 .../recipes-multimedia/minidlna/minidlna_1.1.4.bb  |  6 +++
 .../minidlna/minidlna/fix-makefile.patch   | 41 
 .../search-for-headers-in-staging-dir.patch| 48 ---
 .../nonworking/minidlna/minidlna_1.0.25.bb | 19 
 7 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
 create mode 100644 
meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
 create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
 delete mode 100644 
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb

diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna.inc 
b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
new file mode 100644
index 000..49e23cc
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
+being fully compliant with DLNA/UPnP-AV clients."
+LICENSE = "GPL-2.0|BSD"
+DEPENDS = "virtual/gettext ffmpeg flac libav jpeg sqlite3 libexif libogg 
libid3tag libvorbis"
+
+inherit autotools-brokensep update-rc.d systemd
+
+SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
+file://minidlna-daemon.init.d"
+SRC_URI =+ "${@base_contains('DISTRO_FEATURES', 'systemd', 
'file://minidlna.service', '', d)}"
+
+S = "${WORKDIR}/git"
+
+# This remove "--exclude=autopoint" option from autoreconf argument to avoid 
+# configure.ac:30: error: required file './ABOUT-NLS' not found
+EXTRA_AUTORECONF = ""
+
+do_install_initd() {
+   install -d ${D}${sysconfdir}/init.d
+   install -m 0755 ${WORKDIR}/minidlna-daemon.init.d 
${D}${sysconfdir}/init.d/minidlna
+}
+
+do_install_systemd() {
+   install -d ${D}${nonarch_base_libdir}/systemd/system
+   install -m 0755 ${WORKDIR}/minidlna.service 
${D}${nonarch_base_libdir}/systemd/system
+}
+
+do_install_append(){
+   install -d ${D}${sysconfdir}
+   install -m 0755 minidlna.conf ${D}${sysconfdir}
+   do_install_initd
+   ${@base_contains('DISTRO_FEATURES', 'systemd', 'do_install_systemd', 
'', d)}
+}
+
+SYSTEMD_SERVICE_${PN} = "minidlna.service"
+
+INITSCRIPT_NAME = "minidlna"
+INITSCRIPT_PARAMS = "defaults 90"
+
diff --git 
a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
new file mode 100644
index 000..61b5b54
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+NAME="minidlna"
+DAEMON=/usr/sbin/minidlnad
+SCRIPTNAME=/etc/init.d/$NAME
+PIDFILE=/var/run/$NAME.pid
+CONF=/etc/$NAME.conf
+ARGS="-f $CONF"
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+start_function() {
+
+export PATH=$PWD:$PATH
+
+if [ -f ${PIDFILE} ]; then
+echo "$SCRIPTNAME already running with PID #`cat $PIDFILE` ( according 
to ${PIDFILE} )";
+exit 0
+fi
+
+$DAEMON $ARGS
+ 
+pid=$!
+
+if [ "$pid" != "" ]; then
+echo -n "$pid" > ${PIDFILE}
+fi
+} 
+
+stop_function() {
+
+export PATH=$PWD:$PATH
+
+if [ ! -e "${PIDFILE}" ]; then
+echo "${SCRIPTNAME} not running ( according to ${PIDFILE} )";
+exit 1;
+fi
+PID=`cat ${PIDFILE}`
+kill -INT ${PID}
+rm -f ${PIDFILE}
+}
+
+case $1 in
+"start")
+start_function
+;;
+"stop")
+stop_function
+;;
+*)
+echo "Usage: $0 {start | stop}"
+
+esac
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service 
b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
new file mode 100644
index 000..656100b
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Minidlna Daemon
+After=network.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb 
b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
new file mode 100644
index 000..0531e69
--- /dev/null
+++ b/meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = "v1_1_4"
+LIC_FILES_CHKSUM = 
"file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62