Initial commit
This commit is contained in:
Your Name
+45
@@ -0,0 +1,45 @@
|
||||
## -----------------------------------------------------------------------
|
||||
##
|
||||
## Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
|
||||
##
|
||||
## This program is free software; you can redistribute it and/or modify
|
||||
## it under the terms of the GNU General Public License as published by
|
||||
## the Free Software Foundation, Inc., 53 Temple Place Ste 330,
|
||||
## Boston MA 02111-1307, USA; either version 2 of the License, or
|
||||
## (at your option) any later version; incorporated herein by reference.
|
||||
##
|
||||
## -----------------------------------------------------------------------
|
||||
|
||||
INCLUDES = -I. -I../vboxsf -I../vboxsf/include
|
||||
MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
|
||||
-DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0
|
||||
CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS}
|
||||
LDFLAGS =
|
||||
|
||||
SRCS = mount.vboxsf.c \
|
||||
vbsfmount.c
|
||||
|
||||
OBJS = $(patsubst %.c,%.o,$(notdir $(SRCS)))
|
||||
|
||||
.SUFFIXES: .c .o .i .s .S
|
||||
|
||||
|
||||
all: mount.vboxsf
|
||||
|
||||
clean:
|
||||
-rm -f *.o mount.vboxsf
|
||||
|
||||
spotless: clean
|
||||
-rm -f *~
|
||||
|
||||
mount.vboxsf: $(OBJS)
|
||||
$(CC) $(LDFLAGS) -o $@ $^
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $<
|
||||
%.i: %.c
|
||||
$(CC) $(UMAKEDEPS) $(CFLAGS) -E -o $@ $<
|
||||
%.s: %.c
|
||||
$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
|
||||
|
||||
-include .*.d *.tmp
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
Initial support for kernel 6.4
|
||||
https://www.virtualbox.org/changeset/99666/vbox
|
||||
|
||||
Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch]
|
||||
|
||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
|
||||
--- a/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
@@ -75,4 +75,11 @@
|
||||
#if RTLNX_VER_MAX(2,5,12)
|
||||
# define PageUptodate(a_pPage) Page_Uptodate(a_pPage)
|
||||
+#endif
|
||||
+
|
||||
+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */
|
||||
+#if RTLNX_VER_MIN(6,4,0)
|
||||
+# define VBOX_ITER_IOV(_iter) iter_iov(_iter)
|
||||
+#else
|
||||
+# define VBOX_ITER_IOV(_iter) iter->iov
|
||||
#endif
|
||||
|
||||
@@ -2400,5 +2407,5 @@
|
||||
if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
|
||||
# endif
|
||||
- const struct iovec *pCurIov = iter->iov;
|
||||
+ const struct iovec *pCurIov = VBOX_ITER_IOV(iter);
|
||||
size_t cLeft = iter->nr_segs;
|
||||
size_t cPagesSpan = 0;
|
||||
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
Initial support for kernel 6.4
|
||||
https://www.virtualbox.org/changeset/99667/vbox
|
||||
|
||||
|
||||
Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch]
|
||||
|
||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
||||
|
||||
--- a/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
@@ -77,11 +77,4 @@
|
||||
#endif
|
||||
|
||||
-/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */
|
||||
-#if RTLNX_VER_MIN(6,4,0)
|
||||
-# define VBOX_ITER_IOV(_iter) iter_iov(_iter)
|
||||
-#else
|
||||
-# define VBOX_ITER_IOV(_iter) iter->iov
|
||||
-#endif
|
||||
-
|
||||
|
||||
/*********************************************************************************************************************************
|
||||
@@ -94,4 +87,12 @@
|
||||
#else
|
||||
# define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type)
|
||||
+#endif
|
||||
+
|
||||
+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field
|
||||
+ * of struct iov_iter. */
|
||||
+#if RTLNX_VER_MIN(6,4,0)
|
||||
+# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter)
|
||||
+#else
|
||||
+# define VBSF_GET_ITER_IOV(_iter) iter->iov
|
||||
#endif
|
||||
|
||||
@@ -2407,5 +2408,5 @@
|
||||
if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) {
|
||||
# endif
|
||||
- const struct iovec *pCurIov = VBOX_ITER_IOV(iter);
|
||||
+ const struct iovec *pCurIov = VBSF_GET_ITER_IOV(iter);
|
||||
size_t cLeft = iter->nr_segs;
|
||||
size_t cPagesSpan = 0;
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
SUMMARY = "VirtualBox Linux Guest Drivers"
|
||||
SECTION = "core"
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e"
|
||||
|
||||
DEPENDS = "virtual/kernel"
|
||||
|
||||
inherit module kernel-module-split
|
||||
|
||||
COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
|
||||
|
||||
VBOX_NAME = "VirtualBox-${PV}"
|
||||
|
||||
SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
|
||||
file://Makefile.utils \
|
||||
file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch \
|
||||
file://virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "c305fbe480f507eac7c36893ead66dffaacda944f19c3813a4533e9c39bae237"
|
||||
|
||||
S ?= "${WORKDIR}/vbox_module"
|
||||
S:task-patch = "${WORKDIR}/${VBOX_NAME}"
|
||||
|
||||
export VBOX_KBUILD_TARGET_ARCH="${ARCH}"
|
||||
export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64"
|
||||
|
||||
EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1"
|
||||
|
||||
# otherwise 5.2.22 builds just vboxguest
|
||||
MAKE_TARGETS = "all"
|
||||
|
||||
addtask export_sources after do_patch before do_configure
|
||||
do_export_sources[depends] += "virtual/kernel:do_shared_workdir"
|
||||
|
||||
do_export_sources() {
|
||||
mkdir -p "${S}"
|
||||
${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz
|
||||
tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz
|
||||
|
||||
# add a mount utility to use shared folder from VBox Addition Source Code
|
||||
mkdir -p "${S}/utils"
|
||||
install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils
|
||||
install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils
|
||||
install ${S}/../Makefile.utils ${S}/utils/Makefile
|
||||
|
||||
# some kernel versions have issues with stdarg.h and compatibility with
|
||||
# the sysroot and libc-headers/uapi. If we include the file directly from
|
||||
# the kernel source (STAGING_KERNEL_DIR) we get conflicting types on many
|
||||
# structures, due to kernel .h files being found before libc .h files.
|
||||
# if we grab just this one file from the source, and put it into our
|
||||
# file structure, everything holds together
|
||||
mkdir -p ${S}/vboxsf/include/linux
|
||||
install ${STAGING_KERNEL_DIR}/include/linux/stdarg.h ${S}/vboxsf/include/linux
|
||||
}
|
||||
|
||||
do_configure:prepend() {
|
||||
# vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop.
|
||||
# vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop.
|
||||
mkdir -p ${WORKDIR}/${KERNEL_VERSION}
|
||||
ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
|
||||
}
|
||||
|
||||
# compile and install mount utility
|
||||
do_compile() {
|
||||
oe_runmake all
|
||||
oe_runmake 'LD=${CC}' 'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
|
||||
if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then
|
||||
echo "ERROR: One of vbox*.ko modules wasn't built"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
module_do_install() {
|
||||
MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc
|
||||
install -d $MODULE_DIR
|
||||
install -m 644 vboxguest.ko $MODULE_DIR
|
||||
install -m 644 vboxsf.ko $MODULE_DIR
|
||||
install -m 644 vboxvideo.ko $MODULE_DIR
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${base_sbindir}
|
||||
install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir}
|
||||
}
|
||||
|
||||
PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo"
|
||||
RRECOMMENDS:${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo"
|
||||
|
||||
FILES:${PN} = "${base_sbindir}"
|
||||
|
||||
# autoload if installed
|
||||
KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo"
|
||||
Reference in New Issue
Block a user