diff options
3 files changed, 99 insertions, 0 deletions
diff --git a/recipes-containers/lxcfs/files/systemd-allow-for-distinct-build-directory.patch b/recipes-containers/lxcfs/files/systemd-allow-for-distinct-build-directory.patch new file mode 100644 index 00000000..14228d65 --- /dev/null +++ b/recipes-containers/lxcfs/files/systemd-allow-for-distinct-build-directory.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 66a71fbf94020651880f1dbb6e4663d93391b47c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
3 | Date: Mon, 10 Sep 2018 13:14:07 -0400 | ||
4 | Subject: [PATCH] systemd: allow for distinct build directory | ||
5 | |||
6 | The Makefile.am is currently written in a way that doesn't allow for a | ||
7 | distinct build directory. As such we get the error: | ||
8 | |||
9 | install: cannot stat 'lxcfs.service': No such file or directory | ||
10 | |||
11 | Make use of $(srcdir) to correct this. | ||
12 | |||
13 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
14 | --- | ||
15 | config/init/systemd/Makefile.am | 2 +- | ||
16 | config/init/systemd/Makefile.in | 2 +- | ||
17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/config/init/systemd/Makefile.am b/config/init/systemd/Makefile.am | ||
20 | index 79e96f5..d6933f9 100644 | ||
21 | --- a/config/init/systemd/Makefile.am | ||
22 | +++ b/config/init/systemd/Makefile.am | ||
23 | @@ -5,7 +5,7 @@ SYSTEMD_UNIT_DIR = /lib/systemd/system | ||
24 | |||
25 | install-systemd: lxcfs.service | ||
26 | $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) | ||
27 | - $(INSTALL_DATA) lxcfs.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ | ||
28 | + $(INSTALL_DATA) $(srcdir)/lxcfs.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ | ||
29 | |||
30 | uninstall-systemd: | ||
31 | rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxcfs.service | ||
32 | diff --git a/config/init/systemd/Makefile.in b/config/init/systemd/Makefile.in | ||
33 | index d433e8a..430190c 100644 | ||
34 | --- a/config/init/systemd/Makefile.in | ||
35 | +++ b/config/init/systemd/Makefile.in | ||
36 | @@ -450,7 +450,7 @@ uninstall-am: uninstall-local | ||
37 | |||
38 | @INIT_SCRIPT_SYSTEMD_TRUE@install-systemd: lxcfs.service | ||
39 | @INIT_SCRIPT_SYSTEMD_TRUE@ $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) | ||
40 | -@INIT_SCRIPT_SYSTEMD_TRUE@ $(INSTALL_DATA) lxcfs.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ | ||
41 | +@INIT_SCRIPT_SYSTEMD_TRUE@ $(INSTALL_DATA) $(srcdir)/lxcfs.service $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ | ||
42 | |||
43 | @INIT_SCRIPT_SYSTEMD_TRUE@uninstall-systemd: | ||
44 | @INIT_SCRIPT_SYSTEMD_TRUE@ rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/lxcfs.service | ||
45 | -- | ||
46 | 2.7.4 | ||
47 | |||
diff --git a/recipes-containers/lxcfs/files/systemd-ensure-var-lib-lxcfs-exists.patch b/recipes-containers/lxcfs/files/systemd-ensure-var-lib-lxcfs-exists.patch new file mode 100644 index 00000000..5e5673ac --- /dev/null +++ b/recipes-containers/lxcfs/files/systemd-ensure-var-lib-lxcfs-exists.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 89bf4b64e810e174068e7861490e6d6ab2d14854 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | ||
3 | Date: Mon, 10 Sep 2018 15:01:54 -0400 | ||
4 | Subject: [PATCH] systemd: ensure /var/lib/lxcfs exists | ||
5 | |||
6 | If the directory doesn't exist the service will fail to start. | ||
7 | |||
8 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
9 | --- | ||
10 | config/init/systemd/lxcfs.service | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/config/init/systemd/lxcfs.service b/config/init/systemd/lxcfs.service | ||
14 | index 95e3ee9..d887203 100644 | ||
15 | --- a/config/init/systemd/lxcfs.service | ||
16 | +++ b/config/init/systemd/lxcfs.service | ||
17 | @@ -5,6 +5,7 @@ Before=lxc.service | ||
18 | Documentation=man:lxcfs(1) | ||
19 | |||
20 | [Service] | ||
21 | +ExecStartPre=-/bin/mkdir /var/lib/lxcfs | ||
22 | ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ | ||
23 | KillMode=process | ||
24 | Restart=on-failure | ||
25 | -- | ||
26 | 2.7.4 | ||
27 | |||
diff --git a/recipes-containers/lxcfs/lxcfs_3.0.1.bb b/recipes-containers/lxcfs/lxcfs_3.0.1.bb new file mode 100644 index 00000000..576027fd --- /dev/null +++ b/recipes-containers/lxcfs/lxcfs_3.0.1.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "LXCFS is a userspace filesystem created to avoid kernel limitations" | ||
2 | LICENSE = "Apache-2.0" | ||
3 | |||
4 | inherit autotools pkgconfig systemd | ||
5 | |||
6 | SRC_URI = " \ | ||
7 | https://linuxcontainers.org/downloads/lxcfs/lxcfs-${PV}.tar.gz \ | ||
8 | file://systemd-allow-for-distinct-build-directory.patch \ | ||
9 | file://systemd-ensure-var-lib-lxcfs-exists.patch \ | ||
10 | " | ||
11 | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
13 | SRC_URI[md5sum] = "fa49872fc45846125455199a2cce18f1" | ||
14 | SRC_URI[sha256sum] = "016c317f13392bebccba338511f537332fb2fdbaf62a5f6d77307b38a348f41f" | ||
15 | |||
16 | DEPENDS += "fuse" | ||
17 | RDEPENDS_${PN} += "fuse" | ||
18 | |||
19 | FILES_${PN} += "${datadir}/lxc/config/common.conf.d/*" | ||
20 | |||
21 | CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN='false // No help2man //'" | ||
22 | EXTRA_OECONF += "--with-distro=unknown --with-init-script=${VIRTUAL-RUNTIME_init_manager}" | ||
23 | |||
24 | SYSTEMD_PACKAGES = "${PN}" | ||
25 | SYSTEMD_SERVICE_${PN} = "lxcfs.service" | ||