diff options
| -rw-r--r-- | system/xen/patches/remove_obsolete_udev_rules.diff | 10 | ||||
| -rw-r--r-- | system/xen/xen.SlackBuild | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/system/xen/patches/remove_obsolete_udev_rules.diff b/system/xen/patches/remove_obsolete_udev_rules.diff new file mode 100644 index 0000000000000..f439183131051 --- /dev/null +++ b/system/xen/patches/remove_obsolete_udev_rules.diff @@ -0,0 +1,10 @@ +--- xen-4.2.1/tools/hotplug/Linux/xend.rules.ORIG 2012-12-17 16:00:35.000000000 +0100 ++++ xen-4.2.1/tools/hotplug/Linux/xend.rules 2013-03-01 04:26:34.247176457 +0100 +@@ -1,4 +1,4 @@ +-SUBSYSTEM=="pci", RUN+="socket:/org/xen/xend/udev_event" +-SUBSYSTEM=="scsi", RUN+="socket:/org/xen/xend/udev_event" +-SUBSYSTEM=="usb", RUN+="socket:/org/xen/xend/udev_event" ++#SUBSYSTEM=="pci", RUN+="socket:/org/xen/xend/udev_event" ++#SUBSYSTEM=="scsi", RUN+="socket:/org/xen/xend/udev_event" ++#SUBSYSTEM=="usb", RUN+="socket:/org/xen/xend/udev_event" + #SUBSYSTEM=="net", KERNEL!="vif[0-9]*.[0-9]*|tap[0-9]*.[0-9]*", RUN+="socket:/org/xen/xend/udev_event" diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild index 7a6f4059d5266..d9fcaf51b705f 100644 --- a/system/xen/xen.SlackBuild +++ b/system/xen/xen.SlackBuild @@ -80,6 +80,7 @@ find . \ # Fix some stupid things patch -p1 <$CWD/patches/configuration_goes_to_system_etc.diff patch -p1 <$CWD/patches/symlinks_instead_of_hardlinks.diff +patch -p1 <$CWD/patches/remove_obsolete_udev_rules.diff # Let's not download stuff during the build... patch -p1 <$CWD/patches/use_already_present_ipxe.diff @@ -139,7 +140,9 @@ mkdir -p $PKG/lib/udev/rules.d mv $PKG/etc/udev/rules.d/xen*.rules $PKG/lib/udev/rules.d/ # Remove empty directories -rmdir $PKG/etc/{rc.d/init.d,udev/rules.d,udev} $PKG/usr/doc/$PRGNAM-$VERSION/{pdf,ps} +rmdir $PKG/etc/{rc.d/init.d,udev/rules.d,udev} +# Only if they are really empty +rmdir --ignore-fail-on-non-empty $PKG/usr/doc/$PRGNAM-$VERSION/{pdf,ps} # Append .new to config files for i in $PKG/etc/xen/{*.conf,*.sxp,*.xml} ; do mv $i $i.new ; done |