diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-12-14 19:41:15 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-12-14 19:41:15 +0100 |
commit | 93f954c334777d542ee3a54634def14fe801f9d5 (patch) | |
tree | a3ff88382e1240418f2f732e70b6c4a4b4052c24 /meta-systemd | |
parent | da9e2d4a115cc94efba7f0b833ca782d7ed8e89c (diff) | |
parent | 20451cebde875e580265906d0416c5de7b17f6f9 (diff) | |
download | meta-openembedded-93f954c334777d542ee3a54634def14fe801f9d5.tar.gz |
Merge remote-tracking branch 'meta-oe-contrib/jansa/pull'
Diffstat (limited to 'meta-systemd')
-rw-r--r-- | meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend | 8 | ||||
-rw-r--r-- | meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend (renamed from meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend) | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend new file mode 100644 index 000000000..a60a109af --- /dev/null +++ b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend | |||
@@ -0,0 +1,8 @@ | |||
1 | inherit systemd | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 1}" | ||
4 | |||
5 | SYSTEMD_UNITDIR = "${systemd_unitdir}/system" | ||
6 | |||
7 | SYSTEMD_PACKAGES = "${PN}-systemd" | ||
8 | SYSTEMD_SERVICE = "${PN}.service" | ||
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.32.bbappend index b016bdc2f..0e08358b2 100644 --- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend +++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 2}" | 3 | PRINC := "${@int(PRINC) + 1}" |
4 | 4 | ||
5 | inherit systemd | 5 | inherit systemd |
6 | 6 | ||