VirtualBox

Changeset 36782 in vbox


Ignore:
Timestamp:
Apr 21, 2011 7:57:54 AM (14 years ago)
Author:
vboxsync
Message:

deb/rpm: misc fixes and sync debian/

Location:
trunk
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/debian/lintian-override.in

    r35301 r36782  
    1515%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so
    1616%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVRDP.so
    17 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VRDPAuth.so
     17%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxAuth.so
    1818%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
    1919%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
    … …  
    2929%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VirtualBox.so
    3030%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDbg.so
     31%VERPKG%: binary-without-manpage usr/bin/VBox
     32%VERPKG%: binary-without-manpage usr/bin/VBoxBalloonCtrl
     33%VERPKG%: binary-without-manpage usr/bin/VBoxHeadless
     34%VERPKG%: binary-without-manpage usr/bin/VBoxManage
     35%VERPKG%: binary-without-manpage usr/bin/VBoxSDL
     36%VERPKG%: binary-without-manpage usr/bin/VBoxTunctl
     37%VERPKG%: binary-without-manpage usr/bin/VBoxVRDP
     38%VERPKG%: binary-without-manpage usr/bin/VirtualBox
     39%VERPKG%: binary-without-manpage usr/bin/rdesktop-vrdp
     40%VERPKG%: binary-without-manpage usr/bin/vboxballoonctrl
     41%VERPKG%: binary-without-manpage usr/bin/vboxheadless
     42%VERPKG%: binary-without-manpage usr/bin/vboxmanage
     43%VERPKG%: binary-without-manpage usr/bin/vboxsdl
     44%VERPKG%: binary-without-manpage usr/bin/vboxwebsrv
     45%VERPKG%: binary-without-manpage usr/bin/virtualbox
    3146%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDDGC.gc
    3247%VERPKG%: unstripped-binary-or-object ./usr/lib/virtualbox/VBoxDD2GC.gc
    … …  
    4964%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxGuestControlSvc.so
    5065%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxVRDP.so
    51 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VRDPAuth.so
     66%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxAuth.so
    5267%VERPKG%: binary-or-shlib-defines-rpath ./usr/bin/rdesktop-vrdp /usr/lib/virtualbox
    5368%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDD.so /usr/lib/virtualbox
    … …  
    8196%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxXPCOM.so /usr/lib/virtualbox
    8297%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxXPCOMIPCD /usr/lib/virtualbox
    83 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VRDPAuth.so /usr/lib/virtualbox
     98%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxAuth.so /usr/lib/virtualbox
    8499%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox /usr/lib/virtualbox
    85100%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox.so /usr/lib/virtualbox
    … …  
    89104%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/components/VBoxXPCOMIPCC.so /usr/lib/virtualbox
    90105%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/kchmviewer /usr/lib/virtualbox
     106%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxBalloonCtrl /usr/lib/virtualbox
    91107%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/vboxwebsrv /usr/lib/virtualbox
    92108%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/webtest /usr/lib/virtualbox

  • trunk/debian/postinst.in

    r34679 r36782  
    11#!/bin/sh
    22#
    3 # Copyright (C) 2006-2010 Oracle Corporation
     3# Copyright (C) 2006-2011 Oracle Corporation
    44#
    55# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6868    fi
    6969    usb_createnode="/usr/share/virtualbox/VBoxCreateUSBNode.sh"
    70     echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"add\", RUN=${usb_createnode} \$major \$minor \$attr{bDeviceClass}\"" ${usb_group} \
    71         >> /etc/udev/rules.d/10-vboxdrv.rules
    72     echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"add\", ENV{DEVTYPE}==\"usb_device\", RUN=${usb_createnode} \$major \$minor \$attr{bDeviceClass}\"" ${usb_group} \
    73         >> /etc/udev/rules.d/10-vboxdrv.rules
    74     echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"remove\", RUN=${usb_createnode} --remove \$major \$minor\"" \
    75         >> /etc/udev/rules.d/10-vboxdrv.rules
    76     echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN=${usb_createnode} --remove \$major \$minor\"" \
     70    echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"add\", RUN=\"${usb_createnode} \$major \$minor \$attr{bDeviceClass} ${usb_group}\"" \
     71        >> /etc/udev/rules.d/10-vboxdrv.rules
     72    echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"add\", ENV{DEVTYPE}==\"usb_device\", RUN=\"${usb_createnode} \$major \$minor \$attr{bDeviceClass} ${usb_group}\"" \
     73        >> /etc/udev/rules.d/10-vboxdrv.rules
     74    echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"remove\", RUN=\"${usb_createnode} --remove \$major \$minor\"" \
     75        >> /etc/udev/rules.d/10-vboxdrv.rules
     76    echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN=\"${usb_createnode} --remove \$major \$minor\"" \
    7777        >> /etc/udev/rules.d/10-vboxdrv.rules
    7878  fi
    … …  
    116116    chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl
    117117  fi
    118   if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxExtPackHelperApp > /dev/null 2>&1; then
    119     chmod 4511 /usr/lib/virtualbox/VBoxExtPackHelperApp
    120   fi
    121118
    122119  # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules
    … …  
    132129
    133130if [ "$1" = "configure" ]; then
    134   # Start vboxdrv/vboxweb-service manually as we use our own error handling in postrm
     131  # Start vboxdrv/vboxballoonctrl/vboxweb-service manually as we use our own error handling in postrm
    135132  if [ -x "/etc/init.d/vboxdrv" ]; then
    136133    update-rc.d vboxdrv defaults >/dev/null
    … …  
    183180    fi
    184181  fi
     182  if [ -x "/etc/init.d/vboxballoonctrl-service" ]; then
     183    update-rc.d vboxballoonctrl-service defaults >/dev/null
     184    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
     185        invoke-rc.d vboxballoonctrl-service start || exit $?
     186    else
     187        /etc/init.d/vboxballoonctrl-service start || exit $?
     188    fi
     189  fi
    185190  if [ -x "/etc/init.d/vboxweb-service" ]; then
    186191    update-rc.d vboxweb-service defaults >/dev/null

  • trunk/debian/preinst.in

    r32543 r36782  
    11#!/bin/bash
    22#
    3 # Copyright (C) 2006-2010 Oracle Corporation
     3# Copyright (C) 2006-2011 Oracle Corporation
    44#
    55# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2929  VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null || true`
    3030  if [ -n "$VBOXSVC_PID" ]; then
     31    if [ -f /etc/init.d/vboxballoonctrl-service ]; then
     32      # try graceful termination; terminate the ballon control service first
     33      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
     34        invoke-rc.d vboxballoonctrl-service stop || true
     35      else
     36        /etc/init.d/vboxballoonctrl-service stop || true
     37      fi
     38    fi
    3139    if [ -f /etc/init.d/vboxweb-service ]; then
    3240      # try graceful termination; terminate the webservice first
    … …  
    3644        /etc/init.d/vboxweb-service stop || true
    3745      fi
    38       kill -USR1 $VBOXSVC_PID
    3946    fi
     47    kill -USR1 $VBOXSVC_PID
    4048    sleep 1
    4149    if pidof VBoxSVC > /dev/null 2>&1; then

  • trunk/debian/prerm.in

    r34603 r36782  
    3838  VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null`
    3939  if [ -n "$VBOXSVC_PID" ]; then
     40    # try graceful termination; terminate the balloon control servic first
     41    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
     42      invoke-rc.d vboxballoonctrl-service stop || true
     43    else
     44      /etc/init.d/vboxballoonctrl-service stop || true
     45    fi
    4046    # try graceful termination; terminate the webservice first
    4147    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then

  • trunk/debian/rules

    r36554 r36782  
    11#!/usr/bin/make -f
    22#
    3 # Copyright (C) 2006-2010 Oracle Corporation
     3# Copyright (C) 2006-2011 Oracle Corporation
    44#
    55# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6464
    6565# shipping Linux kernel modules with bleeding-edge releases doesn't make sense
    66 instmod := $(if $(filter _Ubuntu_lucid _Debian_sid,$(debrel)),,1)
    67 
    68 # Locations of custom built Qt libraries (see below)
    69 qtstdc5  := /home/vbox/Qt-4.4.3-stdc++5-$(arch)
     66instmod := $(if $(filter _Ubuntu_lucid _Ubuntu_maverick _Ubuntu_natty _Debian_sid,$(debrel)),,1)
     67
     68# Location of custom built Qt libraries (see below)
    7069qtstdc6  := /home/vbox/Qt-4.4.3-stdc++6-$(arch)
    7170
    … …  
    151150        dh_testroot
    152151        rm -f debian/preinst debian/postinst debian/prerm
    153         rm -f debian/$(package).init debian/vboxdrv.init debian/vboxweb-service.init
     152        rm -f debian/$(package).init debian/vboxdrv.init
     153        rm -f debian/vboxballoonctrl-service.init debian/vboxweb-service.init
    154154        rm -f debian/AutoConfig.kmk debian/configure.log debian/env.sh
    155155        rm -f debian/modules-stamp debian/build-stamp debian/configure-stamp
    … …  
    181181        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor
    182182        cd $(archdir)/icons; for i in *; do \
     183            if [ -f $$i/virtualbox.png ]; then \
     184              install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
     185              mv $$i/virtualbox.png $(prefix)/usr/share/icons/hicolor/$$i/apps; \
     186            fi; \
    183187            install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
    184             mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
     188            mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes || true; \
    185189            rmdir $$i; \
    186190        done
    … …  
    216220        mv $(archdir)/vboxshell.py $(prefix)/usr/lib/$(package)
    217221        mv $(archdir)/sdk $(prefix)/usr/lib/$(package)
    218         install -D -g 0 -o 0 -m 644 debian/VBox.sh $(prefix)/usr/bin/VBox
     222        install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/debian/VBox.sh $(prefix)/usr/bin/VBox
    219223        mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
    220224        mv $(archdir)/VBoxCreateUSBNode.sh $(prefix)/usr/share/$(package)
    221225        for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
    222226            $(if $(NOQT),,VirtualBox) VBoxHeadless \
    223             VBoxExtPackHelperApp \
     227            VBoxExtPackHelperApp VBoxBalloonCtrl \
    224228            $(if $(NOWEBSVC),,vboxwebsrv webtest); do \
    225229            mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
    … …  
    239243        dh_installdocs \
    240244            $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
    241             $(addprefix $(archdir)/, $(if $(HEADLESS),,License-*.html) LICENSE)
     245            $(addprefix $(archdir)/, LICENSE)
    242246        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
    243             LICENSE $(if $(HEADLESS),,License-*.html))
     247            LICENSE)
    244248        for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
    245249            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
    … …  
    267271            usr/bin/VBox                        usr/bin/VBoxHeadless \
    268272            usr/bin/VBox                        usr/bin/vboxheadless \
     273            usr/bin/VBox                        usr/bin/VBoxBalloonCtrl \
     274            usr/bin/VBox                        usr/bin/vboxballoonctrl \
    269275            $(if $(NOWEBSVC),,usr/bin/VBox      usr/bin/vboxwebsrv) \
    270276            usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)
    … …  
    275281            -e 's|%DEBIAN%|yes|g' \
    276282            -e 's|%PACKAGE%|virtualbox|g' \
     283            -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
    277284            $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
    278285        dh_installinit --name=vboxdrv --noscripts
     286        sed \
     287            -e 's|%NOLSB%||g' \
     288            -e 's|%DEBIAN%|yes|g' \
     289            -e 's|%PACKAGE%|virtualbox|g' \
     290            $(vboxroot)/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in > debian/vboxballoonctrl-service.init
     291        dh_installinit --name=vboxballoonctrl-service --noscripts
    279292        sed \
    280293            -e 's|%NOLSB%||g' \

  • trunk/src/VBox/Installer/linux/VBox.sh

    r33231 r36782  
    9494    exec "$INSTALL_DIR/VBoxHeadless" "$@"
    9595    ;;
     96  VBoxBalloonCtrl|vboxballoonctrl)
     97    exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
     98    ;;
    9699  vboxwebsrv)
    97100    exec "$INSTALL_DIR/vboxwebsrv" "$@"

  • trunk/src/VBox/Installer/linux/debian/VBox.sh

    r36714 r36782  
    8686    exec "/usr/lib/virtualbox/VBoxHeadless" "$@"
    8787    ;;
     88  VBoxBalloonCtrl|vboxballoonctrl)
     89    exec "/usr/lib/virtualbox/VBoxBalloonCtrl" "$@"
     90    ;;
    8891  vboxwebsrv)
    8992    exec "/usr/lib/virtualbox/vboxwebsrv" "$@"
    90     ;;
    91   VBoxBalloonCtrl|vboxballoonctrl)
    92     exec "/usr/lib/virtualbox/VBoxBalloonCtrl" "$@"
    9393    ;;
    9494  *)

  • trunk/src/VBox/Installer/linux/debian/rules

    r36758 r36782  
    6868debver   :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(ver)))$(svnver)$(if \
    6969                $(BLEEDING_EDGE),-$(BLEEDING_EDGE),)$(VERSUFFIX)$(if \
    70                 $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,)
     70                $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,)
    7171archdir  := $(prefix)/opt/VirtualBox-$(ver)
    7272endif
    … …  
    8181
    8282# shipping Linux kernel modules with bleeding-edge releases doesn't make sense
    83 instmod := $(if $(filter _Ubuntu_lucid _Debian_sid,$(debrel)),,1)
     83instmod := $(if $(filter _Ubuntu_lucid _Ubuntu_maverick _Ubuntu_natty _Debian_sid,$(debrel)),,1)
    8484
    8585ifneq ($(MAKECMDGOALS),clean)
    … …  
    9090endif
    9191
    92 # Locations of custom built Qt libraries (see below)
    93 qtstdc5  := /home/vbox/Qt-4.4.3-stdc++5-$(arch)
     92# Location of custom built Qt libraries (see below)
    9493qtstdc6  := /home/vbox/Qt-4.4.3-stdc++6-$(arch)
    9594

  • trunk/src/VBox/Installer/linux/rpm/rules

    r36714 r36782  
    5656 endif
    5757
    58  ifeq ($(filter-out rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 pclinuxos2007 turbolinux11,$(rpmrel)),)
     58 ifeq ($(filter-out rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 fedora15 turbolinux11,$(rpmrel)),)
    5959  rpmspec := rpm_redhat
    6060 endif
    … …  
    8080
    8181# Fedora13/14 is bleeding edge, the other jails have outdated kernel headers
    82 instmod  := $(if $(filter rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 pclinuxos2007 fedora13 fedora14,$(rpmrel)),,install_rpm)
     82instmod  := $(if $(filter rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 fedora13 fedora14 fedora15,$(rpmrel)),,install_rpm)
    8383
    8484ifneq ($(STAGEDISO),)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette