From 42a367b2feb29e34b9a75ee5d0d7438660578acc Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 8 Apr 2015 13:55:27 -0700 Subject: [PATCH 1/3] profiles: Add coreos/arm64 support Add a profile to support generic arm64 boards. Signed-off-by: Geoff Levand --- .../third_party/coreos-overlay/profiles/coreos/arm64/README | 4 ++++ .../coreos-overlay/profiles/coreos/arm64/generic/dev/parent | 2 ++ .../profiles/coreos/arm64/generic/make.defaults | 2 ++ .../coreos-overlay/profiles/coreos/arm64/generic/parent | 2 ++ .../coreos-overlay/profiles/coreos/arm64/generic/prod/parent | 2 ++ .../coreos-overlay/profiles/coreos/arm64/make.defaults | 0 .../coreos-overlay/profiles/coreos/arm64/package.use.force | 2 ++ .../coreos-overlay/profiles/coreos/arm64/packages | 3 +++ .../third_party/coreos-overlay/profiles/coreos/arm64/parent | 3 +++ .../coreos-overlay/profiles/coreos/arm64/sdk/make.defaults | 2 ++ .../coreos-overlay/profiles/coreos/arm64/sdk/parent | 2 ++ .../coreos-overlay/profiles/coreos/arm64/usr/parent | 1 + .../src/third_party/coreos-overlay/profiles/profiles.desc | 5 +++++ 13 files changed, 30 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/usr/parent diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README new file mode 100644 index 0000000000..baaec7f6d8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README @@ -0,0 +1,4 @@ +This profile (and its sub-profiles) should *only* contain +architecture specific settings. Architecture independent settings should +go under coreos/base (applies to everything) or coreos/targets/* +(applies to the sdk, amd64-generic, etc.). diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent new file mode 100644 index 0000000000..35ac69992e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/dev/parent @@ -0,0 +1,2 @@ +.. +:coreos/targets/generic/dev diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults new file mode 100644 index 0000000000..01f715c2c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/make.defaults @@ -0,0 +1,2 @@ +CFLAGS="-O2 -pipe -mtune=generic" +CXXFLAGS="${CFLAGS}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent new file mode 100644 index 0000000000..767f085901 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/parent @@ -0,0 +1,2 @@ +.. +:coreos/targets/generic diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent new file mode 100644 index 0000000000..89b629a19e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/generic/prod/parent @@ -0,0 +1,2 @@ +.. +:coreos/targets/generic/prod diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/make.defaults new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force new file mode 100644 index 0000000000..aafa196b0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use.force @@ -0,0 +1,2 @@ +# Do not force this flag, we don't need XATTR_PAX +sys-apps/portage -xattr diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages new file mode 100644 index 0000000000..511adccb20 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/packages @@ -0,0 +1,3 @@ +# Disable PAX utilities, we don't use grsec kernels +-*sys-apps/paxctl +-*sys-apps/elfix diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent new file mode 100644 index 0000000000..abb3d18940 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/parent @@ -0,0 +1,3 @@ +#portage-stable:hardened/linux/arm64 -- switch when available +portage-stable:default/linux/arm64 +:coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults new file mode 100644 index 0000000000..01f715c2c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/make.defaults @@ -0,0 +1,2 @@ +CFLAGS="-O2 -pipe -mtune=generic" +CXXFLAGS="${CFLAGS}" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent new file mode 100644 index 0000000000..f0c938676d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/sdk/parent @@ -0,0 +1,2 @@ +.. +:coreos/targets/sdk diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/usr/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/usr/parent new file mode 100644 index 0000000000..0989a17981 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/usr/parent @@ -0,0 +1 @@ +:coreos/arm64/generic diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc index 0385f806b2..1ef2a7e05b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc @@ -4,3 +4,8 @@ amd64 coreos/amd64/generic/prod dev amd64 coreos/amd64/sdk dev amd64 default/linux/amd64/10.0 dev amd64 default/linux/amd64/10.0/coreos dev + +arm64 coreos/arm64/generic dev +arm64 coreos/arm64/generic/dev dev +arm64 coreos/arm64/generic/prod dev +arm64 coreos/arm64/sdk dev From 07cb82788f1497ec27cc5478c602558bbd983edd Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 8 Apr 2015 13:55:27 -0700 Subject: [PATCH 2/3] cros-board.eclass: Add arm64-generic Signed-off-by: Geoff Levand --- .../src/third_party/coreos-overlay/eclass/cros-board.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass index d13cefadbd..d14a50dfe8 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass @@ -31,6 +31,7 @@ BOARD_USE_PREFIX="board_use_" ALL_BOARDS=( amd64-generic amd64-host + arm64-generic ) # Add BOARD_USE_PREFIX to each board in ALL_BOARDS to create IUSE. From b12171b734802fd116c2ba6b43ba10ec00aac0cb Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 8 Apr 2015 13:55:27 -0700 Subject: [PATCH 3/3] baselayout: Add arm64 keywords Update the baselayout ebuild to include arm64 keywords. Bump the version to baselayout-3.0.13. Signed-off-by: Geoff Levand --- .../{baselayout-3.0.12.ebuild => baselayout-3.0.13.ebuild} | 0 .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.12.ebuild => baselayout-3.0.13.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.13.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.12.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.13.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 3c12b6eb88..63c774a0a0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -7,10 +7,10 @@ CROS_WORKON_LOCALNAME="baselayout" CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" else CROS_WORKON_COMMIT="cc3915ded60928f5a85d594d1faab4899174361e" - KEYWORDS="amd64 arm x86" + KEYWORDS="amd64 arm arm64 x86" fi inherit cros-workon eutils multilib systemd