summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-21 15:31:46 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-21 15:31:57 +0300
commit0e2770ca218e5a902986a5ec9529c6a6877cacf1 (patch)
tree8ddaef8df38fe420fea652943c45e99135702574 /meta-openembedded/meta-oe/recipes-support/vboxguestdrivers
parente2375b556f8744dbfb57f561cfa7c6e67df63474 (diff)
downloadopenbmc-0e2770ca218e5a902986a5ec9529c6a6877cacf1.tar.xz
meta-openembedded: subtree update:ea8604a0e3..d0748372d2
Adrian Bunk (1): libnih: Remove Alexander Kanavin (3): sysprof: add a recipe from oe-core sysprof: update to 3.34.1 sysprof: fix ARM builds Andreas Müller (2): evolution-data-server: remove pythonnative from inherit fontforge: rework for python3 Diego Rondini (2): cups-filters: use libexecdir and cleanup cups-filters: upgrade 1.26.0 -> 1.26.2 Gianfranco Costamagna (2): websocketpp: refresh clang patch vboxguestdrivers: update to new version 6.1.2 Khem Raj (14): sysprof: avoid namesapace conflict with glibc headers jack: Use c++ compiler for programs which use c++ source files iozone3: Do not define prototype for pread64() libhugetlbfs: Fix missing file mode in create() API rdma-core: Use overloadable attribute with clang sysprof: Correct systemdunitdir location opencv: Tend for the compiler --param option rename in gcc10 grpc: Link with libatomic on powerpc ssiapi: Needs boost/ppc support fluentbit: Fix build on powerpc mozjs: extend --with-intl-api=build to ppc mpv: Disable lua support on powerpc packagegroup-meta-oe: Remove unbuildable recipes for ppc64le from rdeps opensc: Upgrade to 0.20.0 Mingde (Matthew) Zeng (2): byacc: upgrade 20191103 -> 20191125 keyutils: upgrade 1.6 -> 1.6.1 Peter Kjellerstedt (1): gitpkgv.bbclass: Add support for extending the supported tag formats S. Lockwood-Childs (1): lcov: geninfo needs another perl module Wang Mingyu (15): python3-cheetah: upgrade 3.2.3 -> 3.2.4 python3-coverage: 4.4.2 -> 5.0.2 python3-keras-applications: upgrade 1.0.6 -> 1.0.8 python3-keras-preprocessing: upgrade 1.0.5 -> 1.1.0 python3-more-itertools: 7.2.0 -> 8.1.0 python3-multidict: 4.5.2 -> 4.7.4 python3-ordered-set: 3.0.1 -> 3.1.1 python3-pulsectl: upgrade 18.12.5 -> 20.1.2 python-cmd2: upgrade 0.9.22 -> 0.9.23 python-engineio: upgrade 3.11.1 -> 3.11.2 python-javaobj-py3: upgrade 0.3.0 -> 0.4.0.1 python-kconfiglib: upgrade 10.42.0 -> 13.7.0 python-packaging: 19.2 -> 20.0 python-periphery: 2.0.0 -> 2.0.1 python-pyrsistent: upgrade 0.15.5 -> 0.15.7 William A. Kennington III via Openembedded-devel (1): cppzmq: bump to version 4.6.0 Yi Zhao (3): crda: fix UDEV_RULE_DIR open-vm-tools: fix build error with usrmerge feature multipath-tools: fix libudevdir Zang Ruochen (14): dhcpcd: upgrade 8.1.1 -> 8.1.5 fio: upgrade 3.16 -> 3.17 libencode-perl: upgrade 3.01 -> 3.02 zabbix: modify service file libmicrohttpd: upgrade 0.9.68 -> 0.9.69 libsass: upgrade 3.6.1 -> 3.6.3 pcsc-lite: upgrade 1.8.25 -> 1.8.26 python3-yarl: upgrade 1.3.0 -> 1.4.2 python3-wheel: upgrade 0.32.3 -> 0.33.6 python3-websockets: upgrade 8.0.2 -> 8.1 python-wcwidth: upgrade 0.1.7 -> 0.1.8 python-waitress: upgrade 1.4.1 -> 1.4.2 python-tqdm: upgrade 4.38.0 -> 4.41.1 python-supervisor: upgrade 4.0.2 -> 4.1.0 Change-Id: I2c394941fc3140bfeadcec3542cd72892fdcda6e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/vboxguestdrivers')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch77
-rw-r--r--meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb (renamed from meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.0.bb)5
2 files changed, 2 insertions, 80 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch
deleted file mode 100644
index bfba3332b..000000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.0.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb
index be18b10c6..62c2b509f 100644
--- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.0.bb
+++ b/meta-openembedded/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"