From e857fee7a7314be0ae6a47ed4e2421f800b9f75e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Oct 2013 17:08:56 +0200 Subject: lxc: update to current git HEAD 1.0.0.alpha1-92-g8111adf The developers claim that the new version works on systemd-based hosts. --- pkgs/os-specific/linux/lxc/default.nix | 18 +++++----- pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch | 22 ------------ .../linux/lxc/install-localstatedir-in-store.patch | 23 +++--------- pkgs/os-specific/linux/lxc/support-db2x.patch | 41 ++++++++-------------- 4 files changed, 27 insertions(+), 77 deletions(-) delete mode 100644 pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index c1dec8b926a..5a9b3587870 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }: +{ stdenv, autoreconfHook, fetchurl, libcap, apparmor, perl, docbook2x +, docbook_xml_dtd_45, gnutls, pkgconfig +}: stdenv.mkDerivation rec { - name = "lxc-0.9.0"; + name = "lxc-1.0.0.alpha1-92-g8111adf"; src = fetchurl { - url = "mirror://sourceforge/lxc/${name}.tar.gz"; - sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy"; + url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; + sha256 = "05hjrn79wyjnm4ynf8y0j7pk2hwfrzp4dzwynxq4z2wxlc1ficd5"; }; - buildInputs = [ libcap apparmor perl docbook2x ]; + buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; - patches = [ - ./dont-run-ldconfig.patch - ./install-localstatedir-in-store.patch - ./support-db2x.patch - ]; + patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; diff --git a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch deleted file mode 100644 index 6904eec5175..00000000000 --- a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.am lxc-0.9.0/src/lxc/Makefile.am ---- lxc-0.9.0-orig/src/lxc/Makefile.am 2013-04-15 10:50:22.898102973 +0200 -+++ lxc-0.9.0/src/lxc/Makefile.am 2013-04-15 10:50:44.264862808 +0200 -@@ -193,7 +193,6 @@ - mkdir -p $(DESTDIR)$(datadir)/lxc - install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc - mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) -- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) - cd $(DESTDIR)$(libdir); \ - ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ - ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so -diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.in lxc-0.9.0/src/lxc/Makefile.in ---- lxc-0.9.0-orig/src/lxc/Makefile.in 2013-04-15 10:50:22.898102973 +0200 -+++ lxc-0.9.0/src/lxc/Makefile.in 2013-04-15 10:51:08.755810177 +0200 -@@ -1519,7 +1519,6 @@ - mkdir -p $(DESTDIR)$(datadir)/lxc - install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc - mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) -- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) - cd $(DESTDIR)$(libdir); \ - ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ - ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so diff --git a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch index 061875aa3b6..d45335a0232 100644 --- a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch +++ b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch @@ -1,23 +1,10 @@ -diff -ubr lxc-0.9.0-orig/Makefile.am lxc-0.9.0/Makefile.am ---- lxc-0.9.0-orig/Makefile.am 2013-04-15 10:50:22.899103057 +0200 -+++ lxc-0.9.0/Makefile.am 2013-04-15 10:58:41.189504254 +0200 -@@ -25,8 +25,8 @@ +diff --git a/Makefile.am b/Makefile.am +index eac2bfd..8f040d3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,8 +25,8 @@ pcdatadir = $(libdir)/pkgconfig pcdata_DATA = lxc.pc - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(LXCPATH) -- $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc -+ $(MKDIR_P) $(out)$(LXCPATH) -+ $(MKDIR_P) $(out)$(localstatedir)/cache/lxc - - ChangeLog:: - @touch ChangeLog -diff -ubr lxc-0.9.0-orig/Makefile.in lxc-0.9.0/Makefile.in ---- lxc-0.9.0-orig/Makefile.in 2013-04-15 10:50:22.899103057 +0200 -+++ lxc-0.9.0/Makefile.in 2013-04-15 10:58:58.817870957 +0200 -@@ -805,8 +805,8 @@ - - install-data-local: - $(MKDIR_P) $(DESTDIR)$(LXCPATH) - $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch index 8be7f5f0a92..4662ca2e504 100644 --- a/pkgs/os-specific/linux/lxc/support-db2x.patch +++ b/pkgs/os-specific/linux/lxc/support-db2x.patch @@ -1,29 +1,16 @@ -diff -ubr lxc-0.9.0-orig/configure lxc-0.9.0/configure ---- lxc-0.9.0-orig/configure 2013-04-15 10:50:22.899103057 +0200 -+++ lxc-0.9.0/configure 2013-04-15 11:08:08.696539776 +0200 -@@ -4792,7 +4792,7 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5 - $as_echo_n "checking for docbook2x-man... " >&6; } -- for name in docbook2x-man db2x_docbook2man; do -+ for name in docbook2x-man db2x_docbook2man docbook2man; do - if "$name" --help >/dev/null 2>&1; then - db2xman="$name" - break; -@@ -8353,4 +8353,3 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +diff --git a/configure.ac b/configure.ac +index 92a4690..4dd341b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then + AC_SUBST(db2xman) fi -- -diff -ubr lxc-0.9.0-orig/configure.ac lxc-0.9.0/configure.ac ---- lxc-0.9.0-orig/configure.ac 2013-04-15 10:50:22.896102806 +0200 -+++ lxc-0.9.0/configure.ac 2013-04-15 11:07:52.399582819 +0200 -@@ -67,7 +67,7 @@ - db2xman="" + AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) +-AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) ++AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"]) - AC_MSG_CHECKING(for docbook2x-man) -- for name in docbook2x-man db2x_docbook2man; do -+ for name in docbook2x-man db2x_docbook2man docbook2man; do - if "$name" --help >/dev/null 2>&1; then - db2xman="$name" - break; +-if test "x$db2xman" = "xdocbook2man"; then ++if test "x$db2xman" = "no-no-no"; then + docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" + else + docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" -- cgit 1.4.1