Makefile: Fix build for Xen unstable.

The udev/hotplug directory is not used anymore.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index c40b26d5eadd947e8c5f9b8770407306afebb889..d152930a73684f5f5926289cb8e11bdb1b574ae7 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -379,7 +379,6 @@ add-debug-bins: root_image-tools-install
        $(call RPM_TO_USERSPACE,./usr/bin/sdparm,$(RPM_DIR)/sdparm)
        $(call RPM_TO_USERSPACE,./sbin/arp,$(RPM_DIR)/net-tools)
        $(call RPM_TO_USERSPACE,./bin/netstat,$(RPM_DIR)/net-tools)
-       $(call RPM_TO_USERSPACE,*libusb-*.so*,$(RPM_DIR)/libusb)
 ifdef FC12_RPM
        $(call RPM_TO_USERSPACE,./usr/sbin/lsusb,$(RPM_DIR)/usbutils)
 else
@@ -398,6 +397,8 @@ endif
        $(call RPM_TO_USERSPACE_ALWAYS,\*lib/udev/\*,$(RPM_DIR)/initscripts)
        $(call RPM_TO_USERSPACE_ALWAYS,\*bin/\*,$(RPM_DIR)/udev)
        $(call RPM_TO_USERSPACE_ALWAYS,\*etc/\*,$(RPM_DIR)/udev)
+       # udev requires libusb now.
+       $(call RPM_TO_USERSPACE,*libusb-*.so*,$(RPM_DIR)/libusb)
        $(call RPM_TO_USERSPACE_ALWAYS,\*lib/udev/\*,$(RPM_DIR)/udev)
 
 .PHONY: tools-lib
@@ -654,8 +655,6 @@ plymouth-install: userspace-prep fb-install
        $(call RPM_TO_USERSPACE,./sbin/plymouthd,$(RPM_DIR)/plymouth)
        $(call RPM_TO_USERSPACE,*$(LIBSDIR)/plymouth/*,$(RPM_DIR)/plymouth)
        $(call RPM_TO_USERSPACE,./usr/share/plymouth/themes/*,$(RPM_DIR)/plymouth)
-       $(call RPM_TO_USERSPACE,./usr$(LIBSDIR)/libpng.so*,$(RPM_DIR)/libpng)
-       $(call RPM_TO_USERSPACE,./usr$(LIBSDIR)/libpng12.so*,$(RPM_DIR)/libpng)
 ifdef FC13
        $(call RPM_TO_USERSPACE,.$(LIBSDIR)/libply.so.*,$(RPM_DIR)/plymouth-core-libs)
        $(call RPM_TO_USERSPACE,.$(LIBSDIR)/libply-splash-core.so*,$(RPM_DIR)/plymouth-core-libs)
@@ -806,6 +805,9 @@ xen-4.2-depend:
        $(call RPM_TO_USERSPACE,*libldap*.so*,$(RPM_DIR)/openldap)
        $(call RPM_TO_USERSPACE,*libgthread*.so*,$(RPM_DIR)/glib2)
        $(call RPM_TO_USERSPACE,*libjpeg*.so*,$(RPM_DIR)/libjpeg)
+       $(call RPM_TO_USERSPACE,./usr$(LIBSDIR)/libpng.so*,$(RPM_DIR)/libpng)
+       $(call RPM_TO_USERSPACE,./usr$(LIBSDIR)/libpng12.so*,$(RPM_DIR)/libpng)
+       $(call RPM_TO_USERSPACE,*libaio*,$(RPM_DIR)/libaio)
 
 .PHONY: power-depend
 power-depend:
@@ -857,7 +859,9 @@ xend-install: xen-python-bytecode yajl-depend xen-4.2-depend
 #      Install all of xen
        cp -rdf $(XEN_DISTDIR)/usr                                            userspace/
        cp -rdf $(XEN_DISTDIR)/etc/bash_completion.d                            userspace/etc/bash_completion.d
-       cp -rdf $(XEN_DISTDIR)/etc/hotplug                              userspace/etc/hotplug
+       if [ -d $(XEN_DISTDIR)/etc/hotplug ]; then \
+               cp -rdf $(XEN_DISTDIR)/etc/hotplug                              userspace/etc/hotplug; \
+       fi
        if [ -d $(XEN_DISTDIR)/etc/rc.d ]; then \
                cp -f $(XEN_DISTDIR)/etc/rc.d/init.d/*                          userspace/etc/init.d; \
        else \