From 825243edacef4dcdfa55ae49990b84b1b8a746a9 Mon Sep 17 00:00:00 2001 From: milisbir Date: Tue, 10 Jul 2018 17:39:56 +0200 Subject: [PATCH] vbox --- ...lbox.60-vboxdrv.rules => 60-vboxdrv.rules} | 0 .../genel/v/virtualbox/60-vboxguest.rules | 2 + .../genel/v/virtualbox/LocalConfig.kmk | 25 +++ .../genel/v/virtualbox/driver-path.patch | 30 ++++ .../genel/v/virtualbox/include-path.patch | 43 +++++ talimatname/genel/v/virtualbox/talimat | 147 ++++++++++++------ .../genel/v/virtualbox/virtualbox.kur-kos | 13 -- .../genel/v/virtualbox/virtualbox.okubeni | 13 -- 8 files changed, 199 insertions(+), 74 deletions(-) rename talimatname/genel/v/virtualbox/{virtualbox.60-vboxdrv.rules => 60-vboxdrv.rules} (100%) create mode 100644 talimatname/genel/v/virtualbox/60-vboxguest.rules create mode 100644 talimatname/genel/v/virtualbox/LocalConfig.kmk create mode 100644 talimatname/genel/v/virtualbox/driver-path.patch create mode 100644 talimatname/genel/v/virtualbox/include-path.patch delete mode 100644 talimatname/genel/v/virtualbox/virtualbox.kur-kos delete mode 100644 talimatname/genel/v/virtualbox/virtualbox.okubeni diff --git a/talimatname/genel/v/virtualbox/virtualbox.60-vboxdrv.rules b/talimatname/genel/v/virtualbox/60-vboxdrv.rules similarity index 100% rename from talimatname/genel/v/virtualbox/virtualbox.60-vboxdrv.rules rename to talimatname/genel/v/virtualbox/60-vboxdrv.rules diff --git a/talimatname/genel/v/virtualbox/60-vboxguest.rules b/talimatname/genel/v/virtualbox/60-vboxguest.rules new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/talimatname/genel/v/virtualbox/60-vboxguest.rules @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/talimatname/genel/v/virtualbox/LocalConfig.kmk b/talimatname/genel/v/virtualbox/LocalConfig.kmk new file mode 100644 index 000000000..1ff5cf13e --- /dev/null +++ b/talimatname/genel/v/virtualbox/LocalConfig.kmk @@ -0,0 +1,25 @@ +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_VALIDATIONKIT = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox +VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /opt/jdk + +VBOX_GCC_WERR = +VBOX_GCC_WARN = + +VBOX_USE_SYSTEM_XORG_HEADERS = 1 +VBOX_NO_LEGACY_XORG_X11 = 1 +VBOX_USE_SYSTEM_GL_HEADERS=1 + +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_WEBSERVICES = +VBOX_WITH_WEBSERVICES_SSL = + diff --git a/talimatname/genel/v/virtualbox/driver-path.patch b/talimatname/genel/v/virtualbox/driver-path.patch new file mode 100644 index 000000000..26b7f3f65 --- /dev/null +++ b/talimatname/genel/v/virtualbox/driver-path.patch @@ -0,0 +1,30 @@ +diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +index 92b4ffc..1a1c467 100644 +--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +@@ -56,24 +56,8 @@ typedef enum { + + //#define DEBUG_DRI_CALLS + +-/// @todo this could be different... +-#ifdef RT_ARCH_AMD64 +-# ifdef RT_OS_FREEBSD +-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri" +-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" +-# else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-# endif +-#else +-# ifdef RT_OS_FREEBSD +-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri" +-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" +-# else +-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-# endif +-#endif + + #ifdef DEBUG_DRI_CALLS + #define SWDRI_SHOWNAME(pext, func) \ diff --git a/talimatname/genel/v/virtualbox/include-path.patch b/talimatname/genel/v/virtualbox/include-path.patch new file mode 100644 index 000000000..0d5cb6d2d --- /dev/null +++ b/talimatname/genel/v/virtualbox/include-path.patch @@ -0,0 +1,43 @@ +Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk +=================================================================== +--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200 ++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200 +@@ -67,18 +67,12 @@ + VBoxOGL_INCS = . + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_INCS += \ +- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ +- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ +- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ +- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ +- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ +- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ +- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ +- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ +- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ +- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(VBOX_MESA_INCS) \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 ++ /usr/include/drm \ ++ /usr/include/libdrm + VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + +@@ -213,10 +207,10 @@ + + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_LIBS += \ +- $(PATH_STAGE_LIB)/libXcomposite.so \ +- $(PATH_STAGE_LIB)/libXdamage.so \ +- $(PATH_STAGE_LIB)/libXfixes.so \ +- $(PATH_STAGE_LIB)/libXext.so ++ Xcomposite \ ++ Xdamage \ ++ Xfixes \ ++ Xext + ifdef VBoxOGL_FAKEDRI + ifeq ($(KBUILD_TARGET), freebsd) + VBoxOGL_LIBS += \ diff --git a/talimatname/genel/v/virtualbox/talimat b/talimatname/genel/v/virtualbox/talimat index d7e25f18a..6405617ea 100644 --- a/talimatname/genel/v/virtualbox/talimat +++ b/talimatname/genel/v/virtualbox/talimat @@ -1,58 +1,109 @@ # Tanım: VirtualBox, güçlü bir 32 ve 64 bit sanallaştırma ürünüdür # URL: http://virtualbox.org # Paketçi: milisarge -# Gerekler: virtualbox-cli sdl +# Gerekler: libidl acpica alsa-lib cdrkit xorg-glu openjdk libidl libvncserver libvpx xorg-libxcomposite xorg-libxcursor xorg-libxinerama libxml2 xorg-libxmu xorg-libxrandr libxslt xorg-libxtst xorg-mesa pulseaudio python qt5 sdl sdl-ttf xorg-proto xf86-input-mouse xorg-server yasm +# Grup: sistem isim=virtualbox -surum=5.0.12 +surum=5.2.14 devir=1 -_isim=Oracle_VM_VirtualBox_Extension_Pack -_devir=104815 - -DOSYAIZLEME_YOKSAY="evet" -MD5SUM_YOKSAY="evet" - - -[ "`uname -m`" == "i686" ] && _ARCH=x86 -[ "`uname -m`" == "x86_64" ] && _ARCH=amd64 - -kaynak=(http://download.virtualbox.org/virtualbox/$surum/VirtualBox-${surum}-${_release}-Linux_${_ARCH}.run - http://download.virtualbox.org/virtualbox/$surum/${_name}-${surum}-${_release}.vbox-extpack - virtualbox.60-vboxdrv.rules) +kaynak=(https://download.virtualbox.org/virtualbox/${surum}/VirtualBox-${surum}.tar.bz2 + 60-vboxdrv.rules + 60-vboxguest.rules + LocalConfig.kmk + driver-path.patch + include-path.patch) derle() { - sh VirtualBox-${surum}-${_release}-Linux_${_ARCH}.run --keep --noexec --target $SRC/ - mkdir -p $PKG/opt/VirtualBox $PKG/etc/vbox $PKG/usr/bin $PKG/etc/udev/rules.d/ \ - $PKG/usr/share/applications/ $PKG/usr/share/pixmaps/ - cd $PKG/opt/VirtualBox - tar xfj $SRC/VirtualBox.tar.bz2 - rm -Rf $PKG/opt/VirtualBox/sdk - for i in VirtualBox VBoxManage VBoxSDL VBoxHeadless - do ln -s /opt/VirtualBox/VBox.sh $PKG/usr/bin/$i - done - cd components - for i in VBoxDDU.so VBoxREM.so VBoxRT.so VBoxVMM.so VBoxXPCOM.so - do ln -s ../$i . - done - ln -s /opt/VirtualBox/rdesktop-vrdp $PKG/usr/bin/rdesktop-vrdp - mv $PKG/opt/VirtualBox/VBox.png $PKG/usr/share/pixmaps/VBox.png - mv $PKG/opt/VirtualBox/virtualbox.desktop $PKG/usr/share/applications/virtualbox.desktop - chmod +s $PKG/opt/VirtualBox/{VirtualBox,VBoxSDL,VBoxHeadless} + cd $SRC/VirtualBox-${surum} + patch -p1 -i ${SRC}/driver-path.patch + #patch -p1 -i ${SRC}/include-path.patch + #sed -i -e 's|/usr/X11R6/bin/xterm|/usr/X11R6/bin/xterm|' src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp + sed -i -e 's|X11R6/||' configure + #sed -i -e 's|CXX_FLAGS=""|CXX_FLAGS="-std=c++11"|' configure + sed -i -e 's|X11R6/||' Config.kmk + sed -i -e 's|.*&& check_makeself||' configure + sed -i -e 's|smc-napa|smcnapa|' src/VBox/Devices/PC/vbox.dsl + sed -i -e 's|$(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system|$(filter-out vboxvideo_drv_%,$(DLLS))|' src/VBox/Additions/x11/vboxvideo/Makefile.kmk + cp ${SRC}/LocalConfig.kmk . + sed -i 's/^check_gcc$/#check_gcc/' configure + echo "VBOX_GCC_OPT=$CXXFLAGS -I/usr/include/glib-2.0 " >> LocalConfig.kmk + + cd $SRC/VirtualBox-${surum} + + ./configure \ + --disable-docs \ + --disable-kmods \ + --disable-vmmraw \ + --enable-pulse \ + --enable-vde \ + --enable-vnc \ + --nofatal \ + --enable-qt5 + source ./env.sh + kmk KBUILD_VERBOSE=2 all - mkdir -p $PKG/etc/udev/rules.d - cp $SRC/virtualbox.60-vboxdrv.rules $PKG/etc/udev/rules.d/60-vboxdrv.rules - - echo "# VirtualBox installation directory" > \ - $PKG/etc/vbox/vbox.cfg - echo "INSTALL_DIR="\"/opt/VirtualBox\" >> \ - $PKG/etc/vbox/vbox.cfg - - install -D -m 644 $SRC/${_name}-$surum-${_release}.vbox-extpack \ - $PKG/opt/VirtualBox/ExtensionPacks/${_name}-$surum-${_release}.vbox-extpack - mkdir -p $PKG/etc/ld.so.conf.d - echo /opt/VirtualBox > $PKG/etc/ld.so.conf.d/virtualbox.conf - # Icon - ln -s VBox.png $PKG/usr/share/pixmaps/virtualbox.png - # Source code files obsolet - rm -r $PKG/opt/VirtualBox/src + source VirtualBox-${surum}/env.sh + cd $SRC/VirtualBox-${surum}/out/linux.amd64/release/bin + # ikililer + install -dm755 ${PKG}/usr/bin + install -m755 VBox.sh ${PKG}/usr/bin/VBox + for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox VBoxBalloonCtrl; do + ln -sf VBox ${PKG}/usr/bin/$i + ln -sf VBox ${PKG}/usr/bin/${i,,} + done + install -m755 VBoxTunctl ${PKG}/usr/bin + # kütüphaneler + install -dm755 ${PKG}/usr/lib/virtualbox + install -m755 *.so ${PKG}/usr/lib/virtualbox + install -m644 *.r0 VBoxEFI*.fd ${PKG}/usr/lib/virtualbox + ## kök dizin izinleri + install -m4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t ${PKG}/usr/lib/virtualbox + ## diğer ikililer + install -m755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl -t ${PKG}/usr/lib/virtualbox + # bileşenler + install -dm755 ${PKG}/usr/lib/virtualbox/components + install -m755 components/* -t ${PKG}/usr/lib/virtualbox/components + # ek paketler pasif şuan + #install -dm755 ${PKG}/usr/lib/virtualbox/ExtensionPacks + #install -m755 ExtensionPacks/* -t ${PKG}/usr/lib/virtualbox/ExtensionPacks + # dil desteği + install -dm755 ${PKG}/usr/share/virtualbox/nls + install -m755 nls/*.qm -t ${PKG}/usr/share/virtualbox/nls + # betikler + install -m755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t ${PKG}/usr/share/virtualbox + # simge seti + install -Dm644 VBox.png ${PKG}/usr/share/pixmaps/VBox.png + pushd icons >/dev/null + for i in *; do + install -d ${PKG}/usr/share/icons/hicolor/$i/mimetypes + cp $i/* ${PKG}/usr/share/icons/hicolor/$i/mimetypes + done + popd >/dev/null + # masaüstü + install -Dm644 virtualbox.desktop ${PKG}/usr/share/applications/virtualbox.desktop + install -Dm644 virtualbox.xml ${PKG}/usr/share/mime/packages/virtualbox.xml + # ayar dosyaları + install -dm755 ${PKG}/etc/vbox + echo 'INSTALL_DIR=/usr/lib/virtualbox' > ${PKG}/etc/vbox/vbox.cfg + install -dm755 ${PKG}/etc/ld.so.conf.d + echo '/usr/lib/virtualbox' > ${PKG}/etc/ld.so.conf.d/virtualbox.conf + cd ${SRC} + install -Dm644 VirtualBox-${surum}/COPYING ${PKG}/usr/share/licenses/$isim/LICENSE + # udev kuralları + install -Dm644 60-vboxdrv.rules ${PKG}/usr/lib/udev/rules.d/60-vboxdrv.rules + # ekler + pushd VirtualBox-${surum}/out/linux.amd64/release/bin/additions + install -d ${PKG}/usr/bin + install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf ${PKG}/usr/bin + install -m755 -D ${SRC}/VirtualBox-${surum}/src/VBox/Additions/x11/Installer/98vboxadd-xclient ${PKG}/usr/bin/VBoxClient-all + install -m755 -D ${SRC}/VirtualBox-${surum}/src/VBox/Additions/x11/Installer/vboxclient.desktop ${PKG}/etc/xdg/autostart/vboxclient.desktop + #install -D vboxvideo_drv_system.so ${PKG}/usr/lib/xorg/modules/drivers/vboxvideo.so + install -d ${PKG}/usr/lib/xorg/modules/dri + install -m755 VBoxOGL*.so ${PKG}/usr/lib + ln -s /usr/lib/VBoxOGL.so ${PKG}/usr/lib/xorg/modules/dri/vboxvideo_dri.so + install -m755 -D pam_vbox.so ${PKG}/usr/lib/security/pam_vbox.so + popd + install -Dm644 60-vboxguest.rules ${PKG}/usr/lib/udev/rules.d/60-vboxguest.rules + # servis dosyası eklenebilir- serkur ile de kurulabilir. } diff --git a/talimatname/genel/v/virtualbox/virtualbox.kur-kos b/talimatname/genel/v/virtualbox/virtualbox.kur-kos deleted file mode 100644 index 0dd5c32c5..000000000 --- a/talimatname/genel/v/virtualbox/virtualbox.kur-kos +++ /dev/null @@ -1,13 +0,0 @@ -echo "For USB 2.0 facility, on the console: - -# VBoxManage extpack install /opt/VirtualBox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack-* - -To remove USB 2.0 Oracle extensions before an update: - -# VBoxManage list extpacks -# VBoxManage extpack uninstall "Oracle VM VirtualBox Extension Pack" -# VBoxManage extpack cleanup - -Then you can install the new version as above. No need to reboot. - -Enjoy it :)" diff --git a/talimatname/genel/v/virtualbox/virtualbox.okubeni b/talimatname/genel/v/virtualbox/virtualbox.okubeni deleted file mode 100644 index c877dd8a9..000000000 --- a/talimatname/genel/v/virtualbox/virtualbox.okubeni +++ /dev/null @@ -1,13 +0,0 @@ -For USB 2.0 facility, on the console: - -# VBoxManage extpack install /opt/VirtualBox/ExtensionPacks/Oracle_VM_VirtualBox_Extension_Pack-* - -To remove USB 2.0 Oracle extensions before an update: - -# VBoxManage list extpacks -# VBoxManage extpack uninstall "Oracle VM VirtualBox Extension Pack" -# VBoxManage extpack cleanup - -Then you can install the new version as above. No need to reboot. - -Enjoy it :)