diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-04-30 16:41:05 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-04-30 16:41:05 +1000 |
| commit | fd48f71ea59355ebf149d2599908a87d44882712 (patch) | |
| tree | 82efd83e81977003484ace63844eefbdab2e3997 /recipes-core | |
| parent | 2a978816d4c72190c1ca5853df069a3af866256d (diff) | |
| download | meta-xilinx-fd48f71ea59355ebf149d2599908a87d44882712.tar.gz | |
util-linux: Updated for newer util-linux in oe-core
* Updated patch, added upstream status
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/util-linux/files/microblaze-fixes.patch | 17 | ||||
| -rw-r--r-- | recipes-core/util-linux/util-linux_2.22.2.bbappend (renamed from recipes-core/util-linux/util-linux_2.21.2.bbappend) | 0 |
2 files changed, 7 insertions, 10 deletions
diff --git a/recipes-core/util-linux/files/microblaze-fixes.patch b/recipes-core/util-linux/files/microblaze-fixes.patch index 484caa97..1bac8ea2 100644 --- a/recipes-core/util-linux/files/microblaze-fixes.patch +++ b/recipes-core/util-linux/files/microblaze-fixes.patch | |||
| @@ -1,17 +1,14 @@ | |||
| 1 | Fixed microblaze/el support. | 1 | Upstream-Status: Not-submitted [Needs verification] |
| 2 | 2 | --- | |
| 3 | Index: util-linux-2.21/fdisk/fdiskbsdlabel.h | 3 | diff a/fdisks/fdiskbsdlabel.h b/fdisks/fdiskbsdlabel.h |
| 4 | =================================================================== | 4 | --- a/fdisks/fdiskbsdlabel.h |
| 5 | --- util-linux-2.21.orig/fdisk/fdiskbsdlabel.h 2012-10-08 12:48:44.749417892 +1000 | 5 | +++ b/fdisks/fdiskbsdlabel.h |
| 6 | +++ util-linux-2.21/fdisk/fdiskbsdlabel.h 2012-10-08 12:49:58.356743930 +1000 | 6 | @@ -55,7 +55,7 @@ |
| 7 | @@ -54,7 +54,8 @@ | ||
| 8 | #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) | 7 | #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) |
| 9 | #define BSD_LABELSECTOR 0 | 8 | #define BSD_LABELSECTOR 0 |
| 10 | #define BSD_LABELOFFSET 64 | 9 | #define BSD_LABELOFFSET 64 |
| 11 | -#elif defined (__s390__) || defined (__s390x__) | 10 | -#elif defined (__s390__) || defined (__s390x__) |
| 12 | +#elif defined (__s390__) || defined (__s390x__) || \ | 11 | +#elif defined (__s390__) || defined (__s390x__) || defined (__microblaze__) || defined (__microblazeel__) |
| 13 | + defined(__microblaze__) || defined(__microblazeel__) | ||
| 14 | #define BSD_LABELSECTOR 1 | 12 | #define BSD_LABELSECTOR 1 |
| 15 | #define BSD_LABELOFFSET 0 | 13 | #define BSD_LABELOFFSET 0 |
| 16 | #else | 14 | #else |
| 17 | |||
diff --git a/recipes-core/util-linux/util-linux_2.21.2.bbappend b/recipes-core/util-linux/util-linux_2.22.2.bbappend index 057e880c..057e880c 100644 --- a/recipes-core/util-linux/util-linux_2.21.2.bbappend +++ b/recipes-core/util-linux/util-linux_2.22.2.bbappend | |||