diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2020-01-15 17:44:46 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-15 20:54:22 -0800 |
commit | df61601333bf2fc8cb003f14e440a7de1582fd82 (patch) | |
tree | 392996cd6960295339700af4646ec720425c292e /meta-oe/recipes-support/vboxguestdrivers | |
parent | 761ab1f701f0cf7e165a51a04ba85ec8c9dd4d64 (diff) | |
download | meta-openembedded-df61601333bf2fc8cb003f14e440a7de1582fd82.tar.gz |
vboxguestdrivers: update to new version 6.1.2
drop export.patch, now part of upstream codebase
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/vboxguestdrivers')
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch | 77 | ||||
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb (renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.0.bb) | 5 |
2 files changed, 2 insertions, 80 deletions
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch deleted file mode 100644 index bfba3332b0..0000000000 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: src/VBox/Additions/linux/export_modules.sh -=================================================================== ---- a/src/VBox/Additions/linux/export_modules.sh -+++ b/src/VBox/Additions/linux/export_modules.sh -@@ -46,7 +46,13 @@ - VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` - VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` - VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` --VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` -+VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` -+VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk` -+if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then -+ VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV -+else -+ VBOX_SVN_REV=$VBOX_SVN_VERSION_REV -+fi - VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` - VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` - VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` -Index: src/VBox/HostDrivers/linux/export_modules.sh -=================================================================== ---- a/src/VBox/HostDrivers/linux/export_modules.sh -+++ b/src/VBox/HostDrivers/linux/export_modules.sh -@@ -100,12 +100,26 @@ - VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` - VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` - VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD --VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_C_YEAR=`date +%Y` -+VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk` -+VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` -+VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk` -+if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then -+ VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV -+else -+ VBOX_SVN_REV=$VBOX_SVN_VERSION_REV -+fi -+VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` -+VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` -+VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` -+VBOX_C_YEAR=`date +%Y` -+VBOX_WITH_PCI_PASSTHROUGH=`sed -e "s/^ *VBOX_WITH_PCI_PASSTHROUGH *= *\(1\?\)/\1/;t;d" $PATH_ROOT/Config.kmk` - - . $PATH_VBOXDRV/linux/files_vboxdrv - . $PATH_VBOXNET/linux/files_vboxnetflt - . $PATH_VBOXADP/linux/files_vboxnetadp --. $PATH_VBOXPCI/linux/files_vboxpci -+if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then -+ . $PATH_VBOXPCI/linux/files_vboxpci -+fi - - # Temporary path for creating the modules, will be removed later - rm -rf "$PATH_TMP" -@@ -187,14 +201,16 @@ - fi - - # vboxpci (VirtualBox host PCI access kernel module) --mkdir $PATH_TMP/vboxpci || exit 1 --for f in $VBOX_VBOXPCI_SOURCES; do -- install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`" --done --if [ -n "$VBOX_WITH_HARDENING" ]; then -- cat $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile --else -- sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile -+if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then -+ mkdir $PATH_TMP/vboxpci || exit 1 -+ for f in $VBOX_VBOXPCI_SOURCES; do -+ install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`" -+ done -+ if [ -n "$VBOX_WITH_HARDENING" ]; then -+ cat $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile -+ else -+ sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile -+ fi - fi - - install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.0.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb index be18b10c66..62c2b509f5 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.0.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb @@ -13,10 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://export.patch;patchdir=${WORKDIR}/${VBOX_NAME} \ " -SRC_URI[md5sum] = "484b550f4692c9d61896b08bb0a1be7f" -SRC_URI[sha256sum] = "49005ed94454f893fc3955e1e2b9607e85c300235cb983b39d1df2cfcf29f039" +SRC_URI[md5sum] = "f4f42fd09857556b04b803fb99cc6905" +SRC_URI[sha256sum] = "4326576e8428ea3626194fc82646347576e94c61f11d412a669fc8a10c2a1e67" S = "${WORKDIR}/vbox_module" |