diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-22 16:13:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:34 +0200 |
commit | 731f452da6502598310d92c7e87b53fa1f0af749 (patch) | |
tree | af699392164a6dd25bc3c92d42398b4ebcd396c1 | |
parent | 52fd2575798d9f8b24ca8b7182b09b1cc698a203 (diff) | |
download | meta-openembedded-731f452da6502598310d92c7e87b53fa1f0af749.tar.gz |
meta-systemd: remove this now pretty empty layer
* the upgrade path from original meta-systemd still isn't provided
by oe-core, but hopefully there are only a few remaining users
of this layer.
* some BSPs probably still use systemd-machine-units, it's now added
to oe-core:
http://git.openembedded.org/openembedded-core/commit/?id=5f3dbcf71059939f1c33af7b8848eb18b311365a
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 files changed, 0 insertions, 159 deletions
diff --git a/meta-systemd/README b/meta-systemd/README deleted file mode 100644 index 2cd90b415..000000000 --- a/meta-systemd/README +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | This layer depends on: | ||
2 | |||
3 | URI: git://github.com/openembedded/oe-core.git | ||
4 | branch: master | ||
5 | revision: HEAD | ||
6 | |||
7 | And we're working to break the dependency on this one: | ||
8 | |||
9 | URI: git://github.com/openembedded/meta-oe.git | ||
10 | branch: master | ||
11 | revision: HEAD | ||
12 | |||
13 | To make BBMASK'ing per layer possible the following directory structure is | ||
14 | used: | ||
15 | |||
16 | $[LAYERDIR}/<layer name>/recipes-<group-name>/<recipe-name>/<recipe-name>.bbappend | ||
17 | |||
18 | Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][meta-systemd]' in the subject' | ||
19 | |||
20 | When sending single patches, please use something like: | ||
21 | 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][meta-systemd][PATCH' | ||
22 | |||
23 | You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. | ||
24 | |||
25 | Main layer maintainer: Koen Kooi <koen@dominion.thruhere.net> | ||
26 | Martin Jansa <martin.jansa@gmail.com> | ||
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf deleted file mode 100644 index 0563f44cc..000000000 --- a/meta-systemd/conf/layer.conf +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | # It really depends on order of the layers appearing in BBLAYERS | ||
2 | # variable in toplevel bblayers.conf file, where bitbake will search | ||
3 | # for .inc files and others where bitbake uses BBPATH since it will | ||
4 | # search the directories from first to last as specified in BBPATH | ||
5 | # Therefore if you want a given layer to be considered high priority | ||
6 | # for the .inc and .conf etc. then consider it adding at the beginning | ||
7 | # of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve | ||
8 | # the recipe contention so the order of directories in BBFILES does | ||
9 | # not matter. | ||
10 | |||
11 | # We have a conf and classes directory, append to BBPATH | ||
12 | BBPATH .= ":${LAYERDIR}" | ||
13 | |||
14 | # We have a recipes directory, add to BBFILES | ||
15 | BBFILES += "\ | ||
16 | ${LAYERDIR}/recipes-*/*/*.bb \ | ||
17 | ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \ | ||
18 | " | ||
19 | |||
20 | BBFILE_COLLECTIONS += "systemd-layer" | ||
21 | BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/" | ||
22 | |||
23 | # Define the priority for recipes (.bb files) from this layer, | ||
24 | # choosing carefully how this layer interacts with all of the | ||
25 | # other layers. | ||
26 | |||
27 | BBFILE_PRIORITY_systemd-layer = "7" | ||
28 | |||
29 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | ||
30 | systemd-serialgetty \ | ||
31 | " | ||
32 | LAYERDEPENDS_systemd-layer = "core" | ||
diff --git a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend deleted file mode 100644 index 181b8784d..000000000 --- a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
4 | |||
diff --git a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_%.bbappend deleted file mode 100644 index 181b8784d..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_%.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
4 | |||
diff --git a/meta-systemd/oe-core/recipes-connectivity/connman/connman_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/connman/connman_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/connman/connman_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhclient.service b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhclient.service deleted file mode 100644 index c9620cf09..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhclient.service +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Dynamic Host Configuration Protocol (DHCP) | ||
3 | After=syslog.target network.target | ||
4 | |||
5 | [Service] | ||
6 | Type=forking | ||
7 | PIDFile=/var/run/dhclient.pid | ||
8 | EnvironmentFile=-/etc/default/dhcp-client | ||
9 | ExecStart=/sbin/dhclient -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $INTERFACES | ||
10 | |||
11 | [Install] | ||
12 | WantedBy=multi-user.target | ||
13 | |||
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend deleted file mode 100644 index 9c7d93f16..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | # look for files in the layer first | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
3 | |||
4 | SYSTEMD_PACKAGES += "dhcp-client" | ||
5 | SYSTEMD_SERVICE_${PN}-client = "dhclient.service" | ||
6 | SYSTEMD_AUTO_ENABLE_${PN}-client = "disable" | ||
7 | |||
8 | FILES_${PN}-client += "${systemd_unitdir}/system/dhclient.service" | ||
9 | RPROVIDES_dhcp-server += "dhcp-server-systemd" | ||
10 | RREPLACES_dhcp-server += "dhcp-server-systemd" | ||
11 | RCONFLICTS_dhcp-server += "dhcp-server-systemd" | ||
12 | RPROVIDES_dhcp-relay += "dhcp-relay-systemd" | ||
13 | RREPLACES_dhcp-relay += "dhcp-relay-systemd" | ||
14 | RCONFLICTS_dhcp-relay += "dhcp-relay-systemd" | ||
15 | RPROVIDES_${PN}-client += "dhcp-client-systemd" | ||
16 | RREPLACES_${PN}-client += "dhcp-client-systemd" | ||
17 | RCONFLICTS_${PN}-client += "dhcp-client-systemd" | ||
18 | |||
19 | SRC_URI += "file://dhclient.service" | ||
20 | |||
21 | do_install_append() { | ||
22 | install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system | ||
23 | } | ||
24 | |||
diff --git a/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_%.bbappend deleted file mode 100644 index 17a312459..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/ofono/ofono_%.bbappend +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
4 | |||
5 | SYSTEMD_AUTO_ENABLE = "disable" | ||
diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend deleted file mode 100644 index dadbc1499..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd" | ||
2 | RREPLACES_${PN}-sshd += "${PN}-sshd-systemd" | ||
3 | RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend deleted file mode 100644 index 642d450a5..000000000 --- a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd" | ||
2 | RREPLACES_${PN}-syslog += "${PN}-syslog-systemd" | ||
3 | RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-core/dbus/dbus_%.bbappend b/meta-systemd/oe-core/recipes-core/dbus/dbus_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-core/dbus/dbus_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend deleted file mode 100644 index 181b8784d..000000000 --- a/meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
4 | |||
diff --git a/meta-systemd/oe-core/recipes-core/systemd/systemd_%.bbappend b/meta-systemd/oe-core/recipes-core/systemd/systemd_%.bbappend deleted file mode 100644 index f5aa547f1..000000000 --- a/meta-systemd/oe-core/recipes-core/systemd/systemd_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_udev += "udev-systemd" | ||
2 | RREPLACES_udev += "udev-systemd" | ||
3 | RCONFLICTS_udev += "udev-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-extended/at/at_%.bbappend b/meta-systemd/oe-core/recipes-extended/at/at_%.bbappend deleted file mode 100644 index 181b8784d..000000000 --- a/meta-systemd/oe-core/recipes-extended/at/at_%.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
4 | |||
diff --git a/meta-systemd/oe-core/recipes-extended/cronie/cronie_%.bbappend b/meta-systemd/oe-core/recipes-extended/cronie/cronie_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-extended/cronie/cronie_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_%.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_%.bbappend b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_%.bbappend deleted file mode 100644 index f006b3fb5..000000000 --- a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_%.bbappend +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | RPROVIDES_${PN} += "${PN}-systemd" | ||
2 | RREPLACES_${PN} += "${PN}-systemd" | ||
3 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
diff --git a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb deleted file mode 100644 index 6a66ac214..000000000 --- a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | SUMMARY = "Machine specific systemd units" | ||
2 | |||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" | ||
5 | |||
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
7 | |||
8 | PR = "r18" | ||
9 | |||
10 | inherit systemd | ||
11 | SYSTEMD_SERVICE_${PN} = "" | ||
12 | NATIVE_SYSTEMD_SUPPORT = "1" | ||
13 | ALLOW_EMPTY_${PN} = "1" | ||