-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wed, 19 Mar 2014, R P Herrold wrote:

These steps build under a basic CentOS 6, updated to current:
 
> > wget \
> > http://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/RHEV/SRPMS/qemu-kvm-rhev-0.12.1.2-2.415.el6_5.5.src.rpm

> > sha256sum qemu-kvm-rhev-0.12.1.2-2.415.el6_5.5.src.rpm
> > # check with http://rhn.redhat.com/errata/RHBA-2014-0248.html

> > yum-builddep /archiv/qemu-kvm-rhev-0.12.1.2-2.415.el6_5.5.src.rpm

wget \
        
ftp://ftp.owlriver.com/pub/local/ORC/qemu-kvm-rhev/qemu-kvm-nousb-redir.spec
 
rpm -U qemu-kvm-rhev-0.12.1.2-2.415.el6_5.5.src.rpm

rpmbuild -ba qemu-kvm-nousb-redir.spec


and a collection of binaries and SRPM will result.
  
/home/herrold/rpmbuild/SRPMS/qemu-kvm-rhev-0.12.1.2-2.415.orc6.6.pmman.src.rpm  
      
/home/herrold/rpmbuild/RPMS/x86_64/qemu-kvm-rhev-0.12.1.2-2.415.orc6.6.pmman.x86_64.rpm
                                                                                
     
/home/herrold/rpmbuild/RPMS/x86_64/qemu-img-rhev-0.12.1.2-2.415.orc6.6.pmman.x86_64.rpm
                                                                                
     
/home/herrold/rpmbuild/RPMS/x86_64/qemu-kvm-rhev-tools-0.12.1.2-2.415.orc6.6.pmman.x86_64.rpm
                                                                          


Diff is as follows (mod linewraps):

[herrold@centos-6 qemu-kvm-rhev]$ diff -u qemu-kvm.spec 
qemu-kvm-nousb-redir.spec     
- --- qemu-kvm.spec       2014-03-19 14:25:52.000000000 -0400                   
        
+++ qemu-kvm-nousb-redir.spec   2014-03-19 16:33:57.000000000 
- -0400                   
@@ -2,6 +2,18 @@                                                                
      
 # Define rhev as the first variable                                            
      
 %define rhev 1                                                                 
      
                                                                                
      
+# usb-redir                                                                    
      
+#      quite invasive, but we can patch the ./configure                        
      
+#      to exclude by default (viz, leave undefined ) and then 
ignore, perhaps        
+%define config_usb_redir %{nil}                                                
      
+%if 0%{?usb-redir}                                                             
      
+%define enable_usb_redir 1                                                     
      
+%define config_usb_redir --enable-usb-redir                                    
      
+%else                                                                          
      
+%define enable_usb_redir 0                                                     
      
+%define config_usb_redir --disable-usb-redir                                   
      
+%endif                                                                         
      
+                                                                               
      
 %if 0%{?rhev_test}                                                             
      
 %define enable_fake_machine 1                                                  
      
 %else                                                                          
      
@@ -85,7 +97,10 @@                                                              
      
                                                                                
      
 %define buildid %{nil}                                                         
      
                                                                                
      
- -%define zrelease 5                                                           
        
+#      orc temp fork as to usb-redir                                           
      
+%define buildid .pmman                                                         
      
+%define zrelease 6                                                             
      
+                                                                               
      
 %define sublevel 0.12.1.2                                                      
      
 %define pkgrelease 2.415                                                       
      
                                                                                
      
@@ -11531,12 +11546,17 @@                                                       
      
             --trace-backend=dtrace \                                           
      
             --enable-smartcard \                                               
      
             --disable-smartcard-nss \                                          
      
- -            --enable-usb-redir \                                             
        
             --enable-mixemu \                                                  
      
             --enable-glusterfs \                                               
      
+            %{config_usb_redir} \                                              
      
             %{fake_machine_arg} \                                              
      
             %{disable_rhev_features_arg}                                       
      
                                                                                
      
+#      view state of orc pmman patch                                           
      
+echo "config_usb_redir: -|%{config_usb_redir}|-"                               
      
+# exit 1                                                                       
      
+                                                                               
      
+
 echo "config-host.mak contents:"
 echo "==="
 cat config-host.mak
@@ -11552,6 +11572,7 @@
 ../configure --target-list=x86_64-softmmu \
              --extra-ldflags="$extraldflags -pie -Wl,-z,relro 
- -Wl,-z,now" \
              --extra-cflags="$RPM_OPT_FLAGS -fPIE -DPIE" \
+             %{config_usb_redir} \
              %{qemu_ga_build_flags}

 cd ../qemu-kvm-x86_64-build
@@ -11804,6 +11825,9 @@
 %endif # with qemu_kvm

 %changelog
+* Tue Mar 19 2014 R P Herrold <i...@owlriver.com> - 
0.12.1.2-2.415.el6_5.6
+- add: config_usb_redir conditional for easier stock C6 
building
+
 * Tue Feb 25 2014 Miroslav Rezanina <mreza...@redhat.com> - 
0.12.1.2-2.415.el6_5.5
 - kvm-monitor-Cleanup-mon-outbuf-on-write-error.patch 
[bz#1069239]
 - Resolves: bz#1069239
[herrold@centos-6 qemu-kvm-rhev]$

untested

- -- Russ herrold

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iEYEARECAAYFAlMqECoACgkQMRh1QZtklkRTygCdHJAWupOrCrzq/iX0bTBduAN7
EC4An2Oa3xaGkSU99+/ABcTOm2ezzybM
=+82Z
-----END PGP SIGNATURE-----
_______________________________________________
Users mailing list
Users@ovirt.org
http://lists.ovirt.org/mailman/listinfo/users

Reply via email to