diff options
author | Adam Duskett <Aduskett@gmail.com> | 2017-06-08 23:05:08 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-20 22:32:20 +0200 |
commit | 67117adc891e06154d23a01b8c8ee348c63e78eb (patch) | |
tree | 3cd096e5a995fd66396cc5ec333cde49b33642f7 /package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch | |
parent | cf57c6aa76729bb0e22d94839db0c69f2402c979 (diff) | |
download | buildroot-67117adc891e06154d23a01b8c8ee348c63e78eb.tar.gz buildroot-67117adc891e06154d23a01b8c8ee348c63e78eb.zip |
mtd: bump to version 2.0.0
This revision includes:
- Moving from a handwritten makefile to autotools.
- Restructuring and cleaning up the source tree.
- Fixing the problems that the patches in the package/mtd directory fixed.
Changes:
- Move from generic-package to autotools-package in mtd.mk.
- Remove no longer necessary patches.
- Update binary locations in mtd.mk
- Update library/header locations in mtd.mk
- Remove MTD_ADD_MISSING_LINTL definition from mtd.mk, as it's no longer
needed.
Tested with toolchains compiled with musl, uclibc, and glibc.
Signed-off-by: Adam Duskett <aduskett@codeblue.com>
[Thomas: additional improvements
- introduce hidden options BR2_PACKAGE_MTD_JFFS_UTILS,
BR2_PACKAGE_MTD_UBIFS_UTILS and BR2_PACKAGE_MTD_TESTS that match the
./configure options of mtd. Those hidden options select the
appropriate dependencies checked by the configure script, and are
selected by the existing per-tool Config.in options.
- .mk file is changed to handle properly the new hidden options
BR2_PACKAGE_MTD_JFFS_UTILS, BR2_PACKAGE_MTD_UBIFS_UTILS and
BR2_PACKAGE_MTD_TESTS.
- .mk file is changed to properly handle BR2_PACKAGE_ACL, by passing
--with-xattr/--without-xattr.
- remove HOST_MTD_BUILD_CMDS and HOST_MTD_INSTALL_CMDS, those are no
longer needed since we have an autotools-package now.
- MTD_STAGING_y and MTD_INSTALL_STAGING_CMDS are removed, we use the
default staging installation commands, that install everything that
is needed.
- the MTD_TARGETS_UBI_y variable is merged into MTD_TARGETS_y, as we no
longer need to distinguish both.
- integck installation logic is moved into MTD_TARGETS_y.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch')
-rw-r--r-- | package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch b/package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch deleted file mode 100644 index 077ca0c6a9..0000000000 --- a/package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5f50207231414bfdbac8f0f974a2824f24177d6e Mon Sep 17 00:00:00 2001 -From: Enrico Jorns <ejo@pengutronix.de> -Date: Fri, 11 Sep 2015 15:28:13 +0200 -Subject: [PATCH] mtd-utils: ubinize: Always return error code (at least -1) in - case of an error - -ubinize should not fail silenty, this can be very annoying when using -it from other tools that rely on the exit code for determining the -success of their operation. - -Signed-off-by: Enrico Jorns <ejo@pengutronix.de> -Signed-off-by: Brian Norris <computersforpeace@gmail.com> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> ---- - ubi-utils/ubinize.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/ubi-utils/ubinize.c b/ubi-utils/ubinize.c -index 34f465a..60bbd9a 100644 ---- a/ubi-utils/ubinize.c -+++ b/ubi-utils/ubinize.c -@@ -519,6 +519,7 @@ int main(int argc, char * const argv[]) - */ - seek = ui.peb_size * 2; - if (lseek(args.out_fd, seek, SEEK_SET) != seek) { -+ err = -1; - sys_errmsg("cannot seek file \"%s\"", args.f_out); - goto out_free; - } -@@ -530,6 +531,7 @@ int main(int argc, char * const argv[]) - int fd, j; - - if (!sname) { -+ err = -1; - errmsg("ini-file parsing error (iniparser_getsecname)"); - goto out_free; - } -@@ -550,6 +552,7 @@ int main(int argc, char * const argv[]) - */ - for (j = 0; j < i; j++) { - if (vi[i].id == vi[j].id) { -+ err = -1; - errmsg("volume IDs must be unique, but ID %d " - "in section \"%s\" is not", - vi[i].id, sname); -@@ -557,6 +560,7 @@ int main(int argc, char * const argv[]) - } - - if (!strcmp(vi[i].name, vi[j].name)) { -+ err = -1; - errmsg("volume name must be unique, but name " - "\"%s\" in section \"%s\" is not", - vi[i].name, sname); -@@ -580,6 +584,7 @@ int main(int argc, char * const argv[]) - if (img) { - fd = open(img, O_RDONLY); - if (fd == -1) { -+ err = fd; - sys_errmsg("cannot open \"%s\"", img); - goto out_free; - } --- -1.9.1 - |