Date: Mon, 22 Sep 2014 16:16:52 +0300 From: Johannes Meixner <xmj@freebsd.org> To: emulation@FreeBSD.org Subject: Making CentOS 6.5 default Message-ID: <20140922131652.GA4045@mx12.chaot.net>
next in thread | raw e-mail | index | archive | help
--da4uJneut+ArUgXk
Content-Type: multipart/mixed; boundary="l76fUT7nc3MelDdI"
Content-Disposition: inline
--l76fUT7nc3MelDdI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi there,
now that CentOS 6.5 base and userland are in, I'd like to use the opportuni=
ty
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=3D2.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?
--=20
Johannes Meixner | FreeBSD Committer
xmj@FreeBSD.org | http://people.freebsd.org/~xmj
--l76fUT7nc3MelDdI
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="centos-default-r368847-clean.diff"
Content-Transfer-Encoding: quoted-printable
Index: Mk/bsd.linux-apps.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.linux-apps.mk (revision 368847)
+++ Mk/bsd.linux-apps.mk (working copy)
@@ -52,7 +52,7 @@
. endif
. else
# default
-LINUX_DIST_SUFFIX=3D -f10 # temporary default, set to -c6 soon
+LINUX_DIST_SUFFIX=3D -c6 # new default.
. endif
=20
WEB_AUTH=3D nvu
Index: Mk/bsd.linux-rpm.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.linux-rpm.mk (revision 368847)
+++ Mk/bsd.linux-rpm.mk (working copy)
@@ -43,13 +43,13 @@
NO_BUILD=3D yes
=20
. if ${ARCH} =3D=3D "amd64" || ${ARCH} =3D=3D "i386"
-. if ${USE_LINUX} =3D=3D "c6"
+. if ${USE_LINUX} =3D=3D "c6" || ${USE_LINUX} =3D=3D "yes"
# Do not build CentOS 6.5 ports if overridden by f10
. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS=
} =3D=3D "f10"
IGNORE=3D This port requires CentOS 6.5. Please remove OVERRIDE_LINUX_NON=
BASE_PORTS=3Df10 in /etc/make.conf.
. endif
LINUX_RPM_ARCH?=3D i686 # ?=3D because of nasty c5 qt ports
-. elif ${USE_LINUX} =3D=3D "f10" || ${USE_LINUX} =3D=3D "yes" # temporary=
default, move or clause to line 46
+. elif ${USE_LINUX} =3D=3D "f10"=20
# Do not build Fedora 10 ports unless specifically overridden.
#. if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) || ${OVERRIDE_LINUX_NONBAS=
E_PORTS} !=3D "f10"
#IGNORE=3D This port requires Fedora 10, yet Fedora 10 is heavily outdate=
d and contains many vulnerable ports. If you really need it, add OVERRIDE_L=
INUX_NONBASE_PORTS=3Df10 in /etc/make.conf.
@@ -68,11 +68,11 @@
=20
Linux_RPM_Post_Include=3D bsd.linux-rpm.mk
=20
-.if ${USE_LINUX} =3D=3D "f10" || ${USE_LINUX} =3D=3D "yes" # temporary def=
ault, remove or clause soon
+.if ${USE_LINUX} =3D=3D "f10"
USE_LINUX?=3D "f10"
LINUX_DIST=3D fedora
LINUX_DIST_VER=3D 10
-.else
+.else # Default to CentOS 6.5 32-bit (for now)
LINUX_DIST=3D centos
LINUX_DIST_VER=3D 6.5
.endif
Index: Mk/bsd.port.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.port.mk (revision 368847)
+++ Mk/bsd.port.mk (working copy)
@@ -1749,9 +1749,8 @@
LINUX_BASE_PORT=3D ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${=
USE_LINUX}
. else
. if ${USE_LINUX:tl} =3D=3D "yes"
-USE_LINUX=3D f10 # temporary default, set to c6 soon
-LINUX_BASE_PORT=3D ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/l=
inux_base-f10
-#LINUX_BASE_PORT=3D ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/=
linux_base-c6
+USE_LINUX=3D c6 # New default linux base.
+LINUX_BASE_PORT=3D ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/l=
inux_base-c6
. else
IGNORE=3D cannot be built: there is no emulators/linux_base-${USE_LINUX},=
perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
. endif
--l76fUT7nc3MelDdI--
--da4uJneut+ArUgXk
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABAgAGBQJUICFEAAoJEPyeKTcbGw0L93wIAKTpTBe0bhMAy7wKJwrdv6ao
zvm/do6/Kgel4B1mOYF93oZZg8ls0RLOY4vzt69um3J/T9O8HecM9E8k0xBUwfMz
MKNzkXTjlrC1i4MdglDl4ZPdiUQ51i/+Zes7w509JD1R+FT0FUVlXkpzCinb1xVP
8Qo2/iVRIsBRuKchm3J/42fOiRy4AtxR49RvKnLAvMVt6VmRkEAnhlRt9pv34FBl
/KFp/PqgStruo+8aGebwjf9yAfvN9U51h2K/4ttN2q7n/IjY+Mf0R7NnVXWybKLL
YAeb7YHpxMBaNiLkjna3k5zPO0gP1B1daTNtnYViZSDc56uO4XPzHOGGqYaH5eI=
=ntAZ
-----END PGP SIGNATURE-----
--da4uJneut+ArUgXk--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140922131652.GA4045>