summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-02-07 08:14:00 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-02-07 08:20:30 -0500
commit0904b0a7788d22f32d28541197c898e032107c99 (patch)
tree40cce531d2520be421fc879f67ceb87159de55d2
parent117425a745d6c37b67dfecd7f9d20337d27dd6f3 (diff)
downloadmeta-virtualization-0904b0a7788d22f32d28541197c898e032107c99.tar.gz
lxcfs: update to 4.0.7
Bumping to the latest available lxcfs. As part of this update, the license has changed to LGPL-2.1+ (from Apache-2.0) We also refresh our systemd patch to continue to apply. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/lxcfs/files/systemd-ensure-var-lib-lxcfs-exists.patch15
-rw-r--r--recipes-containers/lxcfs/lxcfs_4.0.7.bb (renamed from recipes-containers/lxcfs/lxcfs_3.0.3.bb)8
2 files changed, 10 insertions, 13 deletions
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
index 5e5673ac..e8af4a0a 100644
--- a/recipes-containers/lxcfs/files/systemd-ensure-var-lib-lxcfs-exists.patch
+++ b/recipes-containers/lxcfs/files/systemd-ensure-var-lib-lxcfs-exists.patch
@@ -10,18 +10,15 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
10 config/init/systemd/lxcfs.service | 1 + 10 config/init/systemd/lxcfs.service | 1 +
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/config/init/systemd/lxcfs.service b/config/init/systemd/lxcfs.service 13Index: lxcfs-4.0.7/config/init/systemd/lxcfs.service
14index 95e3ee9..d887203 100644 14===================================================================
15--- a/config/init/systemd/lxcfs.service 15--- lxcfs-4.0.7.orig/config/init/systemd/lxcfs.service
16+++ b/config/init/systemd/lxcfs.service 16+++ lxcfs-4.0.7/config/init/systemd/lxcfs.service
17@@ -5,6 +5,7 @@ Before=lxc.service 17@@ -5,6 +5,7 @@
18 Documentation=man:lxcfs(1) 18 Documentation=man:lxcfs(1)
19 19
20 [Service] 20 [Service]
21+ExecStartPre=-/bin/mkdir /var/lib/lxcfs 21+ExecStartPre=-/bin/mkdir /var/lib/lxcfs
22 ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ 22 ExecStart=/usr/bin/lxcfs /usr/local/var/lib/lxcfs
23 KillMode=process 23 KillMode=process
24 Restart=on-failure 24 Restart=on-failure
25--
262.7.4
27
diff --git a/recipes-containers/lxcfs/lxcfs_3.0.3.bb b/recipes-containers/lxcfs/lxcfs_4.0.7.bb
index b6b6ac6b..11d2ff51 100644
--- a/recipes-containers/lxcfs/lxcfs_3.0.3.bb
+++ b/recipes-containers/lxcfs/lxcfs_4.0.7.bb
@@ -1,5 +1,5 @@
1SUMMARY = "LXCFS is a userspace filesystem created to avoid kernel limitations" 1SUMMARY = "LXCFS is a userspace filesystem created to avoid kernel limitations"
2LICENSE = "Apache-2.0" 2LICENSE = "LGPL-2.1+"
3 3
4inherit autotools pkgconfig systemd 4inherit autotools pkgconfig systemd
5 5
@@ -9,9 +9,9 @@ SRC_URI = " \
9 file://systemd-ensure-var-lib-lxcfs-exists.patch \ 9 file://systemd-ensure-var-lib-lxcfs-exists.patch \
10" 10"
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" 12LIC_FILES_CHKSUM = "file://COPYING;md5=29ae50a788f33f663405488bc61eecb1"
13SRC_URI[md5sum] = "bfc41f949caeabd0468189480222f25e" 13SRC_URI[md5sum] = "9d963976207fb0ca4701428ae0587aeb"
14SRC_URI[sha256sum] = "890aa30d960d9b1e53b0c0712bf645c1f1924f750e32cd090f368c1338bd462f" 14SRC_URI[sha256sum] = "3f28e2f4b04c0090aaf88b72666505f0313768a5254dd48a14c43cf78c543ec8"
15 15
16DEPENDS += "fuse" 16DEPENDS += "fuse"
17RDEPENDS_${PN} += "fuse" 17RDEPENDS_${PN} += "fuse"