minidlna: restore & fix recipe
PATCH v2 1/1 minidlna: restore & fix recipe
Restore minidlna recipe and bump it to v1.2.1
--- .../recipes-multimedia/minidlna/minidlna.inc | 41 +++++++++++++++++++ .../0001-Update-Gettext-version.patch | 34 +++++++++++++++ .../minidlna/minidlna_1.2.1.bb | 4 ++ 3 files changed, 79 insertions(+) create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +41 -0
@@ -0,0 +1,41 @@ +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 = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" + +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +inherit gettext 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 \ + file://minidlna.service \ + file://0001-Update-Gettext-version.patch \ + " + +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_append(){ + install -d ${D}${sysconfdir} + install -m 0755 minidlna.conf ${D}${sysconfdir} + +# Systemd script + install -d ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system + +# Sysvinit script + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna + +} + +SYSTEMD_SERVICE_${PN} = "minidlna.service" + +INITSCRIPT_NAME = "minidlna" +INITSCRIPT_PARAMS = "defaults 90" +
meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch new file +34 -0
@@ -0,0 +1,34 @@ +From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 +From: Baptiste Durand <[email protected]> +Date: Sun, 9 Sep 2018 20:50:41 +0200 +Subject: [PATCH] Update Gettext version + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Baptiste Durand <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f343d21..a556b33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ + # License along with MiniDLNA; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA. +-AC_INIT(MiniDLNA,1.1.3,,minidlna) ++AC_INIT(MiniDLNA,1.2.1,,minidlna) + #LT_INIT + + AC_CANONICAL_TARGET +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) + + AM_ICONV + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION(0.18) ++AM_GNU_GETTEXT_VERSION(0.19) + + # Checks for programs. + AC_PROG_AWK
meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb new file +4 -0
@@ -0,0 +1,4 @@ +require ${BPN}.inc + +SRCREV = "v1_2_1" +LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
Signature · 1 line
2.17.1
this should be in meta-multmedia layer.
Quoted 118 lines · Baptiste Durand
Restore minidlna recipe and bump it to v1.2.1
Signed-off-by Baptiste Durand <[email protected]>--- .../recipes-multimedia/minidlna/minidlna.inc | 41 +++++++++++++++++++ .../0001-Update-Gettext-version.patch | 34 +++++++++++++++ .../minidlna/minidlna_1.2.1.bb | 4 ++ 3 files changed, 79 insertions(+) create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bbmeta-oe/recipes-multimedia/minidlna/minidlna.inc new file +41
-0@@ -0,0 +1,41 @@ +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 = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3tag libvorbis" + +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +inherit gettext 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 \ + file://minidlna.service \ + file://0001-Update-Gettext-version.patch \ + " + +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_append(){ + install -d ${D}${sysconfdir} + install -m 0755 minidlna.conf ${D}${sysconfdir} + +# Systemd script + install -d ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system + +# Sysvinit script + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna + +} + +SYSTEMD_SERVICE_${PN} = "minidlna.service" + +INITSCRIPT_NAME = "minidlna" +INITSCRIPT_PARAMS = "defaults 90" +meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch new file +34
-0@@ -0,0 +1,34 @@ +From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 +From: Baptiste Durand <[email protected]> +Date: Sun, 9 Sep 2018 20:50:41 +0200 +Subject: [PATCH] Update Gettext version + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Baptiste Durand <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f343d21..a556b33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ + # License along with MiniDLNA; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA. +-AC_INIT(MiniDLNA,1.1.3,,minidlna) ++AC_INIT(MiniDLNA,1.2.1,,minidlna) + #LT_INIT + + AC_CANONICAL_TARGET +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) + + AM_ICONV + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION(0.18) ++AM_GNU_GETTEXT_VERSION(0.19) + + # Checks for programs. + AC_PROG_AWKmeta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb new file +4
-1@@ -0,0 +1,4 @@ +require ${BPN}.inc + +SRCREV = "v1_2_1" +LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
And don't use tag name in SRCREV, use git SHA, so that bitbake fetcher doesn't need to access the git repository every time it parses the recipe.
Quoted 142 lines · Khem Raj
this should be in meta-multmedia layer.
Quoted 11 lines · Baptiste Durand
Restore minidlna recipe and bump it to v1.2.1
Signed-off-by Baptiste Durand <[email protected]>--- .../recipes-multimedia/minidlna/minidlna.inc | 41 +++++++++++++++++++ .../0001-Update-Gettext-version.patch | 34 +++++++++++++++ .../minidlna/minidlna_1.2.1.bb | 4 ++ 3 files changed, 79 insertions(+) create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchQuoted 1 line
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
meta-oe/recipes-multimedia/minidlna/minidlna.inc line 1
Quoted 6 lines
new file mode 100644
index 000000000..187ff536ameta-oe/recipes-multimedia/minidlna/minidlna.inc new file +1
-0@@ -0,0 +1,41 @@ +DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aimof \
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 3 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +3
-0+being fully compliant with DLNA/UPnP-AV clients." +LICENSE = "GPL-2.0|BSD" +DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3taglibvorbis"
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 7 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +7
-0+ +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +inherit gettext autotools-brokensep update-rc.d systemd + +SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 8 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +8
-0+ file://minidlna-daemon.init.d \ + file://minidlna.service \ + file://0001-Update-Gettext-version.patch \ + " + +S = "${WORKDIR}/git" + +# This remove "--exclude=autopoint" option from autoreconf argument toavoid
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 10 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +10
-0+# configure.ac:30: error: required file './ABOUT-NLS' not found +EXTRA_AUTORECONF = "" + +do_install_append(){ + install -d ${D}${sysconfdir} + install -m 0755 minidlna.conf ${D}${sysconfdir} + +# Systemd script + install -d ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${WORKDIR}/minidlna.service${D}${nonarch_base_libdir}/systemd/system
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 4 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +4
-0+ +# Sysvinit script + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d${D}${sysconfdir}/init.d/minidlna
Quoted 9 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +8
-0+ +} + +SYSTEMD_SERVICE_${PN} = "minidlna.service" + +INITSCRIPT_NAME = "minidlna" +INITSCRIPT_PARAMS = "defaults 90" +diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchb/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchQuoted 4 lines
new file mode 100644
index 000000000..c18095d42
---/dev/null
+++
b/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchQuoted 17 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +16
-0@@ -0,0 +1,34 @@ +From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 +From: Baptiste Durand <[email protected]> +Date: Sun, 9 Sep 2018 20:50:41 +0200 +Subject: [PATCH] Update Gettext version + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Baptiste Durand <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f343d21..a556b33 100644 +--- a/configure.ac ++++ b/configure.acmeta-oe/recipes-multimedia/minidlna/minidlna.inc line 26
Quoted 10 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +10
-0+@@ -14,7 +14,7 @@ + # License along with MiniDLNA; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA. +-AC_INIT(MiniDLNA,1.1.3,,minidlna) ++AC_INIT(MiniDLNA,1.2.1,,minidlna) + #LT_INIT + + AC_CANONICAL_TARGET +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],[
AC_USE_SYSTEM_EXTENSIONS])Review
Quoted 9 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +8
-0+ + AM_ICONV + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION(0.18) ++AM_GNU_GETTEXT_VERSION(0.19) + + # Checks for programs. + AC_PROG_AWK(quoted diff) +0
-0b/meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb line 4
Quoted 9 lines
new file mode 100644
index 000000000..fe6bebce2meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb new file +4
-0@@ -0,0 +1,4 @@ +require ${BPN}.inc + +SRCREV = "v1_2_1" +LIC_FILES_CHKSUM ="file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
Quoted 8 lines
--
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Thanks for the review,
I will resend patch with changes according your comments.
Le lun. 10 sept. 2018 à 19:04, Martin Jansa <[email protected]> a écrit :
Quoted 148 lines
And don't use tag name in SRCREV, use git SHA, so that bitbake fetcher doesn't need to access the git repository every time it parses the recipe.
Quoted 142 lines · Khem Raj
this should be in meta-multmedia layer.
Quoted 11 lines · Baptiste Durand
Restore minidlna recipe and bump it to v1.2.1
Signed-off-by Baptiste Durand <[email protected]>--- .../recipes-multimedia/minidlna/minidlna.inc | 41 +++++++++++++++++++ .../0001-Update-Gettext-version.patch | 34 +++++++++++++++ .../minidlna/minidlna_1.2.1.bb | 4 ++ 3 files changed, 79 insertions(+) create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna.inc create mode 100644
meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchQuoted 1 line
create mode 100644 meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta-oe/recipes-multimedia/minidlna/minidlna.inc
meta-oe/recipes-multimedia/minidlna/minidlna.inc line 1
Quoted 6 lines
new file mode 100644
index 000000000..187ff536ameta-oe/recipes-multimedia/minidlna/minidlna.inc new file +1
-0@@ -0,0 +1,41 @@ +DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with theaim of \
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 3 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +3
-0+being fully compliant with DLNA/UPnP-AV clients." +LICENSE = "GPL-2.0|BSD" +DEPENDS = "ffmpeg flac libav jpeg sqlite3 libexif libogg libid3taglibvorbis"
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 7 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +7
-0+ +# because it depends on libav which has commercial flag +LICENSE_FLAGS = "commercial" + +inherit gettext autotools-brokensep update-rc.d systemd + +SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 8 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +8
-0+ file://minidlna-daemon.init.d \ + file://minidlna.service \ + file://0001-Update-Gettext-version.patch \ + " + +S = "${WORKDIR}/git" + +# This remove "--exclude=autopoint" option from autoreconf argument toavoid
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 10 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +10
-0+# configure.ac:30: error: required file './ABOUT-NLS' not found +EXTRA_AUTORECONF = "" + +do_install_append(){ + install -d ${D}${sysconfdir} + install -m 0755 minidlna.conf ${D}${sysconfdir} + +# Systemd script + install -d ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${WORKDIR}/minidlna.service${D}${nonarch_base_libdir}/systemd/system
meta-oe/recipes-multimedia/minidlna/minidlna.inc
Quoted 4 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +4
-0+ +# Sysvinit script + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/minidlna-daemon.init.d${D}${sysconfdir}/init.d/minidlna
Quoted 9 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +8
-0+ +} + +SYSTEMD_SERVICE_${PN} = "minidlna.service" + +INITSCRIPT_NAME = "minidlna" +INITSCRIPT_PARAMS = "defaults 90" +diff --git
a/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchb/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchQuoted 4 lines
new file mode 100644
index 000000000..c18095d42
---/dev/null
+++
b/meta-oe/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patchQuoted 17 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +16
-0@@ -0,0 +1,34 @@ +From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 +From: Baptiste Durand <[email protected]> +Date: Sun, 9 Sep 2018 20:50:41 +0200 +Subject: [PATCH] Update Gettext version + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Baptiste Durand <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f343d21..a556b33 100644 +--- a/configure.ac ++++ b/configure.acmeta-oe/recipes-multimedia/minidlna/minidlna.inc line 26
Quoted 10 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +10
-0+@@ -14,7 +14,7 @@ + # License along with MiniDLNA; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA. +-AC_INIT(MiniDLNA,1.1.3,,minidlna) ++AC_INIT(MiniDLNA,1.2.1,,minidlna) + #LT_INIT + + AC_CANONICAL_TARGET +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],[
AC_USE_SYSTEM_EXTENSIONS])Review
Quoted 9 lines
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +8
-0+ + AM_ICONV + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION(0.18) ++AM_GNU_GETTEXT_VERSION(0.19) + + # Checks for programs. + AC_PROG_AWK(quoted diff) +0
-0b/meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb
meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb line 4
Quoted 9 lines
new file mode 100644
index 000000000..fe6bebce2meta-oe/recipes-multimedia/minidlna/minidlna_1.2.1.bb new file +4
-0@@ -0,0 +1,4 @@ +require ${BPN}.inc + +SRCREV = "v1_2_1" +LIC_FILES_CHKSUM ="file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
Quoted 8 lines
--
2.17.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Baptiste DURAND