mirror of
https://github.com/xen-project/xen.git
synced 2026-10-30 03:00:05 +01:00
buikd: Fix the detection of udev with udevadm version < 128
Signed-off-by: Marc-A. Dahlhaus <mad@wol.de>
This commit is contained in:
Keir Fraser committed
1 parent
89c6cf58e8
commit
773e0fb2ff
3 files changed
+10
-6
No files matched your search
@@ -24,10 +24,12 @@ XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl
|
||||
XEN_HOTPLUG_DIR = $(CONFIG_DIR)/hotplug
|
||||
XEN_HOTPLUG_SCRIPTS = xen-backend.agent
|
||||
|
||||
UDEVVER = 0
|
||||
ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1)
|
||||
UDEVINFO = /sbin/udevadm
|
||||
else
|
||||
UDEVINFO = /usr/bin/udevinfo
|
||||
UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
||||
endif
|
||||
ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1)
|
||||
UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
||||
endif
|
||||
|
||||
UDEV_RULES_DIR = $(CONFIG_DIR)/udev
|
||||
@@ -38,7 +40,7 @@ DE = $(if $(DESTDIR),$(shell readlink -f $(DESTDIR)),)
|
||||
ifeq ($(findstring $(DI),$(DE)),$(DI))
|
||||
HOTPLUGS=install-hotplug install-udev
|
||||
else
|
||||
ifeq ($(shell [ -x $(UDEVINFO) -a `$(UDEVINFO) -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
|
||||
ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
|
||||
HOTPLUGS=install-udev
|
||||
else
|
||||
HOTPLUGS=install-hotplug
|
||||
|
||||