aboutsummaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-devtools/mtd
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2012-05-13 23:01:01 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-05-14 16:02:01 +0200
commitd983ea32f125325c6524731d9f8055a3a8155247 (patch)
treec60a48c2a114c7af799eae51d6b0686970d445b0 /meta-initramfs/recipes-devtools/mtd
parent2490c44e51fcd83ea9f5ebd0f195e58499c02224 (diff)
downloadmeta-openembedded-contrib-d983ea32f125325c6524731d9f8055a3a8155247.tar.gz
ubi-utils-klibc: clean patch
* after klibc refactoring * bump PR Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-initramfs/recipes-devtools/mtd')
-rw-r--r--meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch27
-rw-r--r--meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb5
2 files changed, 2 insertions, 30 deletions
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch
index 97c4fa3abf..8278a4fc7c 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/libubi.c.patch
@@ -1,32 +1,5 @@
--- a/ubi-utils/libubi.c 2012-05-01 01:57:51.000000000 +0200
+++ b/ubi-utils/libubi.c 2012-05-01 01:55:14.000000000 +0200
-@@ -36,6 +36,26 @@
- #include "libubi_int.h"
- #include "common.h"
-
-+/* parts of mtd/ubi-user.h */
-+
-+/* Set an UBI volume property */
-+#define UBI_IOCSETPROP _IOW(UBI_VOL_IOC_MAGIC, 6, struct ubi_set_prop_req)
-+
-+/**
-+ * struct ubi_set_prop_req - a data structure used to set an ubi volume
-+ * property.
-+ * @property: property to set (%UBI_PROP_DIRECT_WRITE)
-+ * @padding: reserved for future, not used, has to be zeroed
-+ * @value: value to set
-+ */
-+struct ubi_set_prop_req {
-+ uint8_t property;
-+ uint8_t padding[7];
-+ uint64_t value;
-+} __attribute__ ((packed));
-+
-+/* end parts of mtd/ubi-user.h */
-+
- /**
- * mkpath - compose full path from 2 given components.
- * @path: the first component
@@ -382,8 +402,8 @@
return errmsg("\"%s\" is not a character device", node);
}
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb
index c46ded53af..9a8987cb69 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
-PR = "r1"
+PR = "r2"
inherit klibc
@@ -36,7 +36,6 @@ PACKAGES =+ "ubinfo-klibc ubiattach-klibc ubidetach-klibc mtdinfo-klibc ubiupdat
ubimkvol-klibc ubirename-klibc ubirmvol-klibc ubirsvol-klibc \
ubinize-klibc ubiformat-klibc ubicrc32-klibc"
-FILES_ubicrc32-klibc = "${sbindir}/ubicrc32"
FILES_ubinfo-klibc = "${sbindir}/ubinfo"
FILES_ubiattach-klibc = "${sbindir}/ubiattach"
FILES_ubidetach-klibc = "${sbindir}/ubidetach"
@@ -48,4 +47,4 @@ FILES_ubirmvol-klibc = "${sbindir}/ubirmvol"
FILES_ubirsvol-klibc = "${sbindir}/ubirsvol"
FILES_ubinize-klibc = "${sbindir}/ubinize"
FILES_ubiformat-klibc = "${sbindir}/ubiformat"
-
+FILES_ubicrc32-klibc = "${sbindir}/ubicrc32"