forked from pool/virtualbox
- Reorder alignment of buildroot for various install commands so it
does not look so fuzzy OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=182
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
5b9cab96e9
commit
f854927ba3
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 6 15:40:52 UTC 2015 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Reorder alignment of buildroot for various install commands so it
|
||||||
|
does not look so fuzzy
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 20 11:10:16 UTC 2015 - tchvatal@suse.com
|
Mon Apr 20 11:10:16 UTC 2015 - tchvatal@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -361,7 +361,6 @@ install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls
|
|||||||
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
|
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
|
||||||
install -d -m 755 %{buildroot}%{_datadir}/applications
|
install -d -m 755 %{buildroot}%{_datadir}/applications
|
||||||
install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
|
install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
|
||||||
#%__install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/glue
|
|
||||||
install -d -m 755 %{buildroot}%{_vbox_instdir}/components
|
install -d -m 755 %{buildroot}%{_vbox_instdir}/components
|
||||||
install -d -m 755 %{buildroot}%{_libdir}/dri
|
install -d -m 755 %{buildroot}%{_libdir}/dri
|
||||||
install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers
|
install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers
|
||||||
@ -390,16 +389,11 @@ done
|
|||||||
###########################################
|
###########################################
|
||||||
echo "entering guest-tools install section"
|
echo "entering guest-tools install section"
|
||||||
###########################################
|
###########################################
|
||||||
install -m 755 out/linux.*/release/bin/additions/VBoxControl \
|
install -m 755 out/linux.*/release/bin/additions/VBoxControl %{buildroot}%{_bindir}/VBoxControl
|
||||||
%{buildroot}%{_bindir}/VBoxControl
|
install -m 755 out/linux.*/release/bin/additions/VBoxService %{buildroot}%{_bindir}/VBoxService
|
||||||
install -m 755 out/linux.*/release/bin/additions/VBoxService \
|
install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}/sbin/mount.vboxsf
|
||||||
%{buildroot}%{_bindir}/VBoxService
|
install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd
|
||||||
install -m 755 out/linux.*/release/bin/additions/mount.vboxsf \
|
ln -s %{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sbindir}/rcvboxadd
|
||||||
%{buildroot}/sbin/mount.vboxsf
|
|
||||||
install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh \
|
|
||||||
%{buildroot}%{_sysconfdir}/init.d/vboxadd
|
|
||||||
ln -s %{_sysconfdir}/init.d/vboxadd \
|
|
||||||
%{buildroot}%{_sbindir}/rcvboxadd
|
|
||||||
# udev rule for guest (virtualbox-guest-tools)
|
# udev rule for guest (virtualbox-guest-tools)
|
||||||
install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
|
install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
|
||||||
#
|
#
|
||||||
@ -409,21 +403,15 @@ echo "entering guest-x11 install section"
|
|||||||
pushd out/linux.*/release/bin/additions/
|
pushd out/linux.*/release/bin/additions/
|
||||||
#VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
#VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
||||||
install -m 755 VBoxClient %{buildroot}%{_bindir}
|
install -m 755 VBoxClient %{buildroot}%{_bindir}
|
||||||
# xorg drivers for mouse and videos check suse version to add propper driver
|
# xorg drivers for video
|
||||||
# check the patch https://www.virtualbox.org/changeset/38784, regarding the
|
|
||||||
# dropped xorg mouse driver in >= 1130
|
|
||||||
|
|
||||||
%if 0%{?suse_version} > 1320
|
%if 0%{?suse_version} > 1320
|
||||||
install -m 755 vboxvideo_drv_117.so \
|
install -m 755 vboxvideo_drv_117.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||||
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
%endif
|
||||||
%else
|
%if 0%{?suse_version} == 1315
|
||||||
%if 0%{?suse_version} >= 1315
|
install -m 755 vboxvideo_drv_116.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||||
install -m 755 vboxvideo_drv_116.so \
|
|
||||||
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} == 1310
|
%if 0%{?suse_version} == 1310
|
||||||
install -m 755 vboxvideo_drv_114.so \
|
install -m 755 vboxvideo_drv_114.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||||
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
@ -433,8 +421,7 @@ install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
|
|||||||
# make link for dri lib
|
# make link for dri lib
|
||||||
ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
|
ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
|
||||||
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
||||||
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \
|
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
|
||||||
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
|
|
||||||
|
|
||||||
##############################################
|
##############################################
|
||||||
echo "entering virtualbox(-qt) install section"
|
echo "entering virtualbox(-qt) install section"
|
||||||
@ -443,27 +430,25 @@ echo "entering virtualbox(-qt) install section"
|
|||||||
pushd out/linux.*/release/bin
|
pushd out/linux.*/release/bin
|
||||||
install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir}
|
||||||
# create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
|
# create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
|
||||||
ln -s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
|
ln -s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
|
||||||
ln -s %{_vbox_instdir}/VBoxHeadless \
|
ln -s %{_vbox_instdir}/VBoxHeadless %{buildroot}%{_bindir}/VBoxHeadless
|
||||||
%{buildroot}%{_bindir}/VBoxHeadless
|
ln -s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
|
||||||
ln -s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
|
|
||||||
ln -s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
|
ln -s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
|
||||||
install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxPermissionMessage \
|
install -m 755 VBoxPermissionMessage %{buildroot}%{_vbox_instdir}
|
||||||
%{buildroot}%{_vbox_instdir}
|
|
||||||
install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
|
install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
|
install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
|
||||||
install -m 644 *.so %{buildroot}%{_vbox_instdir}
|
install -m 644 *.so %{buildroot}%{_vbox_instdir}
|
||||||
install -m 644 V*.gc %{buildroot}%{_vbox_instdir}
|
install -m 644 V*.gc %{buildroot}%{_vbox_instdir}
|
||||||
install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
|
install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
|
||||||
install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
|
install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
|
||||||
# install languages
|
# install languages
|
||||||
@ -471,13 +456,11 @@ install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
# install desktop file
|
# install desktop file
|
||||||
install -m 644 out/linux.*/release/bin/virtualbox.desktop \
|
install -m 644 out/linux.*/release/bin/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||||
%{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
||||||
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator'
|
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator'
|
||||||
|
|
||||||
# create a menu entry
|
# create a menu entry
|
||||||
install -m 644 out/linux.*/release/bin/VBox.png \
|
install -m 644 out/linux.*/release/bin/VBox.png %{buildroot}%{_datadir}/pixmaps/virtualbox.png
|
||||||
%{buildroot}%{_datadir}/pixmaps/virtualbox.png
|
|
||||||
# install udev rule for host (virtualbox)
|
# install udev rule for host (virtualbox)
|
||||||
install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
|
install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
|
||||||
# install config with session shutdown defs
|
# install config with session shutdown defs
|
||||||
@ -489,25 +472,20 @@ install -m 644 %{SOURCE9} %{buildroot}%{_bindir}/VirtualBox
|
|||||||
# TODO: some of this stuff breaks the fillup macros below?
|
# TODO: some of this stuff breaks the fillup macros below?
|
||||||
sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" \
|
sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" \
|
||||||
src/VBox/Installer/linux/vboxdrv.sh.in
|
src/VBox/Installer/linux/vboxdrv.sh.in
|
||||||
install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in \
|
install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in %{buildroot}%{_sysconfdir}/init.d/vboxdrv
|
||||||
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
|
ln -s %{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sbindir}/rcvboxdrv
|
||||||
ln -s %{_sysconfdir}/init.d/vboxdrv \
|
|
||||||
%{buildroot}%{_sbindir}/rcvboxdrv
|
|
||||||
# Init script to start virtual boxes during boot
|
# Init script to start virtual boxes during boot
|
||||||
install -m 755 %{SOURCE12} %{buildroot}%{_sysconfdir}/init.d/vboxes
|
install -m 755 %{SOURCE12} %{buildroot}%{_sysconfdir}/init.d/vboxes
|
||||||
ln -s %{_sysconfdir}/init.d/vboxes \
|
ln -s %{_sysconfdir}/init.d/vboxes %{buildroot}%{_sbindir}/rcvboxes
|
||||||
%{buildroot}%{_sbindir}/rcvboxes
|
|
||||||
# sysconfig file intended for vboxes script
|
# sysconfig file intended for vboxes script
|
||||||
install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
|
install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
|
||||||
install -m 640 %{SOURCE13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
|
install -m 640 %{SOURCE13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
|
||||||
|
|
||||||
# config file for vboxdrv script and vboxweb
|
# config file for vboxdrv script and vboxweb
|
||||||
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
|
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
|
||||||
echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > \
|
echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg
|
||||||
%{buildroot}%{_sysconfdir}/vbox/vbox.cfg
|
|
||||||
# install udev helper script for creating usb devices
|
# install udev helper script for creating usb devices
|
||||||
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
|
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_udevrulesdir}/../VBoxCreateUSBNode.sh
|
||||||
%{buildroot}%{_udevrulesdir}/../VBoxCreateUSBNode.sh
|
|
||||||
######################################################
|
######################################################
|
||||||
echo "entrering python-virtualbox install section"
|
echo "entrering python-virtualbox install section"
|
||||||
######################################################
|
######################################################
|
||||||
@ -536,16 +514,13 @@ cp out/linux.*/release/bin/sdk/bindings/VirtualBox.xidl %{buildroot}%{_vbox_inst
|
|||||||
echo "entering virtualbox-websrv install section"
|
echo "entering virtualbox-websrv install section"
|
||||||
######################################################
|
######################################################
|
||||||
pushd out/linux.*/release/bin
|
pushd out/linux.*/release/bin
|
||||||
install -m 755 vboxwebsrv %{buildroot}%{_vbox_instdir}
|
install -m 755 vboxwebsrv %{buildroot}%{_vbox_instdir}
|
||||||
install -m 755 webtest %{buildroot}%{_vbox_instdir}
|
install -m 755 webtest %{buildroot}%{_vbox_instdir}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" \
|
sed -i "s|%{NOLSB}%|yes|g;s|%{DEBIAN}%||g;s|%{PACKAGE}%|virtualbox|g" src/VBox/Installer/linux/vboxweb-service.sh
|
||||||
src/VBox/Installer/linux/vboxweb-service.sh
|
install -m 744 src/VBox/Installer/linux/vboxweb-service.sh %{buildroot}%{_sysconfdir}/init.d/vboxweb-service
|
||||||
install -m 744 src/VBox/Installer/linux/vboxweb-service.sh \
|
ln -s %{_sysconfdir}/init.d/vboxweb-service %{buildroot}%{_sbindir}/rcvboxweb-service
|
||||||
%{buildroot}%{_sysconfdir}/init.d/vboxweb-service
|
|
||||||
ln -s %{_sysconfdir}/init.d/vboxweb-service \
|
|
||||||
%{buildroot}%{_sbindir}/rcvboxweb-service
|
|
||||||
#
|
#
|
||||||
######################################################
|
######################################################
|
||||||
echo "entering virtualbox-guest-desktop-icons install section"
|
echo "entering virtualbox-guest-desktop-icons install section"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user