| 1 |
vapier 14/07/29 10:23:00 |
| 2 |
|
| 3 |
Modified: qemu-9999.ebuild qemu-2.0.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Do not try to mung blobs when they are not installed. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.79 app-emulation/qemu/qemu-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.79&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.79&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.78&r2=1.79 |
| 15 |
|
| 16 |
Index: qemu-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v |
| 19 |
retrieving revision 1.78 |
| 20 |
retrieving revision 1.79 |
| 21 |
diff -u -r1.78 -r1.79 |
| 22 |
--- qemu-9999.ebuild 29 Jul 2014 10:17:23 -0000 1.78 |
| 23 |
+++ qemu-9999.ebuild 29 Jul 2014 10:23:00 -0000 1.79 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.78 2014/07/29 10:17:23 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.79 2014/07/29 10:23:00 vapier Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -497,34 +497,36 @@ |
| 33 |
fi |
| 34 |
|
| 35 |
# Remove vgabios since we're using the vgabios packaged one |
| 36 |
- rm "${ED}/usr/share/qemu/vgabios.bin" |
| 37 |
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" |
| 38 |
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin" |
| 39 |
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" |
| 40 |
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin" |
| 41 |
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 42 |
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin |
| 43 |
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin |
| 44 |
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin |
| 45 |
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin |
| 46 |
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin |
| 47 |
- fi |
| 48 |
+ if [[ -n ${softmmu_targets} ]]; then |
| 49 |
+ rm "${ED}/usr/share/qemu/vgabios.bin" |
| 50 |
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" |
| 51 |
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin" |
| 52 |
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" |
| 53 |
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin" |
| 54 |
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 55 |
+ dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin |
| 56 |
+ dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin |
| 57 |
+ dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin |
| 58 |
+ dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin |
| 59 |
+ dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin |
| 60 |
+ fi |
| 61 |
|
| 62 |
- # Remove sgabios since we're using the sgabios packaged one |
| 63 |
- rm "${ED}/usr/share/qemu/sgabios.bin" |
| 64 |
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 65 |
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin |
| 66 |
- fi |
| 67 |
+ # Remove sgabios since we're using the sgabios packaged one |
| 68 |
+ rm "${ED}/usr/share/qemu/sgabios.bin" |
| 69 |
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 70 |
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin |
| 71 |
+ fi |
| 72 |
|
| 73 |
- # Remove iPXE since we're using the iPXE packaged one |
| 74 |
- rm "${ED}"/usr/share/qemu/pxe-*.rom |
| 75 |
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 76 |
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom |
| 77 |
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom |
| 78 |
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom |
| 79 |
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom |
| 80 |
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom |
| 81 |
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom |
| 82 |
+ # Remove iPXE since we're using the iPXE packaged one |
| 83 |
+ rm "${ED}"/usr/share/qemu/pxe-*.rom |
| 84 |
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 85 |
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom |
| 86 |
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom |
| 87 |
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom |
| 88 |
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom |
| 89 |
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom |
| 90 |
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom |
| 91 |
+ fi |
| 92 |
fi |
| 93 |
|
| 94 |
qemu_support_kvm && readme.gentoo_create_doc |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.9 app-emulation/qemu/qemu-2.0.0-r1.ebuild |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.9&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.9&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.8&r2=1.9 |
| 103 |
|
| 104 |
Index: qemu-2.0.0-r1.ebuild |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v |
| 107 |
retrieving revision 1.8 |
| 108 |
retrieving revision 1.9 |
| 109 |
diff -u -r1.8 -r1.9 |
| 110 |
--- qemu-2.0.0-r1.ebuild 29 Jul 2014 10:17:23 -0000 1.8 |
| 111 |
+++ qemu-2.0.0-r1.ebuild 29 Jul 2014 10:23:00 -0000 1.9 |
| 112 |
@@ -1,6 +1,6 @@ |
| 113 |
# Copyright 1999-2014 Gentoo Foundation |
| 114 |
# Distributed under the terms of the GNU General Public License v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.8 2014/07/29 10:17:23 vapier Exp $ |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.9 2014/07/29 10:23:00 vapier Exp $ |
| 117 |
|
| 118 |
EAPI=5 |
| 119 |
|
| 120 |
@@ -503,34 +503,36 @@ |
| 121 |
fi |
| 122 |
|
| 123 |
# Remove vgabios since we're using the vgabios packaged one |
| 124 |
- rm "${ED}/usr/share/qemu/vgabios.bin" |
| 125 |
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" |
| 126 |
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin" |
| 127 |
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" |
| 128 |
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin" |
| 129 |
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 130 |
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin |
| 131 |
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin |
| 132 |
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin |
| 133 |
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin |
| 134 |
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin |
| 135 |
- fi |
| 136 |
+ if [[ -n ${softmmu_targets} ]]; then |
| 137 |
+ rm "${ED}/usr/share/qemu/vgabios.bin" |
| 138 |
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" |
| 139 |
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin" |
| 140 |
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" |
| 141 |
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin" |
| 142 |
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 143 |
+ dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin |
| 144 |
+ dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin |
| 145 |
+ dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin |
| 146 |
+ dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin |
| 147 |
+ dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin |
| 148 |
+ fi |
| 149 |
|
| 150 |
- # Remove sgabios since we're using the sgabios packaged one |
| 151 |
- rm "${ED}/usr/share/qemu/sgabios.bin" |
| 152 |
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 153 |
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin |
| 154 |
- fi |
| 155 |
+ # Remove sgabios since we're using the sgabios packaged one |
| 156 |
+ rm "${ED}/usr/share/qemu/sgabios.bin" |
| 157 |
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 158 |
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin |
| 159 |
+ fi |
| 160 |
|
| 161 |
- # Remove iPXE since we're using the iPXE packaged one |
| 162 |
- rm "${ED}"/usr/share/qemu/pxe-*.rom |
| 163 |
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 164 |
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom |
| 165 |
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom |
| 166 |
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom |
| 167 |
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom |
| 168 |
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom |
| 169 |
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom |
| 170 |
+ # Remove iPXE since we're using the iPXE packaged one |
| 171 |
+ rm "${ED}"/usr/share/qemu/pxe-*.rom |
| 172 |
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 173 |
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom |
| 174 |
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom |
| 175 |
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom |
| 176 |
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom |
| 177 |
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom |
| 178 |
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom |
| 179 |
+ fi |
| 180 |
fi |
| 181 |
|
| 182 |
qemu_support_kvm && readme.gentoo_create_doc |
| 183 |
|
| 184 |
|
| 185 |
|
| 186 |
1.272 app-emulation/qemu/ChangeLog |
| 187 |
|
| 188 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.272&view=markup |
| 189 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.272&content-type=text/plain |
| 190 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.271&r2=1.272 |
| 191 |
|
| 192 |
Index: ChangeLog |
| 193 |
=================================================================== |
| 194 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
| 195 |
retrieving revision 1.271 |
| 196 |
retrieving revision 1.272 |
| 197 |
diff -u -r1.271 -r1.272 |
| 198 |
--- ChangeLog 29 Jul 2014 10:17:23 -0000 1.271 |
| 199 |
+++ ChangeLog 29 Jul 2014 10:23:00 -0000 1.272 |
| 200 |
@@ -1,6 +1,10 @@ |
| 201 |
# ChangeLog for app-emulation/qemu |
| 202 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 203 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.271 2014/07/29 10:17:23 vapier Exp $ |
| 204 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.272 2014/07/29 10:23:00 vapier Exp $ |
| 205 |
+ |
| 206 |
+ 29 Jul 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild, |
| 207 |
+ qemu-9999.ebuild: |
| 208 |
+ Do not try to mung blobs when they are not installed. |
| 209 |
|
| 210 |
29 Jul 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild, |
| 211 |
qemu-9999.ebuild: |
Archives