Package: xen-3.1
Version: None
Severity: wishlist
Tags: patch
binaries have merged into one upstream
*** /tmp/tmpA31Fyl
In Ubuntu, we've applied the attached patch to achieve the following:
* tools/examples/Makefile: call udevadm instead of udevinfo and thus
simply version comparisons
* tools/check/check_udev, install, install.sh: likewise
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers gutsy-updates
APT policy: (500, 'gutsy-updates'), (500, 'gutsy-security'), (500, 'gutsy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u xen-3.1-3.1.0/install xen-3.1-3.1.0/install
--- xen-3.1-3.1.0/install
+++ xen-3.1-3.1.0/install
@@ -27,8 +27,8 @@
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/')
+[ -x "$(which udevadm)" ] && \
+ UDEV_VERSION=$(udevadm version)
if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
echo " - installing for udev-based system"
diff -u xen-3.1-3.1.0/debian/changelog xen-3.1-3.1.0/debian/changelog
only in patch2:
unchanged:
--- xen-3.1-3.1.0.orig/tools/check/check_udev
+++ xen-3.1-3.1.0/tools/check/check_udev
@@ -9,10 +9,10 @@
which ${TOOL} 1>/dev/null 2>&1 || RC=1
;;
Linux)
- TOOL="udevinfo"
+ TOOL="udevadm"
UDEV_VERSION="0"
test -x "$(which ${TOOL} 2>/dev/null)" && \
- UDEV_VERSION=$(${TOOL} -V | sed -e 's/^[^0-9]*
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
+ UDEV_VERSION=$(${TOOL} version)
if test "${UDEV_VERSION}" -ge 059; then
RC=0
else
only in patch2:
unchanged:
--- xen-3.1-3.1.0.orig/tools/examples/Makefile
+++ xen-3.1-3.1.0/tools/examples/Makefile
@@ -46,7 +46,7 @@
ifeq ($(findstring $(DI),$(DE)),$(DI))
HOTPLUGS=install-hotplug install-udev
else
-ifeq ($(shell [ -x /usr/bin/udevinfo ] && [ `/usr/bin/udevinfo -V | sed -e
's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
+ifeq ($(shell [ -x /sbin/udevadm ] && [ `/sbin/udevadm version` -ge 059 ] &&
echo 1),1)
HOTPLUGS=install-udev
else
HOTPLUGS=install-hotplug
only in patch2:
unchanged:
--- xen-3.1-3.1.0.orig/install.sh
+++ xen-3.1-3.1.0/install.sh
@@ -27,8 +27,8 @@
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/')
+[ -x "$(which udevadm)" ] && \
+ UDEV_VERSION=$(udevadm version)
if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
echo " - installing for udev-based system"
