Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent
Hi, If theres no solution to resolve the conflict between the internal tevent and the external one, then maybe putting the libtevent-internal.h from the external lib to the samba tree would be a way to go. Br, György Eredeti levél Feladó: Andreas Müller schnitzeltonygooglemail.com Dátum: 2017 február 20 12:52:18 Tárgy: Re: [oe] [meta-networking][PATCH v2] Samba: use built-in libtevent Címzett: openembedded-devellists.openembedded.org openembedded-devellists.openembedded.org In last build Ive noticed only this new issue related to samba: ctdb-2.5.6: ctdb rdepends on samba, but it isnt a build dependency, missing samba in DEPENDS or PACKAGECONFIG? [build-deps] Maybe this dependency was created from samba being libldb provider in this build. gvfs and whole meta-gnome layers is still included in my world, maybe it didnt fail because some gvfs dependency was already failing or one of samba related changes in master-next is fixing this one. Some background: During last weekend I prepared a series based on master-next unblacklisting. First target is to build a xfce-image again [1]. Last step yesterday evening should be rebasing against latest master-next and run a test build. That failed for gvfs - so I stopped sending stuff. Now I know why gvfs fails... How do we proceed with this patch? [1] https://github.com/schnitzeltony/meta-openembedded/tree/work-2017-02 Andreas -- ___ Openembedded-devel mailing list Openembedded-devellists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCHv2 1/2] nginx: optimize systemd unit file
On Thursday, August 18, 2016 7:02:19 PM CEST Martin Jansa wrote: > Then please send tested v3. > Done. Hopefully OK this time. > Thanks Br, György > > On Thu, Aug 18, 2016 at 6:41 PM, Szombathelyi György <gyu...@freemail.hu> > wrote: > > > Hi, > > > > Sorry for the wrong patch, but this has also some problems (inlined): > > > > On Thursday, August 18, 2016 6:09:38 PM CEST Martin Jansa wrote: > > > From: Szombathelyi György <gyu...@freemail.hu> > > > > > > - 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, 7 insertions(+), 7 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..334a6d8 > > > 100644 > > > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc > > > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc > > > @@ -73,8 +73,8 @@ do_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 > > Don't remove the /run/nginx directory, please > > > > > + 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 +90,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 > > This is missing from the end, since the unit file refers to SBINDIR now, > > and > > no BASE_SBINDIR. > > > > @@ -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 > > } > > > > > > > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCHv2 1/2] nginx: optimize systemd unit file
Hi, Sorry for the wrong patch, but this has also some problems (inlined): On Thursday, August 18, 2016 6:09:38 PM CEST Martin Jansa wrote: > From: Szombathelyi György <gyu...@freemail.hu> > > - 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, 7 insertions(+), 7 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..334a6d8 > 100644 > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc > @@ -73,8 +73,8 @@ do_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 Don't remove the /run/nginx directory, please > + 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 +90,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 This is missing from the end, since the unit file refers to SBINDIR now, and no BASE_SBINDIR. @@ -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 } -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH]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 Szombathelyidiff --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..25ac7a4 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -75,6 +75,9 @@ 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 +93,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 +105,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 } -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] nginx: PACKAGECONFIG for httpv2
Signed-off-by: Gyorgy Szombathelyidiff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/ recipes-httpd/nginx/nginx.inc index ebf926a..cb57b42 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -31,6 +31,8 @@ NGINX_USER ?= "www" EXTRA_OECONF = "" DISABLE_STATIC = "" +PACKAGECONFIG[http2] = "--with-http_v2_module,," + do_configure () { if [ "${SITEINFO_BITS}" = "64" ]; then PTRSIZE=8 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] Samba: use only libsystemd
On Monday, June 20, 2016 10:08:45 AM CEST Joe MacDonald wrote: > Hi Gyorgy, > Hi Joe, > [[oe] [meta-networking][PATCH] Samba: use only libsystemd] On 16.06.18 (Sat 21:06) Gyorgy Szombathelyi wrote: > > This patch was disappeared while moved to 4.4.2 > > I can't find this patch in the git history, but I'm happy to merge it if > you can provide a bit more detail on it. Is it always valid to assume > HAVE_LIBSYSTEMD will always mean HAVE_LIBSYSTEMD_JOURNAL and > HAVE_LIBSYSTEMD_DAEMON? Also, can you provide an upstream-status on > this? I found out the real history: since systemd-209, there's only one library built, called libsystemd.so. https://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html * The APIs "sd-journal.h", "sd-login.h", "sd-id128.h" are no longer found in individual libraries libsystemd-journal.so, libsystemd-login.so, libsystemd-id128.so. Instead, we have merged them into a single library, libsystemd.so, which provides all symbols. Seems others are noticed it, too :) http://firstyear.id.au/blog/html/2016/05/23/systemd_is_not_monolithic.html > Thanks. > -J. Br, György -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] Samba: use only libsystemd
On Monday, June 20, 2016 10:08:45 AM CEST Joe MacDonald wrote: > Hi Gyorgy, > > [[oe] [meta-networking][PATCH] Samba: use only libsystemd] On 16.06.18 (Sat 21:06) Gyorgy Szombathelyi wrote: > > This patch was disappeared while moved to 4.4.2 > > I can't find this patch in the git history, but I'm happy to merge it if > you can provide a bit more detail on it. Is it always valid to assume > HAVE_LIBSYSTEMD will always mean HAVE_LIBSYSTEMD_JOURNAL and > HAVE_LIBSYSTEMD_DAEMON? Also, can you provide an upstream-status on > this? Hi Joe, I did not do a deep research, but without the patch, the systemd notify code doesn't work, so a systemctl start smb will never succeed. Seems some (older?) systemd installations had libsystemd-journal.so and libsystemd-daemon.so, but now only libsystemd.so exists. Br, György > > Thanks. > -J. > > > Signed-off-by: Gyorgy Szombathelyi> > --- > > > > .../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-libsy > > stemd.patch> > > diff --git > > a/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libs > > ystemd.patch > > b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libs > > ystemd.patch new file mode 100644 > > index 000..81621ff > > --- /dev/null > > +++ > > b/meta-networking/recipes-connectivity/samba/samba-4.4.2/10-use-only-libs > > ystemd.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.c2016-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
[oe] [meta-networking][PATCH]Fix postfix-native on Linux 4.0
Make postfix compilable on 4.0 kernel. Signed-off-by: Gyorgy Szombathelyi gyu...@freemail.hu diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/makedefs.patch index 32c31b0..ea1e994 100644 --- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/makedefs.patch @@ -10,14 +10,11 @@ for Linux2 and Linux3 systems. Upstreamstatus: Inappropriate [embedded specific] Signed-off-by: Yao Zhao yao.z...@windriver.com - makedefs | 27 +++ - 1 files changed, 11 insertions(+), 16 deletions(-) -diff --git a/makedefs b/makedefs -index dd5f256..e6fb795 100644 a/makedefs -+++ b/makedefs +5)add Linux 4.0 support + +--- a/makedefs 2015-05-30 13:38:50.346033228 +0200 b/makedefs 2015-05-30 13:40:19.375364795 +0200 @@ -87,9 +87,6 @@ # Defaults for most sane systems @@ -68,7 +65,7 @@ index dd5f256..e6fb795 100644 then echo CCARGS=$CCARGS -DNO_EPOLL else -@@ -356,8 +353,6 @@ int main(int argc, char **argv) +@@ -356,22 +353,20 @@ } EOF ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 @@ -77,7 +74,9 @@ index dd5f256..e6fb795 100644 rm -f makedefs.test makedefs.test.[co] fi;; esac -@@ -366,12 +361,12 @@ EOF + ;; +-Linux.3*) SYSTYPE=LINUX3 ++Linux.3*|Linux.4*)SYSTYPE=LINUX3 case $CCARGS in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -111,6 +110,3 @@ index dd5f256..e6fb795 100644 do test -e $lib/lib$name.a -o -e $lib/lib$name.so { SYSLIBS=$SYSLIBS -l$name --- -1.7.1 - -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking]Fix postfix-native on Linux 4.0
Resubmitted with [PATCH] in the subject. On Saturday 30 May 2015 14:45:04 Szombathelyi György wrote: Make postfix compilable on 4.0 kernel. Signed-off-by: Gyorgy Szombathelyi gyu...@freemail.hu diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/makedefs.patch index 32c31b0..ea1e994 100644 --- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/makedefs.patch @@ -10,14 +10,11 @@ for Linux2 and Linux3 systems. Upstreamstatus: Inappropriate [embedded specific] Signed-off-by: Yao Zhao yao.z...@windriver.com - makedefs | 27 +++ - 1 files changed, 11 insertions(+), 16 deletions(-) -diff --git a/makedefs b/makedefs -index dd5f256..e6fb795 100644 a/makedefs -+++ b/makedefs +5)add Linux 4.0 support + +--- a/makedefs 2015-05-30 13:38:50.346033228 +0200 b/makedefs 2015-05-30 13:40:19.375364795 +0200 @@ -87,9 +87,6 @@ # Defaults for most sane systems @@ -68,7 +65,7 @@ index dd5f256..e6fb795 100644 then echo CCARGS=$CCARGS -DNO_EPOLL else -@@ -356,8 +353,6 @@ int main(int argc, char **argv) +@@ -356,22 +353,20 @@ } EOF ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 @@ -77,7 +74,9 @@ index dd5f256..e6fb795 100644 rm -f makedefs.test makedefs.test.[co] fi;; esac -@@ -366,12 +361,12 @@ EOF + ;; +-Linux.3*) SYSTYPE=LINUX3 ++Linux.3*|Linux.4*) SYSTYPE=LINUX3 case $CCARGS in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -111,6 +110,3 @@ index dd5f256..e6fb795 100644 do test -e $lib/lib$name.a -o -e $lib/lib$name.so { SYSLIBS=$SYSLIBS -l$name --- -1.7.1 - -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking]Fix postfix-native on Linux 4.0
Make postfix compilable on 4.0 kernel. Signed-off-by: Gyorgy Szombathelyi gyu...@freemail.hu diff --git a/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-networking/recipes-daemons/postfix/files/makedefs.patch index 32c31b0..ea1e994 100644 --- a/meta-networking/recipes-daemons/postfix/files/makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/makedefs.patch @@ -10,14 +10,11 @@ for Linux2 and Linux3 systems. Upstreamstatus: Inappropriate [embedded specific] Signed-off-by: Yao Zhao yao.z...@windriver.com - makedefs | 27 +++ - 1 files changed, 11 insertions(+), 16 deletions(-) -diff --git a/makedefs b/makedefs -index dd5f256..e6fb795 100644 a/makedefs -+++ b/makedefs +5)add Linux 4.0 support + +--- a/makedefs 2015-05-30 13:38:50.346033228 +0200 b/makedefs 2015-05-30 13:40:19.375364795 +0200 @@ -87,9 +87,6 @@ # Defaults for most sane systems @@ -68,7 +65,7 @@ index dd5f256..e6fb795 100644 then echo CCARGS=$CCARGS -DNO_EPOLL else -@@ -356,8 +353,6 @@ int main(int argc, char **argv) +@@ -356,22 +353,20 @@ } EOF ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 @@ -77,7 +74,9 @@ index dd5f256..e6fb795 100644 rm -f makedefs.test makedefs.test.[co] fi;; esac -@@ -366,12 +361,12 @@ EOF + ;; +-Linux.3*) SYSTYPE=LINUX3 ++Linux.3*|Linux.4*)SYSTYPE=LINUX3 case $CCARGS in *-DNO_DB*) ;; *-DHAS_DB*) ;; @@ -111,6 +110,3 @@ index dd5f256..e6fb795 100644 do test -e $lib/lib$name.a -o -e $lib/lib$name.so { SYSLIBS=$SYSLIBS -l$name --- -1.7.1 - -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH]ntp: fix perl path
Hi, Any chance to get this into git? Now if one has a system /bin/perl, ntp build will fail. Br, György On Tuesday 13 January 2015 22:44:03 Szombathelyi György wrote: Fix perl path in ntp-wait and calc_tickadj. Signed-off-by: Gyorgy Szombathelyi gyu...@freemail.hu diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb index 9f74f6b..e802ee7 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb @@ -74,8 +74,10 @@ do_install_append() { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace -sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait +sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait +sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/calc_tickadj +sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj install -d ${D}/${sysconfdir}/default install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH]ntp: fix perl path
Fix perl path in ntp-wait and calc_tickadj. Signed-off-by: Gyorgy Szombathelyi gyu...@freemail.hu diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb b/meta- networking/recipes-support/ntp/ntp_4.2.8.bb index 9f74f6b..e802ee7 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb @@ -74,8 +74,10 @@ do_install_append() { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}: ${bindir}!' ${D}${bindir}/ntpdate-sync sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace -sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait +sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait +sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/calc_tickadj +sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj install -d ${D}/${sysconfdir}/default install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH]ntp: fix perl path
Fix perl path in ntp-wait and calc_tickadj. Signed-off-by: Gyorgy Szombathelyi gyu...@freemail.hu diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb index 9f74f6b..e802ee7 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8.bb @@ -74,8 +74,10 @@ do_install_append() { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntptrace sed -i '/use/i use warnings;' ${D}${sbindir}/ntptrace -sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait +sed -i '1s,#!.*perl,#! ${bindir}/env perl,' ${D}${sbindir}/ntp-wait sed -i '/use/i use warnings;' ${D}${sbindir}/ntp-wait +sed -i '1s,#!.*perl -w,#! ${bindir}/env perl,' ${D}${sbindir}/calc_tickadj +sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj install -d ${D}/${sysconfdir}/default install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel