diff options
| author |   Jonathan Liu <net147@gmail.com> | 2013-07-08 23:20:32 +1000 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-09 17:04:40 +0100 |
| commit | a8e0bfb91214f1f387b781b89340eee582496c01 (patch) | |
| tree | 3df789b4341cbda89bb1365e200b8e54b29d2981 /meta-webserver/recipes-httpd | |
| parent | 9d53e8111db2a1dc2a3df05926d90988c08e7dbe (diff) | |
| download | meta-openembedded-contrib-a8e0bfb91214f1f387b781b89340eee582496c01.tar.gz | |
nostromo: fix installed but not shipped /run and /run/nostromo warnings
Changes:
- Remove unnecessary -c option from install
- Add tmpfiles.d config to create /run/nostromo when systemd is
enabled in DISTRO_FEATURES
- Add postinst script to create /run/nostromo using tmpfiles.d if
running systemd (detected by existence of /sys/fs/cgroup/systemd),
otherwise using populate-volatile.sh if it exists
- Remove /var/log/nostromo and /var/run/nostromo from package
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
| -rw-r--r-- | meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf | 1 | ||||
| -rw-r--r-- | meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb | 20 |
2 files changed, 17 insertions, 4 deletions
diff --git a/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf b/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf new file mode 100644 index 0000000000..b7a9f4886e --- /dev/null +++ b/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf @@ -0,0 +1 @@ +d /run/nostromo - www-data www-data - diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb index 94c32d8a28..e34fba2607 100644 --- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb +++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb @@ -7,6 +7,7 @@ SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ file://nhttpd.conf \ file://volatiles \ + file://tmpfiles.conf \ file://nostromo \ " @@ -35,18 +36,29 @@ do_install() { install -d ${D}${localstatedir}/nostromo/conf install -d ${D}${localstatedir}/nostromo/htdocs/cgi-bin install -d ${D}${localstatedir}/nostromo/icons - install -d ${D}${localstatedir}/log/nostromo - install -d ${D}${localstatedir}/run/nostromo install -d ${D}${sysconfdir}/init.d install -m 0644 conf/mimes ${D}${localstatedir}/nostromo/conf/mimes install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d - install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo + install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf + fi install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html install -m 0644 htdocs/nostromo.gif ${D}${localstatedir}/nostromo/htdocs/nostromo.gif install -m 0644 icons/dir.gif ${D}${localstatedir}/nostromo/icons/dir.gif install -m 0644 icons/file.gif ${D}${localstatedir}/nostromo/icons/file.gif - chown -R www-data:www-data ${D}/${localstatedir}/nostromo ${D}/${localstatedir}/log/nostromo ${D}/${localstatedir}/run/nostromo + chown -R www-data:www-data ${D}/${localstatedir}/nostromo } CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf" + +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + if [ -e /sys/fs/cgroup/systemd ]; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} |