jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 345512 from home:lwfinger:branches:Virtualization

Browse Source 
Build with i586 disabled - it fails

OBS-URL: https://build.opensuse.org/request/show/345512
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=235
This commit is contained in:
Larry Finger 2015-11-21 17:20:33 +00:00 committed by Git OBS Bridge
parent 51e167746b
commit 171fcb6bee
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_constraints
View File

@ -2,7 +2,7 @@
<constraints> <constraints>
<hardware> <hardware>
<memory> <memory>
<size unit="M">5000</size> <size unit="M">8000</size>
</memory> </memory>
</hardware> </hardware>
</constraints> </constraints>

17
virtualbox.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Nov 20 19:05:51 UTC 2015 - Larry.Finger@lwfinger.net
- Temporarily disable i586 builds.
-------------------------------------------------------------------
Fri Nov 20 15:44:20 UTC 2015 - Larry.Finger@lwfinger.net
- Increase memory to 8000 MB to try to fix out-of-memory error when building i586 version.
-------------------------------------------------------------------
Mon Nov 16 19:40:37 UTC 2015 - Larry.Finger@lwfinger.net
- Increase memory to 7000 MB in _constraint to see if that fixes link problem on i586.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 12 12:55:16 UTC 2015 - idonmez@suse.com Thu Nov 12 12:55:16 UTC 2015 - idonmez@suse.com
@ -41,7 +56,7 @@ Sun Nov 8 05:10:36 UTC 2015 - Larry.Finger@lwfinger.net
enabled, and explain what steps the user should take if this feature is wanted despite the security enabled, and explain what steps the user should take if this feature is wanted despite the security
hole. hole.
This change fixes the problem shown in boo#953018. Patch file vbox-usb-warning.diff fixes the problem shown in boo#953018.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 20 19:01:09 UTC 2015 - Larry.Finger@lwfinger.net Tue Oct 20 19:01:09 UTC 2015 - Larry.Finger@lwfinger.net

10
virtualbox.spec
View File

@ -149,10 +149,12 @@ Provides: %{name}-ose = %{version}
Obsoletes: %{name}-ose < %{version} Obsoletes: %{name}-ose < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) %(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template)
ExclusiveArch: %ix86 x86_64 # Temporarily disable i586 until build problem is solved
%if 0%{?suse_version} == 1315 #ExclusiveArch: %ix86 x86_64
ExcludeArch: %ix86 #%if 0%{?suse_version} == 1315
%endif #ExcludeArch: %ix86
#%endif
ExclusiveArch: x86_64
%ifarch amd64 x86_64 ia32e em64t %ifarch amd64 x86_64 ia32e em64t
BuildRequires: gcc-32bit BuildRequires: gcc-32bit
BuildRequires: gcc-c++-32bit BuildRequires: gcc-c++-32bit