← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Installer/linux/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Installer/linux/Makefile.kmk
112
112
                VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
113
113
                VBoxNetAdpCtl \
114
114
                VBoxSVC \
115
 
                VBoxSettings.so \
116
115
                VBoxXPCOM.so \
117
116
                VBoxXPCOMC.so \
118
117
                VBoxXPCOMIPCD \
174
173
# Documentation
175
174
ifdef VBOX_WITH_DOCS_PACKING
176
175
 VBOX_LNX_NO_STRIP += \
177
 
        VirtualBox.chm UserManual.pdf \
178
 
        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)
 
176
        UserManual.pdf \
 
177
        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).pdf)
 
178
 ifdef VBOX_WITH_DOCS_CHM
 
179
  VBOX_LNX_NO_STRIP += \
 
180
        VirtualBox.chm \
 
181
        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm)
 
182
 endif
179
183
 VBOX_LNX_STRIP_BIN += \
180
184
        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
181
185
endif
232
236
        webtest
233
237
endif
234
238
 
 
239
# EFI firmware
 
240
ifdef VBOX_WITH_EFIFW_PACKING
 
241
  VBOX_LNX_NO_STRIP += \
 
242
        VBoxEFI32.fd \
 
243
        VBoxEFI64.fd
 
244
endif
 
245
 
235
246
#
236
247
# All the bin files that goes into the archives.
237
248
#
276
287
$(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxdrv.sh.in | $$(dir $$@)
277
288
        $(QUIET)$(SED_EXT) \
278
289
                -e "s|%NOLSB%|yes|g" \
 
290
                -e "s|%DEBIAN%||g" \
279
291
                -e "s|%PACKAGE%|virtualbox|g" \
280
292
                --output $@ \
281
293
                $<