[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/, ...

[Anthony G. Basile]

commit:     19b6846e1b761a2b052d2507f1a86fc3c76ee8a9
Author:     M. J. Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Tue Sep 18 23:05:36 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 00:29:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b6846e

profiles: Add new 17.0 uclibc profiles & features structure

Roughly mimicking commit deb72d3a8b4e6f37c9191a229bbe19/

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 profiles/default/linux/arm/17.0/uclibc/armv6j/eapi   |  1 +
 .../linux/arm/17.0/uclibc/armv6j/hardened/eapi       |  1 +
 .../linux/arm/17.0/uclibc/armv6j/hardened/parent     |  2 ++
 .../linux/arm/17.0/uclibc/armv6j/make.defaults       | 10 ++++++++++
 profiles/default/linux/arm/17.0/uclibc/armv6j/parent |  1 +
 profiles/default/linux/arm/17.0/uclibc/armv7a/eapi   |  1 +
 .../linux/arm/17.0/uclibc/armv7a/hardened/eapi       |  1 +
 .../linux/arm/17.0/uclibc/armv7a/hardened/parent     |  2 ++
 .../linux/arm/17.0/uclibc/armv7a/make.defaults       | 10 ++++++++++
 profiles/default/linux/arm/17.0/uclibc/armv7a/parent |  1 +
 profiles/default/linux/arm/17.0/uclibc/eapi          |  1 +
 profiles/default/linux/arm/17.0/uclibc/parent        |  3 +++
 profiles/features/uclibc/eapi                        |  1 +
 profiles/features/uclibc/make.defaults               | 12 ++++++++++++
 profiles/features/uclibc/package.mask                | 19 +++++++++++++++++++
 profiles/features/uclibc/package.use                 | 11 +++++++++++
 profiles/features/uclibc/package.use.mask            | 20 ++++++++++++++++++++
 profiles/features/uclibc/packages                    |  7 +++++++
 profiles/features/uclibc/packages.build              |  9 +++++++++
 profiles/features/uclibc/use.force                   |  6 ++++++
 profiles/features/uclibc/use.mask                    | 15 +++++++++++++++
 profiles/profiles.desc                               |  4 ++++
 22 files changed, 138 insertions(+)

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi b/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent
new file mode 100644
index 00000000000..3e3d7782bae
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults b/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults
new file mode 100644
index 00000000000..d5f3c4a8df8
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv6j-unknown-linux-uclibceabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/parent b/profiles/default/linux/arm/17.0/uclibc/armv6j/parent
new file mode 100644
index 00000000000..f3229c5b987
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv6j/parent
@@ -0,0 +1 @@
+..

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi b/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent
new file mode 100644
index 00000000000..3e3d7782bae
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults b/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults
new file mode 100644
index 00000000000..ff9bd9e3abd
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv7a-unknown-linux-uclibceabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"

diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/parent b/profiles/default/linux/arm/17.0/uclibc/armv7a/parent
new file mode 100644
index 00000000000..f3229c5b987
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/armv7a/parent
@@ -0,0 +1 @@
+..

diff --git a/profiles/default/linux/arm/17.0/uclibc/eapi b/profiles/default/linux/arm/17.0/uclibc/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/default/linux/arm/17.0/uclibc/parent b/profiles/default/linux/arm/17.0/uclibc/parent
new file mode 100644
index 00000000000..a22f101e8a9
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/uclibc/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/arm
+../../../../../features/uclibc/

diff --git a/profiles/features/uclibc/eapi b/profiles/features/uclibc/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/features/uclibc/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/features/uclibc/make.defaults b/profiles/features/uclibc/make.defaults
new file mode 100644
index 00000000000..e744805b1e7
--- /dev/null
+++ b/profiles/features/uclibc/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+PORTAGE_LIBC="uClibc"
+ELIBC=uclibc
+
+FEATURES="sandbox sfperms strict"
+
+USE="nptl unicode -berkdb"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
+
+SYMLINK_LIB="no"

diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
new file mode 100644
index 00000000000..b2b832a58bd
--- /dev/null
+++ b/profiles/features/uclibc/package.mask
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+sys-libs/musl
+sys-libs/glibc
+sys-libs/pam
+
+# We use eudev which is tested on both uclibc and musl
+sys-apps/systemd
+sys-fs/udev
+
+# Working on it, bug #470884
+dev-libs/elfutils
+>virtual/libelf-2
+
+## MJE 18/09/2018 - Do these still apply?:
+## These binary pkgs have a hard dep on glibc; make repoman shut up
+#app-arch/rar
+#www-plugins/adobe-flash

diff --git a/profiles/features/uclibc/package.use b/profiles/features/uclibc/package.use
new file mode 100644
index 00000000000..53754c2c64e
--- /dev/null
+++ b/profiles/features/uclibc/package.use
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# 17 Aug 2014; Anthony G. Basile <blueness@g.o>
+# Avoid pulling in glib
+dev-util/pkgconfig internal-glib
+
+# Anthony G. Basile <blueness@g.o> (14 Jul 2018)
+# We need this to break a circular dependency with
+# 'sys-libs/libcap pam' in stage3 catalyst builds
+sys-libs/pam -filecaps

diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
new file mode 100644
index 00000000000..d50e095b028
--- /dev/null
+++ b/profiles/features/uclibc/package.use.mask
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Michał Górny <mgorny@g.o> (12 Jan 2018)
+# Those require USE=java that is masked in this profile.
+app-emulation/virtualbox vboxwebsrv
+app-office/libreoffice libreoffice_extensions_wiki-publisher
+
+# Thomas Deutschmann <whissi@g.o> (21 Jan 2017)
+# Mask due Gnome3 not going to be stabilized on this arch
+# due to uclibc
+dev-util/geany-plugins gtkspell
+
+# Joshua Kinard <kumba@g.o> (18 Jan 2016)
+# Fails linking to gettext/libintl for symbol 'libintl_gettext'.
+# Is fixable by using 'append-ldflags' from flag-o-matic to force
+# -lintl, but that's a QA violation.  Real solution is to use
+# 'append-libs', but xfsdump's build system doesn't honor $LIBS.
+# So this is the best way for now.  See 570548.
+sys-fs/xfsdump nls

diff --git a/profiles/features/uclibc/packages b/profiles/features/uclibc/packages
new file mode 100644
index 00000000000..0ff81f33bfb
--- /dev/null
+++ b/profiles/features/uclibc/packages
@@ -0,0 +1,7 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+*app-misc/pax-utils
+*dev-libs/libiconv
+*dev-libs/libintl
+-*sys-apps/man-pages

diff --git a/profiles/features/uclibc/packages.build b/profiles/features/uclibc/packages.build
new file mode 100644
index 00000000000..bc9b8907018
--- /dev/null
+++ b/profiles/features/uclibc/packages.build
@@ -0,0 +1,9 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# This file lists extra packages needed to build for
+# a stage 1 based on this profile.
+
+dev-util/pkgconfig
+dev-libs/libiconv
+dev-libs/libintl

diff --git a/profiles/features/uclibc/use.force b/profiles/features/uclibc/use.force
new file mode 100644
index 00000000000..6225883ae66
--- /dev/null
+++ b/profiles/features/uclibc/use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Select the correct ELIBC
+elibc_uclibc
+uclibc

diff --git a/profiles/features/uclibc/use.mask b/profiles/features/uclibc/use.mask
new file mode 100644
index 00000000000..540851c0f4f
--- /dev/null
+++ b/profiles/features/uclibc/use.mask
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Thomas Deutschmann <whissi@g.o> (28 Jan 2017)
+# No JAVA in uclibc
+java
+
+nls
+pam
+
+-uclibc
+
+-elibc_uclibc
+elibc_glibc
+elibc_musl

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 2a3980d80fc..1c2ea775d5b 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -353,6 +353,10 @@ amd64		default/linux/uclibc/amd64				exp
 amd64		hardened/linux/uclibc/amd64				exp
 arm		default/linux/uclibc/arm/armv7a				exp
 arm		hardened/linux/uclibc/arm/armv7a			exp
+arm		default/linux/arm/17.0/uclibc/armv6j			exp
+arm		default/linux/arm/17.0/uclibc/armv6j/hardened		exp
+arm		default/linux/arm/17.0/uclibc/armv7a			exp
+arm		default/linux/arm/17.0/uclibc/armv7a/hardened		exp
 mips		default/linux/uclibc/mips				exp
 mips		hardened/linux/uclibc/mips				exp
 mips		default/linux/uclibc/mips/mipsel			exp