儲存庫 vbox 的更動 46063

時間撮記:

2013-5-14 下午12:41:59 (12 年 以前)

作者:

vboxsync

訊息:

rpm: no EL4 anymore

位置:

trunk/src/VBox/Installer/linux

檔案:

• distributions_rpm (修改) (1 筆差異)
• rpm/rules (修改) (3 筆差異)

trunk/src/VBox/Installer/linux/distributions_rpm

@@ -10 +10 @@
 el6             = EL_6
 el5             = EL_5
-el4             = EL_4
 centos6         = CENTOS_6
 centos5         = CENTOS_5
-centos4         = CENTOS_4
 ol6             = ORACLE_6
 ol5             = ORACLE_5
-ol4             = ORACLE_4

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

@@ -85 +85 @@
  endif
 
- ifeq ($(filter-out el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),)
+ ifeq ($(filter-out el5 el6 ol5 ol6 centos5 centos6 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
@@ -133 +133 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(filter el4 sles10.1,$(rpmrel)),--build-libxml2,) \
-             $(if $(filter el4 el5 el6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \
-             $(if $(filter el4,$(rpmrel)),--build-libssl,) \
-             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1 sles11.0,$(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,$(rpmrel)),--disable-pulse,) \
-             $(if $(filter el4 el5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
-             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1 sles11.0,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
+             $(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,) \
@@ -165 +164 @@
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
 rpm/configure-stamp: