[oe] [meta-oe][PATCH V2] rsyslog: add PACKAGECONFIG for imjournal
From: Chen Qi Add PACKAGECONFIG for imjournal, and add corresponding configuration to /etc/rsyslog.d/imjournal.conf when it's enabled. Default to disable it. This patch also enables rsyslog.conf to include configuration files /etc/rsyslog.d/*.conf. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf | 5 + meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb| 6 ++ 2 files changed, 11 insertions(+) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf index 324ae6d82..dbfefb759 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -84,3 +84,8 @@ $ActionQueueMaxDiskSpace 10m # 1gb space limit (use as much as possible) # UDP Syslog Server: #$ModLoad imudp.so # provides UDP syslog reception #$UDPServerRun 514 # start a UDP syslog server at standard port 514 + +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index d90695a60..13c1f56ee 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb @@ -67,6 +67,7 @@ PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," +PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," @@ -126,6 +127,11 @@ do_install_append() { install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + +if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then +install -d 0755 ${D}${sysconfdir}/rsyslog.d +echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf +fi } FILES_${PN} += "${bindir}" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] rsyslog: add PACKAGECONFIG for imjournal
From: Chen Qi Add PACKAGECONFIG for imjournal, and add corresponding configuration to /etc/rsyslog.conf when it's enabled. Default to disable it. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index d90695a..1bcbde1 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb @@ -67,6 +67,7 @@ PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," +PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," @@ -126,6 +127,10 @@ do_install_append() { install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + +if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then +echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.conf +fi } FILES_${PN} += "${bindir}" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] rsyslog: fix configuration file for logrotate
From: Chen Qi The logrotate.rsyslog file uses 'cat /var/run/rsyslogd.pid' to determine the pid of rsyslogd daemon. This is incorrect, because rsyslogd may start in a way that does not create rsyslog.pid file. Failing to send HUP signal to rsyslogd daemon will result in unexpected behaviour. e.g. rsyslogd is writing to /var/log/messages- instead of /var/log/messages. We should really use pkill to send HUP signal to rsyslogd to ensure correct behaviour. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate | 4 ++-- meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 94ec517..5f8568f 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -9,7 +9,7 @@ delaycompress compress postrotate - /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true + @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true endscript } @@ -34,6 +34,6 @@ delaycompress sharedscripts postrotate - /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true + @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true endscript } diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index 9737892..d90695a 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb @@ -125,6 +125,7 @@ do_install_append() { install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog +sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog } FILES_${PN} += "${bindir}" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libfastjson: backport patch to fix compilation error
From: Chen Qi I've met the following compilation error. | ../git/json_object.c:415:3: error: jump skips variable initialization [-Werror=jump-misses-init] Backport a patch to fix it. Signed-off-by: Chen Qi --- .../0001-fix-jump-misses-init-gcc-8-warning.patch | 46 ++ .../recipes-extended/rsyslog/libfastjson_0.99.8.bb | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch b/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch new file mode 100644 index 000..25e5efa --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/libfastjson/0001-fix-jump-misses-init-gcc-8-warning.patch @@ -0,0 +1,46 @@ +From d697182f18a421b7f80ea9de4914251b55d82532 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Sun, 15 Jul 2018 17:24:59 +0200 +Subject: [PATCH] "fix" "jump-misses-init" gcc-8 warning + +Actually, that warning is overly conservative, and so we +have changed the code in a somewhat suboptimal way to "fix" +it. In this spots, it's not that bad and we wanted to avoid +totally disabling this warning. + +If it were more costly in terms of cleanness, we would probaly +have done that. Just mention it to tell anyone else the +cure is not really a good one, just selected due to the +circumstances in this special case. + +Upstream-Status: Backport + +Signed-off-by: Chen Qi +--- + json_object.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/json_object.c b/json_object.c +index 35338e1..6e67891 100644 +--- a/json_object.c b/json_object.c +@@ -396,6 +396,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso) + { + struct _fjson_child *chld = NULL; + struct _fjson_child_pg *pg; ++ int pg_idx; + + if (jso->o.c_obj.ndeleted > 0) { + /* we first fill deleted spots */ +@@ -415,7 +416,7 @@ fjson_child_get_empty_etry(struct fjson_object *const __restrict__ jso) + goto done; + } + +- const int pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE; ++ pg_idx = jso->o.c_obj.nelem % FJSON_OBJECT_CHLD_PG_SIZE; + if (jso->o.c_obj.nelem > 0 && pg_idx == 0) { + if((pg = calloc(1, sizeof(struct _fjson_child_pg))) == NULL) { + errno = ENOMEM; +-- +2.11.0 + diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb b/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb index ea089de..b84dde3 100644 --- a/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb +++ b/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.8.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" DEPENDS = "" -SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https \ + file://0001-fix-jump-misses-init-gcc-8-warning.patch" SRCREV = "4758b1caf69ada911ef79e1d80793fe489b98dff" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rsyslog: fix configuration file for logrotate
From: Chen Qi The logrotate.rsyslog file uses 'cat /var/run/rsyslogd.pid' to determine the pid of rsyslogd daemon. This is incorrect, because rsyslogd may start in a way that does not create rsyslog.pid file. Failing to send HUP signal to rsyslogd daemon will result in unexpected behaviour. e.g. rsyslogd is writing to /var/log/messages- instead of /var/log/messages. We should really use pkill to send HUP signal to rsyslogd to ensure correct behaviour. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate | 4 ++-- meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 94ec517..5f8568f 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -9,7 +9,7 @@ delaycompress compress postrotate - /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true + @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true endscript } @@ -34,6 +34,6 @@ delaycompress sharedscripts postrotate - /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true + @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true endscript } diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index 9737892..d90695a 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb @@ -125,6 +125,7 @@ do_install_append() { install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog +sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog } FILES_${PN} += "${bindir}" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 18/20] python(3)-attrs: upgrade 17.4.0 -> 18.1.0
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-attrs.inc | 4 ++-- .../python/{python-attrs_17.4.0.bb => python-attrs_18.1.0.bb} | 0 .../python/{python3-attrs_17.4.0.bb => python3-attrs_18.1.0.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-attrs_17.4.0.bb => python-attrs_18.1.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-attrs_17.4.0.bb => python3-attrs_18.1.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-attrs.inc b/meta-python/recipes-devtools/python/python-attrs.inc index c29f058fa..fa73ea54d 100644 --- a/meta-python/recipes-devtools/python/python-attrs.inc +++ b/meta-python/recipes-devtools/python/python-attrs.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.attrs.org/; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d4ab25949a73fe7d4fdee93bcbdbf8ff" -SRC_URI[md5sum] = "d7a89063b2e0fd36bd82389c4d82821d" -SRC_URI[sha256sum] = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9" +SRC_URI[sha256sum] = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b" +SRC_URI[md5sum] = "3f3f3e0750dab74cfa1dc8b0fd7a5f86" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb b/meta-python/recipes-devtools/python/python-attrs_18.1.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-attrs_17.4.0.bb rename to meta-python/recipes-devtools/python/python-attrs_18.1.0.bb diff --git a/meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb b/meta-python/recipes-devtools/python/python3-attrs_18.1.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb rename to meta-python/recipes-devtools/python/python3-attrs_18.1.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 20/20] python(3)-idna: upgrade 2.6 -> 2.7
From: Chen Qi The license checksum changes but the license remains the same. Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-idna.inc | 6 +++--- .../python/{python-idna_2.6.bb => python-idna_2.7.bb} | 0 .../python/{python3-idna_2.6.bb => python3-idna_2.7.bb} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python-idna_2.6.bb => python-idna_2.7.bb} (100%) rename meta-python/recipes-devtools/python/{python3-idna_2.6.bb => python3-idna_2.7.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-idna.inc b/meta-python/recipes-devtools/python/python-idna.inc index b1d0d1895..d6d8d92ba 100644 --- a/meta-python/recipes-devtools/python/python-idna.inc +++ b/meta-python/recipes-devtools/python/python-idna.inc @@ -1,10 +1,10 @@ SUMMARY = "Internationalised Domain Names in Applications" HOMEPAGE = "https://github.com/kjd/idna; LICENSE = "BSD-3-Clause & Python-2.0 & Unicode" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c9ba5acd829579492fd5eb306c7a0565" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=782775b32f96098512e283fb5d4546cd" -SRC_URI[md5sum] = "c706e2790b016bd0ed4edd2d4ba4d147" -SRC_URI[sha256sum] = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f" +SRC_URI[md5sum] = "0e5bb69018ddef1b9d95f681182be82c" +SRC_URI[sha256sum] = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" RDEPENDS_${PN}_class-target = "\ ${PYTHON_PN}-codecs \ diff --git a/meta-python/recipes-devtools/python/python-idna_2.6.bb b/meta-python/recipes-devtools/python/python-idna_2.7.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-idna_2.6.bb rename to meta-python/recipes-devtools/python/python-idna_2.7.bb diff --git a/meta-python/recipes-devtools/python/python3-idna_2.6.bb b/meta-python/recipes-devtools/python/python3-idna_2.7.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-idna_2.6.bb rename to meta-python/recipes-devtools/python/python3-idna_2.7.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 19/20] python(3)-requests: upgrade 2.18.4 -> 2.19.1
From: Chen Qi The license checksum changes but the license remains the same. Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-requests.inc | 6 +++--- .../python/{python-requests_2.18.4.bb => python-requests_2.19.1.bb} | 0 .../{python3-requests_2.18.4.bb => python3-requests_2.19.1.bb} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python-requests_2.18.4.bb => python-requests_2.19.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-requests_2.18.4.bb => python3-requests_2.19.1.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-requests.inc b/meta-python/recipes-devtools/python/python-requests.inc index 5d6dca5d3..efc652d94 100644 --- a/meta-python/recipes-devtools/python/python-requests.inc +++ b/meta-python/recipes-devtools/python/python-requests.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Python HTTP for Humans." HOMEPAGE = "http://python-requests.org; LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=979d6a23b143e13ea0e5e3aa81248820" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bfbeafb85a2cee261510d65d5ec19156" -SRC_URI[md5sum] = "081412b2ef79bdc48229891af13f4d82" -SRC_URI[sha256sum] = "9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e" +SRC_URI[md5sum] = "6c1a31afec9d614e2e71a91ee6ca2878" +SRC_URI[sha256sum] = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-requests_2.18.4.bb b/meta-python/recipes-devtools/python/python-requests_2.19.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-requests_2.18.4.bb rename to meta-python/recipes-devtools/python/python-requests_2.19.1.bb diff --git a/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb b/meta-python/recipes-devtools/python/python3-requests_2.19.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-requests_2.18.4.bb rename to meta-python/recipes-devtools/python/python3-requests_2.19.1.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 17/20] python3-prctl: upgrade 1.6.1 -> 1.7
From: Chen Qi Signed-off-by: Chen Qi --- .../python/{python3-prctl_1.6.1.bb => python3-prctl_1.7.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python3-prctl_1.6.1.bb => python3-prctl_1.7.bb} (79%) diff --git a/meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb b/meta-python/recipes-devtools/python/python3-prctl_1.7.bb similarity index 79% rename from meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb rename to meta-python/recipes-devtools/python/python3-prctl_1.7.bb index 5de83ce48..54620a066 100644 --- a/meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-prctl_1.7.bb @@ -5,13 +5,13 @@ limitations in C and linux. This module provides a nice non-messy python(ic) \ interface." SECTION = "devel/python" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=5eb2f4bcd60326f83e5deb542372d52f" +LIC_FILES_CHKSUM = "file://COPYING;md5=23ff9f50449d4bd0e513df16e4d9755f" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "1107d0be7bec4b28c85c62c454882d16844c930a" -PV = "1.6.1+git${SRCPV}" +SRCREV = "57cd0a7cad76e8f8792eea22ee5b5d17bae0a90f" +PV = "1.7+git${SRCPV}" SRC_URI = "git://github.com/seveas/python-prctl;branch=master \ file://0001-support-cross-complication.patch \ -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 15/20] python(3)-automat: upgrade 0.6.0 -> 0.7.0
From: Chen Qi Patch is rebased against latest codes. Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-automat.inc | 4 ++-- .../0001-setup.py-remove-the-dependency-on-m2r.patch| 13 +++-- .../{python-automat_0.6.0.bb => python-automat_0.7.0.bb}| 0 .../{python3-automat_0.6.0.bb => python3-automat_0.7.0.bb} | 0 4 files changed, 9 insertions(+), 8 deletions(-) rename meta-python/recipes-devtools/python/{python-automat_0.6.0.bb => python-automat_0.7.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-automat_0.6.0.bb => python3-automat_0.7.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-automat.inc b/meta-python/recipes-devtools/python/python-automat.inc index 43b9ce9e3..f6cbb35c0 100644 --- a/meta-python/recipes-devtools/python/python-automat.inc +++ b/meta-python/recipes-devtools/python/python-automat.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" FILESEXTRAPATHS_prepend := "${THISDIR}/python-automat:" -SRC_URI[md5sum] = "ad7bba58d262d8956d732330cb5ef53d" -SRC_URI[sha256sum] = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8" +SRC_URI[md5sum] = "b72d5b7a83c2b1bd6e9ec3614a69f9ea" +SRC_URI[sha256sum] = "cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e" PYPI_PACKAGE = "Automat" diff --git a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch index d6def98c9..c29b659bc 100644 --- a/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch +++ b/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch @@ -1,4 +1,4 @@ -From d5ebe479fc8fe11c5c75e7f35484849320349222 Mon Sep 17 00:00:00 2001 +From 33b70266930c9093712173c4e0c419815b55e313 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Fri, 22 Dec 2017 09:07:00 -0500 Subject: [PATCH] setup.py: remove the dependency on m2r @@ -11,14 +11,15 @@ value in this case Upstream-Status: Inappropriate (OE specific) Signed-off-by: Derek Straka + --- setup.py | 10 -- 1 file changed, 10 deletions(-) -Index: Automat-0.6.0/setup.py -=== Automat-0.6.0.orig/setup.py -+++ Automat-0.6.0/setup.py +diff --git a/setup.py b/setup.py +index d360c64..7b4180a 100644 +--- a/setup.py b/setup.py @@ -4,14 +4,6 @@ Setup file for automat from setuptools import setup, find_packages @@ -46,4 +47,4 @@ Index: Automat-0.6.0/setup.py -'m2r', ], install_requires=[ - "attrs", + "attrs>=16.1.0", diff --git a/meta-python/recipes-devtools/python/python-automat_0.6.0.bb b/meta-python/recipes-devtools/python/python-automat_0.7.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-automat_0.6.0.bb rename to meta-python/recipes-devtools/python/python-automat_0.7.0.bb diff --git a/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb b/meta-python/recipes-devtools/python/python3-automat_0.7.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-automat_0.6.0.bb rename to meta-python/recipes-devtools/python/python3-automat_0.7.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 13/20] python(3)-pyasn1: upgrade 0.4.2 -> 0.4.3
From: Chen Qi The license checksum changes but the license remains the same. The change is only about year, 2017 -> 2018. Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-pyasn1.inc | 7 --- .../python/{python-pyasn1_0.4.2.bb => python-pyasn1_0.4.3.bb} | 0 .../python/{python3-pyasn1_0.4.2.bb => python3-pyasn1_0.4.3.bb}| 0 3 files changed, 4 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python-pyasn1_0.4.2.bb => python-pyasn1_0.4.3.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pyasn1_0.4.2.bb => python3-pyasn1_0.4.3.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-pyasn1.inc b/meta-python/recipes-devtools/python/python-pyasn1.inc index f3c32e08a..614b6d4ed 100644 --- a/meta-python/recipes-devtools/python/python-pyasn1.inc +++ b/meta-python/recipes-devtools/python/python-pyasn1.inc @@ -1,10 +1,11 @@ SUMMARY = "Python library implementing ASN.1 types." HOMEPAGE = "http://pyasn1.sourceforge.net/; LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=280606d9c18f200e03e0c247ac61475a" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=815ac3f9ca693006349094b358ab3155" -SRC_URI[md5sum] = "cb5883ddc6a9f405600429f37cf0759c" -SRC_URI[sha256sum] = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15" + +SRC_URI[sha256sum] = "fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc" +SRC_URI[md5sum] = "311fff5b2a1303a8cdc334c8867a06f4" RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-codecs \ diff --git a/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb b/meta-python/recipes-devtools/python/python-pyasn1_0.4.3.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb rename to meta-python/recipes-devtools/python/python-pyasn1_0.4.3.bb diff --git a/meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb b/meta-python/recipes-devtools/python/python3-pyasn1_0.4.3.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb rename to meta-python/recipes-devtools/python/python3-pyasn1_0.4.3.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 12/20] python(3)-ndg-httpsclient: upgrade 0.4.4 -> 0.5.0
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-ndg-httpsclient.inc| 4 ++-- ...ython-ndg-httpsclient_0.4.4.bb => python-ndg-httpsclient_0.5.0.bb} | 0 ...hon3-ndg-httpsclient_0.4.4.bb => python3-ndg-httpsclient_0.5.0.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-ndg-httpsclient_0.4.4.bb => python-ndg-httpsclient_0.5.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-ndg-httpsclient_0.4.4.bb => python3-ndg-httpsclient_0.5.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc b/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc index d74302398..4e07e4e95 100644 --- a/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc +++ b/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://python-requests.org; LICENSE = "BSD" LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=ce22c0cd986d2de3f7073cd6b5523ae0" -SRC_URI[md5sum] = "a0d349cf9530e331697a6e5ab1f40de6" -SRC_URI[sha256sum] = "fba4d4798dcac2965874f24afb6631b4326baa4bd02505744d34f690c354856a" +SRC_URI[md5sum] = "1c28be0449268359e795b3b5687feeb7" +SRC_URI[sha256sum] = "c009f5430790936b3a97eaf9f968516664d97e146ab2bda991f0caadb7cc088b" PYPI_PACKAGE = "ndg_httpsclient" diff --git a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb rename to meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.0.bb diff --git a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb rename to meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 14/20] python(3)-lxml: upgrade 4.2.1 -> 4.2.2
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-lxml.inc | 4 ++-- .../python/{python-lxml_4.2.1.bb => python-lxml_4.2.2.bb} | 0 .../python/{python3-lxml_4.2.1.bb => python3-lxml_4.2.2.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-lxml_4.2.1.bb => python-lxml_4.2.2.bb} (100%) rename meta-python/recipes-devtools/python/{python3-lxml_4.2.1.bb => python3-lxml_4.2.2.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc index 3f3a1e27c..51a98f6bb 100644 --- a/meta-python/recipes-devtools/python/python-lxml.inc +++ b/meta-python/recipes-devtools/python/python-lxml.inc @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[md5sum] = "c266d9062e23b08f66426979a2b36f51" -SRC_URI[sha256sum] = "e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b" +SRC_URI[md5sum] = "0aa7db9dd54ed5b0c5611cef0ba490c5" +SRC_URI[sha256sum] = "82f278cd24da1b8a98df89de38946d67381a00e39adef768fd302dc8f4e1c383" DISTUTILS_BUILD_ARGS += " \ --with-xslt-config='pkg-config libxslt' \ diff --git a/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb b/meta-python/recipes-devtools/python/python-lxml_4.2.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-lxml_4.2.1.bb rename to meta-python/recipes-devtools/python/python-lxml_4.2.2.bb diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb b/meta-python/recipes-devtools/python/python3-lxml_4.2.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb rename to meta-python/recipes-devtools/python/python3-lxml_4.2.2.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 16/20] python3-requests-file: upgrade 1.4.2 -> 1.4.3
From: Chen Qi Signed-off-by: Chen Qi --- ...{python3-requests-file_1.4.2.bb => python3-requests-file_1.4.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python3-requests-file_1.4.2.bb => python3-requests-file_1.4.3.bb} (65%) diff --git a/meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb b/meta-python/recipes-devtools/python/python3-requests-file_1.4.3.bb similarity index 65% rename from meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb rename to meta-python/recipes-devtools/python/python3-requests-file_1.4.3.bb index 8652876a4..0407779da 100644 --- a/meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-requests-file_1.4.3.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://github.com/dashea/requests-file; LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9cc728d6087e43796227b0a31422de6b" -SRC_URI[md5sum] = "a907efb75faf0ccbb1857432bf9d8c0f" -SRC_URI[sha256sum] = "f518e7cfe048e053fd1019dfb891b4c55b871c56c5a31693d733240c80b8f191" +SRC_URI[md5sum] = "470711c9b7e0de1057f7b72a58b7ab51" +SRC_URI[sha256sum] = "8f04aa6201bacda0567e7ac7f677f1499b0fc76b22140c54bc06edf1ba92e2fa" inherit pypi setuptools3 -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 09/20] python(3)-certifi: upgrade 2018.1.18 -> 2018.4.16
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-certifi.inc| 4 ++-- .../{python-certifi_2018.1.18.bb => python-certifi_2018.4.16.bb} | 0 .../{python3-certifi_2018.1.18.bb => python3-certifi_2018.4.16.bb}| 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-certifi_2018.1.18.bb => python-certifi_2018.4.16.bb} (100%) rename meta-python/recipes-devtools/python/{python3-certifi_2018.1.18.bb => python3-certifi_2018.4.16.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-certifi.inc b/meta-python/recipes-devtools/python/python-certifi.inc index 26df5c115..a930ff99f 100644 --- a/meta-python/recipes-devtools/python/python-certifi.inc +++ b/meta-python/recipes-devtools/python/python-certifi.inc @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/; LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" -SRC_URI[md5sum] = "068fd5c3c690ae47504b3e0bf4e56c4c" -SRC_URI[sha256sum] = "edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d" +SRC_URI[sha256sum] = "13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7" +SRC_URI[md5sum] = "f5d81d0048e84285611412b0dea0630a" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb b/meta-python/recipes-devtools/python/python-certifi_2018.4.16.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb rename to meta-python/recipes-devtools/python/python-certifi_2018.4.16.bb diff --git a/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb b/meta-python/recipes-devtools/python/python3-certifi_2018.4.16.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb rename to meta-python/recipes-devtools/python/python3-certifi_2018.4.16.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 10/20] python(3)-pyopenssl: upgrade 17.5.0 -> 18.0.0
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-pyopenssl.inc | 4 ++-- .../python/{python-pyopenssl_17.5.0.bb => python-pyopenssl_18.0.0.bb} | 0 .../{python3-pyopenssl_17.5.0.bb => python3-pyopenssl_18.0.0.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-pyopenssl_17.5.0.bb => python-pyopenssl_18.0.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pyopenssl_17.5.0.bb => python3-pyopenssl_18.0.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-pyopenssl.inc b/meta-python/recipes-devtools/python/python-pyopenssl.inc index 7722e8ecd..516e7958a 100644 --- a/meta-python/recipes-devtools/python/python-pyopenssl.inc +++ b/meta-python/recipes-devtools/python/python-pyopenssl.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "openssl ${PYTHON_PN}-cryptography" -SRC_URI[md5sum] = "d9c5134db8bf3183573b7840954cac94" -SRC_URI[sha256sum] = "2c10cfba46a52c0b0950118981d61e72c1e5b1aac451ca1bc77de1a679456773" +SRC_URI[md5sum] = "c92e9c85b520b7e153fef0f7f3c5dda7" +SRC_URI[sha256sum] = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580" PYPI_PACKAGE = "pyOpenSSL" diff --git a/meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb b/meta-python/recipes-devtools/python/python-pyopenssl_18.0.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb rename to meta-python/recipes-devtools/python/python-pyopenssl_18.0.0.bb diff --git a/meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb b/meta-python/recipes-devtools/python/python3-pyopenssl_18.0.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb rename to meta-python/recipes-devtools/python/python3-pyopenssl_18.0.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 11/20] python(3)-urllib3: upgrade 1.22 -> 1.23
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-urllib3.inc| 4 ++-- .../python/{python-urllib3_1.22.bb => python-urllib3_1.23.bb} | 0 .../python/{python3-urllib3_1.22.bb => python3-urllib3_1.23.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-urllib3_1.22.bb => python-urllib3_1.23.bb} (100%) rename meta-python/recipes-devtools/python/{python3-urllib3_1.22.bb => python3-urllib3_1.23.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-urllib3.inc b/meta-python/recipes-devtools/python/python-urllib3.inc index cf79926a6..288ed8b98 100644 --- a/meta-python/recipes-devtools/python/python-urllib3.inc +++ b/meta-python/recipes-devtools/python/python-urllib3.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/shazow/urllib3; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ea114851ad9a8c311aac8728a681a067" -SRC_URI[md5sum] = "0da7bed3fe94bf7dc59ae37885cc72f7" -SRC_URI[sha256sum] = "cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f" +SRC_URI[md5sum] = "1ad43e4b5ab7a0794c89dc057e1d7179" +SRC_URI[sha256sum] = "a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf" RDEPENDS_${PN} += "\ ${PYTHON_PN}-certifi \ diff --git a/meta-python/recipes-devtools/python/python-urllib3_1.22.bb b/meta-python/recipes-devtools/python/python-urllib3_1.23.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-urllib3_1.22.bb rename to meta-python/recipes-devtools/python/python-urllib3_1.23.bb diff --git a/meta-python/recipes-devtools/python/python3-urllib3_1.22.bb b/meta-python/recipes-devtools/python/python3-urllib3_1.23.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-urllib3_1.22.bb rename to meta-python/recipes-devtools/python/python3-urllib3_1.23.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 08/20] python-ipaddress: upgrade 1.0.19 -> 1.0.22
From: Chen Qi Signed-off-by: Chen Qi --- .../python/{python-ipaddress_1.0.19.bb => python-ipaddress_1.0.22.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-ipaddress_1.0.19.bb => python-ipaddress_1.0.22.bb} (67%) diff --git a/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb b/meta-python/recipes-devtools/python/python-ipaddress_1.0.22.bb similarity index 67% rename from meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb rename to meta-python/recipes-devtools/python/python-ipaddress_1.0.22.bb index 9c50b4670..66de8b637 100644 --- a/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb +++ b/meta-python/recipes-devtools/python/python-ipaddress_1.0.22.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7f538584cc3407bf76042def7168548a" DEPENDS += "python-pip" -SRC_URI[md5sum] = "d0687efaf93a32476d81e90ba0609c57" -SRC_URI[sha256sum] = "200d8686011d470b5e4de207d803445deee427455cd0cb7c982b68cf82524f81" +SRC_URI[md5sum] = "74c1ce3109f30eaa1ab3dd342e7b76d4" +SRC_URI[sha256sum] = "b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c" inherit pypi setuptools -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 07/20] python(3)-twisted: upgrade 17.9.0 -> 18.4.0
From: Chen Qi The license checksum changes but the license remains the same. Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-twisted.inc | 6 +++--- .../python/{python-twisted_17.9.0.bb => python-twisted_18.4.0.bb} | 0 .../python/{python3-twisted_17.9.0.bb => python3-twisted_18.4.0.bb} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python-twisted_17.9.0.bb => python-twisted_18.4.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-twisted_17.9.0.bb => python3-twisted_18.4.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-twisted.inc b/meta-python/recipes-devtools/python/python-twisted.inc index 6480ad54f..260909bdd 100644 --- a/meta-python/recipes-devtools/python/python-twisted.inc +++ b/meta-python/recipes-devtools/python/python-twisted.inc @@ -5,10 +5,10 @@ HOMEPAGE = "http://www.twistedmatrix.com; #twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8a9c2fbfcba7d70504e3ba545e1820ed" +LIC_FILES_CHKSUM = "file://LICENSE;md5=04e7730aecedc79d805625a91bc06145" -SRC_URI[md5sum] = "6dbedb918f0c7288a4c670f59393ecf8" -SRC_URI[sha256sum] = "0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c" +SRC_URI[sha256sum] = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9" +SRC_URI[md5sum] = "da8142ad4e9971a75fe751ac96a33b95" PYPI_PACKAGE = "Twisted" PYPI_PACKAGE_EXT = "tar.bz2" diff --git a/meta-python/recipes-devtools/python/python-twisted_17.9.0.bb b/meta-python/recipes-devtools/python/python-twisted_18.4.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-twisted_17.9.0.bb rename to meta-python/recipes-devtools/python/python-twisted_18.4.0.bb diff --git a/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb b/meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb rename to meta-python/recipes-devtools/python/python3-twisted_18.4.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 06/20] python-pip: upgrade 9.0.3 -> 10.0.1
From: Chen Qi The license checksum changes but the license remains the same. Signed-off-by: Chen Qi --- .../python/{python-pip_9.0.3.bb => python-pip_10.0.1.bb}| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python-pip_9.0.3.bb => python-pip_10.0.1.bb} (62%) diff --git a/meta-python/recipes-devtools/python/python-pip_9.0.3.bb b/meta-python/recipes-devtools/python/python-pip_10.0.1.bb similarity index 62% rename from meta-python/recipes-devtools/python/python-pip_9.0.3.bb rename to meta-python/recipes-devtools/python/python-pip_10.0.1.bb index e3fc6ba65..5aaf818d0 100644 --- a/meta-python/recipes-devtools/python/python-pip_9.0.3.bb +++ b/meta-python/recipes-devtools/python/python-pip_10.0.1.bb @@ -1,10 +1,10 @@ SUMMARY = "PIP is a tool for installing and managing Python packages" HOMEPAGE = "https://pip.pypa.io/; LICENSE = "MIT & LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=25fba45109565f87de20bae85bc39452" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f8d33acaac5c5dac8c613904bd56a6f" -SRC_URI[md5sum] = "b15b33f9aad61f88d0f8c866d16c55d8" -SRC_URI[sha256sum] = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796" +SRC_URI[md5sum] = "83a177756e2c801d0b3a6f7b0d4f3f7e" +SRC_URI[sha256sum] = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68" inherit pypi setuptools -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 03/20] python-dbus: upgrade 1.2.6 -> 1.2.8
From: Chen Qi 1. Remove obsolete PACKAGECONFIG. 2. Explicitly disable building documenation. Signed-off-by: Chen Qi --- .../python/{python-dbus_1.2.6.bb => python-dbus_1.2.8.bb} | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta-python/recipes-devtools/python/{python-dbus_1.2.6.bb => python-dbus_1.2.8.bb} (72%) diff --git a/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb b/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb similarity index 72% rename from meta-python/recipes-devtools/python/python-dbus_1.2.6.bb rename to meta-python/recipes-devtools/python/python-dbus_1.2.8.bb index 0f18ccc88..b3f724054 100644 --- a/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb +++ b/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb @@ -9,15 +9,15 @@ DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ " -SRC_URI[md5sum] = "1ce1ddf2582060f8f971652ea54cc17e" -SRC_URI[sha256sum] = "32f29c17172cdb9cb61c68b1f1a71dfe7351506fc830869029c47449bd04faeb" +SRC_URI[md5sum] = "7379db774c10904f27e7e2743d90fb43" +SRC_URI[sha256sum] = "abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools pkgconfig -PACKAGECONFIG ?= "" -PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python3-docutils-native" -PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python3-docutils-native python3-epydoc-native" +# documentation needs python-sphinx, which is not in oe-core or meta-python for now +# change to use PACKAGECONFIG when python-sphinx is added to oe-core or meta-python +EXTRA_OECONF += "--disable-documentation" export STAGING_LIBDIR export STAGING_INCDIR -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 04/20] python(3)-pytest-runner: upgrade 3.0 -> 4.2
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-pytest-runner.inc | 4 ++-- .../{python-pytest-runner_3.0.bb => python-pytest-runner_4.2.bb} | 0 .../{python3-pytest-runner_3.0.bb => python3-pytest-runner_4.2.bb}| 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-pytest-runner_3.0.bb => python-pytest-runner_4.2.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pytest-runner_3.0.bb => python3-pytest-runner_4.2.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-pytest-runner.inc b/meta-python/recipes-devtools/python/python-pytest-runner.inc index 7546743fb..3b057b0ca 100644 --- a/meta-python/recipes-devtools/python/python-pytest-runner.inc +++ b/meta-python/recipes-devtools/python/python-pytest-runner.inc @@ -2,8 +2,8 @@ SUMMARY = "Invoke py.test as distutils command with dependency resolution" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e" -SRC_URI[md5sum] = "8f8363a52bbabc4cedd5e239beb2ba11" -SRC_URI[sha256sum] = "0f7c3a3cf5aead13f54baaa01ceb49e5ae92aba5d3ff1928e81e189c40bc6703" +SRC_URI[md5sum] = "4b696b0f35767f0694f183d0a1855300" +SRC_URI[sha256sum] = "d23f117be39919f00dd91bffeb4f15e031ec797501b717a245e377aee0f577be" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb b/meta-python/recipes-devtools/python/python-pytest-runner_4.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb rename to meta-python/recipes-devtools/python/python-pytest-runner_4.2.bb diff --git a/meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb b/meta-python/recipes-devtools/python/python3-pytest-runner_4.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb rename to meta-python/recipes-devtools/python/python3-pytest-runner_4.2.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 05/20] python3-ordered-set: upgrade 2.0.2 -> 3.0.0
From: Chen Qi The license checksum changes but the license remains the same. The change is just about year, 2013 -> 2018. Add python3-pytest-runner to DEPENDS to solve the following error. | distutils.errors.DistutilsError: Could not find suitable distribution \ for Requirement.parse('pytest-runner') Signed-off-by: Chen Qi --- .../recipes-devtools/python/python3-ordered-set_2.0.2.bb | 10 -- .../recipes-devtools/python/python3-ordered-set_3.0.0.bb | 11 +++ 2 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-ordered-set_3.0.0.bb diff --git a/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb b/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb deleted file mode 100644 index be6d4e169..0 --- a/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "A MutableSet that remembers its order, so that every entry has an index." -HOMEPAGE = "http://github.com/LuminosoInsight/ordered-set; -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://MIT-LICENSE;md5=0feb0c85b722f488b87844fb5f81d2dc" - -SRC_URI[md5sum] = "7b8d73dc64fd3c783ecb48e050bfcc0d" -SRC_URI[sha256sum] = "942cad5d7d5b0760d5cbe93dfb385ac2ed402ca1d48c9f4e102d7d5cce3a90eb" - -inherit pypi setuptools3 - diff --git a/meta-python/recipes-devtools/python/python3-ordered-set_3.0.0.bb b/meta-python/recipes-devtools/python/python3-ordered-set_3.0.0.bb new file mode 100644 index 0..b731c28d2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-ordered-set_3.0.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "A MutableSet that remembers its order, so that every entry has an index." +HOMEPAGE = "http://github.com/LuminosoInsight/ordered-set; +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://MIT-LICENSE;md5=2b36be0d99854aa2ae292a800a7c1d4e" + +SRC_URI[md5sum] = "c8f5b99b717618803b914dd9cfe5ef43" +SRC_URI[sha256sum] = "a34399fe6aa78358aaa00129d67c65b4aa099adfc023731b1d756c85776a89bb" + +inherit pypi setuptools3 + +DEPENDS += "python3-pytest-runner-native" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 01/20] python(3)-hyperlink: upgrade 17.3.1 -> 18.0.0
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-hyperlink.inc | 4 ++-- .../python/{python-hyperlink_17.3.1.bb => python-hyperlink_18.0.0.bb} | 0 .../{python3-hyperlink_17.3.1.bb => python3-hyperlink_18.0.0.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-hyperlink_17.3.1.bb => python-hyperlink_18.0.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-hyperlink_17.3.1.bb => python3-hyperlink_18.0.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-hyperlink.inc b/meta-python/recipes-devtools/python/python-hyperlink.inc index 2b5b0a0ff..78e3ee830 100644 --- a/meta-python/recipes-devtools/python/python-hyperlink.inc +++ b/meta-python/recipes-devtools/python/python-hyperlink.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/python-hyper/hyperlink; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3893d4ed05dcc823f8ed685a9ea19bcb" -SRC_URI[md5sum] = "eaccb9845b559817e838846669cbc68a" -SRC_URI[sha256sum] = "bc4ffdbde9bdad204d507bd8f554f16bba82dd356f6130cb16f41422909c33bc" +SRC_URI[sha256sum] = "f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306" +SRC_URI[md5sum] = "f41a96779b324d824864696a94b24823" inherit pypi diff --git a/meta-python/recipes-devtools/python/python-hyperlink_17.3.1.bb b/meta-python/recipes-devtools/python/python-hyperlink_18.0.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-hyperlink_17.3.1.bb rename to meta-python/recipes-devtools/python/python-hyperlink_18.0.0.bb diff --git a/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb b/meta-python/recipes-devtools/python/python3-hyperlink_18.0.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb rename to meta-python/recipes-devtools/python/python3-hyperlink_18.0.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 02/20] python(3)-protobuf: upgrade 3.5.2 -> 3.6.0
From: Chen Qi Signed-off-by: Chen Qi --- meta-python/recipes-devtools/python/python-protobuf.inc | 4 ++-- .../python/{python-protobuf_3.5.2.bb => python-protobuf_3.6.0.bb} | 1 + .../python/{python3-protobuf_3.5.2.bb => python3-protobuf_3.6.0.bb} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-protobuf_3.5.2.bb => python-protobuf_3.6.0.bb} (97%) rename meta-python/recipes-devtools/python/{python3-protobuf_3.5.2.bb => python3-protobuf_3.6.0.bb} (100%) diff --git a/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-python/recipes-devtools/python/python-protobuf.inc index 5802fea88..6a0568ae6 100644 --- a/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-python/recipes-devtools/python/python-protobuf.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit pypi -SRC_URI[md5sum] = "393a53483224cb338df5c643646c0300" -SRC_URI[sha256sum] = "09879a295fd7234e523b62066223b128c5a8a88f682e3aff62fb115e4a0d8be0" +SRC_URI[md5sum] = "074abcceee0d795ba34ad6430f71d0e8" +SRC_URI[sha256sum] = "a37836aa47d1b81c2db1a6b7a5e79926062b5d76bd962115a0e615551be2b48d" UPSTREAM_CHECK_REGEX = "protobuf/(?P\d+(\.\d+)+)/" diff --git a/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb b/meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb similarity index 97% rename from meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb rename to meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb index f04fc489f..dc0823fd2 100644 --- a/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb +++ b/meta-python/recipes-devtools/python/python-protobuf_3.6.0.bb @@ -1,2 +1,3 @@ inherit setuptools require python-protobuf.inc + diff --git a/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb b/meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb rename to meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gperftools: add the setting of COMPATIBLE_HOST back
From: Chen Qi This setting was deleted, but on mips and glibc, we still have this problem. So add this setting back, but limit it to glibc. Signed-off-by: Chen Qi --- meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb index ecac6c5cc..e475663f2 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb @@ -19,6 +19,10 @@ inherit autotools S = "${WORKDIR}/git" +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 0008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST_mipsarch_libc-glibc = "null" # Disable thumb1 # {standard input}: Assembler messages: # {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gperftools: add the setting of COMPATIBLE_HOST back
From: Chen QiThis setting was deleted, but on mips and glibc, we still have this problem. So add this setting back, but limit it to glibc. Signed-off-by: Chen Qi --- meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb index ecac6c5cc..1d562adda 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb @@ -19,6 +19,10 @@ inherit autotools S = "${WORKDIR}/git" +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 0008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST_libc-glibc = "(i.86|x86_64|powerpc|powerpc64|arm|aarch64).*-linux*" # Disable thumb1 # {standard input}: Assembler messages: # {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] cyrus-sasl: fix systemd related setting
From: Chen QiThe service file belongs to ${PN}-bin instead of ${PN}, fix things accordingly. Signed-off-by: Chen Qi --- meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index 64d1a76d6..6dbff87dd 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb @@ -75,8 +75,8 @@ do_install_append() { USERADD_PACKAGES = "${PN}-bin" USERADD_PARAM_${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "saslauthd.service" +SYSTEMD_PACKAGES = "${PN}-bin" +SYSTEMD_SERVICE_${PN}-bin = "saslauthd.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gnome-common: add PACKAGECONFIG for autoconf-archive
From: Chen QiAdd PACKAGECONFIG for autoconf-archive. Default to enable it to avoid m4 file conflicts between gnome-common and autoconf-archive. e.g. IMAGE_INSTALL_append = " gnome-common autoconf-archive-dev" bitbake We enable autoconf-archive PACKAGECONFIG to avoid the following error. Error: Transaction check error: file /usr/share/aclocal/ax_check_enable_debug.m4 conflicts between attempted installs of gnome-common-3.18.0-r0.noarch and autoconf-archive-dev-2016.09.16-r0.core2_64 file /usr/share/aclocal/ax_code_coverage.m4 conflicts between attempted installs of gnome-common-3.18.0-r0.noarch and autoconf-archive-dev-2016.09.16-r0.core2_64 Signed-off-by: Chen Qi --- meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb index 06f3bb3..d874164 100644 --- a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb +++ b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb @@ -14,6 +14,10 @@ SRC_URI[archive.sha256sum] = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fd EXTRA_AUTORECONF = "" DEPENDS = "" +# Default to enable autoconf-archive to avoid conflicts +PACKAGECONFIG ??= "autoconf-archive" +PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive" + FILES_${PN} += "${datadir}/aclocal" FILES_${PN}-dev = "" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] udisk: fix dependency about libdevmapper
From: Chen QiWe have separated libdevmapper from lvm2, so we need to also fix related dependency for udisk. Instead of simply replacing lvm2 with libdevmapper in DEPENDS, we add PACKAGECONFIG for libdevmapper. Signed-off-by: Chen Qi --- meta-oe/recipes-support/udisks/udisks_1.0.5.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb index ffe2c26..e332660 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces th LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" -DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2 \ +DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native \ dbus-glib-native \ " # optional dependencies: device-mapper parted @@ -24,7 +24,8 @@ SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3 inherit autotools-brokensep systemd gtk-doc -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "libdevmapper" +PACKAGECONFIG[libdevmapper] = "--enable-devmapper,--disable-devmapper,libdevmapper" PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted" EXTRA_OECONF = "--disable-man-pages --libdir=${base_libdir} --sbindir=${base_sbindir}" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] openconnect: upgrade to 7.08
From: Chen QiSigned-off-by: Chen Qi --- meta-networking/recipes-connectivity/openconnect/openconnect_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb index 3a1f0f3..c944144 100644 --- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb @@ -14,9 +14,9 @@ PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," # not config defaults PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," -PV = "7.06" +PV = "7.08" -SRCREV = "35542d52202672b8c12ecc63867432128244013a" +SRCREV = "9697bea0e50952cab57063238b43a7099e498cbb" SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git" S = "${WORKDIR}/git" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] openconnect: fix parallel compilation failure
From: Chen QiThis patch solves the following error which appears now and then because of parallel building. ../git/main.c:78:21: fatal error: version.c: No such file or directory version.c is generated at build time. And it's needed by some objects. So it needs to be generated first to avoid compilation failure. This patch fix the problem by generating version.c first before building others. Signed-off-by: Chen Qi --- meta-networking/recipes-connectivity/openconnect/openconnect_git.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb index 3a1f0f3..4242aa5 100644 --- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb @@ -25,3 +25,7 @@ inherit autotools pkgconfig EXTRA_OECONF += "--with-vpnc-script=${SYSROOT_DESTDIR}${sysconfdir}/vpnc/vpnc-script \ --disable-static" + +do_compile_prepend() { +make version.c +} -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gperftools: fixup HOMEPAGE
From: Chen QiThe old URL for HOMEPAGE is obsolete, use the valid one. Signed-off-by: Chen Qi --- meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb index 6c29a61..ece9dd9 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE = "http://code.google.com/p/gperftools/; +HOMEPAGE = "https://github.com/gperftools/gperftools; LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" DEPENDS += "libunwind" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] tftp-hpa: add systemd unit files
From: Chen QiAdd systemd unit files for tftp-hpa. Signed-off-by: Chen Qi --- .../recipes-daemons/tftp-hpa/files/tftpd-hpa.service | 10 ++ .../recipes-daemons/tftp-hpa/files/tftpd-hpa.socket | 8 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 12 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service new file mode 100644 index 000..97d5658 --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service @@ -0,0 +1,10 @@ +[Unit] +Description=Tftp Server +Requires=tftpd-hpa.socket + +[Service] +ExecStart=@SBINDIR@/in.tftpd-hpa -s /var/lib/tftpboot +StandardInput=socket + +[Install] +Also=tftpd-hpa.socket diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket new file mode 100644 index 000..8764c1d --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket @@ -0,0 +1,8 @@ +[Unit] +Description=Tftp Server Activation Socket + +[Socket] +ListenDatagram=69 + +[Install] +WantedBy=sockets.target diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 7f56713..0a418b9 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -26,12 +26,14 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://add-error-check-for-disk-filled-up.patch \ file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ file://fix-writing-emtpy-file.patch \ + file://tftpd-hpa.socket \ + file://tftpd-hpa.service \ " SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21" SRC_URI[sha256sum] = "0a9f88d4c1c02687b4853b02ab5dd8779d4de4ffdb9b2e5c9332841304d1a269" -inherit autotools-brokensep update-rc.d update-alternatives +inherit autotools-brokensep update-rc.d update-alternatives systemd export AR = "${HOST_PREFIX}ar cq" @@ -60,6 +62,11 @@ do_install() { install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa + +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system +sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service } FILES_${PN} = "${bindir}" @@ -77,3 +84,6 @@ ALTERNATIVE_${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" ALTERNATIVE_PRIORITY = "60" +SYSTEMD_PACKAGES = "tftp-hpa-server" +SYSTEMD_SERVICE_tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" +SYSTEMD_AUTO_ENABLE_tftp-hpa-server = "enable" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] webmin: add systemd service file
From: Chen QiAdd systemd service file for webmin. Signed-off-by: Chen Qi --- .../recipes-webadmin/webmin/files/webmin.service | 15 +++ meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb| 11 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta-webserver/recipes-webadmin/webmin/files/webmin.service diff --git a/meta-webserver/recipes-webadmin/webmin/files/webmin.service b/meta-webserver/recipes-webadmin/webmin/files/webmin.service new file mode 100644 index 000..87cf4f9 --- /dev/null +++ b/meta-webserver/recipes-webadmin/webmin/files/webmin.service @@ -0,0 +1,15 @@ +[Unit] +Description=Webmin Admin Tool +Requires=local-fs.target +After=basic.target +Conflicts=shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@SYSCONFDIR@/webmin/start +ExecStop=@SYSCONFDIR@/webmin/stop +ExecReload=@SYSCONFDIR@/webmin/reload + +[Install] +WantedBy=multi-user.target diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb index 6acff03..ae88eb6 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb @@ -18,12 +18,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://media-tomb.patch \ file://remove-python2.3.patch \ file://mysql-config-fix.patch \ + file://webmin.service \ " SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b" SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1" -inherit perlnative update-rc.d +inherit perlnative update-rc.d systemd do_configure() { # Remove binaries and plugins for other platforms @@ -77,6 +78,11 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 webmin-init ${D}${sysconfdir}/init.d/webmin +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/webmin.service ${D}${systemd_unitdir}/system +sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/webmin.service + install -d ${D}${localstatedir} install -d ${D}${localstatedir}/webmin @@ -117,6 +123,9 @@ do_install() { INITSCRIPT_NAME = "webmin" INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ." +SYSTEMD_SERVICE_${PN} = "webmin.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + # FIXME: some of this should be figured out automatically RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rsyslog: install logrotate configuration file into correct location
From: Chen QiPreviously we used update-alternatives to manage this configuration file, creating link under /etc/logrotate.d/ directory. However, we later dropped the update-alternatives approach and explicitly setting rsyslog to conflict with other syslog providers. So we need to install the logrotate configuration file under /etc/logrotate.d to make things right. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb index 6e3a75c..bd317be 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb @@ -119,9 +119,10 @@ do_install_ptest() { do_install_append() { install -d "${D}${sysconfdir}/init.d" +install -d "${D}${sysconfdir}/logrotate.d" install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf -install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog +install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog } FILES_${PN} += "${bindir}" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rsyslog: fix CVE-2017-12588
From: Chen QiBackport a patch to fix CVE-2017-12588. The zmq3 input and output modules in rsyslog before 8.28.0 interpreted description fields as format strings, possibly allowing a format string attack with unspecified impact. Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-12588 CVE: CVE-2017-12588 Signed-off-by: Chen Qi --- .../rsyslog/rsyslog/CVE-2017-12588.patch | 40 ++ meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/CVE-2017-12588.patch diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/CVE-2017-12588.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/CVE-2017-12588.patch new file mode 100644 index 000..73c3310 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/CVE-2017-12588.patch @@ -0,0 +1,40 @@ +From 6bc4aa975a83abed43d734299ce76cd9e1a14aec Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Wed, 17 May 2017 23:05:24 +0200 +Subject: [PATCH] imzmq3: Fix building with -Werror=format-security + +Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-12588 + +CVE: 2017-12588 + +Upstream-Status: Backport +Signed-off-by: Chen Qi +--- + contrib/imzmq3/imzmq3.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/contrib/imzmq3/imzmq3.c b/contrib/imzmq3/imzmq3.c +index 9ca17871..d32dcbc2 100644 +--- a/contrib/imzmq3/imzmq3.c b/contrib/imzmq3/imzmq3.c +@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { + + /* Do the bind/connect... */ + if (info->action==ACTION_CONNECT) { +-rv = zsocket_connect(*sock, info->description); ++rv = zsocket_connect(*sock, "%s", info->description); + if (rv == -1) { + errmsg.LogError(0, + RS_RET_INVALID_PARAMS, +@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { + } + DBGPRINTF("imzmq3: connect for %s successful\n",info->description); + } else { +-rv = zsocket_bind(*sock, info->description); ++rv = zsocket_bind(*sock, "%s", info->description); + if (rv == -1) { + errmsg.LogError(0, + RS_RET_INVALID_PARAMS, +-- +2.13.0 + diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb index d1d391b..6e3a75c 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb @@ -24,6 +24,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ file://rsyslog-fix-ptest-not-finish.patch \ + file://CVE-2017-12588.patch \ " SRC_URI_append_libc-musl = " \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] openobex: disable building documentation
From: Chen QiWhen building openobex on a host without any connection to outside, the configure fails as it tries to get some url from outside to build the documentation. Fix this problem by disabling building documentation. Signed-off-by: Chen Qi --- meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 053c80a..2db48f3 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -21,6 +21,7 @@ inherit cmake pkgconfig S = "${WORKDIR}/${BP}-Source" EXTRA_OECONF = " -DCMAKE_SKIP_RPATH=ON " +EXTRA_OECMAKE += "-DBUILD_DOCUMENTATION=OFF" #--enable-apps --enable-syslog -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-filesystems][PATCH] xfsdump: upgrade to 3.1.6 and remove from blacklist
From: Robert YangThe 3.1.4 doesn't work with xfsprogs 4.7: | inv_files.o: In function `inv_dirpath': |xfsdump-3.1.4/invutil/inv_files.c:53: undefined reference to `ASSERT' | inv_files.o: In function `inv_fstab': |xfsdump-3.1.4/invutil/inv_files.c:60: undefined reference to `ASSERT' | inv_files.o: In function `inv_lockfile': |xfsdump-3.1.4/invutil/inv_files.c:67: undefined reference to `ASSERT' | inv_files.o: In function `inv_basepath': |xfsdump-3.1.4/invutil/inv_files.c:74: undefined reference to `ASSERT' | collect2: error: ld returned 1 exit status | make[2]: *** [../include/buildrules:33: xfsinvutil] Error 1 Upgrade to 3.1.6, and remove it from blacklist. Signed-off-by: Robert Yang --- .../recipes-utils/xfsdump/{xfsdump_3.1.4.bb => xfsdump_3.1.6.bb}| 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta-filesystems/recipes-utils/xfsdump/{xfsdump_3.1.4.bb => xfsdump_3.1.6.bb} (79%) diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb similarity index 79% rename from meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb rename to meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb index d5ad0b0b2..fac9d47e8 100644 --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb @@ -13,8 +13,8 @@ DEPENDS = "xfsprogs attr" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BPN}-${PV}.tar.gz \ file://remove-install-as-user.patch \ " -SRC_URI[md5sum] = "a8b1761be5feb363131e7b506639ad4c" -SRC_URI[sha256sum] = "570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943" +SRC_URI[md5sum] = "50353cd4f4b435685955363e6044f4d1" +SRC_URI[sha256sum] = "7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0" inherit autotools-brokensep @@ -34,5 +34,3 @@ do_install () { oe_runmake install oe_runmake install-dev } - -PNBLACKLIST[xfsdump] ?= "Depends on broken xfsprogs - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH] evince: fix do_install problem
From: Chen QiWhen building evince for multilib, we would meet the following do_install error. mv: cannot stat [snip]/usr/lib64/systemd/user/evince.service: No such file or directory Fix to use the correct directory related to systemd in do_install function. Signed-off-by: Chen Qi --- meta-gnome/recipes-gnome/evince/evince_3.24.0.bb | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb b/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb index 2b75244..aae8e71 100644 --- a/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb +++ b/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb @@ -30,12 +30,13 @@ do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)} then install -d ${D}${systemd_unitdir}/system -mv ${D}${libdir}/systemd/user/evince.service ${D}${systemd_unitdir}/system/evince.service +mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service else rm -rf ${D}${libdir}/systemd/user/evince.service fi -rmdir --ignore-fail-on-non-empty ${D}${libdir}/systemd/user -rmdir --ignore-fail-on-non-empty ${D}${libdir}/systemd +rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir} +rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd +rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir} } PACKAGECONFIG ??= "" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/3] cryptsetup: DEPENDS on libdevmapper instead of lvm2
From: Chen QiWhen 'cryptsetup' PACKAGECONFIG is enabled for systemd, there would be circular dependency issue among 'systemd', 'cryptsetup' and 'lvm2'. To fix this problem, we've separated libdevmapper into a new recipe. Let cryptsetup depend on libdevmapper instead of lvm2 to fix the issue. Signed-off-by: Chen Qi --- meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb index 38470ac..9075127 100644 --- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb +++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb @@ -9,7 +9,7 @@ SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" -DEPENDS = "util-linux lvm2 popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" SRC_URI[md5sum] = "a11a140cea496961222170944db01fc1" -- 2.1.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/3] multipath-tools: depend on libdevmapper instead of lvm2
From: Chen QiNow we've separted libdevmapper out of lvm2 recipe, we need to change multipath-tools to depend on libdevmapper instead of lvm2 to avoid build error like below. fatal error: libdevmapper.h: No such file or directory Signed-off-by: Chen Qi --- meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb index a63982e..ebe47cc 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_git.bb @@ -1,6 +1,6 @@ SUMMARY = "The upstream project used to drive the Device Mapper multipathing driver" -DEPENDS = "lvm2 libaio liburcu readline udev" +DEPENDS = "libdevmapper libaio liburcu readline udev" LICENSE = "LGPLv2" -- 2.1.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/3] lvm2: separate libdevmapper to avoid circular dependency
From: Chen QiIf we enable 'cryptsetup' PACKAGECONFIG for systemd, there would be circular dependency issue among 'systemd', 'cryptsetup' and 'lvm2'. cryptsetup only needs libdevmapper from lvm2. So we separte libdevmapper into a new recipe to solve this circular dependency issue. Signed-off-by: Chen Qi --- .../0001-Avoid-bashisms-in-init-scripts.patch | 182 ...001-implement-libc-specific-reopen_stream.patch | 79 + ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 30 ++ ...cntl.h-for-O_-defines-and-fcntl-signature.patch | 30 ++ ...0004-tweak-MODPROBE_CMD-for-cross-compile.patch | 38 +++ meta-oe/recipes-support/lvm2/files/lvm.conf| 326 + .../recipes-support/lvm2/libdevmapper_2.02.166.bb | 31 ++ meta-oe/recipes-support/lvm2/lvm2.inc | 75 - .../lvm2/0001-Avoid-bashisms-in-init-scripts.patch | 182 ...001-implement-libc-specific-reopen_stream.patch | 79 - ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 30 -- ...cntl.h-for-O_-defines-and-fcntl-signature.patch | 30 -- ...0004-tweak-MODPROBE_CMD-for-cross-compile.patch | 38 --- meta-oe/recipes-support/lvm2/lvm2/lvm.conf | 326 - meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb | 73 + 15 files changed, 789 insertions(+), 760 deletions(-) create mode 100644 meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch create mode 100644 meta-oe/recipes-support/lvm2/files/lvm.conf create mode 100644 meta-oe/recipes-support/lvm2/libdevmapper_2.02.166.bb delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-Avoid-bashisms-in-init-scripts.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0004-tweak-MODPROBE_CMD-for-cross-compile.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/lvm.conf diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch new file mode 100644 index 000..e86ab25 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -0,0 +1,182 @@ +From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Fri, 17 Mar 2017 03:18:28 +0100 +Subject: [PATCH] Avoid bashisms in init scripts + +Upstream-Status: Inappropriate + +Signed-off-by: Peter Kjellerstedt +--- + scripts/blk_availability_init_red_hat.in | 4 ++-- + scripts/clvmd_init_red_hat.in | 6 +++--- + scripts/cmirrord_init_red_hat.in | 4 ++-- + scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++-- + scripts/lvm2_lvmetad_init_red_hat.in | 4 ++-- + scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_rhel4| 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in +index a84ffe7..6b855b7 100644 +--- a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # +@@ -53,6 +53,6 @@ case "$1" in + status) + ;; + *) +- echo $"Usage: $0 {start|stop|status}" ++ echo "Usage: $0 {start|stop|status}" + ;; + esac +diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in +index d7f3392..abc8011 100644 +--- a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # clvmd - Clustered LVM Daemon init script + # +@@ -161,7 +161,7 @@ restart() { + fi + } + +-[ "$EUID" != "0" ] && { ++[ "$(id -u)" != "0" ] && { + echo "clvmd init script can only be executed as root user" + exit 4 + } +@@ -206,7 +206,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ echo "Usage: $0
[oe] [meta-oe][PATCH 2/2] cryptsetup: DEPENDS on libdevmapper instead of lvm2
From: Chen QiWhen 'cryptsetup' PACKAGECONFIG is enabled for systemd, there would be circular dependency issue among 'systemd', 'cryptsetup' and 'lvm2'. To fix this problem, we've separated libdevmapper into a new recipe. Let cryptsetup depend on libdevmapper instead of lvm2 to fix the issue. Signed-off-by: Chen Qi --- meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb index 38470ac..9075127 100644 --- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb +++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.7.2.bb @@ -9,7 +9,7 @@ SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" -DEPENDS = "util-linux lvm2 popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" SRC_URI[md5sum] = "a11a140cea496961222170944db01fc1" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] lvm2: separate libdevmapper to avoid circular dependency
From: Chen QiIf we enable 'cryptsetup' PACKAGECONFIG for systemd, there would be circular dependency issue among 'systemd', 'cryptsetup' and 'lvm2'. cryptsetup only needs libdevmapper from lvm2. So we separte libdevmapper into a new recipe to solve this circular dependency issue. Signed-off-by: Chen Qi --- .../0001-Avoid-bashisms-in-init-scripts.patch | 182 ...001-implement-libc-specific-reopen_stream.patch | 79 + ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 30 ++ ...cntl.h-for-O_-defines-and-fcntl-signature.patch | 30 ++ ...0004-tweak-MODPROBE_CMD-for-cross-compile.patch | 38 +++ meta-oe/recipes-support/lvm2/files/lvm.conf| 326 + .../recipes-support/lvm2/libdevmapper_2.02.166.bb | 31 ++ meta-oe/recipes-support/lvm2/lvm2.inc | 75 - .../lvm2/0001-Avoid-bashisms-in-init-scripts.patch | 182 ...001-implement-libc-specific-reopen_stream.patch | 79 - ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 30 -- ...cntl.h-for-O_-defines-and-fcntl-signature.patch | 30 -- ...0004-tweak-MODPROBE_CMD-for-cross-compile.patch | 38 --- meta-oe/recipes-support/lvm2/lvm2/lvm.conf | 326 - meta-oe/recipes-support/lvm2/lvm2_2.02.166.bb | 73 + 15 files changed, 789 insertions(+), 760 deletions(-) create mode 100644 meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch create mode 100644 meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch create mode 100644 meta-oe/recipes-support/lvm2/files/lvm.conf create mode 100644 meta-oe/recipes-support/lvm2/libdevmapper_2.02.166.bb delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-Avoid-bashisms-in-init-scripts.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/0004-tweak-MODPROBE_CMD-for-cross-compile.patch delete mode 100644 meta-oe/recipes-support/lvm2/lvm2/lvm.conf diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch new file mode 100644 index 000..e86ab25 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -0,0 +1,182 @@ +From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Fri, 17 Mar 2017 03:18:28 +0100 +Subject: [PATCH] Avoid bashisms in init scripts + +Upstream-Status: Inappropriate + +Signed-off-by: Peter Kjellerstedt +--- + scripts/blk_availability_init_red_hat.in | 4 ++-- + scripts/clvmd_init_red_hat.in | 6 +++--- + scripts/cmirrord_init_red_hat.in | 4 ++-- + scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++-- + scripts/lvm2_lvmetad_init_red_hat.in | 4 ++-- + scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- + scripts/lvm2_monitoring_init_rhel4| 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in +index a84ffe7..6b855b7 100644 +--- a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2012 Red Hat, Inc. All rights reserved. + # +@@ -53,6 +53,6 @@ case "$1" in + status) + ;; + *) +- echo $"Usage: $0 {start|stop|status}" ++ echo "Usage: $0 {start|stop|status}" + ;; + esac +diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in +index d7f3392..abc8011 100644 +--- a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # clvmd - Clustered LVM Daemon init script + # +@@ -161,7 +161,7 @@ restart() { + fi + } + +-[ "$EUID" != "0" ] && { ++[ "$(id -u)" != "0" ] && { + echo "clvmd init script can only be executed as root user" + exit 4 + } +@@ -206,7 +206,7 @@ case "$1" in + ;; + + *) +- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ echo "Usage: $0
[oe] [meta-networking][PATCH] quagga: set ac_cv_path_PERL to '/usr/bin/env perl'
From: Chen QiSet ac_cv_path_PERL to '/usr/bin/env perl' to fix problem when /path/to/hosttools/perl is longer than 128. Signed-off-by: Chen Qi --- meta-networking/recipes-protocols/quagga/quagga.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 13dc4dd..4fb6723 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -70,6 +70,8 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ ap_cv_cc_pie=no \ ${SNMP_CONF}" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_install () { # Install init script and default settings install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH] libnet-ssleay-perl: add openssl-native to DEPENDS
From: Chen QiAdd 'openssl-native' to DEPENDS to fix the following do_configure error. *** Could not find OpenSSL Signed-off-by: Chen Qi --- meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.80.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.80.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.80.bb index 32d92ba..cf621aa 100644 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.80.bb +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.80.bb @@ -10,7 +10,7 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=274;endline=294;md5=67d67095d83e339da538a082fad5f38e" -DEPENDS = "openssl zlib" +DEPENDS = "openssl zlib openssl-native" RDEPENDS_${PN} += "perl-module-carp \ perl-module-errno \ perl-module-extutils-makemaker \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/3] netcat-openbsd: fix ALTERNATIVE_PRIORITY to avoid conflict
From: Chen QiFix ALTERNATIVE_PRIORITY to avoid the same priority of the 'nc' utility with that from busybox. Signed-off-by: Chen Qi --- meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index 3311d24..0afe10c 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -41,4 +41,4 @@ do_install() { install -d ${D}${bindir} install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} } -ALTERNATIVE_PRIORITY = "50" +ALTERNATIVE_PRIORITY = "60" -- 2.1.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 3/3] tftp-hpa: fix ALTERNATIVE_PRIORITY to avoid conflict
From: Chen QiFix ALTERNATIVE_PRIORITY to avoid the same priority of the 'tftp' utility with that from busybox. Signed-off-by: Chen Qi --- meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 115fa2e..5932f85 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -75,5 +75,5 @@ INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." ALTERNATIVE_${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" -ALTERNATIVE_PRIORITY = "50" +ALTERNATIVE_PRIORITY = "60" -- 2.1.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/3] inetutils: fix alternative priority to avoid conflict
From: Chen QiFix ALTERNATIVE_PRIORITY for the logger utility to avoid the same priority with that from util-linux. Signed-off-by: Chen Qi --- meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb index 8db6b74..94a6a6f 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -98,6 +98,7 @@ ALTERNATIVE_${PN} = "talk whois" ALTERNATIVE_LINK_NAME[talkd] = "${sbindir}/in.talkd" ALTERNATIVE_LINK_NAME[uucpd] = "${sbindir}/in.uucpd" +ALTERNATIVE_PRIORITY_${PN}-logger = "60" ALTERNATIVE_${PN}-logger = "logger" ALTERNATIVE_${PN}-syslogd = "syslogd" ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" -- 2.1.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/3] librelp: add recipe
From: Chen QiThis is a project under rsyslog. Add its recipe as it's needed by the new version of rsyslog. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb new file mode 100644 index 000..84c2583 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb @@ -0,0 +1,15 @@ +SUMMARY = "A reliable logging library" +HOMEPAGE = "https://github.com/rsyslog/libfastjson; + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9" + +DEPENDS = "gmp nettle libidn zlib gnutls" + +SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https" + +SRCREV = "02c3be4f5c39fec59d05cd8b75b08dbba04098ad" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 3/3] rsyslog: upgrade to 8.22.0
From: Chen Qienable_tls_ptests.patch is removed as the problem has been fixed in new version. fix_build_with_musl.patch is removed as it's no longer suitable. The file it fixes is not even there any more. Several necessary runtime dependencies are added to rsyslog-ptest. Signed-off-by: Chen Qi --- ...include-config.h-before-any-other-headers.patch | 51 -- .../rsyslog/rsyslog/enable_tls_ptests.patch| 28 .../rsyslog/rsyslog/fix_build_with_musl.patch | 62 --- .../rsyslog/rsyslog/json-0.12-fix.patch| 47 -- .../replace_deprecated_GnuTLS_functions.patch | 73 - ...icate_type_set_priority_only_if_available.patch | 79 - meta-oe/recipes-extended/rsyslog/rsyslog_7.6.7.bb | 180 - meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 172 8 files changed, 172 insertions(+), 520 deletions(-) delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/bugfix-include-config.h-before-any-other-headers.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/json-0.12-fix.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/replace_deprecated_GnuTLS_functions.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/use_gnutls_certificate_type_set_priority_only_if_available.patch delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog_7.6.7.bb create mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/bugfix-include-config.h-before-any-other-headers.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/bugfix-include-config.h-before-any-other-headers.patch deleted file mode 100644 index 1048b42..000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/bugfix-include-config.h-before-any-other-headers.patch +++ /dev/null @@ -1,51 +0,0 @@ -Backport below commit for fixing: - -lexer.l:34:14: error: expected identifier or '(' before '__extension__' - -From 876bdd1c85353f7e254f4b4c3e228484860cea57 Mon Sep 17 00:00:00 2001 -From: Tomas Heinrich -Date: Mon, 17 Nov 2014 20:53:22 +0100 -Subject: [PATCH] bugfix: include config.h before any other headers - -For some reason, flex used to prepend several standard headers before -config.h. This prevented some conditional extension in these headers -from being defined. - -The explicit prototype for strdup() shouldn't be required anymore as -it should be provided by string.h. - -Upstream-Status: Backport - grammar/lexer.l | 7 +-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/grammar/lexer.l b/grammar/lexer.l -index 359cf9f..c834ef7 100644 a/grammar/lexer.l -+++ b/grammar/lexer.l -@@ -28,10 +28,12 @@ - * limitations under the License. - */ - --%{ -+%top{ - #include "config.h" -+} -+ -+%{ - #include "parserif.h" --extern char *strdup(__const char*); /* somehow we may not get this from string.h... */ - %} - - %option noyywrap nodefault case-insensitive yylineno -@@ -67,6 +69,7 @@ extern char *strdup(__const char*); /* somehow we may not get this from string.h - #include - #include - #include -+#include - #include - #include - #include "rainerscript.h" --- -2.7.4 - diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch deleted file mode 100644 index c858f32..000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Enable tls ptest - -Signed-off-by: Tudor Florea -Upstream-Status: Pending - rsyslog-7.4.4/tests/Makefile.am.orig 2013-08-30 18:30:41.0 +0200 -+++ rsyslog-7.4.4/tests/Makefile.am2015-10-01 09:38:45.176289031 +0200 -@@ -118,15 +118,13 @@ - endif - - if ENABLE_GNUTLS --# TODO: re-enable in newer version --#TESTS += \ -- #sndrcv_tls_anon.sh \ -- #sndrcv_tls_anon_rebind.sh \ -- #imtcp-tls-basic.sh -+TESTS += \ -+ imtcp-tls-basic.sh \ -+ imtcp_conndrop_tls.sh - if HAVE_VALGRIND - TESTS += imtcp-tls-basic-vg.sh \ -- imtcp_conndrop_tls-vg.sh -- manytcp-too-few-tls-vg.sh -+ imtcp_conndrop_tls-vg.sh \ -+ manytcp-too-few-tls.sh - endif - endif - diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch deleted file mode 100644 index db35db0..000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/fix_build_with_musl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b6cc506b6ad0b5dd9aa9831ed42e6759183aaf45 Mon Sep 17 00:00:00 2001 -From: Peter Liu -Date: Mon, 26 Sep 2016 17:03:57 +0200 -Subject: [PATCH] fix building
[oe] [meta-oe][PATCH 1/3] libfastjson: add recipe
From: Chen QiThis is a project under rsyslog. Add its recipe as it's needed by new version of rsyslog. Signed-off-by: Chen Qi --- meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb b/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb new file mode 100644 index 000..2e23d7e --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "A fork of json-c library" +HOMEPAGE = "https://github.com/rsyslog/libfastjson; + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f" + +DEPENDS = "" + +SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https" + +SRCREV = "6e057a094cb225c9d80d8d6e6b1f36ca88a942dd" + +S = "${WORKDIR}/git" + +inherit autotools -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libsocketcan: upgrade to 0.0.10
From: Chen QiSigned-off-by: Chen Qi --- ...e-strcmp-instead-of-sizeof-on-char-string.patch | 39 -- .../socketcan/libsocketcan_0.0.10.bb | 14 .../socketcan/libsocketcan_0.0.9.bb| 20 --- 3 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch create mode 100644 meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb delete mode 100644 meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch b/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch deleted file mode 100644 index aa6196e..000 --- a/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 94094cc4ee7ae585da3e5e7e83e7d82b5d6de656 Mon Sep 17 00:00:00 2001 -From: Alexander Stein -Date: Wed, 14 Nov 2012 12:13:06 +0100 -Subject: [PATCH] Use strcmp instead of sizeof on char* string - -This bug was detected by the clang warning: -libsocketcan.c:384:16: warning: argument to 'sizeof' in 'strncmp' call -is the same expression as the source; did you mean to provide an -explicit length? [-Wsizeof-pointer-memaccess] -sizeof(name)) != 0) -~~~^~ - -Signed-off-by: Alexander Stein -Signed-off-by: Marc Kleine-Budde -Upstream-Status: Backport - - src/libsocketcan.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/libsocketcan.c b/src/libsocketcan.c -index fedcbdc..841c2ed 100644 a/src/libsocketcan.c -+++ b/src/libsocketcan.c -@@ -379,9 +379,8 @@ static int do_get_nl_link(int fd, __u8 acquire, const char *name, void *res) - nl_msg->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg)); - parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); - -- if (strncmp -- ((char *)RTA_DATA(tb[IFLA_IFNAME]), name, -- sizeof(name)) != 0) -+ if (strcmp -+ ((char *)RTA_DATA(tb[IFLA_IFNAME]), name) != 0) - continue; - - if (tb[IFLA_LINKINFO]) --- -1.8.3.1 - diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb new file mode 100644 index 000..60ca580 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb @@ -0,0 +1,14 @@ +SUMMARY = "Control basic functions in socketcan from userspace" +HOMEPAGE = "http://www.pengutronix.de; +SECTION = "libs/network" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" + +SRCREV = "51f1610160a1707f026f8c2d714a6f7aa3ca232b" + +SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb deleted file mode 100644 index 98ef73f..000 --- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Control basic functions in socketcan from userspace" -HOMEPAGE = "http://www.pengutronix.de; -SECTION = "libs/network" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" - -SRCREV = "e1a224bf1c409adf0c02b07a90deada634e54b88" - -SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git \ -file://0001-Use-strcmp-instead-of-sizeof-on-char-string.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -do_configure_prepend() { -sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.9: ${S}/configure.ac -} -- 2.8.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gnuplot: upgrade to 5.0.5
From: Chen QiSigned-off-by: Chen Qi --- .../gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch| 16 .../recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 --- meta-oe/recipes-extended/gnuplot/gnuplot.inc | 1 - .../gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch | 16 meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 +++ meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb| 14 -- meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb| 14 ++ 7 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch deleted file mode 100644 index 23f2cd2..000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=== gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+dnl check for dlopen/dl to fix loadlibs link failure -+AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+AC_SUBST(DLOPEN_LIBS) -+LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - else diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch deleted file mode 100644 index 8c7d1f0..000 --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch +++ /dev/null @@ -1,11 +0,0 @@ /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc index 69bc74b..5bcf2ad 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc @@ -17,7 +17,6 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ ---without-lisp-files \ --without-tutorial \ --disable-wxwidgets" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch new file mode 100644 index 000..23f2cd2 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch @@ -0,0 +1,16 @@ +Index: gnuplot-4.6.5/configure.in +=== +--- gnuplot-4.6.5.orig/configure.in gnuplot-4.6.5/configure.in +@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then + fi + + if test "$with_lua" != no; then ++dnl check for dlopen/dl to fix loadlibs link failure ++AC_CHECK_FUNC([dlopen], [], ++ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) ++AC_SUBST(DLOPEN_LIBS) ++LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" + TERMLIBS="$TERMLIBS $LUA_LIBS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + else diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch new file mode 100644 index 000..8c7d1f0 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config
[oe] [meta-oe][PATCH] tipcutils: upgrade to 2.2.0
From: Chen QiSigned-off-by: Chen Qi --- .../recipes-extended/tipcutils/tipcutils_2.0.6.bb | 43 - .../recipes-extended/tipcutils/tipcutils_2.2.0.bb | 45 ++ 2 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb create mode 100644 meta-oe/recipes-extended/tipcutils/tipcutils_2.2.0.bb diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb deleted file mode 100644 index 0ac8fad..000 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Transparent Inter-Process Communication protocol" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://tipc-config/tipc-config.c;endline=32;md5=527a3d5745e1581b15a4fddfb5dfda68" - -SRC_URI = "git://tipc.git.sourceforge.net/gitroot/tipc/tipcutils" -SRCREV = "292a03e17f889013fca2c7bd0aaeebd600c88f40" - -DEPENDS="virtual/kernel" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit autotools - -S = "${WORKDIR}/git" - -do_configure_prepend() { -( cd ${S}; ${S}/bootstrap ) -} - -do_install_append() { -demos="benchmark hello_world topology_subscr_demo connection_demo \ - multicast_demo stream_demo" -for i in $demos;do -install -d ${D}/opt/tipcutils/demos/$i -install ${B}/demos/$i/client_tipc ${D}/opt/tipcutils/demos/$i/ -install ${B}/demos/$i/server_tipc ${D}/opt/tipcutils/demos/$i/ -done -install -d ${D}/opt/tipcutils/demos/inventory_sim -install ${B}/demos/inventory_sim/inventory_sim ${D}/opt/tipcutils/demos/inventory_sim/ - -install -d ${D}/opt/tipcutils/ptts -install ${B}/ptts/tipcTS ${D}/opt/tipcutils/ptts/ -install ${B}/ptts/tipcTC ${D}/opt/tipcutils/ptts/ - -install -d ${D}${sysconfdir} -cp -R --no-dereference --preserve=mode,links -v ${S}/scripts/etc/* ${D}${sysconfdir}/ -chown -R root:root ${D}${sysconfdir} -} - -PACKAGES += "${PN}-demos" -FILES_${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug" -FILES_${PN}-demos = "/opt/tipcutils/*" - diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_2.2.0.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_2.2.0.bb new file mode 100644 index 000..5c5b289 --- /dev/null +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_2.2.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "Transparent Inter-Process Communication protocol" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1b466cce98" + +SRC_URI = "git://tipc.git.sourceforge.net/gitroot/tipc/tipcutils" +SRCREV = "dc8c2d324cda2e80a6e07ee1998fca0839d4a721" + +DEPENDS="virtual/kernel" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit autotools pkgconfig + +DEPENDS += "libdaemon" + +S = "${WORKDIR}/git" + +do_configure_prepend() { +( cd ${S}; ${S}/bootstrap ) +} + +do_install_append() { +demos="benchmark hello_world topology_subscr_demo connection_demo \ + multicast_demo stream_demo" +for i in $demos;do +install -d ${D}/opt/tipcutils/demos/$i +install ${B}/demos/$i/client_tipc ${D}/opt/tipcutils/demos/$i/ +install ${B}/demos/$i/server_tipc ${D}/opt/tipcutils/demos/$i/ +done +install -d ${D}/opt/tipcutils/demos/inventory_sim +install ${B}/demos/inventory_sim/inventory_sim ${D}/opt/tipcutils/demos/inventory_sim/ + +install -d ${D}/opt/tipcutils/ptts +install ${B}/ptts/tipcTS ${D}/opt/tipcutils/ptts/ +install ${B}/ptts/tipcTC ${D}/opt/tipcutils/ptts/ + +install -d ${D}${sysconfdir} +cp -R --no-dereference --preserve=mode,links -v ${S}/scripts/etc/* ${D}${sysconfdir}/ +chown -R root:root ${D}${sysconfdir} +} + +PACKAGES += "${PN}-demos" +FILES_${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug" +FILES_${PN}-demos = "/opt/tipcutils/*" + -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] webmin: ensure correct PERLLIB path
From: Chen QiSigned-off-by: Chen Qi --- meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb index 3fc083a..d96c0f2 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb @@ -109,6 +109,9 @@ do_install() { export no_pam=1 mkdir -p $tempdir ${S}/../setup.sh + +# Ensure correct PERLLIB path +sed -i -e 's#${D}##g' ${D}${sysconfdir}/webmin/start } INITSCRIPT_NAME = "webmin" -- 2.8.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH 2/2] webmin: add systemd service file
From: Chen QiAdd systemd service file for webmin. Signed-off-by: Chen Qi --- .../recipes-webadmin/webmin/files/webmin.service | 14 ++ meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb | 12 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta-webserver/recipes-webadmin/webmin/files/webmin.service diff --git a/meta-webserver/recipes-webadmin/webmin/files/webmin.service b/meta-webserver/recipes-webadmin/webmin/files/webmin.service new file mode 100644 index 000..904bf79 --- /dev/null +++ b/meta-webserver/recipes-webadmin/webmin/files/webmin.service @@ -0,0 +1,14 @@ +[Unit] +Description=Webmin Admin Tool +Requires=local-fs.target +After=basic.target +Conflicts=shutdown.target + +[Service] +Type=oneshot +ExecStart=@LIBEXECDIR@/webmin/miniserv.pl @SYSCONFDIR@/webmin/miniserv.conf +RemainAfterExit=yes +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb index 3fc083a..05b5b92 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb @@ -18,12 +18,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://media-tomb.patch \ file://remove-python2.3.patch \ file://mysql-config-fix.patch \ + file://webmin.service \ " SRC_URI[md5sum] = "91d05b4e31ad1bd14bab14e0f155c088" SRC_URI[sha256sum] = "ad477edb41dc1a900448afc8b5528e136b3778d2d303f23bc564afb975eb5bed" -inherit perlnative update-rc.d +inherit perlnative update-rc.d systemd do_configure() { # Remove binaries and plugins for other platforms @@ -77,6 +78,12 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 webmin-init ${D}${sysconfdir}/init.d/webmin +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/webmin.service ${D}${systemd_unitdir}/system +sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/webmin.service + install -d ${D}${localstatedir} install -d ${D}${localstatedir}/webmin @@ -114,6 +121,9 @@ do_install() { INITSCRIPT_NAME = "webmin" INITSCRIPT_PARAMS = "start 99 5 3 2 . stop 10 0 1 6 ." +SYSTEMD_SERVICE_${PN} = "webmin.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + # FIXME: some of this should be figured out automatically RDEPENDS_${PN} += "perl perl-module-socket perl-module-exporter perl-module-exporter-heavy perl-module-carp perl-module-strict" RDEPENDS_${PN} += "perl-module-warnings perl-module-xsloader perl-module-posix perl-module-autoloader" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] tftp-hpa: add systemd unit files
From: Chen QiAdd systemd unit files for tftp-hpa. Signed-off-by: Chen Qi --- .../recipes-daemons/tftp-hpa/files/tftpd-hpa.service | 10 ++ .../recipes-daemons/tftp-hpa/files/tftpd-hpa.socket | 8 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 12 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service new file mode 100644 index 000..97d5658 --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service @@ -0,0 +1,10 @@ +[Unit] +Description=Tftp Server +Requires=tftpd-hpa.socket + +[Service] +ExecStart=@SBINDIR@/in.tftpd-hpa -s /var/lib/tftpboot +StandardInput=socket + +[Install] +Also=tftpd-hpa.socket diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket new file mode 100644 index 000..8764c1d --- /dev/null +++ b/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket @@ -0,0 +1,8 @@ +[Unit] +Description=Tftp Server Activation Socket + +[Socket] +ListenDatagram=69 + +[Install] +WantedBy=sockets.target diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 115fa2e..60b2f6b 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -26,12 +26,14 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://add-error-check-for-disk-filled-up.patch \ file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ file://fix-writing-emtpy-file.patch \ + file://tftpd-hpa.socket \ + file://tftpd-hpa.service \ " SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21" SRC_URI[sha256sum] = "0a9f88d4c1c02687b4853b02ab5dd8779d4de4ffdb9b2e5c9332841304d1a269" -inherit autotools-brokensep update-rc.d update-alternatives +inherit autotools-brokensep update-rc.d update-alternatives systemd export AR = "${HOST_PREFIX}ar cq" @@ -60,6 +62,11 @@ do_install() { install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa + +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system +sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service } FILES_${PN} = "${bindir}" @@ -77,3 +84,6 @@ ALTERNATIVE_${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" ALTERNATIVE_PRIORITY = "50" +SYSTEMD_PACKAGES = "tftp-hpa-server" +SYSTEMD_SERVICE_tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" +SYSTEMD_AUTO_ENABLE_tftp-hpa-server = "enable" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gperftools: fix to work on aarch64
From: Chen QiAdd '--disable-libunwind' to make it work on aarch64. This would avoid system hanging when using libtcmalloc.so. Signed-off-by: Chen Qi --- meta-oe/recipes-support/gperftools/gperftools_2.5.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb b/meta-oe/recipes-support/gperftools/gperftools_2.5.bb index 1572d4c..2e4479c 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.5.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.5.bb @@ -14,5 +14,6 @@ inherit autotools # On mips, we have the following error. # do_page_fault(): sending SIGSEGV to ls for invalid read access from 0008 # Segmentation fault (core dumped) -# On aarch64, system hangs when using libtcmalloc.so. -COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|arm).*-linux*" +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|arm|aarch64).*-linux*" +# On aarch64, add this option to avoid system hanging when using libtcmalloc.so. +EXTRA_OECONF_aarch64 += "--disable-libunwind" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] meta-initramfs: add core to LAYERDEPENDS in layer.conf
From: Chen Qi qi.c...@windriver.com Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-initramfs/conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index cc78c1a..0026e04 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -14,3 +14,4 @@ BBFILE_PATTERN_meta-initramfs := ^${LAYERDIR}/ # other layers. BBFILE_PRIORITY_meta-initramfs = 8 +LAYERDEPENDS_meta-initramfs = core -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-systemd][PATCH] meta-systemd: add core to LAYERDEPENDS in layer.conf
From: Chen Qi qi.c...@windriver.com Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-systemd/conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf index f3fc45d..0563f44 100644 --- a/meta-systemd/conf/layer.conf +++ b/meta-systemd/conf/layer.conf @@ -29,3 +29,4 @@ BBFILE_PRIORITY_systemd-layer = 7 SIGGEN_EXCLUDERECIPES_ABISAFE += \ systemd-serialgetty \ +LAYERDEPENDS_systemd-layer = core -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] xserver-nodm-init: remove recipe
From: Chen Qi qi.c...@windriver.com Remove recipe as this recipe is in OE-core. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../xserver-nodm-init-2.0/gplv2-license.patch | 353 - .../xserver-nodm-init-2.0/xserver-nodm | 51 --- .../xserver-nodm-init-2.0/xserver-nodm.conf| 1 - .../xserver-nodm-init-2.0/xserver-nodm.service | 9 - .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 41 --- 5 files changed, 455 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/gplv2-license.patch delete mode 100755 meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm delete mode 100644 meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf delete mode 100644 meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service delete mode 100644 meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/gplv2-license.patch b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/gplv2-license.patch deleted file mode 100644 index ec93253..000 --- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/gplv2-license.patch +++ /dev/null @@ -1,353 +0,0 @@ -COPYING: add GPLv2 license file - -this is a local file recipe and the license file is missing.In order -to pass the license checksum checking, the license file is needed. So -this patch add the GPLv2 license file. - -Signed-off-by: Yu Ke ke...@intel.com - -diff --git a/COPYING b/COPYING -new file mode 100644 -index 000..d511905 /dev/null -+++ b/COPYING -@@ -0,0 +1,339 @@ -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 -+ -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ Everyone is permitted to copy and distribute verbatim copies -+ of this license document, but changing it is not allowed. -+ -+ Preamble -+ -+ The licenses for most software are designed to take away your -+freedom to share and change it. By contrast, the GNU General Public -+License is intended to guarantee your freedom to share and change free -+software--to make sure the software is free for all its users. This -+General Public License applies to most of the Free Software -+Foundation's software and to any other program whose authors commit to -+using it. (Some other Free Software Foundation software is covered by -+the GNU Lesser General Public License instead.) You can apply it to -+your programs, too. -+ -+ When we speak of free software, we are referring to freedom, not -+price. Our General Public Licenses are designed to make sure that you -+have the freedom to distribute copies of free software (and charge for -+this service if you wish), that you receive source code or can get it -+if you want it, that you can change the software or use pieces of it -+in new free programs; and that you know you can do these things. -+ -+ To protect your rights, we need to make restrictions that forbid -+anyone to deny you these rights or to ask you to surrender the rights. -+These restrictions translate to certain responsibilities for you if you -+distribute copies of the software, or if you modify it. -+ -+ For example, if you distribute copies of such a program, whether -+gratis or for a fee, you must give the recipients all the rights that -+you have. You must make sure that they, too, receive or can get the -+source code. And you must show them these terms so they know their -+rights. -+ -+ We protect your rights with two steps: (1) copyright the software, and -+(2) offer you this license which gives you legal permission to copy, -+distribute and/or modify the software. -+ -+ Also, for each author's protection and ours, we want to make certain -+that everyone understands that there is no warranty for this free -+software. If the software is modified by someone else and passed on, we -+want its recipients to know that what they have is not the original, so -+that any problems introduced by others will not reflect on the original -+authors' reputations. -+ -+ Finally, any free program is threatened constantly by software -+patents. We wish to avoid the danger that redistributors of a free -+program will individually obtain patent licenses, in effect making the -+program proprietary. To prevent this, we have made it clear that any -+patent must be licensed for everyone's free use or not licensed at all. -+ -+ The precise terms and conditions for copying, distribution and -+modification follow. -+ -+ GNU GENERAL PUBLIC LICENSE -+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+ -+ 0. This License applies to any program or other work which contains -+a notice placed by the copyright holder saying it may be
[oe] [meta-oe][PATCH] mariadb: use ${PN} for SYSTEMD_ATUO_ENABLE
From: Chen Qi qi.c...@windriver.com Use ${PN} instead of hardcoding 'mariadb' so that everything works fine in case of multilib. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-oe/recipes-support/mysql/mariadb_5.5.39.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc index ae2e92b..459c7ec 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc @@ -31,7 +31,7 @@ GROUPADD_PARAM_${PN}-server = --system mysql SYSTEMD_PACKAGES = ${PN}-server SYSTEMD_SERVICE_${PN}-server = mysqld.service -SYSTEMD_AUTO_ENABLE_mariadb-server = disable +SYSTEMD_AUTO_ENABLE_${PN}-server = disable EXTRA_OEMAKE = 'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash' -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] mariadb: change socket location in my.cnf
From: Chen Qi qi.c...@windriver.com Change socket location to /var/lib/mysql/mysql.sock. Otherwise, we could spot errors in systemd systems like below. mysqladmin: connect to server at 'localhost' failed error: 'Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)' Check that mysqld is running and that the socket: '/tmp/mysql.sock' exists! This is because mysqld.service is using PrivateTmp=true. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-oe/recipes-support/mysql/mariadb/my.cnf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf index f2c9b90..c9b785b 100644 --- a/meta-oe/recipes-support/mysql/mariadb/my.cnf +++ b/meta-oe/recipes-support/mysql/mariadb/my.cnf @@ -1,7 +1,7 @@ [client] #password = password port = 3306 -socket = /tmp/mysql.sock +socket = /var/lib/mysql/mysql.sock [mysqld_safe] err-log= /var/log/mysql.err @@ -9,7 +9,7 @@ err-log = /var/log/mysql.err [mysqld] user = mysql port = 3306 -socket = /tmp/mysql.sock +socket = /var/lib/mysql/mysql.sock pid-file = /var/lib/mysql/mysqld.pid log-error = /var/log/mysqld.err basedir= /usr -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] krb5: add initscripts-functions to RDEPENDS
From: Chen Qi qi.c...@windriver.com As this recipe doesn't inherit update-rc.d, we need to add to its runtime dependency initscripts-functions ourselves. Otherwise, we would spot errors in systemd systems when we execute commands like `systemctl start krb5-kdc'. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb index d3c643c..f3f16b9 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.12.2.bb @@ -53,6 +53,9 @@ FILES_${PN} += ${datadir}/gnats FILES_${PN}-doc += ${datadir}/examples FILES_${PN}-dbg += ${libdir}/krb5/plugins/*/.debug +# As this recipe doesn't inherit update-rc.d, we need to add this dependency here +RDEPENDS_${PN} += initscripts-functions + krb5_do_unpack() { # ${P}-signed.tar contains ${P}.tar.gz.asc and ${P}.tar.gz tar xzf ${WORKDIR}/${BP}.tar.gz -C ${WORKDIR}/ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] ntp: make daemon run under ntp:ntp
From: Chen Qi qi.c...@windriver.com Fix the service so that the ntpd daemon is run under ntp:ntp. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-networking/recipes-support/ntp/ntp/ntpd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-networking/recipes-support/ntp/ntp/ntpd.service index b7c4268..0e3d7cd 100644 --- a/meta-networking/recipes-support/ntp/ntp/ntpd.service +++ b/meta-networking/recipes-support/ntp/ntp/ntpd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/run/ntpd.pid -ExecStart=/usr/sbin/ntpd -p /run/ntpd.pid -g +ExecStart=/usr/sbin/ntpd -u ntp:ntp -p /run/ntpd.pid -g [Install] WantedBy=multi-user.target -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] radvd: fix daemon start-up
From: Chen Qi qi.c...@windriver.com 1. Fix radvd.service to start daemon correctly. 2. Make the daemon run under 'radvd' user by default. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-networking/recipes-daemons/radvd/files/radvd.default | 1 + meta-networking/recipes-daemons/radvd/files/radvd.service | 5 + meta-networking/recipes-daemons/radvd/radvd.inc | 6 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-daemons/radvd/files/radvd.default diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.default b/meta-networking/recipes-daemons/radvd/files/radvd.default new file mode 100644 index 000..7cb73c7 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/radvd.default @@ -0,0 +1 @@ +OPTIONS=-u radvd diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service index 3aac7b2..e60798a 100644 --- a/meta-networking/recipes-daemons/radvd/files/radvd.service +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service @@ -4,11 +4,8 @@ After=network.target ConditionPathExists=@SYSCONFDIR@/radvd.conf [Service] -Type=forking -PIDFile=/var/run/radvd/radvd.pid EnvironmentFile=-@SYSCONFDIR@/default/radvd -ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/radvd -ExecStart=@SBINDIR@/radvd $OPTIONS +ExecStart=@SBINDIR@/radvd -n $OPTIONS [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index 85d1a85..6b595b0 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc @@ -17,7 +17,8 @@ LIC_FILES_CHKSUM = file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db SRC_URI = http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ file://radvd.service \ - file://volatiles.03_radvd + file://volatiles.03_radvd \ + file://radvd.default inherit autotools update-rc.d useradd pkgconfig systemd @@ -44,6 +45,9 @@ do_install_append () { -e 's#@SBINDIR@#${sbindir}#g' \ -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service +# Install default environment file +install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] radvd: fix daemon start-up
From: Chen Qi qi.c...@windriver.com 1. Fix radvd.service to start daemon correctly. 2. Make the daemon run under 'radvd' user by default. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-networking/recipes-daemons/radvd/files/radvd.default | 1 + meta-networking/recipes-daemons/radvd/files/radvd.service | 5 + meta-networking/recipes-daemons/radvd/radvd.inc | 6 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-daemons/radvd/files/radvd.default diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.default b/meta-networking/recipes-daemons/radvd/files/radvd.default new file mode 100644 index 000..7cb73c7 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/radvd.default @@ -0,0 +1 @@ +OPTIONS=-u radvd diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service index 3aac7b2..e60798a 100644 --- a/meta-networking/recipes-daemons/radvd/files/radvd.service +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service @@ -4,11 +4,8 @@ After=network.target ConditionPathExists=@SYSCONFDIR@/radvd.conf [Service] -Type=forking -PIDFile=/var/run/radvd/radvd.pid EnvironmentFile=-@SYSCONFDIR@/default/radvd -ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/radvd -ExecStart=@SBINDIR@/radvd $OPTIONS +ExecStart=@SBINDIR@/radvd -n $OPTIONS [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index 85d1a85..6b595b0 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc @@ -17,7 +17,8 @@ LIC_FILES_CHKSUM = file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db SRC_URI = http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ file://radvd.service \ - file://volatiles.03_radvd + file://volatiles.03_radvd \ + file://radvd.default inherit autotools update-rc.d useradd pkgconfig systemd @@ -44,6 +45,9 @@ do_install_append () { -e 's#@SBINDIR@#${sbindir}#g' \ -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service +# Install default environment file +install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] vim: add ncurses-terminfo-base as a runtime dependency
From: Chen Qi qi.c...@windriver.com Without this patch, we may have problem using vim. Steps to reproduce the problem is as follows: 1. Set NO_RECOMMENDATIONS to 1. 2. bitbake core-image-minimal 3. runqemu qemux86 4. On target, execute `vi 1.txt'. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-oe/recipes-support/vim/vim_7.4.373.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/vim/vim_7.4.373.bb b/meta-oe/recipes-support/vim/vim_7.4.373.bb index 81c0ddf..14fee3e 100644 --- a/meta-oe/recipes-support/vim/vim_7.4.373.bb +++ b/meta-oe/recipes-support/vim/vim_7.4.373.bb @@ -93,6 +93,7 @@ FILES_${PN}-common = \ ${datadir}/${BPN}/${VIMDIR}/tools \ +RDEPENDS_${PN} = ncurses-terminfo-base # Recommend that runtime data is installed along with vim RRECOMMENDS_${PN} = ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] ebtables: fix for sysvinit and systemd
From: Chen Qi qi.c...@windriver.com The solution mainly references Fedora20. Extract the common part of the code and install it into ${sbindir}. Add systemd service file. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../ebtables/ebtables-2.0.10-4/ebtables.common | 163 .../ebtables/ebtables-2.0.10-4/ebtables.init | 162 +-- .../ebtables/ebtables-2.0.10-4/ebtables.service| 11 ++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 22 ++- 4 files changed, 192 insertions(+), 166 deletions(-) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common new file mode 100644 index 000..640025d --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common @@ -0,0 +1,163 @@ +#!/bin/sh + +[ -x /sbin/ebtables ] || exit 1 + +EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump + +RETVAL=0 +prog=ebtables +desc=Ethernet bridge filtering +umask 0077 + +#default configuration +EBTABLES_MODULES_UNLOAD=yes +EBTABLES_LOAD_ON_START=no +EBTABLES_SAVE_ON_STOP=no +EBTABLES_SAVE_ON_RESTART=no +EBTABLES_SAVE_COUNTER=no +EBTABLES_BACKUP_SUFFIX=~ + +config=/etc/default/$prog +[ -f $config ] . $config + +function get_supported_tables() { + EBTABLES_SUPPORTED_TABLES= + /sbin/ebtables -t filter -L 21 1/dev/null | grep -q permission + if [ $? -eq 0 ]; then + echo Error: insufficient privileges to access the ebtables rulesets. + exit 1 + fi + for table in filter nat broute; do + /sbin/ebtables -t $table -L /dev/null + if [ $? -eq 0 ]; then + EBTABLES_SUPPORTED_TABLES=${EBTABLES_SUPPORTED_TABLES} $table + fi + done +} + +function load() { + RETVAL=0 + get_supported_tables + echo -n Restoring ebtables rulesets: + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n $table + if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then + /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit + RET=$? + if [ $RET -ne 0 ]; then + echo -n (failed) + RETVAL=$RET + fi + else + echo -n (no saved state) + fi + done + if [ -z $EBTABLES_SUPPORTED_TABLES ]; then + echo -n no kernel support. + else + echo -n done. + fi + if [ $RETVAL -eq 0 ]; then + echo ok + else + echo fail + fi +} + +function clear() { + RETVAL=0 + get_supported_tables + echo -n Clearing ebtables rulesets: + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n $table + /sbin/ebtables -t $table --init-table + done + + if [ $EBTABLES_MODULES_UNLOAD = yes ]; then + for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do + rmmod $mod 2 /dev/null + done + fi + if [ -z $EBTABLES_SUPPORTED_TABLES ]; then + echo -n no kernel support. + else + echo -n done. + fi + if [ $RETVAL -eq 0 ]; then + echo ok + else + echo fail + fi +} + +function save() { + RETVAL=0 + get_supported_tables + echo -n Saving ebtables rulesets: + for table in $EBTABLES_SUPPORTED_TABLES; do + echo -n $table + [ -n $EBTABLES_BACKUP_SUFFIX ] [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] \ + mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX + /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save + RET=$? + if [ $RET -ne 0 ]; then + echo -n (failed) + RETVAL=$RET + else + if [ $EBTABLES_SAVE_COUNTER = no ]; then + /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z + fi + fi + done + if [ -z $EBTABLES_SUPPORTED_TABLES ]; then + echo -n no kernel support. + else + echo -n done. + fi + if [ $RETVAL -eq 0 ]; then + echo ok + else + echo fail + fi +} + +case $1 in + start) + [ $EBTABLES_LOAD_ON_START = yes ] load + ;; + stop) + [
[oe] [meta-networking][PATCH 1/2] vsftpd: fix pkg_postinst
From: Chen Qi qi.c...@windriver.com Fix pkg_postinst to not exit if $D is not empty. Otherwise, postinsts from update-rc.d.bbclass would not run and the symlinks under /etc/rc?.d/ would not be created. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-daemons/vsftpd/vsftpd_3.0.2.bb |9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb index a1c4ff4..07c73c5 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb @@ -88,12 +88,11 @@ USERADD_PARAM_${PN} = --system --home-dir /var/lib/ftp --no-create-home -g ftp GROUPADD_PARAM_${PN} = -r ftp pkg_postinst_${PN}() { - if [ -n $D ]; then - exit 0 - fi +if [ -z $D ]; then if type systemd-tmpfiles /dev/null; then - systemd-tmpfiles --create + systemd-tmpfiles --create elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update + ${sysconfdir}/init.d/populate-volatile.sh update fi +fi } -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/2] vsftpd: add systemd service file
From: Chen Qi qi.c...@windriver.com Add systemd service for vsftpd. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-daemons/vsftpd/files/vsftpd.service|9 + .../recipes-daemons/vsftpd/vsftpd_3.0.2.bb | 10 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/vsftpd/files/vsftpd.service diff --git a/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service b/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service new file mode 100644 index 000..e271020 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Vsftpd ftp daemon +After=network.target + +[Service] +ExecStart=@SBINDIR@/vsftpd + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb index 07c73c5..e4d65ee 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.2.bb @@ -16,6 +16,7 @@ SRC_URI = https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://vsftpd.ftpusers \ file://change-secure_chroot_dir.patch \ file://volatiles.99_vsftpd \ + file://vsftpd.service \ LIC_FILES_CHKSUM = file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ @@ -35,7 +36,7 @@ PAMLIB = ${@base_contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -l NOPAM_SRC =${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)} SRC_URI += ${@base_contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} -inherit update-rc.d useradd +inherit update-rc.d useradd systemd CONFFILES_${PN} = ${sysconfdir}/vsftpd.conf LDFLAGS_append = -lcrypt -lcap @@ -76,6 +77,11 @@ do_install() { echo d /var/run/vsftpd/empty 0755 root root - \ ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi + +# Install systemd unit files +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/vsftpd.service ${D}${systemd_unitdir}/system +sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/vsftpd.service } INITSCRIPT_PACKAGES = ${PN} @@ -87,6 +93,8 @@ USERADD_PARAM_${PN} = --system --home-dir /var/lib/ftp --no-create-home -g ftp --shell /bin/false ftp GROUPADD_PARAM_${PN} = -r ftp +SYSTEMD_SERVICE_${PN} = vsftpd.service + pkg_postinst_${PN}() { if [ -z $D ]; then if type systemd-tmpfiles /dev/null; then -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] smartmontools: fix for its SysV init script
From: Chen Qi qi.c...@windriver.com Changes include: 1. Make it run at runlevel 2, 3, 4 and 5 by default. 2. Add /etc/default/smartmontools, just as Ubuntu does. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../smartmontools/files/initd.smartd |8 ++-- .../smartmontools/files/smartmontools.default |6 ++ .../smartmontools/smartmontools_6.2.bb |5 - 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-extended/smartmontools/files/smartmontools.default diff --git a/meta-oe/recipes-extended/smartmontools/files/initd.smartd b/meta-oe/recipes-extended/smartmontools/files/initd.smartd index 29c27e4..54adcb4 100755 --- a/meta-oe/recipes-extended/smartmontools/files/initd.smartd +++ b/meta-oe/recipes-extended/smartmontools/files/initd.smartd @@ -16,8 +16,8 @@ # Should-Start: sendmail # Required-Stop: $syslog $remote_fs # Should-Stop:sendmail -# Default-Start: -# Default-Stop: 0 1 2 3 4 5 6 +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: Monitors disk and tape health via S.M.A.R.T. # Description:Start S.M.A.R.T. disk and tape monitor. ### END INIT INFO @@ -52,6 +52,10 @@ smartd_opts=--pidfile $SMARTDPID $smartd_opts case $1 in start) + if [ $start_smartd != yes ]; then + [ $VERBOSE != no ] echo Not starting S.M.A.R.T. daemon smartd, disabled via /etc/default/smartmontools + exit 0 + fi echo -n Starting S.M.A.R.T. daemon: smartd if start-stop-daemon --start --quiet --pidfile $SMARTDPID \ --exec $SMARTD_BIN -- $smartd_opts; then diff --git a/meta-oe/recipes-extended/smartmontools/files/smartmontools.default b/meta-oe/recipes-extended/smartmontools/files/smartmontools.default new file mode 100644 index 000..602e00b --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/files/smartmontools.default @@ -0,0 +1,6 @@ +# uncomment to start smartd on system startup for SysV init script +# For systemd service file, use `systemctl enable smartd'. +#start_smartd=yes + +# uncomment to pass additional options to smartd on startup +#smartd_opts=--interval=1800 diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb index 9b9454c..b64b961 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SRC_URI = ${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ file://initd.smartd \ + file://smartmontools.default \ PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ @@ -31,9 +32,11 @@ do_install_append () { #install the init.d/smartd install -d ${D}${sysconfdir}/init.d install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd + install -d ${D}${sysconfdir}/default + install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools } INITSCRIPT_NAME = smartd -INITSCRIPT_PARAMS = start 60 . stop 60 0 1 2 3 4 5 6 . +INITSCRIPT_PARAMS = start 60 2 3 4 5 . stop 60 0 1 6 . RDEPENDS_${PN} += mailx -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] smartmontools: add systemd service file
From: Chen Qi qi.c...@windriver.com Add systemd service file for smartmontools. The service is disabled by default. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../smartmontools/files/smartd.service | 12 .../smartmontools/smartmontools_6.2.bb | 14 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/smartmontools/files/smartd.service diff --git a/meta-oe/recipes-extended/smartmontools/files/smartd.service b/meta-oe/recipes-extended/smartmontools/files/smartd.service new file mode 100644 index 000..f3db946 --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/files/smartd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Self Monitoring and Reporting Technology (SMART) Daemon +After=syslog.target + +[Service] +EnvironmentFile=-@SYSCONFDIR@/smartmontools +ExecStart=@SBINDIR@/smartd -n $smart_opts +ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb index b64b961..fd7b1b8 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SRC_URI = ${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ file://initd.smartd \ file://smartmontools.default \ + file://smartd.service \ PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ @@ -26,7 +27,10 @@ PACKAGECONFIG[selinux] = --with-selinux=yes,--with-selinux=no,libselinux SRC_URI[md5sum] = d44f84081a12cef79cd17f78044351fc SRC_URI[sha256sum] = 486f660579bb0fb4f6b927ded7531cb1f99685c666397377761c5b04dd96065b -inherit autotools update-rc.d +inherit autotools update-rc.d systemd + +SYSTEMD_SERVICE_${PN} = smartd.service +SYSTEMD_AUTO_ENABLE = disable do_install_append () { #install the init.d/smartd @@ -34,6 +38,14 @@ do_install_append () { install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd install -d ${D}${sysconfdir}/default install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools + + #install systemd service file + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/smartd.service } INITSCRIPT_NAME = smartd -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] radvd: add systemd service file
From: Chen Qi qi.c...@windriver.com Add systemd service for for radvd. The unit is disabled by default, just as Fedora20 does. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-daemons/radvd/files/radvd.service | 14 ++ meta-networking/recipes-daemons/radvd/radvd.inc| 14 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/radvd/files/radvd.service diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service new file mode 100644 index 000..3aac7b2 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Router advertisement daemon for IPv6 +After=network.target +ConditionPathExists=@SYSCONFDIR@/radvd.conf + +[Service] +Type=forking +PIDFile=/var/run/radvd/radvd.pid +EnvironmentFile=-@SYSCONFDIR@/default/radvd +ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/radvd +ExecStart=@SBINDIR@/radvd $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index ededf9a..85d1a85 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc @@ -16,9 +16,13 @@ LIC_FILES_CHKSUM = file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db SRC_URI = http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ + file://radvd.service \ file://volatiles.03_radvd -inherit autotools update-rc.d useradd pkgconfig +inherit autotools update-rc.d useradd pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = radvd.service +SYSTEMD_AUTO_ENABLE = disable do_install_append () { install -m 0755 -d ${D}${sysconfdir}/init.d \ @@ -32,6 +36,14 @@ do_install_append () { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd + +# Install systemd service files +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system +sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ + -e 's#@SBINDIR@#${sbindir}#g' \ + -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service + # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] radvd: add systemd service file
From: Chen Qi qi.c...@windriver.com Add systemd service for for radvd. The unit is disabled by default, just as Fedora20 does. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-daemons/radvd/files/radvd.service | 14 ++ meta-networking/recipes-daemons/radvd/radvd.inc| 14 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-daemons/radvd/files/radvd.service diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service new file mode 100644 index 000..3aac7b2 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Router advertisement daemon for IPv6 +After=network.target +ConditionPathExists=@SYSCONFDIR@/radvd.conf + +[Service] +Type=forking +PIDFile=/var/run/radvd/radvd.pid +EnvironmentFile=-@SYSCONFDIR@/default/radvd +ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/radvd +ExecStart=@SBINDIR@/radvd $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index ededf9a..85d1a85 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc @@ -16,9 +16,13 @@ LIC_FILES_CHKSUM = file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db SRC_URI = http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ + file://radvd.service \ file://volatiles.03_radvd -inherit autotools update-rc.d useradd pkgconfig +inherit autotools update-rc.d useradd pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = radvd.service +SYSTEMD_AUTO_ENABLE = disable do_install_append () { install -m 0755 -d ${D}${sysconfdir}/init.d \ @@ -32,6 +36,14 @@ do_install_append () { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd + +# Install systemd service files +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system +sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ + -e 's#@SBINDIR@#${sbindir}#g' \ + -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service + # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rsyslog: add UPDATE_ALTERNATIVE for syslog-service
From: Chen Qi qi.c...@windriver.com Use ALTERNATIVE mechanism in OE to manage the syslog service to avoid conflicts with other syslog implementations like sysklogd or busybox. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb |9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb index 6ee571e..143e1c6 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb @@ -97,9 +97,16 @@ RDEPENDS_${PN} += logrotate # no syslog-init for systemd python () { -if 'sysvinit' in d.getVar(DISTRO_FEATURES, True).split(): +if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): pn = d.getVar('PN', True) sysconfdir = d.getVar('sysconfdir', True) d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) +d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) + +if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): +pn = d.getVar('PN', True) +d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') +d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) +d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir', True))) } -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] hostapd: use ${PN} for SYSTEMD_SERVICE
From: Chen Qi qi.c...@windriver.com Use ${PN} for SYSTEMD_SERVICE to avoid errors in case of multilib. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-connectivity/hostapd/hostapd_2.2.bb|6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb index f1c6b3a..b75f2b9 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb @@ -7,9 +7,9 @@ SUMMARY = User space daemon for extended IEEE 802.11 management inherit update-rc.d systemd INITSCRIPT_NAME = hostapd -SYSTEMD_PACKAGES = hostapd -SYSTEMD_SERVICE_hostapd = hostapd.service -SYSTEMD_AUTO_ENABLE_hostapd = disable + +SYSTEMD_SERVICE_${PN} = hostapd.service +SYSTEMD_AUTO_ENABLE_${PN} = disable DEFAULT_PREFERENCE = -1 -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] mariadb: use ${PN} for SYSTEMD_SERVICE
From: Chen Qi qi.c...@windriver.com Use ${PN} for SYSTEMD_SERVICE to avoid errors in case of multilib. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-oe/recipes-support/mysql/mariadb_5.5.39.inc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc index 9cc2cc9..4d7499d 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.39.inc @@ -29,8 +29,8 @@ USERADD_PACKAGES = ${PN}-server USERADD_PARAM_${PN}-server = --system --home-dir /var/mysql -g mysql --shell /bin/false mysql GROUPADD_PARAM_${PN}-server = --system mysql -SYSTEMD_PACKAGES = mariadb-server -SYSTEMD_SERVICE_mariadb-server = mysqld.service +SYSTEMD_PACKAGES = ${PN}-server +SYSTEMD_SERVICE_${PN}-server = mysqld.service SYSTEMD_AUTO_ENABLE_mariadb-server = disable EXTRA_OEMAKE = 'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash' -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH V2 1/2] mariadb: add systemd unit file
From: Chen Qi qi.c...@windriver.com The service file mainly comes from Fedora20. This patch also adds a configuration file under /etc/tmpfiles.d so that mysqld could start correctly. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-support/mysql/mariadb/mysqld.service | 15 +++ meta-oe/recipes-support/mysql/mariadb_5.5.38.inc | 20 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.service diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-support/mysql/mariadb/mysqld.service new file mode 100644 index 000..18ad8d5 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/mysqld.service @@ -0,0 +1,15 @@ +[Unit] +Description=MariaDB database server +After=syslog.target +After=network.target + +[Service] +Type=simple +User=mysql +Group=mysql +ExecStart=@BINDIR@/mysqld_safe --basedir=@PREFIX@ +TimeoutSec=300 +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc b/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc index 8a73833..4e9a9e5 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc @@ -9,6 +9,7 @@ SRC_URI = http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$ file://remove-bad-path.patch \ file://fix-mysqlclient-r-version.patch \ file://my.cnf \ + file://mysqld.service \ SRC_URI[md5sum] = fa9ba00b084b95a45fab70860c412f10 @@ -18,7 +19,7 @@ S = ${WORKDIR}/mariadb-${PV} BINCONFIG_GLOB = mysql_config -inherit cmake gettext binconfig update-rc.d useradd +inherit cmake gettext binconfig update-rc.d useradd systemd INITSCRIPT_PACKAGES = ${PN}-server INITSCRIPT_NAME = mysqld @@ -28,6 +29,10 @@ USERADD_PACKAGES = ${PN}-server USERADD_PARAM_${PN}-server = --system --home-dir /var/mysql -g mysql --shell /bin/false mysql GROUPADD_PARAM_${PN}-server = --system mysql +SYSTEMD_PACKAGES = mariadb-server +SYSTEMD_SERVICE_mariadb-server = mysqld.service +SYSTEMD_AUTO_ENABLE_mariadb-server = disable + EXTRA_OEMAKE = 'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash' python __anonymous() { @@ -112,6 +117,16 @@ do_install() { install -d ${D}/${sysconfdir}/init.d install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld + +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/mysqld.service ${D}${systemd_unitdir}/system +sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service + +if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo f /var/log/mysqld.err 0640 mysql mysql - \ + ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf +fi } pkg_postinst_${PN}-server () { @@ -247,7 +262,8 @@ FILES_${PN}-server = \ ${datadir}/mysql/ \ ${localstatedir}/mysql/ \ ${sysconfdir}/init.d \ -${sysconfdir}/my.cnf +${sysconfdir}/my.cnf \ +${sysconfdir}/tmpfiles.d DESCRIPTION_${PN}-leftovers = unpackaged and probably unneeded files for ${PN} FILES_${PN}-leftovers = / -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH V2 2/2] apache2: add systemd unit file
From: Chen Qi qi.c...@windriver.com Add systemd unit file for apache2. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-httpd/apache2/apache2_2.4.10.bb| 13 +++-- .../recipes-httpd/apache2/files/apache2.service| 14 ++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta-webserver/recipes-httpd/apache2/files/apache2.service diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb index 614dd4e..0356029 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb @@ -18,7 +18,8 @@ SRC_URI = http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://npn-patch-2.4.7.patch \ file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ file://init \ - file://apache2-volatile.conf + file://apache2-volatile.conf \ + file://apache2.service LIC_FILES_CHKSUM = file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83 SRC_URI[md5sum] = 44543dff14a4ebc1e9e2d86780507156 @@ -26,7 +27,10 @@ SRC_URI[sha256sum] = 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738 S = ${WORKDIR}/httpd-${PV} -inherit autotools update-rc.d pkgconfig +inherit autotools update-rc.d pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = apache2.service +SYSTEMD_AUTO_ENABLE_${PN} = disable SSTATE_SCAN_FILES += apxs config_vars.mk config.nice @@ -81,6 +85,11 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ fi + +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system +sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service +sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service } SYSROOT_PREPROCESS_FUNCS += apache_sysroot_preprocess diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2.service b/meta-webserver/recipes-httpd/apache2/files/apache2.service new file mode 100644 index 000..f4bcf9e --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/apache2.service @@ -0,0 +1,14 @@ +[Unit] +Decription=The Apache HTTP Server +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=simple +Environment=LANG=C +ExecStart=@SBINDIR@/httpd -DFOREGROUND -D SSL -D PHP5 -k start +ExecStop=@BASE_BINDIR@/kill -WINCH ${MAINPID} +KillSignal=SIGCONT +PrivateTmp=true + +[Install] +WantedBy=multi-user.target -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH 2/2] apache2: add systemd unit file
From: Chen Qi qi.c...@windriver.com Add systemd unit file for apache2. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-httpd/apache2/apache2_2.4.10.bb| 13 +++-- .../recipes-httpd/apache2/files/apache2.service| 14 ++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta-webserver/recipes-httpd/apache2/files/apache2.service diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb index 614dd4e..0356029 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb @@ -18,7 +18,8 @@ SRC_URI = http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://npn-patch-2.4.7.patch \ file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ file://init \ - file://apache2-volatile.conf + file://apache2-volatile.conf \ + file://apache2.service LIC_FILES_CHKSUM = file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83 SRC_URI[md5sum] = 44543dff14a4ebc1e9e2d86780507156 @@ -26,7 +27,10 @@ SRC_URI[sha256sum] = 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738 S = ${WORKDIR}/httpd-${PV} -inherit autotools update-rc.d pkgconfig +inherit autotools update-rc.d pkgconfig systemd + +SYSTEMD_SERVICE_${PN} = apache2.service +SYSTEMD_AUTO_ENABLE_${PN} = disable SSTATE_SCAN_FILES += apxs config_vars.mk config.nice @@ -81,6 +85,11 @@ do_install_append() { install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ fi + +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system +sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service +sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service } SYSROOT_PREPROCESS_FUNCS += apache_sysroot_preprocess diff --git a/meta-webserver/recipes-httpd/apache2/files/apache2.service b/meta-webserver/recipes-httpd/apache2/files/apache2.service new file mode 100644 index 000..f4bcf9e --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/files/apache2.service @@ -0,0 +1,14 @@ +[Unit] +Decription=The Apache HTTP Server +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=simple +Environment=LANG=C +ExecStart=@SBINDIR@/httpd -DFOREGROUND -D SSL -D PHP5 -k start +ExecStop=@BASE_BINDIR@/kill -WINCH ${MAINPID} +KillSignal=SIGCONT +PrivateTmp=true + +[Install] +WantedBy=multi-user.target -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] mariadb: add systemd unit file
From: Chen Qi qi.c...@windriver.com The service file mainly comes from Fedora20. This patch also adds a configuration file under /etc/tmpfiles.d so that mysqld could start correctly. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-support/mysql/mariadb/mysqld.service | 15 +++ meta-oe/recipes-support/mysql/mariadb_5.5.38.inc | 19 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/mysql/mariadb/mysqld.service diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-support/mysql/mariadb/mysqld.service new file mode 100644 index 000..698e52d --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/mysqld.service @@ -0,0 +1,15 @@ +[Unit] +Description=MariaDB database server +After=syslog.target +After=network.target + +[Service] +Type=simple +User=mysql +Group=mysql +ExecStart=/usr/bin/mysqld_safe --basedir=/usr +TimeoutSec=300 +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc b/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc index 8a73833..83f2a92 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.38.inc @@ -9,6 +9,7 @@ SRC_URI = http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$ file://remove-bad-path.patch \ file://fix-mysqlclient-r-version.patch \ file://my.cnf \ + file://mysqld.service \ SRC_URI[md5sum] = fa9ba00b084b95a45fab70860c412f10 @@ -18,7 +19,7 @@ S = ${WORKDIR}/mariadb-${PV} BINCONFIG_GLOB = mysql_config -inherit cmake gettext binconfig update-rc.d useradd +inherit cmake gettext binconfig update-rc.d useradd systemd INITSCRIPT_PACKAGES = ${PN}-server INITSCRIPT_NAME = mysqld @@ -28,6 +29,10 @@ USERADD_PACKAGES = ${PN}-server USERADD_PARAM_${PN}-server = --system --home-dir /var/mysql -g mysql --shell /bin/false mysql GROUPADD_PARAM_${PN}-server = --system mysql +SYSTEMD_PACKAGES = mariadb-server +SYSTEMD_SERVICE_mariadb-server = mysqld.service +SYSTEMD_AUTO_ENABLE_mariadb-server = disable + EXTRA_OEMAKE = 'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash' python __anonymous() { @@ -112,6 +117,15 @@ do_install() { install -d ${D}/${sysconfdir}/init.d install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld + +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/mysqld.service ${D}${systemd_unitdir}/system + +if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo f /var/log/mysqld.err 0640 mysql mysql - \ + ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf +fi } pkg_postinst_${PN}-server () { @@ -247,7 +261,8 @@ FILES_${PN}-server = \ ${datadir}/mysql/ \ ${localstatedir}/mysql/ \ ${sysconfdir}/init.d \ -${sysconfdir}/my.cnf +${sysconfdir}/my.cnf \ +${sysconfdir}/tmpfiles.d DESCRIPTION_${PN}-leftovers = unpackaged and probably unneeded files for ${PN} FILES_${PN}-leftovers = / -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] hostapd: add systemd support
From: Chen Qi qi.c...@windriver.com Add hostapd.service file. The file mostly comes from Fedora20. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../hostapd/hostapd-2.2/hostapd.service| 11 +++ .../recipes-connectivity/hostapd/hostapd_2.2.bb| 11 --- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service new file mode 100644 index 000..151c050 --- /dev/null +++ b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/hostapd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator +After=network.target + +[Service] +Type=forking +PIDFile=/run/hostapd.pid +ExecStart=@SBINDIR@/hostapd @SYSCONFDIR@/hostapd.conf -P /run/hostapd.pid -B + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb index d0d9df9..f1c6b3a 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.2.bb @@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = file://README;md5=0854a4da34ac3990770794d771fac7fd DEPENDS = libnl openssl SUMMARY = User space daemon for extended IEEE 802.11 management -inherit update-rc.d +inherit update-rc.d systemd INITSCRIPT_NAME = hostapd - +SYSTEMD_PACKAGES = hostapd +SYSTEMD_SERVICE_hostapd = hostapd.service +SYSTEMD_AUTO_ENABLE_hostapd = disable DEFAULT_PREFERENCE = -1 @@ -15,6 +17,7 @@ SRC_URI = \ http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ file://defconfig \ file://init \ +file://hostapd.service \ S = ${WORKDIR}/hostapd-${PV}/hostapd @@ -30,11 +33,13 @@ do_compile() { } do_install() { -install -d ${D}${sbindir} ${D}${sysconfdir}/init.d +install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} install -m 0755 ${S}/hostapd ${D}${sbindir} install -m 0755 ${S}/hostapd_cli ${D}${sbindir} install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd +install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ +sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service } CONFFILES_${PN} += ${sysconfdir}/hostapd.conf -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] liblockfile: remove unrecognized configure option
From: Chen Qi qi.c...@windriver.com The '--enable-static' is an unrecognized configure option, thus removing it. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../liblockfile/liblockfile_1.09.bb|2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb index 0b9fdaf..38e1915 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb @@ -17,7 +17,7 @@ inherit autotools-brokensep # set default mailgroup to mail # --with-libnfslock specify where to install nfslock.so.NVER -EXTRA_OECONF = --enable-shared --enable-static \ +EXTRA_OECONF = --enable-shared \ --with-mailgroup=mail \ --with-libnfslock=${libdir} \ -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] liblockfile: inherit autotools-brokensep
From: Chen Qi qi.c...@windriver.com Seperation of ${B} and ${S} causes a build failure for liblockfile. The error message is as follows. make: *** No rule to make target `lockfile.c', needed by `lockfile.o'. Stop. Make liblockfile inherit autotools-brokensep to fix this problem. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../liblockfile/liblockfile_1.09.bb|2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb index fa68fd0..0b9fdaf 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb @@ -13,7 +13,7 @@ SRC_URI = ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ SRC_URI[md5sum] = 2aa269e4405ee8235ff17d1b357c6ae8 SRC_URI[sha256sum] = 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f -inherit autotools +inherit autotools-brokensep # set default mailgroup to mail # --with-libnfslock specify where to install nfslock.so.NVER -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/5] cyrus-sasl: remove the unnecessary pkg_postinst
From: Chen Qi qi.c...@windriver.com saslpasswd2 is used by an administrator to set a user's sasl password, setting a default one in pkg_postinst in not only unnecessary but also inappropriate. Besides, running saslpasswd2 takes a significant amount of time to finish, so this pkg_postinst will make the first boot take longer time. According to the above two reasons, the patch remove the pkg_postint. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../cyrus-sasl/cyrus-sasl_2.1.26.bb|5 - 1 file changed, 5 deletions(-) diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index f05ab85..b4e9190 100644 --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb @@ -54,11 +54,6 @@ USERADD_PACKAGES = ${PN}-bin GROUPADD_PARAM_${PN}-bin = --system mail USERADD_PARAM_${PN}-bin = --system --home=/var/spool/mail -g mail cyrus -pkg_postinst_${PN}-bin () { -echo cyrus | saslpasswd2 -p -c cyrus -chgrp mail /etc/sasldb2 -} - SRC_URI[md5sum] = a7f4e5e559a0e37b3ffc438c9456e425 SRC_URI[sha256sum] = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/5] radvd: fix pkg_postinst
From: Chen Qi qi.c...@windriver.com `/etc/init.d/populate-volatile.sh update' only needs to run in case of an on-target installation. And it should have a prerequisite that the script is executable. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta-networking/recipes-daemons/radvd/radvd.inc |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index 89669f7..f314fee 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc @@ -38,5 +38,7 @@ USERADD_PACKAGES = ${PN} USERADD_PARAM_${PN} = --system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd pkg_postinst_${PN} () { -${sysconfdir}/init.d/populate-volatile.sh update +if [ -z $D -a -x /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update +fi } -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 5/5] bridge-utils: inherit update-alternatives to avoid duplicate code
From: Chen Qi qi.c...@windriver.com Inherit update-alternatives to avoid duplicate code. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-support/bridge-utils/bridge-utils.inc | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc index bd96c6a..bcdc04a 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc @@ -11,7 +11,11 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz \ file://bridge-utils-1.5-fix-incorrect-command-in-manual.patch \ -inherit autotools +inherit autotools update-alternatives + +ALTERNATIVE_${PN} = brctl +ALTERNATIVE_PRIORITY[brctl] = 100 +ALTERNATIVE_LINK_NAME[brctl] = ${sbindir}/brctl EXTRA_OECONF = --with-linux-headers=${STAGING_INCDIR} @@ -23,11 +27,3 @@ do_install_append () { } RRECOMMENDS_${PN} = kernel-module-bridge - -pkg_postinst_${PN} () { -update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100 -} - -pkg_prerm_${PN} () { -update-alternatives --remove brctl brctl.${PN} -} -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 4/5] ndisc6: chmod in do_install and remove unnecessary pkg_postinst
From: Chen Qi qi.c...@windriver.com We can use chmod to set the SUID bit for applications in the do_install task. If we do so, the pkg_postinsts are no longer needed. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-support/ndisc6/ndisc6_1.0.2.bb | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb index d753912..a958e37 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb @@ -49,14 +49,8 @@ servers through slateless IPv6 autoconfiguration. do_install_append () { rm -rf ${D}${localstatedir} -} -# Enable SUID bit for applications that need it -pkg_postinst_${PN}-rltraceroute6 () { -chmod 4555 ${bindir}/rltraceroute6 -} -pkg_postinst_${PN}-ndisc6 () { -chmod 4555 ${bindir}/ndisc6 -} -pkg_postinst_${PN}-rdisc6 () { -chmod 4555 ${bindir}/rdisc6 +# Enable SUID bit for applications that need it +chmod 4555 ${D}${bindir}/rltraceroute6 +chmod 4555 ${D}${bindir}/ndisc6 +chmod 4555 ${D}${bindir}/rdisc6 } -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 3/5] quagga: fix pkg_postinst
From: Chen Qi qi.c...@windriver.com This patch mainly involves two changes. 1. Create necessary files at do_install task. Add these configuration files to the CONFFILES variable. 2. Move the `chmod' and `chown' commands to do_install task. After these two changes, qugga can run successfully at rootfs time. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-protocols/quagga/quagga.inc| 28 +--- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 8720876..196bd30 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -73,6 +73,14 @@ do_install () { install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample done +for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do + touch ${D}${sysconfdir}/quagga/$f.conf +done +chown quagga:quaggavty ${D}${sysconfdir}/quagga +chown quagga:quagga ${D}${sysconfdir}/quagga/*.conf +chmod 750 ${D}${sysconfdir}/quagga +chmod 640 ${D}${sysconfdir}/quagga/*.conf + # Install quagga oe_runmake install DESTDIR=${D} prefix=${prefix} \ sbindir=${sbindir} \ @@ -108,7 +116,17 @@ FILES_${PN}-watchquagga = ${sbindir}/watchquagga ${sysconfdir}/default/watchqua ${sysconfdir}/init.d/watchquagga # Indicate that the default files are configuration files -CONFFILES_${PN} = ${sysconfdir}/default/quagga +CONFFILES_${PN} = ${sysconfdir}/default/quagga \ + ${sysconfdir}/quagga/bgpd.conf \ + ${sysconfdir}/quagga/vtysh.conf \ + ${sysconfdir}/quagga/babeld.conf \ + ${sysconfdir}/quagga/isisd.conf \ + ${sysconfdir}/quagga/ospfd.conf \ + ${sysconfdir}/quagga/ripngd.conf \ + ${sysconfdir}/quagga/zebra.conf \ + ${sysconfdir}/quagga/ripd.conf \ + ${sysconfdir}/quagga/ospf6d.conf \ + CONFFILES_${PN}-watchquagga = ${sysconfdir}/default/watchquagga # Stop the names being rewritten due to the internal shared libraries @@ -132,14 +150,6 @@ GROUPADD_PARAM_${PN} = --system quagga ; --system quaggavty USERADD_PARAM_${PN} = --system --home ${localstatedir}/run/quagga/ -M -g quagga quagga pkg_postinst_${PN} () { -if [ x$D != x ] ; then -exit 1 -fi -for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do touch ${sysconfdir}/quagga/$f.conf; done -chown quagga:quaggavty ${sysconfdir}/quagga -chown quagga:quagga ${sysconfdir}/quagga/*.conf -chmod 750 ${sysconfdir}/quagga -chmod 640 ${sysconfdir}/quagga/*.conf if [ -z $D ] [ -e /etc/init.d/populate-volatile.sh ] ; then ${sysconfdir}/init.d/populate-volatile.sh update fi -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-selinux][PATCH] README: update the Dependencies area
From: Chen Qi qi.c...@windriver.com Add meta-oe to the dependencies as some recipes in meta-selinux may require it. Here's a dependency chain: ['policycoreutils', 'libselinux', 'swig-native'] And swig is from meta-oe layer. Signed-off-by: Chen Qi qi.c...@windriver.com --- README |7 +++ 1 file changed, 7 insertions(+) diff --git a/README b/README index 926d880..987f7ac 100644 --- a/README +++ b/README @@ -34,6 +34,13 @@ the Yocto Project website: http://www.yoctoproject.org +For some recipes, the meta-oe layer is required: + +URI: git://github.com/openembedded/meta-oe.git +subdirectory: meta-oe +branch: master +revision: HEAD + Maintenance --- -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] quagga: fix babeld_option
From: Chen Qi qi.c...@windriver.com Fix babeld_option to make babeld start correctly. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../recipes-protocols/quagga/files/quagga.default |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.default b/meta-networking/recipes-protocols/quagga/files/quagga.default index 438c3b6..0c1ce6c 100644 --- a/meta-networking/recipes-protocols/quagga/files/quagga.default +++ b/meta-networking/recipes-protocols/quagga/files/quagga.default @@ -4,7 +4,7 @@ vtysh_enable=yes # Bind all daemons to loopback only by default zebra_options= --daemon -A 127.0.0.1 -babeld_options=-D 127.0.0.1 +babeld_options=--daemon -A 127.0.0.1 bgpd_options= --daemon -A 127.0.0.1 ospfd_options= --daemon -A 127.0.0.1 ospf6d_options=--daemon -A ::1 -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel