Merging AArch64 support

Merging AArch64 support

[Marcin Juszkiewicz]

Hello guys

Now, when AArch64 is buildable from public sources it came a time to
work on merging all changes I had to do to get it working with current
OE-Core.

All changes are available in:

git://git.openembedded.org/openembedded-core-contrib hrw/aarch64-support

Those are first versions of patches so if anything has to be changed
feel free to tell. Probably descriptions needs to be updated etc but I
would like to see some kind of review as it was long time since last
time I did OE merging stuff.

[PATCH 1/5] siteinfo.bbclass: add AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/classes/siteinfo.bbclass |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 8c256ce..aab0867 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -18,6 +18,7 @@
 def siteinfo_data(d):
     archinfo = {
         "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch
+        "aarch64": "endian-little bit-64 arm-common",
         "arm": "endian-little bit-32 arm-common",
         "armeb": "endian-big bit-32 arm-common",
         "avr32": "endian-big bit-32 avr32-common",
@@ -60,6 +61,7 @@ def siteinfo_data(d):
         "mingw32": "common-mingw",
     }
     targetinfo = {
+        "aarch64-linux-gnu": "aarch64-linux",
         "arm-linux-gnueabi": "arm-linux",
         "arm-linux-uclibceabi": "arm-linux-uclibc",
         "armeb-linux-gnueabi": "armeb-linux",
-- 
1.7.10.4

[PATCH 2/5] kernel-arch.bblass: add AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/classes/kernel-arch.bbclass |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index 6446504..b3b78b6 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -8,7 +8,7 @@ valid_archs = "alpha cris ia64 \
                i386 x86 \
                m68knommu m68k ppc powerpc powerpc64 ppc64  \
                sparc sparc64 \
-               arm \
+               arm aarch64 \
                m32r mips \
                sh sh64 um h8300   \
                parisc s390  v850 \
@@ -22,6 +22,7 @@ def map_kernel_arch(a, d):
 
     if   re.match('(i.86|athlon|x86.64)$', a):  return 'x86'
     elif re.match('armeb$', a):                 return 'arm'
+    elif re.match('aarch64$', a):               return 'arm64'
     elif re.match('mips(el|64|64el)$', a):      return 'mips'
     elif re.match('p(pc|owerpc)(|64)', a):      return 'powerpc'
     elif re.match('sh(3|4)$', a):               return 'sh'
-- 
1.7.10.4

[PATCH 3/5] insane.bbclass: add AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/classes/insane.bbclass |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 4f87c93..5e9cba1 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -44,6 +44,7 @@ def package_qa_get_machine_dict():
                         "arm" :       (40,     0,    0,          True,          32),
                       },
             "linux" : { 
+                        "aarch64" :   (183,    0,    0,          True,          64),
                         "arm" :       (40,    97,    0,          True,          32),
                         "armeb":      (40,    97,    0,          False,         32),
                         "powerpc":    (20,     0,    0,          False,         32),
-- 
1.7.10.4

[PATCH 4/5] openssl: add AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 .../openssl/openssl-1.0.0j/configure-targets.patch    |   17 ++++++++++++-----
 meta/recipes-connectivity/openssl/openssl_1.0.0j.bb   |    2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0j/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0j/configure-targets.patch
index 3d253d8..e273ab4 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0j/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0j/configure-targets.patch
@@ -3,11 +3,15 @@ Upstream-Status: Inappropriate [embedded specific]
 The number of colons are important :)
 
 
-Index: openssl-1.0.0h/Configure
-===================================================================
---- openssl-1.0.0h.orig/Configure	2012-04-23 09:16:09.521511921 -0700
-+++ openssl-1.0.0h/Configure	2012-04-23 09:17:41.829516389 -0700
-@@ -380,6 +380,22 @@
+---
+ Configure |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+--- openssl-1.0.0j.orig/Configure
++++ openssl-1.0.0j/Configure
+@@ -378,10 +378,27 @@ my %table=(
+ "linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
  
@@ -18,6 +22,7 @@ Index: openssl-1.0.0h/Configure
 +"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-aarch64","$ENV{'CC'}:-DL_ENDIAN 	-DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
 +"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
 +
@@ -30,3 +35,5 @@ Index: openssl-1.0.0h/Configure
  #### *BSD [do see comment about ${BSDthreads} above!]
  "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0j.bb
index 7dac79c..8c0166a 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0j.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0j.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-- 
1.7.10.4

[PATCH 5/5] util-linux: add AArch64 support

[Marcin Juszkiewicz]

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 .../util-linux/util-linux/add-aarch64-support.patch  |   18 ++++++++++++++++++
 meta/recipes-core/util-linux/util-linux_2.21.2.bb    |    3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch

diff --git a/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch b/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
new file mode 100644
index 0000000..4480f13
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
@@ -0,0 +1,18 @@
+---
+ fdisk/fdiskbsdlabel.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- util-linux-2.21.2.orig/fdisk/fdiskbsdlabel.h
++++ util-linux-2.21.2/fdisk/fdiskbsdlabel.h
+@@ -46,10 +46,11 @@
+ 
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+ #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
+     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
++    defined (__aarch64__) || \
+     defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
+ #define BSD_LABELSECTOR   0
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index 39e3609..e64ebe9 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.21"
-PR = "r5"
+PR = "r6"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
@@ -9,6 +9,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \
 	    file://configure-sbindir.patch \
+	    file://add-aarch64-support.patch \
 "
 
 SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"
-- 
1.7.10.4

Re: Merging AArch64 support

[Richard Purdie]

On Wed, 2012-10-03 at 11:51 +0200, Marcin Juszkiewicz wrote:
> Hello guys
> 
> Now, when AArch64 is buildable from public sources it came a time to
> work on merging all changes I had to do to get it working with current
> OE-Core.
> 
> All changes are available in:
> 
> git://git.openembedded.org/openembedded-core-contrib hrw/aarch64-support
> 
> Those are first versions of patches so if anything has to be changed
> feel free to tell. Probably descriptions needs to be updated etc but I
> would like to see some kind of review as it was long time since last
> time I did OE merging stuff.

The five you've sent look straightforward to me and ok...

Cheers,

Richard

Re: Merging AArch64 support

[Mark Hatle]

On 10/3/12 4:51 AM, Marcin Juszkiewicz wrote:
> Hello guys
>
> Now, when AArch64 is buildable from public sources it came a time to
> work on merging all changes I had to do to get it working with current
> OE-Core.
>
> All changes are available in:
>
> git://git.openembedded.org/openembedded-core-contrib hrw/aarch64-support
>
> Those are first versions of patches so if anything has to be changed
> feel free to tell. Probably descriptions needs to be updated etc but I
> would like to see some kind of review as it was long time since last
> time I did OE merging stuff.

I was recently told that the glibc components were not yet available, but the 
other toolchain items are.  Has the glibc stuff (and other toolchain items) been 
submitted to oe-core yet?  I didn't see them in any of your commits.

--Mark

>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: Merging AArch64 support

[Marcin Juszkiewicz]

W dniu 03.10.2012 15:36, Mark Hatle pisze:
> On 10/3/12 4:51 AM, Marcin Juszkiewicz wrote:

>> Now, when AArch64 is buildable from public sources it came a time
>> to work on merging all changes I had to do to get it working with
>> current OE-Core.

> I was recently told that the glibc components were not yet
> available, but the other toolchain items are.

First version of public glibc patches were released on Monday.

> Has the glibc stuff (and other toolchain items) been submitted to
> oe-core yet?  I didn't see them in any of your commits.

They are not sent yet cause I am working on many different things at
same time this week due to ARMv8 sprint in Cambridge. I will send
patches to OE-Core during next 2 weeks to add it. The compiler for
example is still not final version.

In meantime you can use
http://git.linaro.org/gitweb?p=openembedded/meta-aarch64.git layer on
top of meta-linaro + meta-oe + oe-core setup (scripts/init.sh fetches
all needed layers and does configuration).

[PATCH] autotools.bbclass: update gnu-config files always

[Marcin Juszkiewicz]

For new architectures we need to update gnu-config for all recipes
which use autotools. Normally we do that with "autoreconf" but some
recipes (db, ncurses, slang, xinetd for example) have own do_configure
function so we need to patch them one by one.

This solution handles this once and for all. There are some recipes
which will need special treatment but that's because they have
config.* files in other directory than ${S}.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/classes/autotools.bbclass |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index e4e034b..7effd48 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -99,6 +99,10 @@ autotools_preconfigure() {
 			mkdir ${B}
 		fi
 	fi
+
+	# not all recipes which use autotools use it's do_configure
+	install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
+	install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
 }
 
 autotools_postconfigure(){
-- 
1.7.10.4

Re: Merging AArch64 support

[Saul Wold]

On 10/03/2012 02:51 AM, Marcin Juszkiewicz wrote:
> Hello guys
>
> Now, when AArch64 is buildable from public sources it came a time to
> work on merging all changes I had to do to get it working with current
> OE-Core.
>
> All changes are available in:
>
> git://git.openembedded.org/openembedded-core-contrib hrw/aarch64-support
>
> Those are first versions of patches so if anything has to be changed
> feel free to tell. Probably descriptions needs to be updated etc but I
> would like to see some kind of review as it was long time since last
> time I did OE merging stuff.
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Merged the full series of Aarch64 support patches into OE-Core

Thanks
	Sau!