diff options
| author |   Andrea Galbusera <gizero@gmail.com> | 2017-04-12 15:25:57 +0200 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2017-04-25 15:55:37 -0400 |
| commit | eb0a49cc9ce4e5aa66e7168ab733974179ce1848 (patch) | |
| tree | 3101121e7353fcd009f3bdb5dc0ec439b505ba42 /meta-networking | |
| parent | ccaf0a99d834dcc6b669de15615f7b07bbc85255 (diff) | |
| download | meta-openembedded-contrib-eb0a49cc9ce4e5aa66e7168ab733974179ce1848.tar.gz | |
openvpn: remove duplicate attempt to create dir in ${localstatedir}
When systemd is in DISTRO_FEATURES we have two attempts to create
${localstatedir}/run/openvpn: one at build time with install command and
the other via systemd-tmpfiles at runtime which is enabled by installing
openvpn-volatile.conf. Beside looking redundant, by dropping the build-time
dir creation attempt solves the following error when building images with
both base-files and openvpn:
Error: Transaction check error:
file /var/run conflicts between attempted installs of
openvpn-2.3.9-r0.cortexa7hf_neon_vfpv4 and
base-files-3.0.14-r89.raspberrypi3
Signed-off-by: Andrea Galbusera <gizero@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb b/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb index 5fd714abb4..8dd45669f3 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb @@ -47,8 +47,6 @@ do_install_append() { install -d ${D}/${localstatedir} install -d ${D}/${localstatedir}/lib install -d -m 710 ${D}/${localstatedir}/lib/openvpn - install -d -m 755 ${D}/${localstatedir}/run/ - install -d -m 755 ${D}/${localstatedir}/run/openvpn install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf |