diff --git a/vbox-2.6.38.patch b/vbox-2.6.38.patch new file mode 100644 index 0000000..34c797c --- /dev/null +++ b/vbox-2.6.38.patch @@ -0,0 +1,60 @@ +--- include/iprt/types.h.orig ++++ include/iprt/types.h +@@ -101,9 +101,6 @@ RT_C_DECLS_END + # define true linux_true + # define false linux_false + # define uintptr_t linux_uintptr_t +-# ifndef AUTOCONF_INCLUDED +-# include +-# endif + # include + # include + # undef uintptr_t +--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig ++++ src/VBox/HostDrivers/Support/SUPDrvInternal.h +@@ -75,9 +75,6 @@ + RT_C_DECLS_END + + #elif defined(RT_OS_LINUX) +-# ifndef AUTOCONF_INCLUDED +-# include +-# endif + # include + # if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS) + # define MODVERSIONS +--- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h.orig ++++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +@@ -34,9 +34,6 @@ + #include + #define bool linux_bool + +-#ifndef AUTOCONF_INCLUDED +-# include +-#endif + #include + + /* We only support 2.4 and 2.6 series kernels */ +--- src/VBox/Runtime/include/internal/iprt.h.orig ++++ src/VBox/Runtime/include/internal/iprt.h +@@ -39,9 +39,6 @@ + && defined(MODULE) \ + && !defined(RT_NO_EXPORT_SYMBOL) + # define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */ +-# ifndef AUTOCONF_INCLUDED +-# include +-# endif + # if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS) + # include + # define MODVERSIONS +--- src/VBox/Additions/linux/drm/vboxvideo_drm.c.orig ++++ src/VBox/Additions/linux/drm/vboxvideo_drm.c +@@ -49,9 +49,6 @@ + * Gareth Hughes + */ + +-#ifndef AUTOCONF_INCLUDED +-# include +-#endif + #include + #include + #include "version-generated.h" diff --git a/vbox-config.diff b/vbox-config.diff new file mode 100644 index 0000000..0374704 --- /dev/null +++ b/vbox-config.diff @@ -0,0 +1,29 @@ +--- VirtualBox-4.0.2_OSE.orig/Config.kmk 2011-01-18 16:33:45.000000000 +0000 ++++ VirtualBox-4.0.2_OSE/Config.kmk 2011-01-31 01:27:30.788003407 +0000 +@@ -503,7 +503,7 @@ + VBOX_WITH_CROGL = 1 + endif + # Enable the VNC server in VBoxHeadless (GPL only). +-#VBOX_WITH_VNC = 1 ++VBOX_WITH_VNC = 1 + # Enable S3 support (requires libcurl) + VBOX_WITH_S3 = 1 + ## @} +@@ -581,7 +581,7 @@ + #VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox + ifdef VBOX_WITH_HARDENING + if1of ($(KBUILD_TARGET), linux solaris) +- VBOX_PATH_APP_PRIVATE = /opt/VirtualBox ++ VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox + else ifeq ($(KBUILD_TARGET),darwin) + VBOX_PATH_APP_PRIVATE = /Applications/VirtualBox.app/Contents/MacOS + else ifeq ($(KBUILD_TARGET),freebsd) +@@ -608,7 +608,7 @@ + endif + endif + # Where the documentation is (going to be) installed. +-#VBOX_PATH_APP_DOCS = /usr/share/doc/virtualbox ++VBOX_PATH_APP_DOCS = /usr/share/doc/packages/virtualbox + ifdef VBOX_WITH_HARDENING + if1of ($(KBUILD_TARGET), darwin solaris) + VBOX_PATH_APP_DOCS = $(VBOX_PATH_APP_PRIVATE) diff --git a/vbox-no-build-dates.diff b/vbox-no-build-dates.diff index 2da1509..c1c2938 100644 --- a/vbox-no-build-dates.diff +++ b/vbox-no-build-dates.diff @@ -1,6 +1,15 @@ --- src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp.orig +++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp -@@ -1150,10 +1150,9 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE +@@ -424,7 +424,7 @@ extern "C" DECLEXPORT(int) TrustedMain ( + #endif + int rc = VINF_SUCCESS; + +- RTPrintf(VBOX_PRODUCT " Simple SDL GUI built %s %s\n", __DATE__, __TIME__); ++ RTPrintf(VBOX_PRODUCT " Simple SDL GUI\n"); + + // less than one parameter is not possible + if (argc < 2) +@@ -1144,10 +1144,9 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE char szNowUct[64]; RTTimeSpecToString(RTTimeNow(&TimeSpec), szNowUct, sizeof(szNowUct)); RTLogRelLogger(pLogger, 0, ~0U, @@ -15,7 +24,7 @@ RTLogRelSetDefaultInstance(pLogger); --- src/VBox/Main/src-client/ConsoleImpl.cpp.orig +++ src/VBox/Main/src-client/ConsoleImpl.cpp -@@ -5063,13 +5063,12 @@ HRESULT Console::consoleInitReleaseLog(c +@@ -5262,13 +5262,12 @@ HRESULT Console::consoleInitReleaseLog(c char szTmp[256]; RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp)); RTLogRelLogger(loggerRelease, 0, ~0U, diff --git a/vbox-rpath.diff b/vbox-rpath.diff deleted file mode 100644 index 00fc6d0..0000000 --- a/vbox-rpath.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: VirtualBox-4.0.0_OSE/Config.kmk -=================================================================== ---- VirtualBox-4.0.0_OSE.orig/Config.kmk -+++ VirtualBox-4.0.0_OSE/Config.kmk -@@ -580,7 +580,7 @@ endif - #VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox - ifdef VBOX_WITH_HARDENING - if1of ($(KBUILD_TARGET), linux solaris) -- VBOX_PATH_APP_PRIVATE = /opt/VirtualBox -+ VBOX_PATH_APP_PRIVATE = /usr/lib/virtualbox - else ifeq ($(KBUILD_TARGET),darwin) - VBOX_PATH_APP_PRIVATE = /Applications/VirtualBox.app/Contents/MacOS - else ifeq ($(KBUILD_TARGET),freebsd) diff --git a/virtualbox.changes b/virtualbox.changes index 2340cd3..0308894 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jan 31 01:52:58 UTC 2011 - cshorler@googlemail.com + +- Minor packaging fixes + * ExtPack: add missing host helper util (VBoxExtPackHelper) + * Config.kmk: patch for VNC (removed from spec), documentation path (fixes GUI), combine with existing rpath diff + * spec: migrate VNC echo to patch, fix desktop file overwrite issue / bug + +------------------------------------------------------------------- +Thu Jan 27 12:47:31 UTC 2011 - cristian.rodriguez@opensuse.org + +- Fix build in 2.6.38 kernels. + +------------------------------------------------------------------- +Wed Jan 26 16:36:42 UTC 2011 - cristian.rodriguez@opensuse.org + +- Fix one more build date in binaries that causes unneeded + republish of binaries. + ------------------------------------------------------------------- Wed Jan 19 13:49:49 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 8ccd4d5..59f304b 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # -# spec file for package virtualbox +# spec file for package virtualbox (Version 3.9.80) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-d BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk BuildRequires: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev %if %suse_version > 1110 -BuildRequires: zlib-devel-static +BuildRequires: zlib-devel-static %endif %ifarch amd64 x86_64 ia32e em64t BuildRequires: hal-32bit @@ -75,8 +75,8 @@ Patch1: vbox-vboxdrv-init-script.diff Patch2: vbox-vboxadd-init-script.diff #fix return values which trigger post build checks and coused build error - should goes to upstream Patch4: vbox-ret-in-nonvoid-fnc.diff -#fix rpath -Patch5: vbox-rpath.diff +#fix/enable config (rpath, docs, VNC) +Patch5: vbox-config.diff #fix build : "Error 4001 - String must be entirely alphanumeric" #with renaming we probably break some macosx functionality however ths is just quick fix #file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds @@ -89,8 +89,9 @@ Patch99: vbox-permissions_warning.diff Patch100: vbox-no-build-dates.diff Patch101: vbox-default-os-type.diff #disable update in vbox gui -Patch102: vbox-disable-updates.diff +Patch102: vbox-disable-updates.diff # +Patch103: vbox-2.6.38.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions Requires: %{name}-host-kmp = %version @@ -118,6 +119,7 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so Provides: %{name}-ose-qt = %version Obsoletes: %{name}-ose-qt < %version + %description qt Qt GUI part for %{name}. ######################################### @@ -170,7 +172,6 @@ VirtualBox guest addition tools. ########################################### %package -n python-%{name} - Summary: Python bindings for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -205,6 +206,7 @@ Development file for %{name} %patch100 %patch101 %patch102 -p1 +%patch103 #copy user manual %__cp %{S:1} ./UserManual.pdf @@ -212,8 +214,6 @@ Development file for %{name} # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. export SUSE_ASNEEDED=0 -# turn on vnc feature by hand, this line could be dropped when we could use configure script -echo VBOX_WITH_VNC=1 >> Config.kmk # # --disable-kmods \ don't build Linux kernel modules - but use SUSE specific way see few lines under # --with-gcc=/usr/bin/gxx-4.3 do configure and set proper gcc - currently vbox support only gcc<=4.4 @@ -400,6 +400,7 @@ pushd out/linux.*/release/bin %__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl %__install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir} %__install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir} +%__install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir} %__install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir} %__install -m 755 VBoxPermissionMessage \ %{buildroot}%{_vbox_instdir} @@ -441,7 +442,7 @@ popd %__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox -%suse_update_desktop_file -i %{name} System Emulator +%suse_update_desktop_file -i %{buildroot}%{_datadir}/applications/%{name}.desktop System Emulator ###################################################### echo "entrering python-virtualbox and virtualbox-devel install section" @@ -540,6 +541,7 @@ exit 0 %{_vbox_instdir}/VBoxTunctl %{_vbox_instdir}/VBoxXPCOMIPCD #added for 4.0.0 +%{_vbox_instdir}/VBoxExtPackHelperApp %{_vbox_instdir}/DBGCPlugInDiggers.so %{_vbox_instdir}/VBoxAuth.so %{_vbox_instdir}/VBoxAuthSimple.so @@ -611,7 +613,6 @@ exit 0 %config %{_sysconfdir}/init.d/vboxadd %{_sbindir}/rcvboxadd # - %files -n python-%{name} %defattr(-,root, root) %dir %{_vbox_instdir}/sdk @@ -639,3 +640,4 @@ exit 0 %{_vbox_instdir}/sdk/bindings/glue %changelog +