I have made the following changes intended for : CE:Adaptation:x86-generic / virtualbox
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7611 Thank You, yunta [This message was auto-generated] --- Request # 7611: Messages from BOSS: WARNING check_package_is_complete_sources (virtualbox) failed: No dsc file found Extra source files: boss.conf, virtualbox.changes_suse. State: new at 2013-01-10T07:45:06 by sage Reviews: accepted by bossbot : Prechecks succeeded. accepted by CE-maintainers (sage) : ok Changes: submit: home:yunta / virtualbox -> CE:Adaptation:x86-generic / virtualbox changes files: -------------- --- virtualbox.changes +++ virtualbox.changes @@ -0,0 +1,4 @@ +* Mon Nov 05 2012 Maciej Blomberg <[email protected]> - 4.2.4 +- Upgraded to upstream 4.2.4 +- All previous patches broken + old: ---- VirtualBox-4.1.18-patched.tar.bz2 vbox-default-os-type.diff vbox-no-build-dates.diff vbox-permissions_warning.diff virtualbox-4.1.18-UserManual.pdf virtualbox-4.1.18-rpmlintrc virtualbox-kernel-3.6.patch new: ---- VirtualBox-4.2.4.tar.bz2 virtualbox-4.2.4-UserManual.pdf virtualbox-4.2.4-rpmlintrc spec files: ----------- --- virtualbox.spec +++ virtualbox.spec @@ -35,6 +35,7 @@ BuildRequires: e2fsprogs-devel BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: kernel-adaptation-pc BuildRequires: kernel-adaptation-pc-devel %define kernel_version %{expand:%(rpm -q --qf '[%%{version}-%%{release}]' kernel-adaptation-pc-devel)} BuildRequires: kbuild @@ -58,7 +59,7 @@ #BuildRequires: yasm #BuildRequires: zlib-devel-static -Version: 4.1.18 +Version: 4.2.4 Release: 1 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -69,7 +70,7 @@ # script virtualbox-patch-source.sh will do the job :) # WARNING: This is not a comment, but the real command to repack souce #%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2) -Source0: VirtualBox-%{version}-patched.tar.bz2 +Source0: VirtualBox-%{version}.tar.bz2 Source1: %{name}-%{version}-UserManual.pdf Source2: %{name}-60-vboxdrv.rules Source3: %{name}-60-vboxguest.rules @@ -102,16 +103,12 @@ Patch8: vbox-python-detection.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user #try to start VirtualBox and is not memeber of vboxusers group -Patch99: vbox-permissions_warning.diff #PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier -Patch100: vbox-no-build-dates.diff -Patch101: vbox-default-os-type.diff +#YPatch101: vbox-default-os-type.diff #disable update in vbox gui Patch103: vbox-disable-updates.diff #use pie/fPIE for setuid binaries (bnc#743143) Patch104: vbox-fpie.diff -# Fix compilation with kernel 3.6, upstream r42784 -Patch105: virtualbox-kernel-3.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #PreReq: pwdutils permissions Requires: %{name}-host-kmp = %version @@ -164,18 +161,17 @@ ########################################### %prep %setup -q -n VirtualBox-%{version} -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch6 -p1 %patch8 -p1 -%patch99 -p1 -%patch100 -%patch101 +#Y%patch100 +#Y%patch101 %patch103 %patch104 -p1 -%patch105 -p1 +#Y%patch105 -p1 #copy user manual %__cp %{S:1} UserManual.pdf #copy kbuild config @@ -224,9 +220,13 @@ # # VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui + +#cp tools/linux.x86/bin/yasm %{buildroot}/yasm + echo "build basic parts" -/usr/bin/kmk %{?_smp_mflags} VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=/home/abuild/rpmbuild/BUILD/VirtualBox-4.1.18/tools/linux.x86/bin/yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox VBOX_ONLY_ADDITIONS=1 vboxsf-mod vboxvideo_drm-mod /home/abuild/rpmbuild/BUILD/VirtualBox-4.1.18/out/linux.x86/release/bin/additions/{mount.vboxsf,VBoxControl,VBoxService} -# +/usr/bin/kmk %{?_smp_mflags} VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=`pwd`/tools/linux.x86/bin/yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox VBOX_ONLY_ADDITIONS=1 vboxsf-mod vboxvideo_drm-mod mount VBoxControl VBoxService + + # build kernel modules for guest and host (check novel-kmp package as example) # host modules : vboxdrv,vboxnetflt,vboxnetadp # guest modules : vboxguest,vboxsf,vboxvideo @@ -236,7 +236,7 @@ src/VBox/Additions/linux/export_modules modules_build_dir/modules.tar.gz pushd modules_build_dir tar xf modules.tar.gz -KERN_DIR=/usr/src/kernels/3.*-adaptation-pc make +KERN_DIR=/usr/src/kernels/%{kernel_version} make popd @@ -253,15 +253,14 @@ export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=vbox # Feel free to find a better solution: -KERNEL_DIR=/usr/src/kernels/%{kernel_version}-adaptation-pc - +KERNEL_DIR=/usr/src/kernels/%{kernel_version} # -M doesn't work if it ends in "/." :/ for module_name in modules_build_dir/*/. do %__make -C $KERNEL_DIR modules_install M=$(dirname $PWD/$module_name) done # Clean up spurious stuff -rm -f %{buildroot}/lib/modules/%{kernel_version}-adaptation-pc/modules.* +rm -f %{buildroot}/lib/modules/*/modules.* ########################################### echo "entering guest-tools install section" @@ -288,4 +287,4 @@ %files guest-modules %defattr(-, root, root) -/lib/modules/%{kernel_version}-adaptation-pc/vbox +/lib/modules/*/vbox other changes: -------------- ++++++ VirtualBox-4.1.18-patched.tar.bz2 -> VirtualBox-4.2.4.tar.bz2 (5899932 lines skipped) ++++++ vbox-disable-updates.diff --- vbox-disable-updates.diff +++ vbox-disable-updates.diff @@ -11,14 +11,14 @@ m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex); --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h -@@ -34,7 +34,6 @@ public: +@@ -39,7 +39,6 @@ { GLSettingsPage_General = 0, GLSettingsPage_Input, - GLSettingsPage_Update, GLSettingsPage_Language, + GLSettingsPage_Display, GLSettingsPage_USB, - GLSettingsPage_Network, --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -340,15 +340,6 @@ UISettingsDialogGlobal::UISettingsDialog ++++++ vbox-vboxadd-init-script.diff --- vbox-vboxadd-init-script.diff +++ vbox-vboxadd-init-script.diff @@ -1,8 +1,7 @@ -Index: src/VBox/Additions/linux/installer/vboxadd.sh -=================================================================== ---- src/VBox/Additions/linux/installer/vboxadd.sh.orig -+++ src/VBox/Additions/linux/installer/vboxadd.sh -@@ -21,14 +21,18 @@ +diff -Naur VirtualBox-4.2.4-orig/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-4.2.4/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-4.2.4-orig/src/VBox/Additions/linux/installer/vboxadd.sh 2012-10-26 19:23:34.000000000 +0300 ++++ VirtualBox-4.2.4/src/VBox/Additions/linux/installer/vboxadd.sh 2012-10-29 22:23:54.384329027 +0200 +@@ -21,11 +21,12 @@ # ### BEGIN INIT INFO # Provides: vboxadd @@ -17,24 +16,17 @@ +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO --. /var/lib/VBoxGuestAdditions/config -+if [ -f /var/lib/VBoxGuestAdditions/config ]; then -+ . /var/lib/VBoxGuestAdditions/config -+fi -+ - export BUILD_TYPE - export USERNAME - -@@ -169,8 +173,6 @@ fi - + PATH=$PATH:/bin:/sbin:/usr/sbin +@@ -178,8 +179,6 @@ dev=/dev/vboxguest userdev=/dev/vboxuser + config=/var/lib/VBoxGuestAdditions/config -owner=vboxadd -group=1 test_for_gcc_and_make() { -@@ -256,12 +258,6 @@ do_vboxguest_non_udev() +@@ -250,12 +249,6 @@ fail "Cannot create device $dev with major $maj and minor $min" } fi @@ -47,7 +39,7 @@ if [ ! -c $userdev ]; then maj=10 -@@ -272,12 +268,6 @@ do_vboxguest_non_udev() +@@ -266,12 +259,6 @@ rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } @@ -60,43 +52,26 @@ fi fi } -@@ -308,8 +298,7 @@ start() - do_vboxguest_non_udev;; - esac - -- if [ -n "$BUILDVBOXSF" ]; then -- running_vboxsf || { -+ running_vboxsf || { - $MODPROBE vboxsf > /dev/null 2>&1 || { - if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then - fail_msg -@@ -319,8 +308,7 @@ start() - fi - fail "modprobe vboxsf failed" - } -- } -- fi -+ } - - # Mount all shared folders from /etc/fstab. Normally this is done by some - # other startup script but this requires the vboxdrv kernel module loaded. -@@ -337,10 +325,8 @@ stop() - if ! umount -a -t vboxsf 2>/dev/null; then - fail "Cannot unmount vboxsf folders" - fi -- if [ -n "$BUILDVBOXSF" ]; then -- if running_vboxsf; then -- rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf" -- fi -+ if running_vboxsf; then -+ rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf" - fi - if running_vboxguest; then - rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" -@@ -500,16 +486,8 @@ extra_setup() +@@ -483,32 +470,6 @@ # setup_script setup() { +- if test -r $config; then +- . $config +- else +- fail "Configuration file $config not found" +- fi +- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || +- fail "Configuration file $config not complete" +- export BUILD_TYPE +- export USERNAME +- +- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER" +- BUILDINTMP="$MODULE_SRC/build_in_tmp" +- DODKMS="$MODULE_SRC/do_dkms" +- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1 +- chcon -t bin_t "$DODKMS" > /dev/null 2>&1 +- - setup_modules - mod_succ="$?" - extra_setup @@ -107,8 +82,6 @@ - start - fi - fi -+ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged." -+ succ_msg } # cleanup_script ++++++ vbox-vboxdrv-init-script.diff --- vbox-vboxdrv-init-script.diff +++ vbox-vboxdrv-init-script.diff @@ -1,24 +1,7 @@ -Index: src/VBox/Installer/linux/vboxdrv.sh.in -=================================================================== ---- src/VBox/Installer/linux/vboxdrv.sh.in.orig -+++ src/VBox/Installer/linux/vboxdrv.sh.in -@@ -19,11 +19,12 @@ - # - ### BEGIN INIT INFO - # Provides: vboxdrv --# Required-Start: $syslog --# Required-Stop: --# Default-Start: 2 3 4 5 -+# Required-Start: $syslog $remote_fs -+# Required-Stop: $syslog $remote_fs -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # Short-Description: VirtualBox Linux kernel module -+# Description: VirtualBox Linux kernel module - ### END INIT INFO - - PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH -@@ -195,13 +196,6 @@ start() +diff -Naur VirtualBox-4.2.4-orig/src/VBox/Installer/linux/vboxdrv.sh.in VirtualBox-4.2.4/src/VBox/Installer/linux/vboxdrv.sh.in +--- VirtualBox-4.2.4-orig/src/VBox/Installer/linux/vboxdrv.sh.in 2012-10-29 21:58:09.000000000 +0200 ++++ VirtualBox-4.2.4/src/VBox/Installer/linux/vboxdrv.sh.in 2012-10-29 21:59:31.337352017 +0200 +@@ -193,13 +193,6 @@ fi fi # ensure permissions @@ -32,14 +15,17 @@ if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi -@@ -299,58 +293,8 @@ stop_vms() +@@ -297,70 +290,8 @@ # setup_script setup() { - stop -- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" -- $DODKMS uninstall > $LOG -- succ_msg +- DKMS=`which dkms 2>/dev/null` +- if [ -n "$DKMS" ]; then +- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" +- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG +- succ_msg +- fi - if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then - begin_msg "Removing old VirtualBox pci kernel module" - find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null @@ -60,27 +46,36 @@ - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi -- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" -- if ! $DODKMS install >> $LOG; then -- fail_msg "Failed, trying without DKMS" +- if [ -n "$DKMS" ]; then +- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" +- if ! $DODKMS install vboxhost $VERSION >> $LOG; then +- fail_msg "Failed, trying without DKMS" +- DKMS="" +- fi +- fi +- if [ -z "$DKMS" ]; then - begin_msg "Recompiling VirtualBox kernel modules" -- if ! $BUILDVBOXDRV \ +- if ! $BUILDINTMP \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxdrv" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi -- if ! $BUILDVBOXNETFLT \ +- if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetflt" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi -- if ! $BUILDVBOXNETADP \ +- if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetadp" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi -- if ! $BUILDVBOXPCI \ +- if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxpci" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi ++++++ virtualbox-4.2.4-UserManual.pdf (new) --- virtualbox-4.2.4-UserManual.pdf +++ virtualbox-4.2.4-UserManual.pdf @@ -0,0 +1,52686 @@ +%PDF-1.4 +%ÐÔÅØ +1 0 obj +<< /S /GoTo /D (chapter.1) >> +endobj +4 0 obj +(1 First steps) +endobj +5 0 obj +<< /S /GoTo /D (section.1.1) >> +endobj +8 0 obj +(1.1 Why is virtualization useful?) +endobj +9 0 obj +<< /S /GoTo /D (section.1.2) >> +endobj +12 0 obj +(1.2 Some terminology) +endobj +13 0 obj +<< /S /GoTo /D (section.1.3) >> +endobj +16 0 obj +(1.3 Features overview) +endobj +17 0 obj +<< /S /GoTo /D (section.1.4) >> +endobj +20 0 obj +(1.4 Supported host operating systems) +endobj +21 0 obj +<< /S /GoTo /D (section.1.5) >> +endobj +24 0 obj +(1.5 Installing VirtualBox and extension packs) +endobj +25 0 obj +<< /S /GoTo /D (section.1.6) >> +endobj +28 0 obj +(1.6 Starting VirtualBox) +endobj +29 0 obj +<< /S /GoTo /D (section.1.7) >> +endobj +32 0 obj +(1.7 Creating your first virtual machine) +endobj +33 0 obj +<< /S /GoTo /D (section.1.8) >> +endobj +36 0 obj +(1.8 Running your virtual machine) +endobj +37 0 obj +<< /S /GoTo /D (subsection.1.8.1) >> +endobj +40 0 obj +(1.8.1 Starting a new VM for the first time) +endobj +41 0 obj +<< /S /GoTo /D (subsection.1.8.2) >> +endobj +44 0 obj +(1.8.2 Capturing and releasing keyboard and mouse) +endobj +45 0 obj +<< /S /GoTo /D (subsection.1.8.3) >> +endobj +48 0 obj +(1.8.3 Typing special characters) +endobj +49 0 obj +<< /S /GoTo /D (subsection.1.8.4) >> +endobj +52 0 obj +(1.8.4 Changing removable media) +endobj +53 0 obj +<< /S /GoTo /D (subsection.1.8.5) >> +endobj +56 0 obj +(1.8.5 Resizing the machine's window) +endobj +57 0 obj +<< /S /GoTo /D (subsection.1.8.6) >> +endobj +60 0 obj +(1.8.6 Saving the state of the machine) +endobj +61 0 obj +<< /S /GoTo /D (section.1.9) >> +endobj +64 0 obj +(1.9 Snapshots) +endobj +65 0 obj +<< /S /GoTo /D (subsection.1.9.1) >> +endobj +68 0 obj +(1.9.1 Taking, restoring and deleting snapshots) +endobj +69 0 obj +<< /S /GoTo /D (subsection.1.9.2) >> +endobj +72 0 obj +(1.9.2 Snapshot contents) +endobj +73 0 obj +<< /S /GoTo /D (section.1.10) >> +endobj +76 0 obj +(1.10 Virtual machine configuration) +endobj +77 0 obj +<< /S /GoTo /D (section.1.11) >> +endobj +80 0 obj +(1.11 Removing virtual machines) +endobj +81 0 obj +<< /S /GoTo /D (section.1.12) >> +endobj +84 0 obj +(1.12 Cloning virtual machines) +endobj +85 0 obj +<< /S /GoTo /D (section.1.13) >> +endobj +88 0 obj +(1.13 Importing and exporting virtual machines) +endobj +89 0 obj +<< /S /GoTo /D (section.1.14) >> +endobj +92 0 obj +(1.14 Alternative front-ends) +endobj +93 0 obj +<< /S /GoTo /D (chapter.2) >> +endobj +96 0 obj +(2 Installation details) +endobj +97 0 obj +<< /S /GoTo /D (section.2.1) >> +endobj +100 0 obj +(2.1 Installing on Windows hosts) +endobj +101 0 obj +<< /S /GoTo /D (subsection.2.1.1) >> +endobj +104 0 obj +(2.1.1 Prerequisites) +endobj +105 0 obj +<< /S /GoTo /D (subsection.2.1.2) >> +endobj +108 0 obj +(2.1.2 Performing the installation) +endobj +109 0 obj +<< /S /GoTo /D (subsection.2.1.3) >> +endobj +112 0 obj +(2.1.3 Uninstallation) +endobj +113 0 obj +<< /S /GoTo /D (subsection.2.1.4) >> +endobj +116 0 obj +(2.1.4 Unattended installation) +endobj +117 0 obj +<< /S /GoTo /D (section.2.2) >> +endobj +120 0 obj +(2.2 Installing on Mac OS X hosts) +endobj +121 0 obj +<< /S /GoTo /D (subsection.2.2.1) >> +endobj +124 0 obj +(2.2.1 Performing the installation) +endobj +125 0 obj +<< /S /GoTo /D (subsection.2.2.2) >> +endobj +128 0 obj +(2.2.2 Uninstallation) +endobj +129 0 obj +<< /S /GoTo /D (subsection.2.2.3) >> +endobj +132 0 obj +(2.2.3 Unattended installation) (52487 more lines skipped) ++++++ virtualbox-4.2.4-rpmlintrc (new) --- virtualbox-4.2.4-rpmlintrc +++ virtualbox-4.2.4-rpmlintrc @@ -0,0 +1,3 @@ +addFilter("incoherent-init-script-name vboxdrv") +addFilter("incoherent-init-script-name vboxadd") +addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix") ++++++ deleted files: --- vbox-default-os-type.diff --- vbox-no-build-dates.diff --- vbox-permissions_warning.diff --- virtualbox-4.1.18-UserManual.pdf --- virtualbox-4.1.18-rpmlintrc --- virtualbox-kernel-3.6.patch
