Hi there, now that CentOS 6.5 base and userland are in, I'd like to use the opportunity to spawn a discussion about making it default within the next two to four weeks (once things stabilize).
The ports work necessary for that isn't complicated at all (see patch
attached). The only "issue" I see is that we'd have to get all users to set
compat.linux.osrelease=2.6.18
in /etc/sysctl.conf.
As was reported during Cambridge's DevSummit, some vendors depend on having
-f10 ports in the portstree, hence deprecating/removing them is not a good
idea.
What are your thoughts?
--
Johannes Meixner | FreeBSD Committer
x...@freebsd.org | http://people.freebsd.org/~xmj
Index: Mk/bsd.linux-apps.mk
===================================================================
--- Mk/bsd.linux-apps.mk (revision 368847)
+++ Mk/bsd.linux-apps.mk (working copy)
@@ -52,7 +52,7 @@
. endif
. else
# default
-LINUX_DIST_SUFFIX= -f10 # temporary default, set to -c6 soon
+LINUX_DIST_SUFFIX= -c6 # new default.
. endif
WEB_AUTH= nvu
Index: Mk/bsd.linux-rpm.mk
===================================================================
--- Mk/bsd.linux-rpm.mk (revision 368847)
+++ Mk/bsd.linux-rpm.mk (working copy)
@@ -43,13 +43,13 @@
NO_BUILD= yes
. if ${ARCH} == "amd64" || ${ARCH} == "i386"
-. if ${USE_LINUX} == "c6"
+. if ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes"
# Do not build CentOS 6.5 ports if overridden by f10
. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
IGNORE= This port requires CentOS 6.5. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
. endif
LINUX_RPM_ARCH?= i686 # ?= because of nasty c5 qt ports
-. elif ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, move or clause to line 46
+. elif ${USE_LINUX} == "f10"
# Do not build Fedora 10 ports unless specifically overridden.
#. if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) || ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
#IGNORE= This port requires Fedora 10, yet Fedora 10 is heavily outdated and contains many vulnerable ports. If you really need it, add OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
@@ -68,11 +68,11 @@
Linux_RPM_Post_Include= bsd.linux-rpm.mk
-.if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, remove or clause soon
+.if ${USE_LINUX} == "f10"
USE_LINUX?= "f10"
LINUX_DIST= fedora
LINUX_DIST_VER= 10
-.else
+.else # Default to CentOS 6.5 32-bit (for now)
LINUX_DIST= centos
LINUX_DIST_VER= 6.5
.endif
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk (revision 368847)
+++ Mk/bsd.port.mk (working copy)
@@ -1749,9 +1749,8 @@
LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
. else
. if ${USE_LINUX:tl} == "yes"
-USE_LINUX= f10 # temporary default, set to c6 soon
-LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
-#LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
+USE_LINUX= c6 # New default linux base.
+LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
. else
IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
. endif
pgpoE6LlaztJW.pgp
Description: PGP signature
