From 094cbf9b4d716375ba6bcfa8cd0eda2807332ef8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Oct 2012 12:36:44 +0200 Subject: Move lxc from "applications/virtualization" to "os-specific/linux". --- pkgs/os-specific/linux/lxc/default.nix | 45 ++++ pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch | 24 ++ .../linux/lxc/fix-documentation-build.patch | 40 +++ .../linux/lxc/fix-sgml-documentation.patch | 291 +++++++++++++++++++++ 4 files changed, 400 insertions(+) create mode 100644 pkgs/os-specific/linux/lxc/default.nix create mode 100644 pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch create mode 100644 pkgs/os-specific/linux/lxc/fix-documentation-build.patch create mode 100644 pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch (limited to 'pkgs/os-specific/linux/lxc') diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix new file mode 100644 index 00000000000..be943f5df9e --- /dev/null +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: + +stdenv.mkDerivation rec { + name = "lxc-0.8.0-rc2"; + + src = fetchurl { + url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; + sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef"; + }; + + buildInputs = [ libcap perl docbook2x ]; + + patches = [ + ./dont-run-ldconfig.patch + ./fix-documentation-build.patch + ./fix-sgml-documentation.patch + ]; + + preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + + configureFlags = "--localstatedir=/var"; + + postInstall = '' + cd "$out/lib" + lib=liblxc.so.?.* + ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/') + ''; + + meta = { + homepage = "http://lxc.sourceforge.net"; + description = "lightweight virtual system mechanism"; + license = stdenv.lib.licenses.lgpl21Plus; + + longDescription = '' + LXC is the userspace control package for Linux Containers, a + lightweight virtual system mechanism sometimes described as + "chroot on steroids". LXC builds up from chroot to implement + complete virtual systems, adding resource management and isolation + mechanisms to Linux’s existing process management infrastructure. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch new file mode 100644 index 00000000000..e72ac0250f5 --- /dev/null +++ b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch @@ -0,0 +1,24 @@ +diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am +--- lxc-0.7.5-orig/src/lxc/Makefile.am 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/src/lxc/Makefile.am 2011-09-26 09:58:03.479916848 +0200 +@@ -115,7 +115,7 @@ + + install-exec-local: install-soPROGRAMS + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) +- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) ++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + +diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in +--- lxc-0.7.5-orig/src/lxc/Makefile.in 2011-08-11 19:02:19.000000000 +0200 ++++ lxc-0.7.5/src/lxc/Makefile.in 2011-09-26 09:58:18.812685181 +0200 +@@ -1322,7 +1322,7 @@ + + install-exec-local: install-soPROGRAMS + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) +- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) ++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + diff --git a/pkgs/os-specific/linux/lxc/fix-documentation-build.patch b/pkgs/os-specific/linux/lxc/fix-documentation-build.patch new file mode 100644 index 00000000000..0189b35a33e --- /dev/null +++ b/pkgs/os-specific/linux/lxc/fix-documentation-build.patch @@ -0,0 +1,40 @@ +diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am lxc-0.7.5/doc/Makefile.am +--- lxc-0.7.5-orig/doc/Makefile.am 2011-02-14 09:14:07.000000000 +0100 ++++ lxc-0.7.5/doc/Makefile.am 2011-09-26 09:53:02.192817940 +0200 +@@ -30,13 +30,13 @@ + + + %.1 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + %.5 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + %.7 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + lxc-%.sgml : common_options.sgml see_also.sgml + +diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in lxc-0.7.5/doc/Makefile.in +--- lxc-0.7.5-orig/doc/Makefile.in 2011-08-11 19:02:18.000000000 +0200 ++++ lxc-0.7.5/doc/Makefile.in 2011-09-26 09:53:13.835401448 +0200 +@@ -786,13 +786,13 @@ + + + @ENABLE_DOCBOOK_TRUE@%.1 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@%.5 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@%.7 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml + diff --git a/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch new file mode 100644 index 00000000000..60c9027cca5 --- /dev/null +++ b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch @@ -0,0 +1,291 @@ +diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in +index 7092f16..021da41 100644 +--- a/doc/lxc-attach.sgml.in ++++ b/doc/lxc-attach.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in +index 5acd313..856a544 100644 +--- a/doc/lxc-cgroup.sgml.in ++++ b/doc/lxc-cgroup.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in +index bf0efd9..eeb0039 100644 +--- a/doc/lxc-checkpoint.sgml.in ++++ b/doc/lxc-checkpoint.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in +index 606c868..62f9e07 100644 +--- a/doc/lxc-console.sgml.in ++++ b/doc/lxc-console.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in +index a3cca83..d59106d 100644 +--- a/doc/lxc-create.sgml.in ++++ b/doc/lxc-create.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +@@ -141,6 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + filesystem) of size SIZE rather than the default, which is 1G. + + ++ + + + +diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in +index e75de57..05f53d6 100644 +--- a/doc/lxc-destroy.sgml.in ++++ b/doc/lxc-destroy.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in +index 77d132a..1e58bef 100644 +--- a/doc/lxc-execute.sgml.in ++++ b/doc/lxc-execute.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in +index 798ccf4..f0d0485 100644 +--- a/doc/lxc-freeze.sgml.in ++++ b/doc/lxc-freeze.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in +index 5bec922..1f48820 100644 +--- a/doc/lxc-kill.sgml.in ++++ b/doc/lxc-kill.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in +index 3ffd4f8..b11d211 100644 +--- a/doc/lxc-ls.sgml.in ++++ b/doc/lxc-ls.sgml.in +@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + ]> +diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in +index 9d8711c..b492968 100644 +--- a/doc/lxc-monitor.sgml.in ++++ b/doc/lxc-monitor.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in +index bb7b5a6..05ed59f 100644 +--- a/doc/lxc-ps.sgml.in ++++ b/doc/lxc-ps.sgml.in +@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + ]> +diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in +index eb556d9..d158cc7 100644 +--- a/doc/lxc-restart.sgml.in ++++ b/doc/lxc-restart.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in +index 4504d58..f268185 100644 +--- a/doc/lxc-start.sgml.in ++++ b/doc/lxc-start.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in +index d15e649..51179c4 100644 +--- a/doc/lxc-stop.sgml.in ++++ b/doc/lxc-stop.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in +index bb00d85..3f8f59b 100644 +--- a/doc/lxc-unfreeze.sgml.in ++++ b/doc/lxc-unfreeze.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in +index 97a4c39..0c7c589 100644 +--- a/doc/lxc-wait.sgml.in ++++ b/doc/lxc-wait.sgml.in +@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + +diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in +index 9edabf8..daa2ff8 100644 +--- a/doc/lxc.conf.sgml.in ++++ b/doc/lxc.conf.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + ]> +diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in +index 1b30fed..d98ca21 100644 +--- a/doc/lxc.sgml.in ++++ b/doc/lxc.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + --> + +- + ]> +@@ -280,7 +280,7 @@ rootfs + + + +- ++ + + + +@@ -570,7 +570,7 @@ rootfs + to the background. + + +- ++ + + + -- cgit 1.4.1