diff --git a/qemu-xen-dir-remote.tar.bz2 b/qemu-xen-dir-remote.tar.bz2 index 42a616c..b51fd48 100644 --- a/qemu-xen-dir-remote.tar.bz2 +++ b/qemu-xen-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e638878f86a530319b0c391bf34f90361939afbfa99650cbd2e0a1ac58dd2417 -size 5111841 +oid sha256:6fe1ff40b8f0305a2911bbf8701096facb6a47f23d2deffb19b22aea9739c81d +size 5111353 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index 8c29116..09dc5f5 100644 --- a/qemu-xen-traditional-dir-remote.tar.bz2 +++ b/qemu-xen-traditional-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:207a214e0234add0748fc12b186e365d1ebfb082a045e762563136dee1eb39e1 -size 3210667 +oid sha256:79d607307935499aca9fa7ddaea37dd9f7f767695b9feb3f25ee9a4a181ccbd9 +size 3212153 diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 index af01e0e..e0c8adc 100644 --- a/seabios-dir-remote.tar.bz2 +++ b/seabios-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19c94171a349b7983e30beb82e393f92074359e44282600310967f7deae590b2 -size 356370 +oid sha256:9569ad2cae31a65caeb17e9b517220f0c18d7165bed1b1412217fcff15c59aef +size 356387 diff --git a/xen-4.2.0-testing-src.tar.bz2 b/xen-4.2.0-testing-src.tar.bz2 index 798c19d..efb8dbe 100644 --- a/xen-4.2.0-testing-src.tar.bz2 +++ b/xen-4.2.0-testing-src.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3377276a6def862197a8f9d71e74bb0b981f4c5015bbf79d723ea39f90f74ed2 -size 4861363 +oid sha256:eb9bedd095a2d08ef53a0828ef801e9293cfbfca0a6204bf01a38727e83e92cf +size 4862049 diff --git a/xen.changes b/xen.changes index 6bad49f..3868ddf 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 18 16:16:04 MDT 2012 - carnold@novell.com + +- Fixed the 32bit build. + ------------------------------------------------------------------- Mon Sep 17 09:02:37 MDT 2012 - carnold@novell.com diff --git a/xen.spec b/xen.spec index aea4e2d..5ec958c 100644 --- a/xen.spec +++ b/xen.spec @@ -751,9 +751,6 @@ sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET = %{changeset}/" xen/Makefi RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/} export CFLAGS="${RPM_OPT_FLAGS}" export RPM_OPT_FLAGS -%if %{?with_dom0_support}0 -CFLAGS_SAVE=$CFLAGS -make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags} ./configure \ --enable-xenapi \ --prefix=/usr \ @@ -762,6 +759,9 @@ make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags} --sbindir=%{_sbindir} \ --libdir=%{_libdir} \ --datadir=%{_datadir} +%if %{?with_dom0_support}0 +CFLAGS_SAVE=$CFLAGS +make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags} make -C tools/include/xen-foreign %{?_smp_mflags} make tools docs %{?_smp_mflags} make -C tools/debugger/gdbsx @@ -981,7 +981,10 @@ install -m 644 %{S:26} $RPM_BUILD_ROOT/%{_fwdefdir}/xend-relocation-server %else # 32 bit hypervisor no longer supported. Remove dom0 tools. rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc +rm -rf $RPM_BUILD_ROOT/usr/local/share/doc rm -rf $RPM_BUILD_ROOT/%{_datadir}/man +rm -rf $RPM_BUILD_ROOT/usr/local/share/man +rm -rf $RPM_BUILD_ROOT/%{_datadir}/qemu-xen rm -rf $RPM_BUILD_ROOT/%{_datadir}/xen rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale rm -rf $RPM_BUILD_ROOT/%{_libdir}/xen @@ -993,7 +996,9 @@ rm -rf $RPM_BUILD_ROOT/etc/logrotate.d rm -rf $RPM_BUILD_ROOT/etc/pam.d rm -rf $RPM_BUILD_ROOT/etc/sysconfig rm -rf $RPM_BUILD_ROOT/etc/udev +rm -rf $RPM_BUILD_ROOT/etc/qemu rm -rf $RPM_BUILD_ROOT/etc/xen +rm -rf $RPM_BUILD_ROOT/usr/local/etc rm -rf $RPM_BUILD_ROOT/var rm -f $RPM_BUILD_ROOT/%{_bindir}/*store* rm -f $RPM_BUILD_ROOT/%{_bindir}/*trace*