Changeset 63946 in vbox for trunk/src/VBox
- Timestamp:
- Sep 22, 2016 12:05:35 PM (8 years ago)
- svn:sync-xref-src-repo-rev:
- 110832
- Location:
- trunk/src/VBox/Installer/linux
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/linux/debian/rules
r63571 r63946 39 39 # STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso 40 40 # PKGDIR=<path> where to store the final package(s) 41 # BLEEDING_EDGE=xyz42 41 # 43 42 # NODOCS will also be set if UserManual*.pdf and VirtualBox*.chm are placed in … … 75 74 svn info|sed -e "s/^Revision: \(.*\)/-\1/;t;d"; else \ 76 75 date +"-%Y%m%d"; fi))) 77 debver :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(subst _RC,~rc,$(subst _OSE,~ose,$(ver)))))$(svnver)$(if \ 78 $(BLEEDING_EDGE),-$(BLEEDING_EDGE),)$(VERSUFFIX)$(if \ 79 $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,) 76 debver :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(subst _RC,~rc,$(subst _OSE,~ose,$(ver)))))$(svnver)$(VERSUFFIX)$(if $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,) 80 77 archdir := $(prefix)/opt/VirtualBox-$(ver) 81 78 endif … … 120 117 $(if $(NODOCS),VBOX_WITH_DOCS= ,) \ 121 118 $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \ 122 $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \ 123 $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) 119 $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) 124 120 125 121 configure: debian/configure-stamp … … 158 154 make -C $(builddir)/bin/src/vboxdrv KERN_DIR=$$d/build MODULE_DIR=$$d clean && \ 159 155 make -j4 -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \ 160 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \161 $(builddir)/bin/src/vboxdrv/vboxdrv.ko $(moddir)/$$(basename $$d)/vboxdrv.ko); \162 156 make -C $(builddir)/bin/src/vboxnetflt KERN_DIR=$$d/build MODULE_DIR=$$d clean && \ 163 157 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \ 164 158 make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \ 165 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \166 $(builddir)/bin/src/vboxnetflt/vboxnetflt.ko $(moddir)/$$(basename $$d)/vboxnetflt.ko); \167 159 make -C $(builddir)/bin/src/vboxnetadp KERN_DIR=$$d/build MODULE_DIR=$$d clean && \ 168 160 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \ 169 161 make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \ 170 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \171 $(builddir)/bin/src/vboxnetadp/vboxnetadp.ko $(moddir)/$$(basename $$d)/vboxnetadp.ko); \172 162 make -C $(builddir)/bin/src/vboxpci KERN_DIR=$$d/build MODULE_DIR=$$d clean && \ 173 163 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \ 174 164 make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \ 175 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \176 $(builddir)/bin/src/vboxpci/vboxpci.ko $(moddir)/$$(basename $$d)/vboxpci.ko); \177 165 fi; \ 178 166 done … … 333 321 mv $(prefix)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib 334 322 endif 335 $(if $(filter _Ubuntu_hardy _Ubuntu_lucid,$(debrel)),dh_pycentral,dh_python2)323 dh_python2 336 324 dh_compress -X.pdf -X.chm -X LICENSE -X.py 337 325 dh_fixperms … … 346 334 -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0) 347 335 dh_md5sums 348 dh_builddeb --destdir $(pkgdir) -- \ 349 $(if $(filter _Ubuntu_lucid,$(debrel)),,-Zxz) 336 dh_builddeb --destdir $(pkgdir) -- -Zxz 350 337 endif 351 338 -
trunk/src/VBox/Installer/linux/rpm/rules
r63631 r63946 32 32 # STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso 33 33 # PKGDIR=<path> where to store the final package(s) 34 # BLEEDING_EDGE=xyz35 34 # svn_revision=xxx do not depend on subversion being available, but use this 36 35 # hard-coded revision number instead … … 81 80 82 81 ifneq ($(MAKECMDGOALS),clean) 83 rpmrel := $(subst ol,el,$(subst rhel,el,$(s hell cat /etc/distname)))82 rpmrel := $(subst ol,el,$(subst rhel,el,$(subst centos,el,$(shell cat /etc/distname)))) 84 83 ifeq ($(rpmrel),) 85 84 # look for fedora … … 88 87 ifeq ($(rpmrel),) 89 88 # look for OL 90 rpmrel := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/ ol\1/p')89 rpmrel := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p') 91 90 endif 92 91 ifeq ($(rpmrel),) 93 92 # look for CentOS 94 rpmrel := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/ centos\1/p')93 rpmrel := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p') 95 94 endif 96 95 ifeq ($(rpmrel),) 97 96 # look for Red Hat 98 rpmrel := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/ centos\1/p')97 rpmrel := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p') 99 98 endif 100 99 ifeq ($(rpmrel),) … … 107 106 endif 108 107 109 ifeq ($(filter-out el5 el6 ol5 ol6 el7 centos5 centos6fedora18 fedora19 fedora20 fedora21 fedora22 fedora24,$(rpmrel)),)108 ifeq ($(filter-out el5 el6 el7 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24,$(rpmrel)),) 110 109 rpmspec := rpm_redhat 111 110 endif 112 ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132 sles10.1 sles11.0,$(rpmrel)),)111 ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132,$(rpmrel)),) 113 112 rpmspec := rpm_suse 114 endif115 ifeq ($(filter-out mdv2009.1 mdv2010.0 mdv2011.0,$(rpmrel)),)116 rpmspec := rpm_mdv117 113 endif 118 114 ifeq ($(rpmspec),) … … 128 124 129 125 ver := $(VBOX_VERSION_STRING) 130 rpmver :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,)) $(if $(BLEEDING_EDGE),_$(BLEEDING_EDGE),)126 rpmver :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,)) 131 127 archdir := $(current)/rpm/VirtualBox-$(ver) 132 128 rpmname := $(verpkg)-$(rpmver)_$(rpmrel) … … 150 146 cfg_flags := $(if $(NOQT),--disable-qt,) \ 151 147 $(if $(NOSDL),--disable-vboxsdl,) \ 152 $(if $(filter sles10.1,$(rpmrel)),--build-libxml2,) \153 $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \154 $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \155 $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \156 $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-pulse,) \148 $(if $(filter el5 el6,$(rpmrel)),--build-libvpx,) \ 149 $(if $(filter el5,$(rpmrel)),--build-libcurl,) \ 150 $(if $(filter el5,$(rpmrel)),--disable-sdl-ttf,) \ 151 $(if $(filter el5,$(rpmrel)),--disable-pulse,) \ 152 $(if $(filter el5,$(rpmrel)),--disable-python,) \ 157 153 $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \ 158 154 $(if $(HEADLESS),--build-headless,) \ … … 168 164 VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \ 169 165 VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \ 170 $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \166 $(if $(filter el5 el6,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \ 171 167 VBOX_DO_STRIP= \ 172 $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON= /usr/bin/python,) \168 $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python))),) \ 173 169 VBOX_WITH_MULTIVERSION_PYTHON= \ 174 170 $(doc_dir) \ … … 179 175 $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \ 180 176 $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \ 181 $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \ 182 $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1) 177 $(if $(filter el5,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1) 183 178 184 179 rpm/configure-stamp:
Note:
See TracChangeset
for help on using the changeset viewer.