From 0904b0a7788d22f32d28541197c898e032107c99 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 7 Feb 2021 08:14:00 -0500 Subject: 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 --- .../systemd-ensure-var-lib-lxcfs-exists.patch | 15 ++++++------- recipes-containers/lxcfs/lxcfs_3.0.3.bb | 25 ---------------------- recipes-containers/lxcfs/lxcfs_4.0.7.bb | 25 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 34 deletions(-) delete mode 100644 recipes-containers/lxcfs/lxcfs_3.0.3.bb create mode 100644 recipes-containers/lxcfs/lxcfs_4.0.7.bb (limited to 'recipes-containers/lxcfs') 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 config/init/systemd/lxcfs.service | 1 + 1 file changed, 1 insertion(+) -diff --git a/config/init/systemd/lxcfs.service b/config/init/systemd/lxcfs.service -index 95e3ee9..d887203 100644 ---- a/config/init/systemd/lxcfs.service -+++ b/config/init/systemd/lxcfs.service -@@ -5,6 +5,7 @@ Before=lxc.service +Index: lxcfs-4.0.7/config/init/systemd/lxcfs.service +=================================================================== +--- lxcfs-4.0.7.orig/config/init/systemd/lxcfs.service ++++ lxcfs-4.0.7/config/init/systemd/lxcfs.service +@@ -5,6 +5,7 @@ Documentation=man:lxcfs(1) [Service] +ExecStartPre=-/bin/mkdir /var/lib/lxcfs - ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ + ExecStart=/usr/bin/lxcfs /usr/local/var/lib/lxcfs KillMode=process Restart=on-failure --- -2.7.4 - diff --git a/recipes-containers/lxcfs/lxcfs_3.0.3.bb b/recipes-containers/lxcfs/lxcfs_3.0.3.bb deleted file mode 100644 index b6b6ac6b..00000000 --- a/recipes-containers/lxcfs/lxcfs_3.0.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "LXCFS is a userspace filesystem created to avoid kernel limitations" -LICENSE = "Apache-2.0" - -inherit autotools pkgconfig systemd - -SRC_URI = " \ - https://linuxcontainers.org/downloads/lxcfs/lxcfs-${PV}.tar.gz \ - file://systemd-allow-for-distinct-build-directory.patch \ - file://systemd-ensure-var-lib-lxcfs-exists.patch \ -" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "bfc41f949caeabd0468189480222f25e" -SRC_URI[sha256sum] = "890aa30d960d9b1e53b0c0712bf645c1f1924f750e32cd090f368c1338bd462f" - -DEPENDS += "fuse" -RDEPENDS_${PN} += "fuse" - -FILES_${PN} += "${datadir}/lxc/config/common.conf.d/*" - -CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN='false // No help2man //'" -EXTRA_OECONF += "--with-distro=unknown --with-init-script=${VIRTUAL-RUNTIME_init_manager}" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "lxcfs.service" diff --git a/recipes-containers/lxcfs/lxcfs_4.0.7.bb b/recipes-containers/lxcfs/lxcfs_4.0.7.bb new file mode 100644 index 00000000..11d2ff51 --- /dev/null +++ b/recipes-containers/lxcfs/lxcfs_4.0.7.bb @@ -0,0 +1,25 @@ +SUMMARY = "LXCFS is a userspace filesystem created to avoid kernel limitations" +LICENSE = "LGPL-2.1+" + +inherit autotools pkgconfig systemd + +SRC_URI = " \ + https://linuxcontainers.org/downloads/lxcfs/lxcfs-${PV}.tar.gz \ + file://systemd-allow-for-distinct-build-directory.patch \ + file://systemd-ensure-var-lib-lxcfs-exists.patch \ +" + +LIC_FILES_CHKSUM = "file://COPYING;md5=29ae50a788f33f663405488bc61eecb1" +SRC_URI[md5sum] = "9d963976207fb0ca4701428ae0587aeb" +SRC_URI[sha256sum] = "3f28e2f4b04c0090aaf88b72666505f0313768a5254dd48a14c43cf78c543ec8" + +DEPENDS += "fuse" +RDEPENDS_${PN} += "fuse" + +FILES_${PN} += "${datadir}/lxc/config/common.conf.d/*" + +CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN='false // No help2man //'" +EXTRA_OECONF += "--with-distro=unknown --with-init-script=${VIRTUAL-RUNTIME_init_manager}" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "lxcfs.service" -- cgit v1.2.3-54-g00ecf