Updated it to work with 32-bit RPMs.

diff --git a/root_image/Makefile b/root_image/Makefile
index f366001a6ad1fdedd8c8bfdf81a1ada235b6a07f..3bc5600e8df0ad1df659096b63d56e9ebc1c6cfa 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -682,7 +682,11 @@ bridge-utils-install: userspace-prep $(RPMs-repo-exists)
 .PHONY:        python-deps
 python-deps:
        @echo "Installing python deps"
+ifeq ($(RPM_ARCH), x86_64)
        mkdir -p userspace/usr/lib64
+else
+       mkdir -p userspace/usr/lib
+endif
        mkdir -p userspace/usr/bin
        $(call RPM_TO_USERSPACE,*libssl.so*,$(RPM_DIR)/openssl)
        $(call RPM_TO_USERSPACE,*libgdbm.so*,$(RPM_DIR)/gdbm)
@@ -707,9 +711,9 @@ python-install: python-core
        $(call RPM_INSTALL,$(RPM_DIR)/libxml2-python)
        #rm -f userspace/usr/lib64/python2.6/site-packages/libxml2mod.la
        #rm -f userspace/usr/lib64/python2.6/lib-dynload/pyexpat.so
-       rm -f userspace/usr/lib64/python2.6/lib-dynload/_ctypes.so
-       rm -f userspace/usr/lib64/python2.6/lib-dynload/_sqlite3.so
-       rm -f userspace/usr/lib64/python2.6/idlelib/*.bat
+       rm -f userspace/usr/lib*/python2.6/lib-dynload/_ctypes.so
+       rm -f userspace/usr/lib*/python2.6/lib-dynload/_sqlite3.so
+       rm -f userspace/usr/lib*/python2.6/idlelib/*.bat
 
 .PHONY: xen-python-bytecode
 xen-python-bytecode: python-install
@@ -733,9 +737,16 @@ xend-install: xen-python-bytecode
        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 ) \
        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 ) \
+       fi
+endif
        if ! test -f userspace/bin/hvmloader; then \
                ( ln -sf /usr/lib/xen/boot/hvmloader            userspace/bin/hvmloader ) \
        fi