3
0
Fork 0
forked from mirrors/nixpkgs

nixpart0: Don't search for libudev using SO major.

The SO major is going to change in the upcoming update of the Hetzner
rescue system, which will cause NixOps to break because it's statically
using the SO major 0 while the new rescue system will have the major
number 1.

I'm still keeping the udevSoMajor attribute to retain backwards-
compatibility with older NixOps versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-10-21 16:43:34 +02:00
parent b7f3d55979
commit 3bf3d19759
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
3 changed files with 47 additions and 11 deletions

View file

@ -1,8 +1,6 @@
{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
, libselinux, cryptsetup, multipath_tools, lsof, utillinux
, useNixUdev ? true, udev ? null
# This is only used when useNixUdev is false
, udevSoMajor ? 1
}:
assert useNixUdev -> udev != null;
@ -17,6 +15,8 @@ buildPythonPackage rec {
sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
};
patches = [ ./blivet.patch ];
postPatch = ''
sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
blivet/devicelibs/mpath.py blivet/devices.py
@ -27,16 +27,11 @@ buildPythonPackage rec {
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
'' + (if useNixUdev then ''
'' + stdenv.lib.optionalString useNixUdev ''
sed -i -e '/find_library/,/find_library/ {
c libudev = "${udev}/lib/libudev.so.1"
}' blivet/pyudev.py
'' else ''
sed -i \
-e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \
-e 's|common =.*|& + ["/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]|' \
blivet/pyudev.py
'');
'';
propagatedBuildInputs = [
pykickstart pyparted pyblock libselinux cryptsetup

View file

@ -0,0 +1,39 @@
diff --git a/blivet/pyudev.py b/blivet/pyudev.py
index 705b93d..7268d71 100644
--- a/blivet/pyudev.py
+++ b/blivet/pyudev.py
@@ -7,9 +7,9 @@ from ctypes import *
# XXX this one may need some tweaking...
-def find_library(name, somajor=0):
+def find_library(name):
env = os.environ.get("LD_LIBRARY_PATH")
- common = ["/lib64", "/lib"]
+ common = ["/lib64", "/lib", "/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]
if env:
libdirs = env.split(":") + common
@@ -19,7 +19,7 @@ def find_library(name, somajor=0):
libdirs = filter(os.path.isdir, libdirs)
for dir in libdirs:
- files = fnmatch.filter(os.listdir(dir), "lib%s.so.%d" % (name, somajor))
+ files = fnmatch.filter(os.listdir(dir), "lib%s.so.*" % name)
files = [os.path.join(dir, file) for file in files]
if files:
@@ -32,11 +32,10 @@ def find_library(name, somajor=0):
# find the udev library
name = "udev"
-somajor = 1
-libudev = find_library(name=name, somajor=somajor)
+libudev = find_library(name)
if not libudev or not os.path.exists(libudev):
- raise ImportError, "No library named %s.%d" % (name, somajor)
+ raise ImportError, "No library named lib%s.so" % name
# load the udev library
libudev = CDLL(libudev)

View file

@ -1,6 +1,8 @@
{ stdenv, fetchurl, python, buildPythonPackage
# Propagated to blivet
, useNixUdev ? true, udevSoMajor ? null
, useNixUdev ? true
# No longer needed, but kept for backwards-compatibility with older NixOps.
, udevSoMajor ? null
# Propagated dependencies
, pkgs, urlgrabber
}:
@ -9,7 +11,7 @@ let
blivet = import ./blivet.nix {
inherit stdenv fetchurl buildPythonPackage;
inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
inherit useNixUdev udevSoMajor;
inherit useNixUdev;
inherit (pkgs) lsof utillinux udev;
libselinux = pkgs.libselinux.override { enablePython = true; };
};