Makefile: Xen 4.2 support to build and a pm-suspend build failure issue.

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

diff --git a/root_image/Makefile b/root_image/Makefile
index 1d01231fc526850a7775068fe40aeb9f6c93659d..3c1cf537861579c7de8477acb4aea2c0d4f579d6 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -719,6 +719,7 @@ irqbalance-install:
 pm-utils-install:
        if ! [ -e pm-utils/config.h ]; then (cd pm-utils; ./autogen.sh;./configure --prefix=/usr); fi
        if ! [ -e pm-utils/src/service ]; then touch pm-utils/src/service; fi
+       if [ -e $(CURDIR)/userspace/usr/share/man/man8/pm-suspend.8 ]; then rm -f $(CURDIR)/userspace/usr/share/man/man8/pm-*; fi
        ln -sf `which install` pm-utils/install
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C pm-utils
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C pm-utils DESTDIR=$(CURDIR)/userspace install
@@ -808,6 +809,7 @@ xen-4.2-depend:
        $(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)
+       $(call RPM_TO_USERSPACE,*libpixman*.so*,$(RPM_DIR)/pixman)
 
 .PHONY: power-depend
 power-depend: