From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 5 Sep 2012 17:47:16 +0000 (-0400)
Subject: Makefile: Work with Xen 4.2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=533a6b715eb8b6905d03dd419645f42bf2ac96be;p=xentesttools%2Fbootstrap.git

Makefile: Work with Xen 4.2

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

diff --git a/root_image/Makefile b/root_image/Makefile
index 0af9f62..ca69bcb 100644
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -805,6 +805,7 @@ xen-4.2-depend:
 	$(call RPM_TO_USERSPACE,*liblber*.so*,$(RPM_DIR)/openldap)
 	$(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)
 
 .PHONY: power-depend
 power-depend:
@@ -860,28 +861,26 @@ xend-install: xen-python-bytecode yajl-depend xen-4.2-depend
 		cp -f $(XEN_DISTDIR)/etc/rc.d/init.d/*				userspace/etc/init.d; \
 	else \
 		cp -f $(XEN_DISTDIR)/etc/init.d/*				userspace/etc/init.d; \
-	fi	
+	fi
 	cp -rdf $(XEN_DISTDIR)/etc/sysconfig				userspace/etc/sysconfig
 	cp -rdf $(XEN_DISTDIR)/etc/udev/*				userspace/etc/udev
 	cp -rdf $(XEN_DISTDIR)/etc/xen				userspace/etc/xen
 	cp -rdf $(XEN_DISTDIR)/var					      userspace/
 	find userspace/usr/$(LIBSDIR) -name '*.so*' ! -type l | xargs chmod a+x
+	if test -f userspace/usr/lib; then \
+		find userspace/usr/lib -name '*.so*' ! -type l | xargs chmod a+x; \
+	fi
 # 	prune usr/include after copy
 	rm -rf userspace/usr/include
-#	make them usable by nex, or xen
-	if ! test -f userspace/bin/qemu-dm; then \
-		( ln -sf /usr/local/$(LIBSDIR)/xen/bin/qemu-dm 	userspace/bin/qemu-dm ) \
-	fi
-#	it would be nice if xen could make up their mind where they are
-#	launching things from
 
 ifeq ($(RPM_ARCH), x86_64)
-	if ! test -f userspace/usr/lib64/xen/bin/qemu-dm; then \
-		( ln -sf /usr/local/$(LIBSDIR)/xen/bin/qemu-dm 	userspace/usr/lib64/xen/bin/qemu-dm ) \
+	if ! test -f userspace/usr/lib64/xen; then \
+		( ln -sf /usr/lib/xen 	userspace/usr/lib64; true ) \
 	fi
-else
-	if ! test -f userspace/usr/lib/xen/bin/qemu-dm; then \
-		( ln -sf /usr/local/$(LIBSDIR)/xen/bin/qemu-dm 	userspace/usr/lib/xen/bin/qemu-dm ) \
+	if test -f userspace/usr/lib/libxenctrl.so; then \
+		if ! test -f userspace/usr/lib64/libxenctrl.so; then \
+			( cd userspace/usr/lib; for lib in `ls -1 *libxen* *libblktap* libvhd* libfsimage* libxl*`; do (cd ../lib64;ln -s ../lib/$$lib); done;); \
+		fi \
 	fi
 endif
 	if ! test -f userspace/bin/hvmloader; then \