diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-25 22:55:05 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 14:22:49 +0000 |
| commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
| tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/meta-virtualization/recipes-containers/oci-systemd-hook | |
| parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
| download | talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.gz talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.zip | |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/oci-systemd-hook')
2 files changed, 21 insertions, 16 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook/0001-selinux-drop-selinux-support.patch b/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook/0001-selinux-drop-selinux-support.patch index 507cd08e6..5016f6e75 100644 --- a/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook/0001-selinux-drop-selinux-support.patch +++ b/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook/0001-selinux-drop-selinux-support.patch @@ -5,25 +5,34 @@ Subject: [PATCH] selinux: drop selinux support Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- - src/systemdhook.c | 9 --------- - 1 file changed, 9 deletions(-) + src/systemdhook.c | 12 ------------ + 1 file changed, 12 deletions(-) -diff --git a/src/systemdhook.c b/src/systemdhook.c -index 274e5b910699..b9e8f1be376a 100644 --- a/src/systemdhook.c +++ b/src/systemdhook.c -@@ -14,7 +14,6 @@ +@@ -16,7 +16,6 @@ #include <errno.h> #include <inttypes.h> #include <linux/limits.h> -#include <selinux/selinux.h> #include <yajl/yajl_tree.h> + #include <stdbool.h> - #include "config.h" -@@ -538,14 +537,6 @@ static int prestart(const char *rootfs, +@@ -129,9 +128,6 @@ static int chperm(const char *path, cons + closedir(dir); + return -1; } - } +- if (setfilecon (full_path, label) < 0) { +- pr_perror("Failed to set context %s on %s", label, full_path); +- } + if (doChown) { + /* Change uid and gid to something the container can handle */ +@@ -496,14 +492,6 @@ static int prestart(const char *rootfs, + return -1; + } + } +- - if (strcmp("", mount_label)) { - rc = setfilecon(journal_dir, (security_context_t)mount_label); - if (rc < 0) { @@ -31,10 +40,6 @@ index 274e5b910699..b9e8f1be376a 100644 - return -1; - } - } -- - if (makepath(cont_journal_dir, 0755) == -1) { - if (errno != EEXIST) { - pr_perror("Failed to mkdir container journal dir: %s", cont_journal_dir); --- -2.4.0.53.g8440f74 - + + /* Attempt to creare /var/log/journal inside of rootfs, + if successful, or directory exists, mount tmpfs on top of diff --git a/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb b/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb index 872872a11..fc8890533 100644 --- a/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb +++ b/import-layers/meta-virtualization/recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "yajl util-linux" -SRCREV = "ca515c1f399bd0b16e94b7c34aa1ef20498beca6" +SRCREV = "1ac958a4197a9ea52174812fc7d7d036af8140d3" SRC_URI = "git://github.com/projectatomic/oci-systemd-hook \ file://0001-selinux-drop-selinux-support.patch \ file://0001-configure-drop-selinux-support.patch \ |
