From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Marc - A. Dahlhaus [ Administration | Westermann GmbH ]" Subject: Re: [XEN-3.4.1-rc5] no udev rules with udev 124 Date: Thu, 02 Jul 2009 13:07:18 +0200 Message-ID: <1246532838.4233.2.camel@marc> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-WkYPVtoFFO/ISHw/iAaL" Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser Cc: xen-devel List-Id: xen-devel@lists.xenproject.org --=-WkYPVtoFFO/ISHw/iAaL Content-Type: text/plain Content-Transfer-Encoding: 7bit Here we go... Same logic as tested with xen-3.4... Marc Am Donnerstag, den 02.07.2009, 11:27 +0100 schrieb Keir Fraser: > Sure. > > > On 02/07/2009 10:17, "Marc - A. Dahlhaus [ Administration | Westermann GmbH > ]" wrote: > > > Thanks for testing Daniel. > > > > Keir, > > > > i've tested installation target with udev versions from 120 up to 141. > > > > Should i create a backported version of the patch for xen-3.3? > > > > > > Am Donnerstag, den 02.07.2009, 10:10 +0200 schrieb Daniel Schroeder: > >> Hi Marc, > >> > >> yepp, this patch fixes the installation on udev 124. > >> > >> -- > >> daniel > >> > >> Marc - A. Dahlhaus wrote: > >>> Hello Daniel, > >>> > >>> does this patch fix the installation of udev rules on your system? > >>> > >>> Marc - A. Dahlhaus schrieb: > >>>> Hello Daniel, > >>>> > >>>> it was added on version 128... > >>>> I'll submit a followup fix for this problem shortly, testing it right > >>>> now. > >>>> > >>>> Marc > >>>> > >>>> Daniel Schroeder schrieb: > >>>>> this could be the problem in > >>>>> http://xenbits.xensource.com/xen-3.4-testing.hg?rev/1bc7dd557233 > >>>>> : > >>>>> > >>>>> > >>>>> +ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1) > >>>>> +UDEVINFO = /sbin/udevadm > >>>>> +else > >>>>> +UDEVINFO = /usr/bin/udevinfo > >>>>> +endif > >>>>> . > >>>>> . > >>>>> . > >>>>> +ifeq ($(shell [ -x $(UDEVINFO) -a `$(UDEVINFO) -V | sed -e 's/^[^0-9]* > >>>>> \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1) > >>>>> > >>>>> > >>>>> i am not sure, but this evaluates to, if /sbin/udevadm exists, then set > >>>>> UDEVINFO to it and get the version with /sbin/udevadm -V...the problem > >>>>> is, that udev 124 doesnt know the -V switch... > >>>>> > >>>>> > >>>>> /sbin/udevadm -V > >>>>> unknown command, try help > >>>>> > >>>>> > >>>>> > >>>>> /sbin/udevadm -V > >>>>> 141 > >>>>> > >>>>> > >>>>> -- > >>>>> daniel > >>>>> > >>>>> Keir Fraser wrote: > >>>>> > >>>>>> If you revert changeset 19668 in xen-3.4-testing.hg (e.g., hg export > >>>>>> 19668 | > >>>>>> patch -Rp1) then does the problem go away? > >>>>>> > >>>>>> -- Keir > >>>>>> > >>>>>> On 01/07/2009 18:01, "Daniel Schroeder" wrote: > >>>>>> > >>>>>> > >>>>>>> hello *, > >>>>>>> > >>>>>>> rc5 and udev version 141 = fine > >>>>>>> rc5 and udev version 124 = missing files > >>>>>>> > >>>>>>> -- > >>>>>>> daniel > >>>>>>> > >>>>>>> _______________________________________________ > >>>>>>> Xen-devel mailing list > >>>>>>> Xen-devel@lists.xensource.com > >>>>>>> http://lists.xensource.com/xen-devel > >>>>>>> > >>>>>> > >>>>> > >>>>> > >>>>> _______________________________________________ > >>>>> Xen-devel mailing list > >>>>> Xen-devel@lists.xensource.com > >>>>> http://lists.xensource.com/xen-devel > >>>>> > >>>> > >>>> > >>>> _______________________________________________ > >>>> Xen-devel mailing list > >>>> Xen-devel@lists.xensource.com > >>>> http://lists.xensource.com/xen-devel > >>> > > > > > --=-WkYPVtoFFO/ISHw/iAaL Content-Disposition: attachment; filename="xen-3.3-udev.patch" Content-Type: text/x-patch; name="xen-3.3-udev.patch"; charset="ISO-8859-15" Content-Transfer-Encoding: 7bit Fix the detection of udev with udev version > 123 Signed-off-by: Marc-A. Dahlhaus diff -Nurp xen-3.3.1.orig/install.sh xen-3.3.1/install.sh --- xen-3.3.1.orig/install.sh +++ xen-3.3.1/install.sh @@ -30,6 +30,9 @@ echo "Installing Xen from '$src' to '$ds [ -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" diff -Nurp xen-3.3.1.orig/tools/check/check_udev xen-3.3.1/tools/check/check_udev --- xen-3.3.1.orig/tools/check/check_udev +++ xen-3.3.1/tools/check/check_udev @@ -8,8 +8,11 @@ OpenBSD|NetBSD|FreeBSD) has_or_fail vnconfig ;; Linux) - has_or_fail udevinfo - [ "`udevinfo -V | awk '{print $NF}'`" -ge 59 ] 2>/dev/null || \ + has /sbin/udevadm && \ + udevver=`/sbin/udevadm info -V | awk '{print $NF}'` + [ -z "$udevver" ] && has_or_fail udevinfo && \ + udevver=`udevinfo -V | awk '{print $NF}'` + [ "$udevver" -ge 59 ] 2>/dev/null || \ has hotplug || \ fail "udev is too old, upgrade to version 59 or later" ;; diff -Nurp xen-3.3.1.orig/tools/examples/Makefile xen-3.3.1/tools/examples/Makefile --- xen-3.3.1.orig/tools/examples/Makefile +++ xen-3.3.1/tools/examples/Makefile @@ -44,6 +44,14 @@ XEN_SCRIPT_DATA += vtpm-migration.sh vtp XEN_HOTPLUG_DIR = /etc/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 = /etc/udev UDEV_RULES = xen-backend.rules @@ -52,7 +60,7 @@ DE = $(if $(DESTDIR),$(shell readlink -f 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 [ $(UDEVVER) -ge 059 ] && echo 1),1) HOTPLUGS=install-udev else HOTPLUGS=install-hotplug --=-WkYPVtoFFO/ISHw/iAaL Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-WkYPVtoFFO/ISHw/iAaL--