From 4a87464fa6cbd4a3c292509fcca40267ddcbbad1 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 20 Sep 2012 09:43:26 +0200 Subject: lighttpd: move systemd appends since recipe is in oe-core --- .../recipes-extended/lighttpd/lighttpd/lighttpd.service | 13 ------------- .../recipes-extended/lighttpd/lighttpd_1.4.31.bbappend | 10 ---------- .../recipes-extended/lighttpd/lighttpd/lighttpd.service | 13 +++++++++++++ .../recipes-extended/lighttpd/lighttpd_1.4.31.bbappend | 10 ++++++++++ 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service delete mode 100644 meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend create mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service create mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend diff --git a/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service deleted file mode 100644 index f4564f3f7d..0000000000 --- a/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Lightning Fast Webserver With Light System Requirements -After=syslog.target - -[Service] -Type=oneshot -EnvironmentFile=-/etc/sysconfig/lighttpd -ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target - diff --git a/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend b/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend deleted file mode 100644 index b016bdc2fb..0000000000 --- a/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 2}" - -inherit systemd - -SRC_URI += "file://lighttpd.service" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "lighttpd.service" diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service new file mode 100644 index 0000000000..f4564f3f7d --- /dev/null +++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=syslog.target + +[Service] +Type=oneshot +EnvironmentFile=-/etc/sysconfig/lighttpd +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target + diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend new file mode 100644 index 0000000000..b016bdc2fb --- /dev/null +++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 2}" + +inherit systemd + +SRC_URI += "file://lighttpd.service" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "lighttpd.service" -- cgit v1.2.3-54-g00ecf