mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
hotplug/Linux: remove hotplug support, rely on udev instead
Hotplug has been replaced by udev since several years. Remove the hotplug related files and install udev unconditionally. This makes it possible to remove udev from rpm BuildRequires which reduces the buildtime dependency chain. For openSuSE:Factory it was done just now: http://lists.opensuse.org/opensuse-buildservice/2012-10/msg00085.html The patch by itself will have no practical impact unless someone attempts to build and run a Xen dom0 on a really old base system. e.g. circa SLES9/2007 or earlier Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Olaf Hering committed
1 parent
87a05a4586
commit
301febc0fe
5 files changed
+5
-91
No files matched your search
@@ -223,7 +223,6 @@ uninstall:
|
||||
$(MAKE) -C xen uninstall
|
||||
rm -rf $(D)$(CONFIG_DIR)/init.d/xendomains $(D)$(CONFIG_DIR)/init.d/xend
|
||||
rm -rf $(D)$(CONFIG_DIR)/init.d/xencommons $(D)$(CONFIG_DIR)/init.d/xen-watchdog
|
||||
rm -rf $(D)$(CONFIG_DIR)/hotplug/xen-backend.agent
|
||||
rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules
|
||||
rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules
|
||||
rm -f $(D)$(SYSCONFIG_DIR)/xendomains
|
||||
|
||||
@@ -54,7 +54,7 @@ provided by your OS distributor:
|
||||
* pkg-config
|
||||
* bridge-utils package (/sbin/brctl)
|
||||
* iproute package (/sbin/ip)
|
||||
* hotplug or udev
|
||||
* udev
|
||||
* GNU bison and GNU flex
|
||||
* GNU gettext
|
||||
* 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & bcc debs)
|
||||
@@ -120,9 +120,9 @@ performed with root privileges.]
|
||||
|
||||
make install and make dist differ in that make install does the
|
||||
right things for your local machine (installing the appropriate
|
||||
version of hotplug or udev scripts, for example), but make dist
|
||||
includes all versions of those scripts, so that you can copy the dist
|
||||
directory to another machine and install from that distribution.
|
||||
version of udev scripts, for example), but make dist includes all
|
||||
versions of those scripts, so that you can copy the dist directory
|
||||
to another machine and install from that distribution.
|
||||
|
||||
Python Runtime Libraries
|
||||
========================
|
||||
|
||||
-14
@@ -27,20 +27,6 @@ tmp="`mktemp -d`"
|
||||
echo "Installing Xen from '$src' to '$dst'..."
|
||||
(cd $src; tar -cf - * ) | tar -C "$tmp" -xf -
|
||||
|
||||
[ -x "$(which udevinfo)" ] && \
|
||||
UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
|
||||
|
||||
[ -z "$UDEV_VERSION" -a -x /sbin/udevadm ] && \
|
||||
UDEV_VERSION=$(/sbin/udevadm info -V | awk '{print $NF}')
|
||||
|
||||
if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
|
||||
echo " - installing for udev-based system"
|
||||
rm -rf "$tmp/etc/hotplug"
|
||||
else
|
||||
echo " - installing for hotplug-based system"
|
||||
rm -rf "$tmp/etc/udev"
|
||||
fi
|
||||
|
||||
echo " - modifying permissions"
|
||||
chmod -R a+rX "$tmp"
|
||||
|
||||
|
||||
@@ -27,32 +27,9 @@ XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh
|
||||
XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
|
||||
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)
|
||||
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
|
||||
UDEV_RULES = xen-backend.rules xend.rules
|
||||
|
||||
DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
|
||||
DE = $(if $(DESTDIR),$(shell readlink -f $(DESTDIR)),)
|
||||
ifeq ($(findstring $(DI),$(DE)),$(DI))
|
||||
HOTPLUGS=install-hotplug install-udev
|
||||
else
|
||||
ifeq ($(shell [ $(UDEVVER) -ge 059 ] && echo 1),1)
|
||||
HOTPLUGS=install-udev
|
||||
else
|
||||
HOTPLUGS=install-hotplug
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
|
||||
@@ -60,7 +37,7 @@ all:
|
||||
build:
|
||||
|
||||
.PHONY: install
|
||||
install: all install-initd install-scripts $(HOTPLUGS)
|
||||
install: all install-initd install-scripts install-udev
|
||||
|
||||
# See docs/misc/distro_mapping.txt for INITD_DIR location
|
||||
.PHONY: install-initd
|
||||
@@ -87,15 +64,6 @@ install-scripts:
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
|
||||
done
|
||||
|
||||
.PHONY: install-hotplug
|
||||
install-hotplug:
|
||||
[ -d $(DESTDIR)$(XEN_HOTPLUG_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_HOTPLUG_DIR)
|
||||
set -e; for i in $(XEN_HOTPLUG_SCRIPTS); \
|
||||
do \
|
||||
$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_HOTPLUG_DIR); \
|
||||
done
|
||||
|
||||
.PHONY: install-udev
|
||||
install-udev:
|
||||
[ -d $(DESTDIR)$(UDEV_RULES_DIR) ] || \
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
PATH=/etc/xen/scripts:$PATH
|
||||
|
||||
. /etc/xen/scripts/locking.sh
|
||||
|
||||
claim_lock xenbus_hotplug_global
|
||||
|
||||
case "$XENBUS_TYPE" in
|
||||
tap)
|
||||
/etc/xen/scripts/blktap "$ACTION"
|
||||
;;
|
||||
vbd)
|
||||
/etc/xen/scripts/block "$ACTION"
|
||||
;;
|
||||
vtpm)
|
||||
/etc/xen/scripts/vtpm "$ACTION"
|
||||
;;
|
||||
vif)
|
||||
[ -n "$script" ] && $script "$ACTION"
|
||||
;;
|
||||
vscsi)
|
||||
/etc/xen/scripts/vscsi "$ACTION"
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$ACTION" in
|
||||
add)
|
||||
;;
|
||||
remove)
|
||||
/etc/xen/scripts/xen-hotplug-cleanup
|
||||
;;
|
||||
online)
|
||||
;;
|
||||
offline)
|
||||
;;
|
||||
esac
|
||||
|
||||
release_lock xenbus_hotplug_global
|
||||