From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../recipes-core/volatile-binds/files/COPYING.MIT | 17 ----- .../volatile-binds/files/mount-copybind | 34 --------- .../volatile-binds/files/volatile-binds.service.in | 19 ----- .../recipes-core/volatile-binds/volatile-binds.bb | 80 ---------------------- 4 files changed, 150 deletions(-) delete mode 100644 import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT delete mode 100755 import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind delete mode 100644 import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in delete mode 100644 import-layers/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb (limited to 'import-layers/yocto-poky/meta/recipes-core/volatile-binds') diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT b/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT deleted file mode 100644 index 7e7d57413..000000000 --- a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind b/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind deleted file mode 100755 index 2aeaf84dd..000000000 --- a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Perform a bind mount, copying existing files as we do so to ensure the -# overlaid path has the necessary content. - -if [ $# -lt 2 ]; then - echo >&2 "Usage: $0 spec mountpoint [OPTIONS]" - exit 1 -fi - -spec=$1 -mountpoint=$2 - -if [ $# -gt 2 ]; then - options=$3 -else - options= -fi - -[ -n "$options" ] && options=",$options" - -mkdir -p "${spec%/*}" -if [ -d "$mountpoint" ]; then - if [ ! -d "$spec" ]; then - mkdir "$spec" - cp -pPR "$mountpoint"/. "$spec/" - fi -elif [ -f "$mountpoint" ]; then - if [ ! -f "$spec" ]; then - cp -pP "$mountpoint" "$spec" - fi -fi - -mount -o "bind$options" "$spec" "$mountpoint" diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in b/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in deleted file mode 100644 index b23355a71..000000000 --- a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Bind mount volatile @where@ -DefaultDependencies=false -Before=local-fs.target -RequiresMountsFor=@whatparent@ @whereparent@ -ConditionPathIsReadWrite=@whatparent@ -ConditionPathExists=@where@ -ConditionPathIsReadWrite=!@where@ - -[Service] -Type=oneshot -RemainAfterExit=Yes -StandardOutput=syslog -TimeoutSec=0 -ExecStart=/sbin/mount-copybind @what@ @where@ -ExecStop=/bin/umount @where@ - -[Install] -WantedBy=local-fs.target diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb b/import-layers/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb deleted file mode 100644 index d861a71a6..000000000 --- a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Volatile bind mount setup and configuration for read-only-rootfs" -DESCRIPTION = "${SUMMARY}" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=5750f3aa4ea2b00c2bf21b2b2a7b714d" - -SRC_URI = "\ - file://mount-copybind \ - file://COPYING.MIT \ - file://volatile-binds.service.in \ -" - -S = "${WORKDIR}" - -inherit allarch systemd distro_features_check - -REQUIRED_DISTRO_FEATURES = "systemd" - -VOLATILE_BINDS ?= "\ - /var/volatile/lib /var/lib\n\ - /var/volatile/cache /var/cache\n\ - /var/volatile/spool /var/spool\n\ - /var/volatile/srv /srv\n\ -" -VOLATILE_BINDS[type] = "list" -VOLATILE_BINDS[separator] = "\n" - -def volatile_systemd_services(d): - services = [] - for line in oe.data.typed_value("VOLATILE_BINDS", d): - if not line: - continue - what, where = line.split(None, 1) - services.append("%s.service" % what[1:].replace("/", "-")) - return " ".join(services) - -SYSTEMD_SERVICE_${PN} = "${@volatile_systemd_services(d)}" - -FILES_${PN} += "${systemd_unitdir}/system/*.service" - -do_compile () { - while read spec mountpoint; do - if [ -z "$spec" ]; then - continue - fi - - servicefile="${spec#/}" - servicefile="$(echo "$servicefile" | tr / -).service" - sed -e "s#@what@#$spec#g; s#@where@#$mountpoint#g" \ - -e "s#@whatparent@#${spec%/*}#g; s#@whereparent@#${mountpoint%/*}#g" \ - volatile-binds.service.in >$servicefile - done <