- Timestamp:
- Aug 26, 2010 2:03:20 PM (14 years ago)
- Location:
- trunk/debian
- Files:
-
- 6 edited
-
LocalConfig.kmk (modified) (2 diffs)
-
VBox.sh (modified) (2 diffs)
-
lintian-override.in (modified) (3 diffs)
-
postinst.in (modified) (6 diffs)
-
preinst.in (modified) (4 diffs)
-
rules (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/debian/LocalConfig.kmk
r28800 r31999 5 5 6 6 # 7 # Copyright (C) 2006-20 08Oracle Corporation7 # Copyright (C) 2006-2010 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 16 16 # 17 17 18 # shut up wine complaining about unknown locale19 EXEC_X86_WIN32 := wine20 21 18 # don't build testcases to save time, they are not needed for the package 22 19 VBOX_WITH_TESTCASES := 23 20 VBOX_WITH_TESTSUITE := 24 25 26 VBOX_WITH_HARDENING := 127 21 28 22 # required for VBOX_WITH_RUNPATH -
trunk/debian/VBox.sh
r29657 r31999 3 3 # Oracle VM VirtualBox 4 4 # 5 # Copyright (C) 2006-20 09Oracle Corporation5 # Copyright (C) 2006-2010 Oracle Corporation 6 6 # 7 7 # This file is part of VirtualBox Open Source Edition (OSE), as … … 89 89 exec "/usr/lib/virtualbox/VBoxHeadless" "$@" 90 90 ;; 91 vboxwebsrv) 92 exec "/usr/lib/virtualbox/vboxwebsrv" "$@" 93 ;; 91 94 *) 92 95 echo "Unknown application - $APP" -
trunk/debian/lintian-override.in
r20586 r31999 12 12 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedClipboard.so 13 13 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestPropSvc.so 14 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxGuestControlSvc.so 14 15 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so 15 16 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVRDP.so … … 46 47 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxSharedClipboard.so 47 48 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxGuestPropSvc.so 49 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxGuestControlSvc.so 48 50 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxVRDP.so 49 51 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VRDPAuth.so … … 54 56 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDbg.so /usr/lib/virtualbox 55 57 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestPropSvc.so /usr/lib/virtualbox 58 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxGuestControlSvc.so /usr/lib/virtualbox 56 59 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHeadless /usr/lib/virtualbox 57 60 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHeadless.so /usr/lib/virtualbox -
trunk/debian/postinst.in
r29657 r31999 12 12 # 13 13 14 # we can be called with the following arguments :14 # we can be called with the following arguments (6.5 of Debian policy): 15 15 # configure: (our version): installing/configuring new version 16 16 # abort-upgrade: (old version): upgrading to a new version failed … … 19 19 20 20 LOG="/var/log/vbox-install.log" 21 22 # defaults 23 [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox 21 24 22 25 if [ "$1" = "configure" ]; then … … 37 40 fi 38 41 39 # install udev rule 40 if [ -d /etc/udev/rules.d ]; then42 # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox) 43 if [ -d /etc/udev/rules.d -a "$INSTALL_NO_UDEV" != "1" ]; then 41 44 udev_call="" 42 45 udev_app=`which udevadm 2> /dev/null` … … 58 61 fi 59 62 echo "KERNEL=${udev_fix}\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"root\", MODE=\"0600\"" \ 60 > /etc/udev/rules.d/60-vboxdrv.rules 61 fi 62 63 # create users groups 64 db_input high virtualbox/group-vboxusers || true 65 db_go || true 66 addgroup --system vboxusers || true 67 68 if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then 63 > /etc/udev/rules.d/10-vboxdrv.rules 64 if [ "$INSTALL_NO_GROUP" != "1" ]; then 65 echo "SUBSYSTEM=${udev_fix}\"usb_device\", GROUP=\"vboxusers\", MODE=\"0664\"" \ 66 >> /etc/udev/rules.d/10-vboxdrv.rules 67 echo "SUBSYSTEM=${udev_fix}\"usb\", ENV{DEVTYPE}==\"usb_device\", GROUP=\"vboxusers\", MODE=\"0664\"" \ 68 >> /etc/udev/rules.d/10-vboxdrv.rules 69 else 70 echo "SUBSYSTEM=${udev_fix}\"usb_device\", GROUP=\"root\", MODE=\"0664\"" \ 71 >> /etc/udev/rules.d/10-vboxdrv.rules 72 echo "SUBSYSTEM=${udev_fix}\"usb\", ENV{DEVTYPE}==\"usb_device\", GROUP=\"root\", MODE=\"0664\"" \ 73 >> /etc/udev/rules.d/10-vboxdrv.rules 74 fi 75 fi 76 # Remove old udev description file 77 if [ -f /etc/udev/rules.d/60-vboxdrv.rules ]; then 78 rm -f /etc/udev/rules.d/60-vboxdrv.rules 2> /dev/null 79 fi 80 # Push the permissions to the USB device nodes. One of these should match. 81 # Rather nasty to use udevadm trigger for this, but I don't know of any 82 # better way. 83 udevadm trigger --subsystem-match=usb > /dev/null 2>&1 84 udevtrigger --subsystem-match=usb > /dev/null 2>&1 85 udevtrigger --subsystem-match=usb_device > /dev/null 2>&1 86 udevplug -Busb > /dev/null 2>&1 87 88 # create users groups (disable with INSTALL_NO_GROUP=1 in /etc/default/virtualbox) 89 if [ "$INSTALL_NO_GROUP" != "1" ]; then 90 db_input low virtualbox/group-vboxusers || true 91 db_go || true 92 addgroup --system vboxusers || true 93 fi 94 95 # try to build a kernel module (disable with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox) 96 REGISTER_DKMS=1 97 if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko -a "$INSTALL_NO_VBOXDRV" != "1" ]; then 69 98 db_get virtualbox/module-compilation-allowed 70 99 if [ "$RET" = "false" ]; then … … 74 103 EOF 75 104 else 76 db_input criticalvirtualbox/module-compilation-allowed || true105 db_input low virtualbox/module-compilation-allowed || true 77 106 db_go || true 78 107 db_get virtualbox/module-compilation-allowed … … 172 201 fi 173 202 203 # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules 204 if [ "$INSTALL_NO_VBOXDRV" = "1" ]; then 205 rm -f /lib/modules/*/misc/vboxdrv.ko 206 rm -f /lib/modules/*/misc/vboxnetflt.ko 207 rm -f /lib/modules/*/misc/vboxnetadp.ko 208 fi 209 174 210 fi # $1 = "configure" 175 211 -
trunk/debian/preinst.in
r29657 r31999 12 12 # 13 13 14 # we can be called with the following arguments :14 # we can be called with the following arguments (6.5 of Debian policy): 15 15 # install: (our version): install our version 16 16 # upgrade: (our version): upgrade to our version 17 17 # abort-upgrade: (old version): upgrade to a new version failed 18 19 # defaults 20 [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox 18 21 19 22 if [ "$1" = "install" -o "$1" = "upgrade" ]; then … … 26 29 if pidof VBoxSVC > /dev/null 2>&1; then 27 30 db_fset virtualbox/old-running seen false || true 28 db_input highvirtualbox/old-running || true31 db_input critical virtualbox/old-running || true 29 32 db_go || true 30 33 exit 1 … … 36 39 if [ "x$INSTALL_DIR" != "x" -a -d "$INSTALL_DIR" ]; then 37 40 db_fset virtualbox/old-installation-found seen false || true 38 db_input highvirtualbox/old-installation-found || true41 db_input critical virtualbox/old-installation-found || true 39 42 db_go || true 40 43 exit 1 … … 44 47 45 48 # check for old vboxdrv modules 46 if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then 47 # old modules found 48 db_get virtualbox/delete-old-modules || true 49 if [ "$RET" = "false" ]; then 50 cat << EOF 49 if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then 50 if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then 51 # old modules found 52 db_get virtualbox/delete-old-modules || true 53 if [ "$RET" = "false" ]; then 54 cat << EOF 51 55 Old vboxdrv kernel modules found in 52 56 EOF 53 find /lib/modules -name "vboxdrv\.*" 2>/dev/null|sed "s+\(.*\)+ \1+g"54 cat << EOF57 find /lib/modules -name "vboxdrv\.*" 2>/dev/null|sed "s+\(.*\)+ \1+g" 58 cat << EOF 55 59 Removing of these modules denied by debconf setting 56 60 EOF 57 else 58 db_input critical virtualbox/delete-old-modules || true 59 db_go || true 60 db_get virtualbox/delete-old-modules || true 61 if [ "$RET" = "true" ]; then 62 find /lib/modules -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null 63 find /lib/modules -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null 64 find /lib/modules -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null 61 else 62 db_input low virtualbox/delete-old-modules || true 63 db_go || true 64 db_get virtualbox/delete-old-modules || true 65 if [ "$RET" = "true" ]; then 66 find /lib/modules -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null 67 find /lib/modules -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null 68 find /lib/modules -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null 69 fi 65 70 fi 66 71 fi -
trunk/debian/rules
r29781 r31999 60 60 endif 61 61 62 # Hack: Xandros is actually Debian/sarge ... :( 63 ifneq ($(wildcard /etc/xandros-desktop-version),) 64 debrel := _xandros4.1 65 else 66 ifneq ($(wildcard /etc/univention),) 67 debrel := _ucs1.3 68 else 69 debrel := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown) 70 endif 71 endif 62 debrel := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown) 72 63 73 64 # shipping Linux kernel modules with bleeding-edge releases doesn't make sense 74 instmod := $(if $(filter _Ubuntu_ karmic_Debian_sid,$(debrel)),,1)65 instmod := $(if $(filter _Ubuntu_lucid _Debian_sid,$(debrel)),,1) 75 66 76 67 # Locations of custom built Qt libraries (see below) … … 80 71 cfg_flags := $(if $(NOQT),--disable-qt,) \ 81 72 $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \ 82 $(if $(filter _Ubuntu_dapper,$(debrel)),--with-gcc=gcc-3.4 --with-g++=g++-3.4,) \83 $(if $(filter _Ubuntu_gutsy,$(debrel)),--with-gcc=gcc-4.2 --with-g++=g++-4.2,) \84 $(if $(filter _xandros4.1 _ucs1.3 _Debian_sarge _Ubuntu_dapper,$(debrel)),--build-libxml2,) \85 $(if $(filter _xandros4.1 _ucs1.3 _Debian_sarge _Ubuntu_dapper,$(debrel)),--build-libxslt,) \86 73 $(if $(filter _Debian_etch,$(debrel)),$(if $(ose),,--build-libcurl),) \ 87 $(if $(filter _Debian_sarge _xandros4.1 _ucs1.3,$(debrel)),--with-qt4-dir=$(qtstdc5)) \ 88 $(if $(filter _Debian_etch _Ubuntu_dapper _Ubuntu_edgy _Ubuntu_feisty _Ubuntu_gutsy _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \ 89 $(if $(filter _xandros4.1 _ucs1.3,$(debrel)),--disable-sdl-ttf,) \ 90 $(if $(filter _Debian_sarge _Ubuntu_dapper _Ubuntu_edgy _xandros4.1 _ucs1.3,$(debrel)),--disable-pulse,) \ 74 $(if $(filter _Debian_etch _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \ 91 75 $(if $(HEADLESS),--build-headless,) \ 92 76 $(if $(DEBUG),--build-debug,) \ … … 105 89 $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \ 106 90 $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \ 107 $(if $(filter _Debian_sarge _xandros4.1 _ucs1.3,$(debrel)),VBOX_LD_as_needed= ,) \108 91 $(if $(filter _Debian_etch _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1) 109 92 110 # Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead111 # Ubuntu gutsy: gcc-4.1 does not work for the webservices, use gcc-4.2 instead112 93 configure: debian/configure-stamp 113 94 debian/configure-stamp: … … 126 107 . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \ 127 108 VBOX_NO_LINUX_RUN_INSTALLER=1 \ 128 VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \ 109 VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \ 110 VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \ 129 111 packing 130 112 touch debian/build-stamp … … 238 220 dh_installdocs \ 239 221 $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \ 240 LICENSE 241 rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm LICENSE) 222 $(addprefix $(archdir)/, $(if $(HEADLESS),,License-*.html) LICENSE) 223 rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \ 224 LICENSE $(if $(HEADLESS),,License-*.html)) 242 225 for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \ 243 226 mv $(archdir)/$$i $(prefix)/usr/share/$(package); done … … 263 246 $(if $(NOMODS),,dh_installmodules) 264 247 sed \ 265 -e 's|%NOLSB%| $(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g' \248 -e 's|%NOLSB%||g' \ 266 249 -e 's|%DEBIAN%|yes|g' \ 267 250 -e 's|%PACKAGE%|virtualbox|g' \ 268 src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init 269 dh_installinit --name=vboxdrv 251 $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init 252 dh_installinit --name=vboxdrv --noscripts 253 sed \ 254 -e 's|%NOLSB%||g' \ 255 -e 's|%DEBIAN%|yes|g' \ 256 -e 's|%PACKAGE%|virtualbox|g' \ 257 $(vboxroot)/src/VBox/Installer/linux/vboxweb-service.sh.in > debian/vboxweb-service.init 258 dh_installinit --name=vboxweb-service --noscripts 270 259 cat debian/preinst.in | sed -e 's|%VER%|$(ver)|g' > debian/preinst 271 260 cat debian/postinst.in | sed -e 's|%VER%|$(ver)|g' > debian/postinst 272 if [ "$(debrel)" = "_Ubuntu_dapper" -o "$(debrel)" = "_Debian_sarge" ]; then \273 cat debian/postrm.dapper > debian/postrm; fi274 261 dh_installdebconf 275 262 dh_installchangelogs … … 302 289 -Vpulse=$(if $(HEADLESS),,libpulse0) \ 303 290 -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0) \ 304 -Vdkms=$(if $(filter _Ubuntu_ gutsy _Ubuntu_hardy _Ubuntu_intrepid _Ubuntu_jaunty _Ubuntu_karmic,$(debrel)),dkms,)291 -Vdkms=$(if $(filter _Ubuntu_hardy _Ubuntu_intrepid _Ubuntu_jaunty _Ubuntu_karmic _Ubuntu_lucid,$(debrel)),dkms,) 305 292 dh_md5sums 306 293 dh_builddeb --destdir $(pkgdir)
Note:
See TracChangeset
for help on using the changeset viewer.
