alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lxc: update to current git HEAD 1.0.0.alpha1-92-g8111adf

Browse source 
The developers claim that the new version works on systemd-based hosts.
This commit is contained in:
Peter Simons 2013-10-03 17:08:56 +02:00
parent 9c6e0e584c
commit e857fee7a7
4 changed files with 27 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/os-specific/linux/lxc/default.nix
View file

@ -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";

22
pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
View file

@ -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

23
pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
View file

@ -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

41
pkgs/os-specific/linux/lxc/support-db2x.patch
View file

@ -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\""