update buildroot to 2017.02.11

This commit is contained in:
jbnadal
2018-05-22 15:35:47 +02:00
parent 4bf1f5e091
commit a3c10bd762
9257 changed files with 433426 additions and 1701 deletions

View File

@@ -0,0 +1,64 @@
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

View File

@@ -0,0 +1,62 @@
From 30f0cd91b21dbc5d593d61ae44875ad0cb53cb4d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 16 Jul 2016 11:27:06 +0200
Subject: [PATCH] integck: only use execinfo.h when INTEGCK_DEBUG is enabled
Guard the usage of execinfo.h by INTEGCK_DEBUG so that by defaut,
integck builds properly on systems without <execinfo.h> (uClibc and
musl based systems). As stated in the code, the backtrace()
functionality of <execinfo.h> will anyway only work properly when
INTEGCK_DEBUG is defined (it makes all functions non-static, which is
needed for backtrace to provide some useful information).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
tests/fs-tests/integrity/integck.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 8badd1f..6ef817e 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -31,7 +31,9 @@
#include <getopt.h>
#include <assert.h>
#include <mntent.h>
+#ifdef INTEGCK_DEBUG
#include <execinfo.h>
+#endif
#include <bits/stdio_lim.h>
#include <sys/mman.h>
#include <sys/vfs.h>
@@ -248,14 +250,18 @@ static char *random_name_buf;
static void check_failed(const char *cond, const char *func, const char *file,
int line)
{
- int error = errno, count;
+ int error = errno;
+#ifdef INTEGCK_DEBUG
+ int count;
void *addresses[128];
+#endif
fflush(stdout);
fflush(stderr);
errmsg("condition '%s' failed in %s() at %s:%d",
cond, func, file, line);
normsg("error %d (%s)", error, strerror(error));
+#ifdef INTEGCK_DEBUG
/*
* Note, to make this work well you need:
* 1. Make all functions non-static - add "#define static'
@@ -264,6 +270,7 @@ static void check_failed(const char *cond, const char *func, const char *file,
*/
count = backtrace(addresses, 128);
backtrace_symbols_fd(addresses, count, fileno(stdout));
+#endif
exit(EXIT_FAILURE);
}
--
2.7.4

View File

@@ -0,0 +1,45 @@
From 600ab10e3b452cdffc6c82770b0bb2ff5c23ad70 Mon Sep 17 00:00:00 2001
From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Date: Fri, 12 Aug 2016 22:59:35 +0530
Subject: [PATCH 1/1] fs-tests: integrity: don't include header
<bits/stdio_lim.h>
With musl C library, we get following build error
integck.c:37:28: fatal error: bits/stdio_lim.h: No such file or directory
#include <bits/stdio_lim.h>
^
compilation terminated.
make[2]: *** [integck] Error 1
Header <bits/stdio_lim.h> is not available in musl C library. However
<stdio.h> has all definition that <bits/stdio_lim.h> supposed to be
providing. Moreover <bits/stdio_lim.h> shouldn't be included directly
instead we should be using <stdio.h>.
Since we already include <stdio.h> and in case of uClibc or glibc
<bits/stdio_lim.h> gets included internally, we can safely remove it.
This build issue is found by Buildroot autobuilder
http://autobuild.buildroot.net/results/175/1754861457af520480cc34d7d2d0edff2868ff66/
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
tests/fs-tests/integrity/integck.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 6ef817e..0bb9711 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -34,7 +34,6 @@
#ifdef INTEGCK_DEBUG
#include <execinfo.h>
#endif
-#include <bits/stdio_lim.h>
#include <sys/mman.h>
#include <sys/vfs.h>
#include <sys/mount.h>
--
2.6.2

View File

@@ -0,0 +1,164 @@
config BR2_PACKAGE_MTD
bool "mtd, jffs2 and ubi/ubifs tools"
help
Build mtd, jffs2 and ubi/ubifs tools
http://www.linux-mtd.infradead.org/
if BR2_PACKAGE_MTD
comment "MTD tools selection"
config BR2_PACKAGE_MTD_DOCFDISK
bool "docfdisk"
config BR2_PACKAGE_MTD_DOC_LOADBIOS
bool "doc_loadbios"
config BR2_PACKAGE_MTD_FLASHCP
bool "flashcp"
default y
config BR2_PACKAGE_MTD_FLASH_ERASE
bool "flash_erase"
default y
config BR2_PACKAGE_MTD_FLASH_LOCK
bool "flash_lock"
default y
config BR2_PACKAGE_MTD_FLASH_OTP_DUMP
bool "flash_otp_dump"
config BR2_PACKAGE_MTD_FLASH_OTP_INFO
bool "flash_otp_info"
config BR2_PACKAGE_MTD_FLASH_OTP_LOCK
bool "flash_otp_lock"
config BR2_PACKAGE_MTD_FLASH_OTP_WRITE
bool "flash_otp_write"
config BR2_PACKAGE_MTD_FLASH_UNLOCK
bool "flash_unlock"
default y
config BR2_PACKAGE_MTD_FTL_CHECK
bool "ftl_check"
config BR2_PACKAGE_MTD_FTL_FORMAT
bool "ftl_format"
config BR2_PACKAGE_MTD_JFFS2DUMP
bool "jffs2dump"
config BR2_PACKAGE_MTD_MKFSJFFS2
bool "mkfs.jffs2"
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LZO
config BR2_PACKAGE_MTD_MKFSUBIFS
bool "mkfs.ubifs"
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LZO
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
config BR2_PACKAGE_MTD_MTD_DEBUG
bool "mtd_debug"
default y
config BR2_PACKAGE_MTD_MTDPART
bool "mtdpart"
config BR2_PACKAGE_MTD_NANDDUMP
bool "nanddump"
default y
config BR2_PACKAGE_MTD_NANDTEST
bool "nandtest"
default y
config BR2_PACKAGE_MTD_NANDWRITE
bool "nandwrite"
default y
config BR2_PACKAGE_MTD_NFTLDUMP
bool "nftldump"
config BR2_PACKAGE_MTD_NFTL_FORMAT
bool "nftl_format"
config BR2_PACKAGE_MTD_RECV_IMAGE
bool "recv_image"
config BR2_PACKAGE_MTD_RFDDUMP
bool "rfddump"
config BR2_PACKAGE_MTD_RFDFORMAT
bool "rfdformat"
config BR2_PACKAGE_MTD_SERVE_IMAGE
bool "serve_image"
config BR2_PACKAGE_MTD_SUMTOOL
bool "sumtool"
config BR2_PACKAGE_MTD_MTDINFO
bool "mtdinfo"
default y
config BR2_PACKAGE_MTD_UBIATTACH
bool "ubiattach"
default y
config BR2_PACKAGE_MTD_UBICRC32
bool "ubicrc32"
default y
config BR2_PACKAGE_MTD_UBIDETACH
bool "ubidetach"
default y
config BR2_PACKAGE_MTD_UBIFORMAT
bool "ubiformat"
default y
config BR2_PACKAGE_MTD_UBIMKVOL
bool "ubimkvol"
default y
config BR2_PACKAGE_MTD_UBINFO
bool "ubinfo"
default y
config BR2_PACKAGE_MTD_UBINIZE
bool "ubinize"
default y
config BR2_PACKAGE_MTD_UBIRENAME
bool "ubirename"
default y
config BR2_PACKAGE_MTD_UBIRMVOL
bool "ubirmvol"
default y
config BR2_PACKAGE_MTD_UBIRSVOL
bool "ubirsvol"
default y
config BR2_PACKAGE_MTD_UBIUPDATEVOL
bool "ubiupdatevol"
default y
config BR2_PACKAGE_MTD_UBIBLOCK
bool "ubiblock"
default y
config BR2_PACKAGE_MTD_INTEGCK
bool "integck"
depends on BR2_USE_MMU # fork()
help
Install the integck test program.
endif

View File

@@ -0,0 +1,6 @@
config BR2_PACKAGE_HOST_MTD
bool "host mtd, jffs2 and ubi/ubifs tools"
help
Build mtd, jffs2 and ubi/ubifs tools
http://www.linux-mtd.infradead.org/

View File

@@ -0,0 +1,3 @@
# Locally calculated after checking pgp signature
# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.5.2.tar.bz2.asc
sha256 5db57389280a3abaec5dd23af2590988b70f213fa3929c12a2642c8f9a86f400 mtd-utils-1.5.2.tar.bz2

View File

@@ -0,0 +1,134 @@
################################################################################
#
# mtd
#
################################################################################
MTD_VERSION = 1.5.2
MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
MTD_LICENSE = GPLv2
MTD_LICENSE_FILES = COPYING
MTD_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
MTD_DEPENDENCIES = zlib lzo
endif
ifeq ($(BR2_PACKAGE_MTD_MKFSUBIFS),y)
MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf
define MTD_ADD_MISSING_LINTL
$(SED) "/^LDLIBS_mkfs\.ubifs/ s%$$% `$(PKG_CONFIG_HOST_BINARY) --libs uuid`%" \
$(@D)/Makefile
endef
MTD_POST_PATCH_HOOKS += MTD_ADD_MISSING_LINTL
endif
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
MTD_DEPENDENCIES += busybox
endif
# If extended attributes are required, the acl package must
# also be enabled which will also include the attr package.
ifeq ($(BR2_PACKAGE_ACL),y)
MTD_DEPENDENCIES += acl
MTD_MAKE_OPTS += WITHOUT_XATTR=0
else
MTD_MAKE_OPTS += WITHOUT_XATTR=1
endif
HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
define HOST_MTD_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE1) \
CROSS= BUILDDIR=$(@D) WITHOUT_XATTR=1 -C $(@D)
endef
define HOST_MTD_INSTALL_CMDS
$(MAKE1) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
endef
MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
MTD_STAGING_y = lib/libmtd.a ubi-utils/libubi.a
MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write
MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart
MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image
MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump
MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat
MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image
MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock
MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs
ifeq ($(BR2_PACKAGE_MTD_INTEGCK),y)
define MTD_BUILD_INTEGCK
$(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \
BUILDDIR=$(@D) $(MTD_MAKE_OPTS) -C $(@D)/tests/fs-tests all
endef
define MTD_INSTALL_INTEGCK
$(INSTALL) -D -m 755 $(@D)/tests/fs-tests/integrity/integck $(TARGET_DIR)/usr/sbin/integck
endef
endif
define MTD_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \
BUILDDIR=$(@D) $(MTD_MAKE_OPTS) -C $(@D) \
$(addprefix $(@D)/,$(MTD_TARGETS_y)) \
$(addprefix $(@D)/,$(MTD_STAGING_y))
$(MTD_BUILD_INTEGCK)
endef
define MTD_INSTALL_STAGING_CMDS
$(INSTALL) -D -m 0755 $(@D)/lib/libmtd.a $(STAGING_DIR)/usr/lib/libmtd.a
$(INSTALL) -D -m 0755 $(@D)/ubi-utils/libubi.a $(STAGING_DIR)/usr/lib/libubi.a
$(INSTALL) -D -m 0644 $(@D)/include/libmtd.h $(STAGING_DIR)/usr/include/mtd/libmtd.h
$(INSTALL) -D -m 0644 $(@D)/ubi-utils/include/libubi.h $(STAGING_DIR)/usr/include/mtd/libubi.h
$(INSTALL) -D -m 0644 $(@D)/include/mtd/ubi-media.h $(STAGING_DIR)/usr/include/mtd/ubi-media.h
endef
define MTD_INSTALL_TARGET_CMDS
for f in $(MTD_TARGETS_y) ; do \
$(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
done
$(MTD_INSTALL_INTEGCK)
endef
$(eval $(generic-package))
$(eval $(host-generic-package))