util-linux: add AArch64 support

(From OE-Core rev: 1dbf17d221ee9d50c5de8c04144c92fdc78d6d73)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 20 insertions, 1 deletions

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 0000000000..4480f13ac5
--- /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 39e3609ac0..e64ebe97ac 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"