From b6d11b2fab1f1a9937e7153623a8a0ddfa9b2056 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 7 Jul 2016 16:21:25 -0700 Subject: [PATCH 1/4] dev-lang/spidermonkey: Fix for CONFIG_ARM64_VA_BITS_48 Fixes runtime errors like these on arm64: polkitd[2760]: unhandled level 1 translation fault (11) at 0x7fff8c304108, esr 0x90000005 Signed-off-by: Geoff Levand --- .../spidermonkey-1.8.5-fix-arm64-va-48.patch | 21 +++++++++++++++++++ .../spidermonkey/spidermonkey-1.8.5-r4.ebuild | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch new file mode 100644 index 0000000000..6248f3ac52 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-arm64-va-48.patch @@ -0,0 +1,21 @@ + +Fix for CONFIG_ARM64_VA_BITS_48=y +https://bugzilla.redhat.com/show_bug.cgi?id=1242326 + +--- a/js/src/jsval.h.old ++++ b/js/src/jsval.h +@@ -236,8 +236,14 @@ + + #elif JS_BITS_PER_WORD == 64 + ++#if defined(__aarch64__) ++#define JSVAL_PAYLOAD_MASK 0x0000FFFFFFFFFFFFLL ++#define JSVAL_TAG_MASK 0xFFFF000000000000LL ++#else + #define JSVAL_PAYLOAD_MASK 0x00007FFFFFFFFFFFLL + #define JSVAL_TAG_MASK 0xFFFF800000000000LL ++#endif ++ + #define JSVAL_TYPE_TO_TAG(type) ((JSValueTag)(JSVAL_TAG_MAX_DOUBLE | (type))) + #define JSVAL_TYPE_TO_SHIFTED_TAG(type) (((uint64)JSVAL_TYPE_TO_TAG(type)) << JSVAL_TAG_SHIFT) + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild index e260a10cc1..e7996be117 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-1.8.5-r4.ebuild @@ -60,6 +60,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch # fix builds for alternate $ROOT locations epatch "${FILESDIR}"/${P}-no-link-lib-deps.patch + # Fix for CONFIG_ARM64_VA_BITS_48=y + # https://bugzilla.redhat.com/show_bug.cgi?id=1242326 + epatch "${FILESDIR}/${P}-fix-arm64-va-48.patch" epatch_user From 4fdc4c00e794fd0551c4279b54ee5f5cf756a3d0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 7 Jul 2016 16:21:25 -0700 Subject: [PATCH 2/4] ca-certificates: Add arm64 keyword Signed-off-by: Geoff Levand --- .../app-misc/ca-certificates/ca-certificates-3.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.19.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.19.1.ebuild index 0f70a006f7..cb1947148c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.19.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.19.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME} # NSS is licensed under the MPL, files/certdata2pem.py is GPL LICENSE="MPL-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 arm64" IUSE="" RDEPEND="dev-libs/openssl From 73468c5ba260e0ed2d7ffe93dcfa9b2a99e61b23 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 7 Jul 2016 16:21:25 -0700 Subject: [PATCH 3/4] profiles: Remove bogus app-emulation/rkt Signed-off-by: Geoff Levand --- .../profiles/coreos/arm64/package.accept_keywords | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 7110bf2b6c..04931e7e4d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -21,8 +21,6 @@ dev-vcs/git ~arm64 sys-fs/squashfs-tools ~arm64 net-dns/dnsmasq ~arm64 -app-emulation/rkt ~amd64 - dev-libs/libevent ~arm64 net-misc/ntp ~arm64 From 18ebfb33e3196cd277cc56fe1dda2425931741e0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 7 Jul 2016 16:21:25 -0700 Subject: [PATCH 4/4] profiles/arm64: Remove thin-provisioning-tools --- .../profiles/coreos/arm64/package.accept_keywords | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 04931e7e4d..58cace51a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -53,7 +53,6 @@ net-fs/nfs-utils ~arm64 =sys-devel/bison-3.0.4-r1 ~arm64 -=sys-block/thin-provisioning-tools-0.4.1 ** =sys-fs/cryptsetup-1.6.7 ** =sys-fs/xfsprogs-3.2.2-r1 ** =sys-apps/i2c-tools-3.1.1-r1 ** @@ -106,4 +105,3 @@ net-fs/nfs-utils ~arm64 # https://bugs.gentoo.org/show_bug.cgi?id=585926 / CVE-2016-4971 =net-misc/wget-1.18 ** -