[oe] [meta-webserver][PATCH] Nginx: use PACKAGECONFIG variables in configure
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc
b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 77d1b32..4a97e26 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -72,7 +72,7 @@ do_configure () {
--prefix=${prefix} \
--with-http_ssl_module \
--with-http_gzip_static_module \
-${EXTRA_OECONF}
+${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS}
}
do_install () {
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] sg3-utils: add mirror
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
index a11bd77..c7de057 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
@@ -9,6 +9,7 @@ LICENSE = "GPLv2+ & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca"
SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz;
+MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc;
SRC_URI[md5sum] = "28080de5bff8b55a29093bec8aea"
SRC_URI[sha256sum] =
"1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] sdparm: add mirror
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-oe/recipes-support/sdparm/sdparm_1.10.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
index 8ab2819..3299a77 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
@@ -10,6 +10,7 @@ DEPENDS="sg3-utils"
SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
file://make-sysroot-work.patch \
"
+MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc;
PACKAGES =+ "${PN}-scripts"
RDEPENDS_${PN}-scripts += "bash ${PN}"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] xf86-video-nouveau: bump version to 1.0.15
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
.../{xf86-video-nouveau_1.0.12.bb => xf86-video-nouveau_1.0.15.bb} | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
rename meta-oe/recipes-graphics/xorg-driver/{xf86-video-nouveau_1.0.12.bb =>
xf86-video-nouveau_1.0.15.bb} (58%)
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.12.bb
b/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
similarity index 58%
rename from meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.12.bb
rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
index 444189a..b10ee71 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.12.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
@@ -12,8 +12,5 @@ RDEPENDS_${PN} += "xserver-xorg-module-exa"
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = "dc79910c7b9e32321cefc7af250c7765"
-SRC_URI[sha256sum] =
"0ea057ad7fc31caba2d4e46c7e418fe2b3c762b04fb8d382f53383397fd8391e"
-
-
-PNBLACKLIST[xf86-video-nouveau] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/130657/ - the recipe will be
removed on 2017-09-01 unless the issue is fixed"
+SRC_URI[md5sum] = "717203cb87029cddcbccf7398f9ad8c3"
+SRC_URI[sha256sum] =
"aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] samba: fix conflict between samba and sudo packages
Use the same permissions for sudoers.d as in the sudo package.
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index d0235c1..f2d52a2 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -154,6 +154,7 @@ do_install_append() {
sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode
fi
+chmod 0750 ${D}${sysconfdir}/sudoers.d
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
--
2.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] samba: update tevent_internal.h
Update the tevent_internal.h file to the same version
as the current OpenEmbedded recipe version, otherwise
nmbd will segfault immediately at start, and strange
crashes occurs with smbd. Samba uses this internal
libtevent header file, and it is crucial to match
this file to the external libtevent.
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
.../samba-4.4.5/internal_tevent_to_0.9.31.patch| 92 ++
.../recipes-connectivity/samba/samba_4.4.5.bb | 1 +
2 files changed, 93 insertions(+)
create mode 100644
meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch
diff --git
a/meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch
b/meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch
new file mode 100644
index 000..bd4cd64
--- /dev/null
+++
b/meta-networking/recipes-connectivity/samba/samba-4.4.5/internal_tevent_to_0.9.31.patch
@@ -0,0 +1,92 @@
+--- samba-4.4.5.orig/lib/tevent/tevent_internal.h 2016-01-26
12:45:46.0 +0100
samba-4.4.5/lib/tevent/tevent_internal.h 2016-10-07 06:45:35.0
+0200
+@@ -228,6 +228,16 @@
+ void *additional_data;
+ };
+
++struct tevent_threaded_context {
++ struct tevent_threaded_context *next, *prev;
++
++#ifdef HAVE_PTHREAD
++ pthread_mutex_t event_ctx_mutex;
++#endif
++ struct tevent_context *event_ctx;
++ int wakeup_fd;
++};
++
+ struct tevent_debug_ops {
+ void (*debug)(void *context, enum tevent_debug_level level,
+ const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0);
+@@ -241,24 +251,41 @@
+ /* the specific events implementation */
+ const struct tevent_ops *ops;
+
++ /*
++ * The following three pointers are queried on every loop_once
++ * in the order in which they appear here. Not measured, but
++ * hopefully putting them at the top together with "ops"
++ * should make tevent a *bit* more cache-friendly than before.
++ */
++
++ /* list of signal events - used by common code */
++ struct tevent_signal *signal_events;
++
++ /* List of threaded job indicators */
++ struct tevent_threaded_context *threaded_contexts;
++
++ /* list of immediate events - used by common code */
++ struct tevent_immediate *immediate_events;
++
+ /* list of fd events - used by common code */
+ struct tevent_fd *fd_events;
+
+ /* list of timed events - used by common code */
+ struct tevent_timer *timer_events;
+
+- /* list of immediate events - used by common code */
+- struct tevent_immediate *immediate_events;
+-
+- /* list of signal events - used by common code */
+- struct tevent_signal *signal_events;
++ /* List of scheduled immediates */
++ pthread_mutex_t scheduled_mutex;
++ struct tevent_immediate *scheduled_immediates;
+
+ /* this is private for the events_ops implementation */
+ void *additional_data;
+
+ /* pipe hack used with signal handlers */
+- struct tevent_fd *pipe_fde;
+- int pipe_fds[2];
++ struct tevent_fd *wakeup_fde;
++ int wakeup_fd; /* fd to write into */
++#ifndef HAVE_EVENT_FD
++ int wakeup_read_fd;
++#endif
+
+ /* debugging operations */
+ struct tevent_debug_ops debug_ops;
+@@ -282,6 +309,10 @@
+* tevent_common_add_timer_v2()
+*/
+ struct tevent_timer *last_zero_timer;
++
++#ifdef HAVE_PTHREAD
++ struct tevent_context *prev, *next;
++#endif
+ };
+
+ const struct tevent_ops *tevent_find_ops_byname(const char *name);
+@@ -327,6 +358,12 @@
+ const char *handler_name,
+ const char *location);
+ bool tevent_common_loop_immediate(struct tevent_context *ev);
++void tevent_common_threaded_activate_immediate(struct tevent_context *ev);
++
++bool tevent_common_have_events(struct tevent_context *ev);
++int tevent_common_wakeup_init(struct tevent_context *ev);
++int tevent_common_wakeup_fd(int fd);
++int tevent_common_wakeup(struct tevent_context *ev);
+
+ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev,
+ TALLOC_CTX *mem_ctx,
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 0ba59c7..6a4f726 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -19,6 +19,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
file://21-add-config-option-without-valgrind.patch \
file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
file://0006-avoid-using-colon-in-the-checking-msg.patch \
+ file://internal_tevent_to_0.9.31.patch \
file
[oe] [meta-networking][PATCH v2] Samba: use built-in libtevent
Since Samba uses libtevent-internal.h in some places, it is
incompatible with external libtevent versions if they're not
the same as the built-in, and just crashes.
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index 0ba59c7..754455e 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -33,7 +33,7 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d
# remove default added RDEPENDS on perl
RDEPENDS_${PN}_remove = "perl"
-DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent
libldb krb5 libbsd libaio libpam"
+DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libldb krb5
libbsd libaio libpam"
DEPENDS_append_libc-musl = " libtirpc"
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc"
LDFLAGS_append_libc-musl = " -ltirpc"
@@ -74,7 +74,7 @@
SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pd
SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}"
-SAMBA4_LIBS="heimdal,!zlib,!popt,!talloc,!pytalloc,!pytalloc-util,!tevent,!pytevent,!tdb,!pytdb,!ldb,!pyldb"
+SAMBA4_LIBS="heimdal,!zlib,!popt,!talloc,!pytalloc,!pytalloc-util,tevent,!pytevent,!tdb,!pytdb,!ldb,!pyldb"
EXTRA_OECONF += "--enable-fhs \
--with-piddir=/run \
--
2.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCHv3 2/2] nginx.inc: use 4 spaces for indentation
From: Martin Jansa <martin.ja...@gmail.com>
* like any other sane recipes do
Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-webserver/recipes-httpd/nginx/nginx.inc | 194 ++-
1 file changed, 98 insertions(+), 96 deletions(-)
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc
b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 7698c90..f3660af 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -12,12 +12,12 @@ SECTION = "net"
DEPENDS = "libpcre gzip openssl"
SRC_URI = " \
- http://nginx.org/download/nginx-${PV}.tar.gz \
- file://nginx-cross.patch \
- file://nginx.conf \
- file://nginx.init \
- file://nginx-volatile.conf \
- file://nginx.service \
+http://nginx.org/download/nginx-${PV}.tar.gz \
+file://nginx-cross.patch \
+file://nginx.conf \
+file://nginx.init \
+file://nginx-volatile.conf \
+file://nginx.service \
"
inherit update-rc.d useradd
@@ -34,104 +34,106 @@ DISABLE_STATIC = ""
PACKAGECONFIG[http2] = "--with-http_v2_module,,"
do_configure () {
- if [ "${SITEINFO_BITS}" = "64" ]; then
- PTRSIZE=8
- else
- PTRSIZE=4
- fi
-
- echo $CFLAGS
- echo $LDFLAGS
-
- # Add the LDFLAGS to the main nginx link to avoid issues with missing
GNU_HASH
- echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf
-
- ./configure \
- --crossbuild=Linux:${TUNE_ARCH} \
- --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le',
'little', 'big', d)} \
- --with-int=4 \
- --with-long=${PTRSIZE} \
- --with-long-long=8 \
- --with-ptr-size=${PTRSIZE} \
- --with-sig-atomic-t=${PTRSIZE} \
- --with-size-t=${PTRSIZE} \
- --with-off-t=${PTRSIZE} \
- --with-time-t=${PTRSIZE} \
- --with-sys-nerr=132 \
- --conf-path=${sysconfdir}/nginx/nginx.conf \
- --http-log-path=${localstatedir}/log/nginx/access.log \
- --error-log-path=${localstatedir}/log/nginx/error.log \
- --pid-path=/run/nginx/nginx.pid \
- --prefix=${prefix} \
- --with-http_ssl_module \
- --with-http_gzip_static_module \
- ${EXTRA_OECONF}
+if [ "${SITEINFO_BITS}" = "64" ]; then
+PTRSIZE=8
+else
+PTRSIZE=4
+fi
+
+echo $CFLAGS
+echo $LDFLAGS
+
+# Add the LDFLAGS to the main nginx link to avoid issues with missing
GNU_HASH
+echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf
+
+./configure \
+--crossbuild=Linux:${TUNE_ARCH} \
+--with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little',
'big', d)} \
+--with-int=4 \
+--with-long=${PTRSIZE} \
+--with-long-long=8 \
+--with-ptr-size=${PTRSIZE} \
+--with-sig-atomic-t=${PTRSIZE} \
+--with-size-t=${PTRSIZE} \
+--with-off-t=${PTRSIZE} \
+--with-time-t=${PTRSIZE} \
+--with-sys-nerr=132 \
+--conf-path=${sysconfdir}/nginx/nginx.conf \
+--http-log-path=${localstatedir}/log/nginx/access.log \
+--error-log-path=${localstatedir}/log/nginx/error.log \
+--pid-path=/run/nginx/nginx.pid \
+--prefix=${prefix} \
+--with-http_ssl_module \
+--with-http_gzip_static_module \
+${EXTRA_OECONF}
}
do_install () {
- oe_runmake 'DESTDIR=${D}' install
- rm -fr ${D}${localstatedir}/run ${D}/run
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
- install -d ${D}${sysconfdir}/tmpfiles.d
- echo "d /run/${BPN} - - - -" \
-> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
-echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
- >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
- fi
- install -d ${D}${sysconfdir}/${BPN}
- ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
- install -d ${D}${NGINX_WWWDIR}
- mv ${D}/usr/html ${D}${NGINX_WWWDIR}/
- chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR}
-
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx
- sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx
- sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx
-
- install -d ${D}${sysconfdir}/nginx
- install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf
- sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf
- sed -i 's/^user.*/user ${NGINX_USER};/g'
${D}${sysconfdir}/nginx/nginx.conf
- install -d ${D}${sysconfdir}/nginx/sites-enabled
-
- install
[oe] [meta-webserver][PATCHv3 1/2] nginx: optimize systemd unit file
- Call the nginx binary directly, no need to wrap the SysV init file.
- Create /var/log/nginx with tmpfiles, like volatiles without systemd.
- Run nginx with ${NGINX_USER} (user ${NGINX_USER} in nginx.conf)
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-webserver/recipes-httpd/nginx/files/nginx.service | 9 -
meta-webserver/recipes-httpd/nginx/nginx.inc | 5 -
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service
b/meta-webserver/recipes-httpd/nginx/files/nginx.service
index 9926a4b..ce99061 100644
--- a/meta-webserver/recipes-httpd/nginx/files/nginx.service
+++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service
@@ -3,10 +3,9 @@ Description=Nginx Server
After=network.target
[Service]
Type=forking
-PIDFile=@SYSCONFDIR@/nginx/run/nginx.pid
-ExecStartPre=@BASEBINDIR@/mkdir -p @LOCALSTATEDIR@/log/nginx
-ExecStart=@SYSCONFDIR@/init.d/nginx start
-ExecStop=@SYSCONFDIR@/init.d/nginx stop
+PIDFile=/run/nginx/nginx.pid
+ExecStart=@SBINDIR@/nginx
+ExecStop=@SBINDIR@/nginx -s stop
+ExecReload=@SBINDIR@/nginx -s reload
[Install]
WantedBy=multi-user.target
-
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc
b/meta-webserver/recipes-httpd/nginx/nginx.inc
index fe51ca0..7698c90 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -75,6 +75,8 @@ do_install () {
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d /run/${BPN} - - - -" \
> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
+echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
+ >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
fi
install -d ${D}${sysconfdir}/${BPN}
ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
@@ -90,6 +92,7 @@ do_install () {
install -d ${D}${sysconfdir}/nginx
install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf
+ sed -i 's/^user.*/user ${NGINX_USER};/g'
${D}${sysconfdir}/nginx/nginx.conf
install -d ${D}${sysconfdir}/nginx/sites-enabled
install -d ${D}${sysconfdir}/default/volatiles
@@ -101,7 +104,7 @@ do_install () {
install -m 0644 ${WORKDIR}/nginx.service
${D}${systemd_unitdir}/system/
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@LOCALSTATEDIR@,${localstatedir},g' \
--e 's,@BASEBINDIR@,${base_bindir},g' \
+-e 's,@SBINDIR@,${sbindir},g' \
${D}${systemd_unitdir}/system/nginx.service
fi
}
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH] Mpd: use libsystemd
Mpd tries to find and link to libsystemd-daemon by default,
but there's only libsystemd in OpenEmbedded. Fixing this makes
socket activation work.
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
index caba589..5c574c1 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
@@ -22,6 +22,10 @@ PACKAGECONFIG[id3tag] =
"--enable-id3,--disable-id3,libid3tag"
PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame"
PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba"
+do_configure_prepend() {
+sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac
+}
+
do_install_append() {
install -d ${D}/${localstatedir}/lib/mpd/music
chmod 775 ${D}/${localstatedir}/lib/mpd/music
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] Samba: use only libsystemd
This patch was disappeared while moved to 4.4.2
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
.../samba/samba-4.4.2/10-use-only-libsystemd.patch | 81 ++
.../recipes-connectivity/samba/samba_4.4.2.bb | 1 +
2 files changed, 82 insertions(+)
create mode 100644
meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
diff --git
a/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
new file mode 100644
index 000..81621ff
--- /dev/null
+++
b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libsystemd.patch
@@ -0,0 +1,81 @@
+diff -ur samba-4.4.2/lib/util/become_daemon.c
samba-4.4.2/lib/util/become_daemon.c
+--- samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:33:24.0
+0200
samba-4.4.2/lib/util/become_daemon.c 2016-05-08 18:26:50.275177918
+0200
+@@ -24,7 +24,7 @@
+ #include "includes.h"
+ #include "system/filesys.h"
+ #include "system/locale.h"
+-#if HAVE_LIBSYSTEMD_DAEMON
++#if HAVE_LIBSYSTEMD
+ #include
+ #endif
+ #include "lib/util/close_low_fd.h"
+@@ -69,9 +69,9 @@
+ if (do_fork) {
+ newpid = fork();
+ if (newpid) {
+-#if HAVE_LIBSYSTEMD_DAEMON
++#if HAVE_LIBSYSTEMD
+ sd_notifyf(0, "READY=0\nSTATUS=Starting
process...\nMAINPID=%lu", (unsigned long) newpid);
+-#endif /* HAVE_LIBSYSTEMD_DAEMON */
++#endif /* HAVE_LIBSYSTEMD */
+ _exit(0);
+ }
+ }
+@@ -98,7 +98,7 @@
+
+ _PUBLIC_ void exit_daemon(const char *msg, int error)
+ {
+-#ifdef HAVE_LIBSYSTEMD_DAEMON
++#ifdef HAVE_LIBSYSTEMD
+ if (msg == NULL) {
+ msg = strerror(error);
+ }
+@@ -117,7 +117,7 @@
+ if (name == NULL) {
+ name = "Samba";
+ }
+-#ifdef HAVE_LIBSYSTEMD_DAEMON
++#ifdef HAVE_LIBSYSTEMD
+ sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...",
name);
+ #endif
+ DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve "
+@@ -129,7 +129,7 @@
+ if (name == NULL) {
+ name = "Samba";
+ }
+-#ifdef HAVE_LIBSYSTEMD_DAEMON
++#ifdef HAVE_LIBSYSTEMD
+ sd_notifyf(0, "\nSTATUS=%s: %s", name, msg);
+ #endif
+ DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg));
+diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c
+--- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.0 +0200
samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200
+@@ -102,7 +102,7 @@
+ .fd = 2 /* stderr by default */
+ };
+
+-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL)
++#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD)
+ static int debug_level_to_priority(int level)
+ {
+ /*
+@@ -179,7 +179,7 @@
+ }
+ #endif /* WITH_SYSLOG */
+
+-#ifdef HAVE_LIBSYSTEMD_JOURNAL
++#ifdef HAVE_LIBSYSTEMD
+ #include
+ static void debug_systemd_log(int msg_level,
+ const char *msg, const char *msg_no_nl)
+@@ -251,7 +251,7 @@
+ },
+ #endif
+
+-#ifdef HAVE_LIBSYSTEMD_JOURNAL
++#ifdef HAVE_LIBSYSTEMD
+ {
+ .name = "systemd",
+ .log = debug_systemd_log,
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
index 50c100e..b7ee730 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
@@ -13,6 +13,7 @@ ${SAMBA_MIRROR}
http://www.mirrorservice.org/sites/ftp.samba.org \n \
SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
file://00-fix-typos-in-man-pages.patch \
+ file://10-use-only-libsystemd.patch \
file://16-do-not-check-xsltproc-manpages.patch \
file://20-do-not-import-target-module-while-cross-compile.patch \
file://21-add-config-option-without-valgrind.patch \
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH] MPD: update to 0.19.15
This fixes a build issue
Signed-off-by: Gyorgy Szombathelyi <gyu...@freemail.hu>
---
.../recipes-multimedia/musicpd/{mpd_0.19.10.bb => mpd_0.19.15.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.19.10.bb =>
mpd_0.19.15.bb} (94%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
similarity index 94%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
index 7b124ca..caba589 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
@@ -9,8 +9,8 @@ SRC_URI = " \
http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \
file://mpd.conf.in \
"
-SRC_URI[md5sum] = "da4bc3e47afd0faf9e7a67168e012102"
-SRC_URI[sha256sum] =
"c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851"
+SRC_URI[md5sum] = "bb855b1689c9e863c2dd214ab1cb9344"
+SRC_URI[sha256sum] =
"0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b"
inherit autotools useradd systemd
--
2.5.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH] MPD: update to 0.19.15
This fixes a build issue
---
.../recipes-multimedia/musicpd/{mpd_0.19.10.bb => mpd_0.19.15.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.19.10.bb =>
mpd_0.19.15.bb} (94%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
similarity index 94%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
index 7b124ca..caba589 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
@@ -9,8 +9,8 @@ SRC_URI = " \
http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \
file://mpd.conf.in \
"
-SRC_URI[md5sum] = "da4bc3e47afd0faf9e7a67168e012102"
-SRC_URI[sha256sum] =
"c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851"
+SRC_URI[md5sum] = "bb855b1689c9e863c2dd214ab1cb9344"
+SRC_URI[sha256sum] =
"0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b"
inherit autotools useradd systemd
--
2.5.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] MPD: update to 0.19.15
This fixes a build issue
---
.../recipes-multimedia/musicpd/{mpd_0.19.10.bb => mpd_0.19.15.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.19.10.bb =>
mpd_0.19.15.bb} (94%)
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
similarity index 94%
rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
index 7b124ca..caba589 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb
@@ -9,8 +9,8 @@ SRC_URI = " \
http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \
file://mpd.conf.in \
"
-SRC_URI[md5sum] = "da4bc3e47afd0faf9e7a67168e012102"
-SRC_URI[sha256sum] =
"c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851"
+SRC_URI[md5sum] = "bb855b1689c9e863c2dd214ab1cb9344"
+SRC_URI[sha256sum] =
"0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b"
inherit autotools useradd systemd
--
2.5.5
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
