mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
2f9d8fef13
* Fix build failing because of UBI_IOCSETPROP -> UBI_IOCSETVOLPROP renaming. * This patch follows the one in oe-core for mtd-utils_1.5.0 * which was staging an older version of the ubi-user.h header. * We need to match the renaming done in kernel 3.0 * http://lists.infradead.org/pipermail/linux-mtd/2011-March/ * 034419.html Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
29 lines
835 B
Diff
29 lines
835 B
Diff
--- 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
|
|
@@ -686,7 +706,7 @@
|
|
* success and %-1 in case of failure. @r->ubi_num contains newly created UBI
|
|
* device number.
|
|
*/
|
|
-static int do_attach(const char *node, const struct ubi_attach_req *r)
|
|
+static int do_attach(const char *node, struct ubi_attach_req *r)
|
|
{
|
|
int fd, ret;
|
|
|
|
@@ -1346,13 +1346,13 @@
|
|
|
|
int ubi_set_property(int fd, uint8_t property, uint64_t value)
|
|
{
|
|
- struct ubi_set_prop_req r;
|
|
+ struct ubi_set_vol_prop_req r;
|
|
|
|
- memset(&r, 0, sizeof(struct ubi_set_prop_req));
|
|
+ memset(&r, 0, sizeof(struct ubi_set_vol_prop_req));
|
|
r.property = property;
|
|
r.value = value;
|
|
|
|
- return ioctl(fd, UBI_IOCSETPROP, &r);
|
|
+ return ioctl(fd, UBI_IOCSETVOLPROP, &r);
|
|
}
|
|
|
|
int ubi_leb_unmap(int fd, int lnum)
|