aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElvis Dowson <elvis.dowson@gmail.com>2013-04-19 11:34:30 +0400
committerElvis Dowson <elvis.dowson@gmail.com>2013-04-19 19:49:07 +0400
commit4a0d5764d457cc70a1de212130848467ef0b5a9e (patch)
tree4e385191a1d5d34e719ce859fedc3d734db8b6e3
parent333bb0b3ce85e11f6bce1d567fe93047daa58ba1 (diff)
downloadmeta-xilinx-community-edowson/xilinx-ml507-gcc-4.7.tar.gz
meta-xilinx-community-edowson/xilinx-ml507-gcc-4.7.tar.bz2
meta-xilinx-community-edowson/xilinx-ml507-gcc-4.7.zip
recipes-core/util-linux: Update to util-linux-2.22.2.bbappendedowson/xilinx-ml507-gcc-4.7
This commit - updates the recipe over-ride to match util-linux-2.22.2 - refactors the microblaze patch to take into account the change in the top-level directory 'fdisk' to 'fdisks' Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
-rw-r--r--recipes-core/util-linux/files/0001-fdisks-fdiskbsdlabel.h-Add-support-for-microblaze-an.patch28
-rw-r--r--recipes-core/util-linux/files/microblaze-fixes.patch17
-rw-r--r--recipes-core/util-linux/util-linux_2.21.2.bbappend4
-rw-r--r--recipes-core/util-linux/util-linux_2.22.2.bbappend4
4 files changed, 32 insertions, 21 deletions
diff --git a/recipes-core/util-linux/files/0001-fdisks-fdiskbsdlabel.h-Add-support-for-microblaze-an.patch b/recipes-core/util-linux/files/0001-fdisks-fdiskbsdlabel.h-Add-support-for-microblaze-an.patch
new file mode 100644
index 0000000..4c5d947
--- /dev/null
+++ b/recipes-core/util-linux/files/0001-fdisks-fdiskbsdlabel.h-Add-support-for-microblaze-an.patch
@@ -0,0 +1,28 @@
+From af1bfbd8f95f2dfa879960cc5edd0922b9fac458 Mon Sep 17 00:00:00 2001
+From: Elvis Dowson <elvis.dowson@gmail.com>
+Date: Wed, 3 Apr 2013 22:15:10 +0400
+Subject: [PATCH] fdisks/fdiskbsdlabel.h: Add support for microblaze and
+ microblazeel.
+
+Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
+---
+ fdisks/fdiskbsdlabel.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fdisks/fdiskbsdlabel.h b/fdisks/fdiskbsdlabel.h
+index c7cc818..dd908fd 100644
+--- a/fdisks/fdiskbsdlabel.h
++++ b/fdisks/fdiskbsdlabel.h
+@@ -55,7 +55,8 @@
+ #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
+--
+1.7.10.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 484caa9..0000000
--- a/recipes-core/util-linux/files/microblaze-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixed microblaze/el support.
-
-Index: util-linux-2.21/fdisk/fdiskbsdlabel.h
-===================================================================
---- util-linux-2.21.orig/fdisk/fdiskbsdlabel.h 2012-10-08 12:48:44.749417892 +1000
-+++ util-linux-2.21/fdisk/fdiskbsdlabel.h 2012-10-08 12:49:58.356743930 +1000
-@@ -54,7 +54,8 @@
- #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.21.2.bbappend b/recipes-core/util-linux/util-linux_2.21.2.bbappend
deleted file mode 100644
index d98f2f4..0000000
--- a/recipes-core/util-linux/util-linux_2.21.2.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS := "${THISDIR}/files"
-
-# Apply patch to add "microblaze" support to util-linux
-SRC_URI += "file://microblaze-fixes.patch"
diff --git a/recipes-core/util-linux/util-linux_2.22.2.bbappend b/recipes-core/util-linux/util-linux_2.22.2.bbappend
new file mode 100644
index 0000000..c54f1ef
--- /dev/null
+++ b/recipes-core/util-linux/util-linux_2.22.2.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS := "${THISDIR}/files"
+
+# Apply patches
+SRC_URI += "file://0001-fdisks-fdiskbsdlabel.h-Add-support-for-microblaze-an.patch"