mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1312 from glevand/for-merge-4

Browse Source 
coreos-overlay: Updates for arm64
This commit is contained in:
Geoff Levand 2015-06-25 13:27:43 -07:00
commit 00c75ee887
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild vendored
View File

@ -17,7 +17,7 @@ SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="amd64 ~arm ~x86" KEYWORDS="amd64 ~arm arm64 ~x86"
IUSE="" IUSE=""
DEPEND="${PYTHON_DEPS}" DEPEND="${PYTHON_DEPS}"
@ -35,6 +35,8 @@ pkg_setup() {
export XEN_TARGET_ARCH="x86_64" export XEN_TARGET_ARCH="x86_64"
elif use arm; then elif use arm; then
export XEN_TARGET_ARCH="arm32" export XEN_TARGET_ARCH="arm32"
elif use arm64; then
export XEN_TARGET_ARCH="arm64"
else else
die "Unsupported architecture!" die "Unsupported architecture!"
fi fi

19
sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/files/python-2.7-aarch64-fix.patch vendored Normal file
View File

@ -0,0 +1,19 @@
Fixes build errors like these when building for arm64:
File "build/temp.linux2-aarch64-2.7/libffi/fficonfig.py"
ffi_sources += ffi_platforms['AARCH64']
KeyError: 'AARCH64'
Makefile:475: recipe for target 'sharedmods' failed
Signed-off-by: Geoff Levand <geoff@infradead.org>
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -4,6 +4,7 @@
""".split()
ffi_platforms = {
+ 'AARCH64': ['src/aarch64/ffi.c', 'src/aarch64/sysv.S'],
'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],

5
sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r1.ebuild → sdk_container/src/third_party/coreos-overlay/dev-lang/python-oem/python-oem-2.7.6-r2.ebuild vendored
View File

@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
LICENSE="PSF-2" LICENSE="PSF-2"
SLOT="2.7" SLOT="2.7"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="hardened" IUSE="hardened"
# Do not add a dependency on dev-lang/python to this ebuild. # Do not add a dependency on dev-lang/python to this ebuild.
@ -50,6 +50,9 @@ src_prepare() {
# Fix for linux_distribution() # Fix for linux_distribution()
epatch "${FILESDIR}/python-2.7.6-add_os_release_support.patch" epatch "${FILESDIR}/python-2.7.6-add_os_release_support.patch"
# Fix for arm64 builds
epatch "${FILESDIR}/python-2.7-aarch64-fix.patch"
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \ Lib/distutils/command/install.py \
Lib/distutils/sysconfig.py \ Lib/distutils/sysconfig.py \