From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by mail.openembedded.org (Postfix) with ESMTP id 533037823F for ; Tue, 22 Aug 2017 14:19:57 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id f8so90781447wrf.3 for ; Tue, 22 Aug 2017 07:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=oqBNOU6qVvVgm+B0vtR+bylI+nYfOxXiP8a4WxTFqJg=; b=WVYBtKabgH7NH4VqRlyw0OVif9UMpB4O9HC8CR3yp/JLPiOFK73L9vUJV4w7UnIEpL 5N/M56VtWMcEW07xeRr1F9L19DPvos/LX3vi2V3xNRyLS5iEi9WNsJejEA94NKK5icjx iAIvYcteNbpQlWuyLYAc4stzBQE2f6+gxRPhbG6xIsA8Yt2f7bPmF6cRhgjqSCakJeY1 aVENEoN5puuLgnNLCxW05zjpgcrBE2/iBzIdfE+iwLPLB2bdU8oim7+dV/144EB3MlKL c/hEGGO7s5mKoJyLyLNz80HDC4O2UNYuPxircGLAMFFQDCspvDfLZqmF8OQozvPPzbde KB1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oqBNOU6qVvVgm+B0vtR+bylI+nYfOxXiP8a4WxTFqJg=; b=gU2K6joWUIYxyol3ABObzdto7sy84k6v0TqLJexzzGchjvxNoq066WXVOw6qsVhxDx C0BIeTEeNHtTLaMfNbyp9T7ChbFPQfn2uFZv9o8I5ir4oQrqETKzgA4m6vVs57pfBuzg 4RS2kUT2s7OcGz93tpgqp0eGljebLrk/PKWxgWqEaMooqy8shY796Bb+uvMjstd5Biqs pKGsMyUOvVhReu5OuzombOqafDQ+yAvFA801oeOQsClJ+xckJ+fJXCMLTLFi08Q0jtjV G8JmS54/iKv9oxhwBmm1rq8syCoQQFAOMcziJvidt7gm2OvBBWlcLDmRrPYdUOibYKCi 7VMA== X-Gm-Message-State: AHYfb5gIvlC7WZ3O70brtATQ1DHofa0TfcMcOM30HDwWJhlht9usBZ6B 6GKcms84Q0A9veL5 X-Received: by 10.223.160.6 with SMTP id k6mr601284wrk.220.1503411598420; Tue, 22 Aug 2017 07:19:58 -0700 (PDT) Received: from localhost ([217.30.68.212]) by smtp.gmail.com with ESMTPSA id o82sm6473553wmo.5.2017.08.22.07.19.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Aug 2017 07:19:57 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-devel@lists.openembedded.org Date: Tue, 22 Aug 2017 16:21:41 +0200 Message-Id: <20170822142141.9783-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [meta-systemd][PATCH] meta-systemd: remove this now pretty empty layer X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Aug 2017 14:19:58 -0000 * 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, but they should push it to oe-core instead of depending on this layer just for this one recipe Signed-off-by: Martin Jansa --- meta-systemd/README | 26 ------------------ meta-systemd/conf/layer.conf | 32 ---------------------- .../recipes-bsp/keymaps/keymaps_1.0.bbappend | 4 --- .../recipes-connectivity/avahi/avahi_%.bbappend | 4 --- .../connman/connman_%.bbappend | 3 -- .../dhcp/dhcp/dhclient.service | 13 --------- .../recipes-connectivity/dhcp/dhcp_%.bbappend | 24 ---------------- .../recipes-connectivity/ofono/ofono_%.bbappend | 5 ---- .../openssh/openssh_%.bbappend | 3 -- .../wpa-supplicant/wpa-supplicant_%.bbappend | 3 -- .../recipes-core/busybox/busybox_%.bbappend | 3 -- .../oe-core/recipes-core/dbus/dbus_%.bbappend | 3 -- .../recipes-core/dropbear/dropbear_%.bbappend | 4 --- .../recipes-core/systemd/systemd_%.bbappend | 3 -- .../recipes-core/util-linux/util-linux_%.bbappend | 3 -- .../oe-core/recipes-extended/at/at_%.bbappend | 4 --- .../recipes-extended/cronie/cronie_%.bbappend | 3 -- .../recipes-extended/lighttpd/lighttpd_%.bbappend | 3 -- .../recipes-extended/rpcbind/rpcbind_%.bbappend | 3 -- .../systemd/systemd-machine-units_1.0.bb | 13 --------- 20 files changed, 159 deletions(-) delete mode 100644 meta-systemd/README delete mode 100644 meta-systemd/conf/layer.conf delete mode 100644 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/avahi/avahi_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/connman/connman_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhclient.service delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/ofono/ofono_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/dbus/dbus_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/systemd/systemd_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-extended/at/at_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-extended/cronie/cronie_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_%.bbappend delete mode 100644 meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb 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 @@ -This layer depends on: - -URI: git://github.com/openembedded/oe-core.git -branch: master -revision: HEAD - -And we're working to break the dependency on this one: - -URI: git://github.com/openembedded/meta-oe.git -branch: master -revision: HEAD - -To make BBMASK'ing per layer possible the following directory structure is -used: - -$[LAYERDIR}//recipes-//.bbappend - -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][meta-systemd]' in the subject' - -When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][meta-systemd][PATCH' - -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 ' 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. - -Main layer maintainer: Koen Kooi - Martin Jansa 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 @@ -# It really depends on order of the layers appearing in BBLAYERS -# variable in toplevel bblayers.conf file, where bitbake will search -# for .inc files and others where bitbake uses BBPATH since it will -# search the directories from first to last as specified in BBPATH -# Therefore if you want a given layer to be considered high priority -# for the .inc and .conf etc. then consider it adding at the beginning -# of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve -# the recipe contention so the order of directories in BBFILES does -# not matter. - -# We have a conf and classes directory, append to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "\ - ${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \ -" - -BBFILE_COLLECTIONS += "systemd-layer" -BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/" - -# Define the priority for recipes (.bb files) from this layer, -# choosing carefully how this layer interacts with all of the -# other layers. - -BBFILE_PRIORITY_systemd-layer = "7" - -SIGGEN_EXCLUDERECIPES_ABISAFE += " \ - systemd-serialgetty \ -" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - 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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - 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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -[Unit] -Description=Dynamic Host Configuration Protocol (DHCP) -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/dhclient.pid -EnvironmentFile=-/etc/default/dhcp-client -ExecStart=/sbin/dhclient -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $INTERFACES - -[Install] -WantedBy=multi-user.target - 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 @@ -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SYSTEMD_PACKAGES += "dhcp-client" -SYSTEMD_SERVICE_${PN}-client = "dhclient.service" -SYSTEMD_AUTO_ENABLE_${PN}-client = "disable" - -FILES_${PN}-client += "${systemd_unitdir}/system/dhclient.service" -RPROVIDES_dhcp-server += "dhcp-server-systemd" -RREPLACES_dhcp-server += "dhcp-server-systemd" -RCONFLICTS_dhcp-server += "dhcp-server-systemd" -RPROVIDES_dhcp-relay += "dhcp-relay-systemd" -RREPLACES_dhcp-relay += "dhcp-relay-systemd" -RCONFLICTS_dhcp-relay += "dhcp-relay-systemd" -RPROVIDES_${PN}-client += "dhcp-client-systemd" -RREPLACES_${PN}-client += "dhcp-client-systemd" -RCONFLICTS_${PN}-client += "dhcp-client-systemd" - -SRC_URI += "file://dhclient.service" - -do_install_append() { - install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system -} - 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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - -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 @@ -RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd" -RREPLACES_${PN}-sshd += "${PN}-sshd-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd" -RREPLACES_${PN}-syslog += "${PN}-syslog-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - 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 @@ -RPROVIDES_udev += "udev-systemd" -RREPLACES_udev += "udev-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - 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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -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 @@ -SUMMARY = "Machine specific systemd units" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -PR = "r18" - -inherit systemd -SYSTEMD_SERVICE_${PN} = "" -NATIVE_SYSTEMD_SUPPORT = "1" -ALLOW_EMPTY_${PN} = "1" -- 2.14.1