SOURCES: VirtualBox-configure.patch, VirtualBox-export_modules.patch (NEW) ...

lmasko lmasko at pld-linux.org
Thu Jan 22 17:17:46 CET 2009


Author: lmasko                       Date: Thu Jan 22 16:17:46 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Updated to 2.1.2. Compiles and works on i686 but spec probably needs some
  cleanups.

---- Files affected:
SOURCES:
   VirtualBox-configure.patch (1.15 -> 1.16) , VirtualBox-export_modules.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/VirtualBox-configure.patch
diff -u SOURCES/VirtualBox-configure.patch:1.15 SOURCES/VirtualBox-configure.patch:1.16
--- SOURCES/VirtualBox-configure.patch:1.15	Thu Dec 18 19:08:27 2008
+++ SOURCES/VirtualBox-configure.patch	Thu Jan 22 17:17:39 2009
@@ -1,9 +1,8 @@
-diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure
---- VirtualBox-2.0.0.orig/configure	2008-09-03 16:59:10.000000000 +0200
-+++ VirtualBox-2.0.0/configure	2008-09-04 20:04:52.000000000 +0200
-@@ -69,11 +69,7 @@
- INCPNG=""
+--- VirtualBox-2.1.2_OSE/configure.orig	2009-01-21 16:07:11.000000000 +0100
++++ VirtualBox-2.1.2_OSE/configure	2009-01-22 15:25:14.000000000 +0100
+@@ -94,11 +94,7 @@
  LIBPNG="-lpng"
+ PKGCONFIG="`which_wrapper pkg-config`"
  PYTHONDIR="/usr /usr/local"
 -QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3"
 -QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
@@ -13,7 +12,7 @@
  KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
  DEVDIR="`cd \`dirname $0\`; pwd`/tools"
  if [ -d "/lib/modules/`uname -r`/build" ]; then
-@@ -215,8 +211,8 @@
+@@ -219,8 +215,8 @@
    echo "compiling the following source file:" >> $LOG
    cat .tmp_src.cc >> $LOG
    echo "using the following command line:" >> $LOG
@@ -24,7 +23,7 @@
    if [ $? -ne 0 ]; then
      if [ -z "$4" ]; then
        echo
-@@ -1236,37 +1232,25 @@
+@@ -1208,37 +1204,25 @@
  }
  EOF
    found_qt=0
@@ -73,7 +72,7 @@
      if [ $? -ne 0 ]; then
        log_failure "not found"
        fail
-@@ -1343,21 +1327,19 @@
+@@ -1321,21 +1305,19 @@
  #endif
  }
  EOF
@@ -108,7 +107,7 @@
      fi
    fi
    if [ -n "$foundqt4" ]; then
-@@ -1375,7 +1375,7 @@
+@@ -1372,7 +1354,7 @@
              cnf_append "VBOX_WITH_QT4_SUN" "1"
            fi
            test_header "Qt4 devtools"
@@ -117,16 +116,16 @@
              if which_wrapper "$q/bin/moc" > /dev/null; then
                moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
                if [ $? -ne 0 ]; then
-@@ -1765,8 +1745,6 @@
+@@ -1796,8 +1778,6 @@
    --with-iasl=PATH         location of the iasl compiler [$IASL]
    --with-linux=DIR         Linux kernel source directory [$LINUX]
    --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
 -  --with-qt-dir=DIR        directory for Qt3 headers/libraries [$QT3DIR]
 -  --with-qt4-dir=DIR       directory for Qt4 headers/libraries [pkgconfig]
+   --with-gsoap-dir=PATH    directory for SOAP compiler (soapcpp2 and wsdl2h)
  
  Build type:
-   -d, --build-debug        build with debugging symbols and assertions
-@@ -1809,13 +1787,6 @@
+@@ -1838,13 +1818,6 @@
          exit 1
        fi
        ;;
@@ -137,6 +136,6 @@
 -      QT4DIR=`echo $option | cut -d'=' -f2`
 -      QT4DIR_PKGCONFIG=0
 -      ;;
-     --with-iasl=*)
-       IASL=`echo $option | cut -d'=' -f2`
+     --with-gsoap-dir=*)
+       GSOAP=`echo $option | cut -d'=' -f2`
        ;;

================================================================
Index: SOURCES/VirtualBox-export_modules.patch
diff -u /dev/null SOURCES/VirtualBox-export_modules.patch:1.1
--- /dev/null	Thu Jan 22 17:17:47 2009
+++ SOURCES/VirtualBox-export_modules.patch	Thu Jan 22 17:17:40 2009
@@ -0,0 +1,96 @@
+--- /dev/null	2009-01-22 12:52:06.498125436 +0100
++++ VirtualBox-2.1.0/src/VBox/HostDrivers/Support/linux/export_modules	2008-09-01 14:23:30.000000000 +0200
+@@ -0,0 +1,93 @@
++#!/bin/sh
++
++#
++# Create a tar archive containing the sources of the vboxdrv kernel module
++#
++# Copyright (C) 2007 Sun Microsystems, Inc.
++#
++# This file is part of VirtualBox Open Source Edition (OSE), as
++# available from http://www.virtualbox.org. This file is free software;
++# you can redistribute it and/or modify it under the terms of the GNU
++# General Public License (GPL) as published by the Free Software
++# Foundation, in version 2 as it comes in the "COPYING" file of the
++# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
++# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
++#
++# The contents of this file may alternatively be used under the terms
++# of the Common Development and Distribution License Version 1.0
++# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
++# VirtualBox OSE distribution, in which case the provisions of the
++# CDDL are applicable instead of those of the GPL.
++#
++# You may elect to license modified versions of this file under the
++# terms and conditions of either the GPL or the CDDL or both.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
++# Clara, CA 95054 USA or visit http://www.sun.com if you need
++# additional information or have any questions.
++#
++
++if [ -z "$1" ]; then
++    echo "Usage: $0 <filename.tar.gz> [--without-hardening]"
++    echo "  Export VirtualBox kernel modules to <filename.tar.gz>"
++    exit 1
++fi
++
++VBOX_WITH_HARDENING=1
++if [ "$2" = "--without-hardening" ]; then
++    VBOX_WITH_HARDENING=
++fi
++
++PATH_TMP="`cd \`dirname $1\`; pwd`/.vbox_modules"
++PATH_OUT=$PATH_TMP
++FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
++PATH_ROOT="`cd \`dirname $0\`/../../../../..; pwd`"
++PATH_VBOXDRV="$PATH_ROOT/src/VBox/HostDrivers/Support"
++
++VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
++VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
++VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
++VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
++
++. $PATH_VBOXDRV/linux/files_vboxdrv
++
++# Temporary path for creating the modules, will be removed later
++mkdir $PATH_TMP || exit 1
++
++# Create auto-generated version file, needed by all modules
++echo "#ifndef __version_generated_h__" > $PATH_TMP/version-generated.h
++echo "#define __version_generated_h__" >> $PATH_TMP/version-generated.h
++echo "" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_MAJOR $VBOX_VERSION_MAJOR" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_MINOR $VBOX_VERSION_MINOR" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_BUILD $VBOX_VERSION_BUILD" >> $PATH_TMP/version-generated.h
++echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_STRING\"" >> $PATH_TMP/version-generated.h
++echo "" >> $PATH_TMP/version-generated.h
++echo "#endif" >> $PATH_TMP/version-generated.h
++
++# vboxdrv (VirtualBox host kernel module)
++mkdir $PATH_TMP/vboxdrv || exit 1
++for f in $FILES_VBOXDRV_NOBIN; do
++    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxdrv/`echo $f|cut -d'>' -f2`"
++done
++for f in $FILES_VBOXDRV_BIN; do
++    install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxdrv/`echo $f|cut -d'>' -f2`"
++done
++sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/build_in_tmp > $PATH_TMP/vboxdrv/build_in_tmp
++chmod 0755 $PATH_TMP/vboxdrv/build_in_tmp
++sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/dkms.conf > $PATH_TMP/vboxdrv/dkms.conf
++if [ -n "$VBOX_WITH_HARDENING" ]; then
++    cat                                   $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
++else
++    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
++fi
++
++# Only temporary, omit from archive
++rm $PATH_TMP/version-generated.h
++
++# Create the archive
++tar -czf $FILE_OUT -C $PATH_TMP . || exit 1
++
++# Remove the temporary directory
++rm -r $PATH_TMP
++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/VirtualBox-configure.patch?r1=1.15&r2=1.16&f=u



More information about the pld-cvs-commit mailing list