Changeset 43838 in vbox for trunk/src

Timestamp:

Nov 8, 2012 11:27:59 AM (12 years ago)

Author:

vboxsync

Message:

deb/rpm: fixes

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (1 diff)
• distributions_rpm (modified) (1 diff)
• rpm/rules (modified) (2 diffs)

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

@@ -96 +96 @@
 cfg_flags := $(if $(NOQT),--disable-qt,) \
              $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
+             $(if $(filter _Ubuntu_hardy,$(debrel)),--build-libcurl,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \

trunk/src/VBox/Installer/linux/distributions_rpm

@@ -13 +13 @@
 mdv2008.0       = MANDRIVA_2008_0
 mdv2007.1       = MANDRIVA_2007_1
+fedora18        = FEDORA_18
 fedora17        = FEDORA_17
 fedora16        = FEDORA_16

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

@@ -85 +85 @@
  endif
 
- ifeq ($(filter-out el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 turbolinux11,$(rpmrel)),)
+ ifeq ($(filter-out el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 turbolinux11,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
@@ -111 +111 @@
 
 # Fedora13/14 is bleeding edge, the other jails have outdated kernel headers
-instmod  := $(if $(filter el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 fedora13 fedora14 fedora15 fedora16 fedora17,$(rpmrel)),,install_rpm)
+instmod  := $(if $(filter el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 mdv2010.0 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),,install_rpm)
 
 ifneq ($(STAGEDISO),)