diff options
-rw-r--r-- | meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch | 32 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb (renamed from meta-networking/recipes-daemons/lldpd/lldpd_0.9.6.bb) | 6 |
2 files changed, 35 insertions, 3 deletions
diff --git a/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch b/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch new file mode 100644 index 000000000..4876e1794 --- /dev/null +++ b/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From f9f3e4dd31588cce5f655730da7b5c3f56a9bdc1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Tue, 26 Sep 2017 09:19:51 -0300 | ||
4 | Subject: [PATCH] src/daemon/lldpd.service.in: Use fixed path for mkdir command | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | @mkdir_p@ is expanded to host tools path ../build/tmp/hosttools/mkdir that | ||
8 | doesn't exist on target. Remove @mkdir_p@ and use /bin/mkdir -p to | ||
9 | create /var/run/lldpd directory. | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
14 | --- | ||
15 | src/daemon/lldpd.service.in | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/daemon/lldpd.service.in b/src/daemon/lldpd.service.in | ||
19 | index fdb7338..4291830 100644 | ||
20 | --- a/src/daemon/lldpd.service.in | ||
21 | +++ b/src/daemon/lldpd.service.in | ||
22 | @@ -9,7 +9,7 @@ Type=notify | ||
23 | NotifyAccess=main | ||
24 | EnvironmentFile=-/etc/default/lldpd | ||
25 | EnvironmentFile=-/etc/sysconfig/lldpd | ||
26 | -ExecStartPre=@mkdir_p@ @PRIVSEP_CHROOT@ | ||
27 | +ExecStartPre=/bin/mkdir -p @PRIVSEP_CHROOT@ | ||
28 | ExecStart=@sbindir@/lldpd $DAEMON_ARGS $LLDPD_OPTIONS | ||
29 | Restart=on-failure | ||
30 | PrivateTmp=yes | ||
31 | -- | ||
32 | 2.14.2 | ||
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.6.bb b/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb index 0cd063720..dbd84cf67 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_0.9.6.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb | |||
@@ -9,10 +9,11 @@ SRC_URI = "\ | |||
9 | http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ | 9 | http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ |
10 | file://lldpd.init.d \ | 10 | file://lldpd.init.d \ |
11 | file://lldpd.default \ | 11 | file://lldpd.default \ |
12 | file://src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "0dcdee7c1b3c62362d73f6508c11edae" | 15 | SRC_URI[md5sum] = "8809600492f6b73149eb19158e819c1f" |
15 | SRC_URI[sha256sum] = "e74e2dd7e2a233ca1ff385c925ddae2a916d302819d1433741407d2f8fb0ddd8" | 16 | SRC_URI[sha256sum] = "9ee494e91bc33938575b2c09b26188c486ef8eac6e2155d250c189cc4e988c4f" |
16 | 17 | ||
17 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion | 18 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion |
18 | 19 | ||
@@ -29,7 +30,6 @@ EXTRA_OECONF += "--without-embedded-libevent \ | |||
29 | " | 30 | " |
30 | 31 | ||
31 | PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" | 32 | PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" |
32 | PACKAGECONFIG[json] = "--with-json,--without-json,jansson" | ||
33 | PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" | 33 | PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" |
34 | PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" | 34 | PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" |
35 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | 35 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" |