From 53709cce717ad371f41e3e601c23064d02f0f0bd22c316d1437cea759445cf9a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 18 Feb 2013 09:32:27 +0000 Subject: [PATCH] Accepting request 155674 from home:Andreas_Schwab:Factory - fdiskbsdlabel.patch: Fix fdisk compilation on aarch64 OBS-URL: https://build.opensuse.org/request/show/155674 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=155 --- fdiskbsdlabel.patch | 14 ++++++++++++++ util-linux.changes | 6 ++++++ util-linux.spec | 4 ++++ 3 files changed, 24 insertions(+) create mode 100644 fdiskbsdlabel.patch diff --git a/fdiskbsdlabel.patch b/fdiskbsdlabel.patch new file mode 100644 index 0000000..8d1d4da --- /dev/null +++ b/fdiskbsdlabel.patch @@ -0,0 +1,14 @@ +Index: util-linux-2.21.2/fdisk/fdiskbsdlabel.h +=================================================================== +--- util-linux-2.21.2.orig/fdisk/fdiskbsdlabel.h ++++ util-linux-2.21.2/fdisk/fdiskbsdlabel.h +@@ -48,7 +48,8 @@ + + #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \ + defined (__mips__) || defined (__s390__) || defined (__sh__) || \ +- defined(__x86_64__) || defined (__avr32__) || defined(__cris__) ++ defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \ ++ defined(__aarch64__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 + #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) diff --git a/util-linux.changes b/util-linux.changes index e04ac50..cf4ed08 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 16 17:48:29 UTC 2013 - schwab@suse.de + +- fdiskbsdlabel.patch: + Fix fdisk compilation on aarch64 + ------------------------------------------------------------------- Tue Feb 5 14:32:49 UTC 2013 - crrodriguez@opensuse.org diff --git a/util-linux.spec b/util-linux.spec index ad08dde..87891dd 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -116,6 +116,9 @@ Patch24: umount-sanitize-paths-from-non-root-users.patch ##### # There is no __secure_getenv anymore.. Patch25: 0001-Test-for-secure_getenv-too.patch + +# fix fdisk compilation on aarch64 +Patch26: fdiskbsdlabel.patch ## ## adjtimex ## @@ -234,6 +237,7 @@ Files to develop applications using the libmount library. %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 # cd adjtimex-* # adjtimex patches belongs here