From 32603ce5f13618fb46c590687f251517d656df3f Mon Sep 17 00:00:00 2001 From: Jan S Date: Mon, 24 Feb 2014 14:55:20 +0100 Subject: [PATCH 1/4] lxc: update to 1.0 --- srcpkgs/lxc/files/service | 11 +++++++++++ srcpkgs/lxc/template | 15 ++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/lxc/files/service diff --git a/srcpkgs/lxc/files/service b/srcpkgs/lxc/files/service new file mode 100644 index 0000000000..4c0c34e3ea --- /dev/null +++ b/srcpkgs/lxc/files/service @@ -0,0 +1,11 @@ +[Unit] +Description=%i LXC +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/lxc-start -d -n %i +ExecStop=/usr/bin/lxc-stop -n %i + +[Install] +WantedBy=multi-user.target diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index 63458c3dd9..05a5fd534c 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -2,20 +2,20 @@ _desc="Linux Containers" pkgname=lxc -version=0.9.0 -revision=2 +version=1.0.0 +revision=1 conf_files="/etc/lxc/default.conf" build_style=gnu-configure -configure_args="--enable-doc --enable-seccomp --disable-apparmor --with-distro=none +configure_args="--enable-seccomp --disable-apparmor --with-distro=none --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log" hostmakedepends="pkg-config docbook2x" -makedepends="libcap-devel libseccomp-devel" +makedepends="libcap-devel libseccomp-devel automake" short_desc="${_desc} - utilities" maintainer="Juan RP " homepage="http://linuxcontainers.org" license="LGPL-2.1" distfiles="http://linuxcontainers.org/downloads/lxc-${version}.tar.gz" -checksum=1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 +checksum=0992212ddaad01dfe8c048e130566b73dd5f34191585f36bdac07a4f8a91f3bd make_dirs=" /var/lib/lxc 0755 root root @@ -23,6 +23,7 @@ make_dirs=" /var/lxc/log 0755 root root" pre_configure() { + sed -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' -i configure sed -e 's,docbook2x-man,docbook2man,g' -i configure } @@ -42,3 +43,7 @@ lxc-devel_package() { vmove "usr/lib/*.so" } } + +post_install() { + vinstall ${FILESDIR}/service 644 usr/lib/systemd/system lxc.service +} From f2897bc8678fe8b799c5e7dea135a19d9faa6e79 Mon Sep 17 00:00:00 2001 From: Jan S Date: Mon, 24 Feb 2014 14:59:24 +0100 Subject: [PATCH 2/4] lxc: reenabled doc --- srcpkgs/lxc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index 05a5fd534c..0268c6280e 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -6,7 +6,7 @@ version=1.0.0 revision=1 conf_files="/etc/lxc/default.conf" build_style=gnu-configure -configure_args="--enable-seccomp --disable-apparmor --with-distro=none +configure_args="--enable-doc --enable-seccomp --disable-apparmor --with-distro=none --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log" hostmakedepends="pkg-config docbook2x" makedepends="libcap-devel libseccomp-devel automake" From 0a05235089bdb9b5b1b786c27e467f2620b5d234 Mon Sep 17 00:00:00 2001 From: Jan S Date: Mon, 24 Feb 2014 15:01:31 +0100 Subject: [PATCH 3/4] lxc: added liblxc.so.1 to shlibs --- common/shlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/shlibs b/common/shlibs index 8920518572..dfbaf75cc7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1475,3 +1475,4 @@ libgwengui-cpp.so.0 gwenhywfar-4.10.0beta_1 libaqbanking.so.34 aqbanking-5.0.25_1 libxmlsec1.so.1 xmlsec1-1.2.19_1 libcheck.so.0 check-0.9.12_1 +liblxc.so.1 lxc-1.0.0_1 From 1076fbfc8891f53598a371c17205ec8cf513f3f6 Mon Sep 17 00:00:00 2001 From: Jan S Date: Mon, 24 Feb 2014 15:33:36 +0100 Subject: [PATCH 4/4] lxc: fixed installation. renamed systemd service file, removed unnecessary dependency and fixed entry in shlibs. --- common/shlibs | 2 +- srcpkgs/lxc/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index dfbaf75cc7..cf147a0d88 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1475,4 +1475,4 @@ libgwengui-cpp.so.0 gwenhywfar-4.10.0beta_1 libaqbanking.so.34 aqbanking-5.0.25_1 libxmlsec1.so.1 xmlsec1-1.2.19_1 libcheck.so.0 check-0.9.12_1 -liblxc.so.1 lxc-1.0.0_1 +liblxc.so.1 liblxc-1.0.0_1 diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index 0268c6280e..7d04e52c62 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -9,7 +9,7 @@ build_style=gnu-configure configure_args="--enable-doc --enable-seccomp --disable-apparmor --with-distro=none --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log" hostmakedepends="pkg-config docbook2x" -makedepends="libcap-devel libseccomp-devel automake" +makedepends="libcap-devel libseccomp-devel" short_desc="${_desc} - utilities" maintainer="Juan RP " homepage="http://linuxcontainers.org" @@ -45,5 +45,5 @@ lxc-devel_package() { } post_install() { - vinstall ${FILESDIR}/service 644 usr/lib/systemd/system lxc.service + vinstall ${FILESDIR}/service 644 usr/lib/systemd/system lxc@.service }