From 717e13c423e8e4ee560196ebdf3b3f0ff4b27e26 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 11 Jun 2013 10:29:53 +1000 Subject: util-linux: Replace local patch with submitted patch * Initial MicroBlaze patch has been submitted up-stream Signed-off-by: Nathan Rossi --- ...d-support-for-the-MicroBlaze-architecture.patch | 29 ++++++++++++++++++++++ .../util-linux/files/microblaze-fixes.patch | 14 ----------- recipes-core/util-linux/util-linux_2.23.bbappend | 2 +- 3 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 recipes-core/util-linux/files/fdisk-add-support-for-the-MicroBlaze-architecture.patch delete mode 100644 recipes-core/util-linux/files/microblaze-fixes.patch (limited to 'recipes-core') diff --git a/recipes-core/util-linux/files/fdisk-add-support-for-the-MicroBlaze-architecture.patch b/recipes-core/util-linux/files/fdisk-add-support-for-the-MicroBlaze-architecture.patch new file mode 100644 index 00000000..0a2d71ff --- /dev/null +++ b/recipes-core/util-linux/files/fdisk-add-support-for-the-MicroBlaze-architecture.patch @@ -0,0 +1,29 @@ +From: Nathan Rossi +Date: Fri, 7 Jun 2013 14:03:41 +1000 +Subject: [PATCH] fdisk: add support for the MicroBlaze architecture + +Add support to fdisk for the MicroBlaze architecture. + +Signed-off-by: Nathan Rossi +Upstream-Status: Submitted +--- + fdisks/fdiskbsdlabel.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/fdisks/fdiskbsdlabel.h b/fdisks/fdiskbsdlabel.h +index 8c4e4e7..69f1065 100644 +--- a/fdisks/fdiskbsdlabel.h ++++ b/fdisks/fdiskbsdlabel.h +@@ -49,7 +49,8 @@ + #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \ + defined (__mips__) || defined (__s390__) || defined (__sh__) || \ + defined (__aarch64__) || defined(__xtensa__) || \ +- defined(__x86_64__) || defined (__avr32__) || defined(__cris__) ++ defined (__x86_64__) || defined (__avr32__) || defined(__cris__) || \ ++ defined (__microblaze__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 + #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) +-- +1.7.5.4 + diff --git a/recipes-core/util-linux/files/microblaze-fixes.patch b/recipes-core/util-linux/files/microblaze-fixes.patch deleted file mode 100644 index 1bac8ea2..00000000 --- a/recipes-core/util-linux/files/microblaze-fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Not-submitted [Needs verification] ---- -diff a/fdisks/fdiskbsdlabel.h b/fdisks/fdiskbsdlabel.h ---- a/fdisks/fdiskbsdlabel.h -+++ b/fdisks/fdiskbsdlabel.h -@@ -55,7 +55,7 @@ - #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) - #define BSD_LABELSECTOR 0 - #define BSD_LABELOFFSET 64 --#elif defined (__s390__) || defined (__s390x__) -+#elif defined (__s390__) || defined (__s390x__) || defined (__microblaze__) || defined (__microblazeel__) - #define BSD_LABELSECTOR 1 - #define BSD_LABELOFFSET 0 - #else diff --git a/recipes-core/util-linux/util-linux_2.23.bbappend b/recipes-core/util-linux/util-linux_2.23.bbappend index 057e880c..01e37383 100644 --- a/recipes-core/util-linux/util-linux_2.23.bbappend +++ b/recipes-core/util-linux/util-linux_2.23.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS := "${THISDIR}/files" # Apply patch to add "microblaze" support to util-linux -SRC_URI += "file://microblaze-fixes.patch" +SRC_URI += "file://fdisk-add-support-for-the-MicroBlaze-architecture.patch" -- cgit v1.2.3-54-g00ecf