Skip to contentSkip to conversation

ktap-module: blacklist because it's not compatible with 3.19 kernel

PATCH New Martin Jansa 1 participant 3 messages Mar 5, 2015

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/3 ktap-module: blacklist because it's not compatible with 3.19 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-kernel/ktap/ktap-module_git.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-oe/recipes-kernel/ktap/ktap-module_git.bb +3 -0
index 62f2a99..e3c94e3 100644
@@ -6,6 +6,9 @@ SUMMARY = "KTAP is a scripting dynamic tracing tool for Linux"
 
 inherit module
 
+# See https://github.com/ktap/ktap/issues/80
+PNBLACKLIST[ktap-module] ?= "Not compatible with 3.19 kernel"
+
 # Available package configs: ffi (only supported on x86_64)
 PACKAGECONFIG ?= ""
Signature · 1 line
2.3.1
author
#1 lore raw

PATCH 2/3 mplayer2: set REQUIRED_DISTRO_FEATURES and LICENSE_FLAGS

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +6 -0
index 2de26b0..8c5f4eb 100644
@@ -10,6 +10,12 @@ PROVIDES = "mplayer"
 RPROVIDES_${PN} = "mplayer"
 RCONFLICTS_${PN} = "mplayer"
 
+# Depends on xsp, libxv, virtual/libx11, libxscrnsaver
+REQUIRED_DISTRO_FEATURES = "x11"
+
+# because it depends on libpostproc/libav which has commercial flag
+LICENSE_FLAGS = "${@base_contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}"
+
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
Signature · 1 line
2.3.1
author
#2 lore raw

PATCH 3/3 minidlna: Fix package and bump to version 1.1.4

In reply to Martin Jansa

From: Baptiste DURAND <[email protected]>

Signed-off-by Baptiste DURAND <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 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
meta-oe/recipes-multimedia/minidlna/minidlna.inc new file +39 -0
new file mode 100644
index 0000000..ebca755
@@ -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 = "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 "
+
+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/minidlna-daemon.init.d new file +54 -0

54 lines not on this page · raw message

meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service new file +10 -0
new file mode 100644
index 0000000..656100b
@@ -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
meta-oe/recipes-multimedia/minidlna/minidlna_1.1.4.bb new file +6 -0
new file mode 100644
index 0000000..0531e69
@@ -0,0 +1,6 @@
+require ${BPN}.inc
+
+SRCREV = "v1_1_4"
+LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b"
+SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"
+SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"
meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch deleted +0 -41

41 lines not on this page · raw message

meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch deleted +0 -48

48 lines not on this page · raw message

meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb deleted +0 -19
deleted file mode 100644
index 9264bc2..0000000
@@ -1,19 +0,0 @@
-DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
-being fully compliant with DLNA/UPnP-AV clients."
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=b1a795ac1a06805cf8fd74920bc46b5c"
-
-DEPENDS = "flac libav jpeg sqlite3 libexif libogg libid3tag"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}_${PV}_src.tar.gz \
-    file://search-for-headers-in-staging-dir.patch \
-    file://fix-makefile.patch \
-"
-
-SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"
-SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"
-
-export STAGING_DIR_HOST
-
-inherit autotools
-
Signature · 1 line
2.3.1