summaryrefslogtreecommitdiff
path: root/src/VBox/Installer/linux/rpm/rules
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/Installer/linux/rpm/rules')
-rwxr-xr-xsrc/VBox/Installer/linux/rpm/rules55
1 files changed, 21 insertions, 34 deletions
diff --git a/src/VBox/Installer/linux/rpm/rules b/src/VBox/Installer/linux/rpm/rules
index 8e22093b..91606c44 100755
--- a/src/VBox/Installer/linux/rpm/rules
+++ b/src/VBox/Installer/linux/rpm/rules
@@ -52,7 +52,7 @@ ifeq ($(shell if grep -q '^%disttag' /usr/lib/rpm/macros.d/mandriva 2>/dev/null;
$(error Fix /usr/lib/rpm/macros.d/mandriva)
endif
-verpkg := VirtualBox-4.2
+verpkg := VirtualBox-4.3
current := $(shell pwd)
vboxroot := $(shell cd ../../../..; pwd)
pkgdir := $(if $(PKGDIR),$(PKGDIR),$(shell cd ../../../../..; pwd))
@@ -62,7 +62,7 @@ arch := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "
verfile := $(builddir)/version-generated.mk
ose := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
-include $(vboxroot)/SVN_REVISION
-svnrev :=$(if $(svn_revision),$(svn_revision),0)
+svnrev :=$(if $(svn_revision),$(svn_revision),)
NOMODS ?= $(ose)
NOQT ?= $(HEADLESS)
@@ -84,10 +84,10 @@ ifneq ($(MAKECMDGOALS),clean)
$(error Cannot detect package distribution (rpmrel=$(rpmrel)))
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 el5 el6 ol5 ol6 centos5 centos6 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),)
rpmspec := rpm_redhat
endif
- ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 sles10.1 sles11.0,$(rpmrel)),)
+ ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 sles10.1 sles11.0,$(rpmrel)),)
rpmspec := rpm_suse
endif
ifeq ($(filter-out mdv2009.1 mdv2010.0 mdv2011.0,$(rpmrel)),)
@@ -109,8 +109,8 @@ rpmver :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERS
archdir := $(current)/rpm/VirtualBox-$(ver)
rpmname := $(verpkg)-$(rpmver)_$(rpmrel)
-# 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)
+# never ship any modules
+instmod :=
ifneq ($(STAGEDISO),)
ifeq ($(wildcard $(STAGEDISO)/VBoxGuestAdditions.iso),)
@@ -132,18 +132,18 @@ else
endif
cfg_flags := $(if $(NOQT),--disable-qt,) \
- $(if $(filter el4 sles10.1,$(rpmrel)),--build-libxml2,) \
- $(if $(filter el4,$(rpmrel)),--build-libssl,) \
- $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1,$(rpmrel)),--build-libcurl,) \
+ $(if $(filter sles10.1,$(rpmrel)),--build-libxml2,) \
+ $(if $(filter el5 el6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \
+ $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \
$(if $(filter el5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
- $(if $(filter sles10.1 turbolinux11,$(rpmrel)),--disable-pulse,) \
- $(if $(filter el4 el5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
- $(if $(filter el4 el5 ol4 ol5 centos4 centos5 mdv2010.0 sles10.1 sles11.0 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
+ $(if $(filter sles10.1,$(rpmrel)),--disable-pulse,) \
+ $(if $(filter el5 ol5 centos5,$(rpmrel)),--enable-pulse,) \
+ $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
$(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
$(if $(HEADLESS),--build-headless,) \
$(if $(DEBUG),--build-debug,) \
$(if $(NOWINE),,--setup-wine) \
- $(if $(NOWEBSVC),,--enable-webservice) \
+ $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
$(if $(VNC),--enable-vnc,) \
--disable-extpack
@@ -153,17 +153,16 @@ bld_flags := AUTOCFG=$(current)/rpm/AutoConfig.kmk \
VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
VBOX_DO_STRIP= \
- VBOX_DO_STRIP_MODULES= \
VBOX_WITH_MULTIVERSION_PYTHON= \
$(doc_dir) \
$(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
VBOX_PACKAGE_DIST=$(rpmdist) \
- VBOX_SVN_REV=$(svnrev) \
+ $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
$(if $(NODOCS),VBOX_WITH_DOCS= ,) \
$(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
$(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
$(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
- $(if $(filter el4 el5 ol4 ol5 centos4 centos5 fedora9 fedora10 sles10.1 turbolinux11,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+ $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
rpm/configure-stamp:
cd $(vboxroot) && ./configure --odir=$(current)/rpm $(cfg_flags)
@@ -179,8 +178,8 @@ rpm/build-stamp: rpm/configure-stamp
$(if $(STAGEDISO),cp $(STAGEDISO)/VBoxGuestAdditions.iso $(builddir)/bin/additions,)
. rpm/env.sh && kmk -C $(vboxroot) $(bld_flags) \
VBOX_NO_LINUX_RUN_INSTALLER=1 \
- VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \
- VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \
+ VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
+ VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \
VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
packing
@@ -227,22 +226,10 @@ binary: rpm/build-stamp
-e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
-e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
vboxdrv.sh.in > $(archdir)/vboxdrv.init
- sed \
- -e 's|%NOLSB%|yes|g' \
- -e 's|%DEBIAN%||g' \
- -e 's|%PACKAGE%|virtualbox|g' \
- vboxballoonctrl-service.sh.in > $(archdir)/vboxballoonctrl-service.init
- sed \
- -e 's|%NOLSB%|yes|g' \
- -e 's|%DEBIAN%||g' \
- -e 's|%PACKAGE%|virtualbox|g' \
- vboxautostart-service.sh.in > $(archdir)/vboxautostart-service.init
- sed \
- -e 's|%NOLSB%|yes|g' \
- -e 's|%DEBIAN%||g' \
- -e 's|%PACKAGE%|virtualbox|g' \
- vboxweb-service.sh.in > $(archdir)/vboxweb-service.init
- cp debian/VBox.sh $(archdir)
+ cp vboxballoonctrl-service.sh $(archdir)/vboxballoonctrl-service.init
+ cp vboxautostart-service.sh $(archdir)/vboxautostart-service.init
+ cp vboxweb-service.sh $(archdir)/vboxweb-service.init
+ cp VBox.sh $(archdir)
mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
tar -cjf rpm/VirtualBox.tar.bz2 -C rpm $(rpmname)
rm -f /usr/src/packages/RPMS/*/VirtualBox*rpm
View Lorry Controller Status