[Buildroot] [PATCH 00/36] check-package: allow to check other directories v1

[Buildroot] [PATCH 00/36] check-package: allow to check other directories v1

[Ricardo Martincoski]

Hello,

This series do some improvements to check-package:
 - enable checking directories other than package/;
 - add an entry to the manual;
 - change scanpypi to avoid new help text warnings;
 - fix the warnings that would show in the Gitlab CI job;
 - enable checking Config.in files in the Gitlab CI job.

Any subset 1..N of these patches can be applied without changing the result of
the Gitlab CI job because I first corrected the style then I added the check.

Patch 1 changes the main check-package script to make it more friendly to add
support to check directories other than package.

Patches 2 to 16 add support to check style in other directories:
 - arch/ and system/ (2),
 - boot/ (3 to 4),
 - fs/ (5 to 8),
 - linux/ (9 to 12),
 - toolchain/ (13 to 15),
 - Config.in* in the base dir (16).

Patch 17 adds an entry for check-package in the manual. The reason to it not be
patch 2 is because I added this text: "This script can be used for packages and
also for package-like files: boot, fs, toolchain, ...".

Patches 18 to 36 aim to add the style check for Config.in in Gitlab job CI.
Patches 18 to 33 fix all remaining style warnings for Config.in files after the
other directories were enabled in check-package. I tried to split the patches to
make the review easier but without creating a patch for each package, as it
would make this series really large. If you prefer other split between the
patches let me know.
Patch 34 changes scanpypi to generate help text compliant to check-package
(avoiding the need for patches as 33 in the future).
Patch 35 excludes 4 special Config.in files from the indentation check.
Patch 36 adds the Config.in files to be checked in Gitlab CI job.

This is how the Gitlab CI job output would look like with only the changes to
check-package applied and not the fix to package files:
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/59340601

The resulting Gitlab CI job with the entire series applied is here:
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/60295757
which is part of a full build:
https://gitlab.com/RicardoMartincoski/buildroot/pipelines/19730218

Regards,
Ricardo


Ricardo Martincoski (35):
  check-package: prepare to extend to other directories
  check-package: enable for arch/ and system/
  boot/*/*.mk: fix code style
  check-package: enable for boot/
  fs/yaffs2: fix code style
  fs/ubi: use namespace for internal variable
  fs/*/*.mk: fix code style
  check-package: enable for fs/
  linux/linux-ext-*.mk: fit file header into one line
  linux/linux*.mk: fix code style
  linux/linux.mk: use namespace for internal variables
  check-package: enable for linux/
  toolchain/wrapper: fix code style
  toolchain/toolchain.mk: fix code style
  check-package: enable for toolchain/
  check-package: enable for Config.in* in base dir
  docs/manual: add check-package to "Tips and tricks"
  */Config.in*: remove consecutive empty lines
  Config.in*: fix attributes order
  arch/Config.in*: fix attributes order
  boot/*/Config.in: fix attributes order
  fs/*/Config.in: fix attributes order
  package/*/Config.in: fix attributes order
  toolchain/*/Config.in: fix attributes order
  Config.in*: re-wrap help text
  arch/Config.in*: re-wrap help text
  boot/*/Config.in: re-wrap help text
  fs/*/Config.in: re-wrap help text
  linux/Config.*: re-wrap help text
  system/Config.in: re-wrap help text
  toolchain/{*/Config.in,*.in}: re-wrap help text
  qemu/Config.in.host: fix overindented depends on
  package/*/Config.in: re-wrap help text
  scanpypi: generate help text compliant to check-package
  .gitlab-ci.yml: extend check-package test to Config.* files

Thomas Petazzoni (1):
  utils/checkpackagelib: exclude four files from Config.in indentation
    check

 .gitlab-ci.yml                                     |   3 +-
 .gitlab-ci.yml.in                                  |   3 +-
 Config.in                                          |  36 +--
 Config.in.legacy                                   | 292 ++++++++++++---------
 arch/Config.in                                     |  99 +++----
 arch/Config.in.arc                                 |   2 +-
 arch/Config.in.arm                                 |   4 +-
 arch/Config.in.bfin                                |   2 +-
 arch/Config.in.m68k                                |   2 +-
 arch/Config.in.mips                                |  13 +-
 arch/Config.in.powerpc                             |   4 +-
 arch/Config.in.sh                                  |   2 +-
 arch/Config.in.sparc                               |   2 +-
 arch/Config.in.x86                                 |  30 +--
 arch/Config.in.xtensa                              |  20 +-
 boot/at91bootstrap/Config.in                       |   8 +-
 boot/at91bootstrap3/Config.in                      |  12 +-
 boot/at91dataflashboot/Config.in                   |   2 +-
 boot/barebox/barebox/Config.in                     |   1 -
 boot/lpc32xxcdl/Config.in                          |   2 +-
 boot/lpc32xxcdl/lpc32xxcdl.mk                      |   8 +-
 boot/mxs-bootlets/Config.in                        |   8 +-
 boot/syslinux/Config.in                            |   1 -
 boot/syslinux/syslinux.mk                          |   2 +-
 boot/uboot/Config.in                               |  55 ++--
 boot/uboot/uboot.mk                                |  14 +-
 docs/manual/adding-packages-tips.txt               |  31 +++
 docs/manual/adding-packages.txt                    |   2 +
 docs/manual/contribute.txt                         |   4 +
 fs/cpio/Config.in                                  |   6 +-
 fs/ext2/Config.in                                  |  22 +-
 fs/initramfs/Config.in                             |   3 +-
 fs/initramfs/initramfs.mk                          |   3 +-
 fs/iso9660/iso9660.mk                              |   1 -
 fs/jffs2/Config.in                                 |  23 +-
 fs/tar/Config.in                                   |   2 +-
 fs/ubi/Config.in                                   |  11 +-
 fs/ubi/ubi.mk                                      |   6 +-
 fs/yaffs2/{yaffs.mk => yaffs2.mk}                  |   0
 linux/Config.ext.in                                |  15 +-
 linux/Config.in                                    |  43 +--
 linux/linux-ext-aufs.mk                            |   2 +-
 linux/linux-ext-ev3dev-linux-drivers.mk            |   2 +-
 linux/linux-ext-fbtft.mk                           |   2 +-
 linux/linux-ext-rtai.mk                            |   6 +-
 linux/linux-ext-xenomai.mk                         |   4 +-
 linux/linux.mk                                     |  61 +++--
 package/mono/Config.in                             |   2 +-
 package/php/Config.in                              |   8 +-
 package/python-functools32/Config.in               |   4 +-
 package/python-jsonmodels/Config.in                |   4 +-
 package/qemu/Config.in.host                        |   2 +-
 package/systemd/Config.in                          |   4 +-
 system/Config.in                                   | 122 +++++----
 toolchain/Config.in                                |   2 +-
 toolchain/toolchain-buildroot/Config.in            |   2 +-
 toolchain/toolchain-common.in                      |  10 +-
 toolchain/toolchain-external/Config.in             |  11 +-
 .../Config.in                                      |   6 +-
 .../Config.in                                      |   6 +-
 .../toolchain-external-custom/Config.in.options    |  12 +-
 toolchain/toolchain-wrapper.mk                     |   6 +-
 toolchain/toolchain.mk                             |  20 +-
 utils/check-package                                |  45 +++-
 utils/checkpackagelib/lib_config.py                |   6 +
 utils/checkpackagelib/lib_mk.py                    |   9 +-
 utils/scanpypi                                     |   2 +-
 67 files changed, 659 insertions(+), 500 deletions(-)
 rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%)

-- 
2.14.1

[Buildroot] [PATCH 01/36] check-package: prepare to extend to other directories

[Ricardo Martincoski]

Currently the script only checks files inside the package/ directory.
Upcoming patches will enable it for other directories.

In order to reliably test for file names, i.e. the Config.in in the base
directory, normalize the path of files to check to a relative path to
the base directory.

Rename the variable that holds the compiled regexp to better represent
its content and rearrange how it is declared to make easy to later add
new directories to check. As a consequence the files that declare
package infra types would not be ignored anymore, so create a new
variable to list the files intree to be ignored during the check. The
same variable will be used by upcoming patches to ignore other files.
Ignore pkg-*.mk and doc-asciidoc.mk since they are package infra files.

In order to not produce weird results when used for files outside the
tree (i.e. in a private br2-external) add an explicit command line
option (-b) that bypasses any checks that would make a file be ignored
by the path that contains it.
When in this out-of-tree mode, the user is responsible for providing a
list of files to check that do not contain files the script does not
understand, e.g. package infra files.

As a result of this patch, besides the known use:
$ ./utils/check-package package/new-package/*
someone with the utils/ directory in the path can now also run:
$ cd package/new-package/
$ check-package *
or
$ check-package -b /path/to/br2-ext-tree/package/staging-package/*

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 utils/check-package | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/utils/check-package b/utils/check-package
index a87a74decc..d2457c706c 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -4,6 +4,7 @@
 from __future__ import print_function
 import argparse
 import inspect
+import os
 import re
 import sys
 
@@ -24,6 +25,9 @@ def parse_args():
     parser.add_argument("files", metavar="F", type=str, nargs="*",
                         help="list of files")
 
+    parser.add_argument("--br2-external", "-b", dest='intree_only', action="store_false",
+                        help="do not apply the pathname filters used for intree files")
+
     parser.add_argument("--manual-url", action="store",
                         default="http://nightly.buildroot.org/",
                         help="default: %(default)s")
@@ -41,12 +45,21 @@ def parse_args():
 
 
 CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
-FILE_IS_FROM_A_PACKAGE = re.compile("package/[^/]*/")
+DO_CHECK_INTREE = re.compile("|".join([
+    "package/",
+    ]))
+DO_NOT_CHECK_INTREE = re.compile("|".join([
+    "package/doc-asciidoc\.mk$",
+    "package/pkg-\S*\.mk$",
+    ]))
 
 
 def get_lib_from_filename(fname):
-    if FILE_IS_FROM_A_PACKAGE.search(fname) is None:
-        return None
+    if flags.intree_only:
+        if DO_CHECK_INTREE.match(fname) is None:
+            return None
+        if DO_NOT_CHECK_INTREE.match(fname):
+            return None
     if CONFIG_IN_FILENAME.search(fname):
         return checkpackagelib.lib_config
     if fname.endswith(".hash"):
@@ -117,7 +130,16 @@ def __main__():
     global flags
     flags = parse_args()
 
-    if len(flags.files) == 0:
+    if flags.intree_only:
+        # change all paths received to be relative to the base dir
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        files_to_check = [os.path.relpath(os.path.abspath(f), base_dir) for f in flags.files]
+        # move current dir so the script find the files
+        os.chdir(base_dir)
+    else:
+        files_to_check = flags.files
+
+    if len(files_to_check) == 0:
         print("No files to check style")
         sys.exit(1)
 
@@ -125,7 +147,7 @@ def __main__():
     total_warnings = 0
     total_lines = 0
 
-    for fname in flags.files:
+    for fname in files_to_check:
         nwarnings, nlines = check_file_using_lib(fname)
         total_warnings += nwarnings
         total_lines += nlines
-- 
2.14.1

[Buildroot] [PATCH 02/36] check-package: enable for arch/ and system/

[Ricardo Martincoski]

These directories can benefit from this script to prevent common
mistakes when submitting patches.

In order to accomplish this:
Do not ignore anymore files from these directories.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
 utils/check-package | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index d2457c706c..8d10affabd 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -46,7 +46,9 @@ def parse_args():
 
 CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
+    "arch/",
     "package/",
+    "system/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
     "package/doc-asciidoc\.mk$",
-- 
2.14.1

[Buildroot] [PATCH 03/36] boot/*/*.mk: fix code style

[Ricardo Martincoski]

Use only one space before backslash.
Indent with tabs.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 boot/lpc32xxcdl/lpc32xxcdl.mk |  8 ++++----
 boot/syslinux/syslinux.mk     |  2 +-
 boot/uboot/uboot.mk           | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index 04c1c7f060..30afed050b 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -33,10 +33,10 @@ LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag
 endif
 
 LPC32XXCDL_BUILD_FLAGS = \
-	CROSS_COMPILE=$(TARGET_CROSS)           \
-	NXPMCU_WINBASE=$(@D)                    \
-	NXPMCU_SOFTWARE=$(@D)                   \
-	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME)  \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	NXPMCU_WINBASE=$(@D) \
+	NXPMCU_SOFTWARE=$(@D) \
+	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
 	CSP=lpc32xx TOOL=gnu GEN=lpc
 
 LPC32XXCDL_BOARD_STARTUP_DIR = \
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 13496414dd..67bc69254e 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -59,7 +59,7 @@ define SYSLINUX_BUILD_CMDS
 		CC_FOR_BUILD="$(HOSTCC)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
-            $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)
+		$(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)
 endef
 
 # While the actual bootloader is compiled for the target, several
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index b7032d5901..24d3e4ef54 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -202,8 +202,8 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE
 
 ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
 define UBOOT_CONFIGURE_CMDS
-	$(TARGET_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS)		\
+	$(TARGET_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
 		$(UBOOT_BOARD_NAME)_config
 endef
 else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y)
@@ -230,16 +230,16 @@ define UBOOT_BUILD_CMDS
 	$(if $(UBOOT_CUSTOM_DTS_PATH),
 		cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
 	)
-	$(TARGET_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
+	$(TARGET_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
 		$(UBOOT_MAKE_TARGET)
 	$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
 		$(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)
 	$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
 		$(@D)/tools/mxsboot \
-			-w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE)	\
-			-o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE)	\
-			-e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE)	\
+			-w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE) \
+			-o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE) \
+			-e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE) \
 			nand $(@D)/u-boot.sb $(@D)/u-boot.nand)
 endef
 
-- 
2.14.1

[Buildroot] [PATCH 04/36] check-package: enable for boot/

[Ricardo Martincoski]

This directory can benefit from this script to prevent common mistakes
when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the boot/ directory.
Ignore boot/barebox/barebox.mk as it declares a package infra and not a
package itself.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 utils/check-package | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index 8d10affabd..48ce956443 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -47,10 +47,12 @@ def parse_args():
 CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
+    "boot/",
     "package/",
     "system/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
+    "boot/barebox/barebox\.mk$",
     "package/doc-asciidoc\.mk$",
     "package/pkg-\S*\.mk$",
     ]))
-- 
2.14.1

[Buildroot] [PATCH 05/36] fs/yaffs2: fix code style

[Ricardo Martincoski]

Rename the .mk to follow the convention. The variables inside it already
use the correct name.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 fs/yaffs2/{yaffs.mk => yaffs2.mk} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%)

diff --git a/fs/yaffs2/yaffs.mk b/fs/yaffs2/yaffs2.mk
similarity index 100%
rename from fs/yaffs2/yaffs.mk
rename to fs/yaffs2/yaffs2.mk
-- 
2.14.1

[Buildroot] [PATCH 06/36] fs/ubi: use namespace for internal variable

[Ricardo Martincoski]

UBINIZE_CONFIG_FILE_PATH is only used inside this file, so rename it to
start with UBI_, following the namespace convention already used by
common packages.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 fs/ubi/ubi.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ubi/ubi.mk b/fs/ubi/ubi.mk
index c78feda5a3..9874e73ff6 100644
--- a/fs/ubi/ubi.mk
+++ b/fs/ubi/ubi.mk
@@ -15,16 +15,16 @@ UBI_UBINIZE_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_OPTS))
 ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 
 ifeq ($(BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG),y)
-UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE))
+UBI_UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE))
 else
-UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg
+UBI_UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg
 endif
 
 # don't use sed -i as it misbehaves on systems with SELinux enabled when this is
 # executed through fakeroot (see #9386)
 define ROOTFS_UBI_CMD
 	sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
-		$(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
+		$(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
 	$(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
 	rm $(BUILD_DIR)/ubinize.cfg
 endef
-- 
2.14.1

[Buildroot] [PATCH 07/36] fs/*/*.mk: fix code style

[Ricardo Martincoski]

The header of the initramfs.mk file fits in one line, so rearrange it.
Remove consecutive empty line.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 fs/initramfs/initramfs.mk | 3 +--
 fs/iso9660/iso9660.mk     | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index b8dee18ec5..c751093214 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -1,7 +1,6 @@
 ################################################################################
 #
-# Build a kernel with an integrated initial ramdisk
-# filesystem based on cpio.
+# Build a kernel with an integrated initial ramdisk filesystem based on cpio.
 #
 ################################################################################
 
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 207c6aa39f..348be9950d 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -128,7 +128,6 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
 
 endif # ROOTFS_ISO9660_USE_INITRD
 
-
 define ROOTFS_ISO9660_CMD
 	$(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
-- 
2.14.1

[Buildroot] [PATCH 08/36] check-package: enable for fs/

[Ricardo Martincoski]

The filesystem types can benefit from this script to prevent common
mistakes when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the fs/ directory.
Ignore fs/common.mk as it declares a package infra and not a package itself.
Register the ROOTFS_ as a valid prefix for variables.
Ignore these symbols:
 - PACKAGES_PERMISSIONS_TABLE: defined either by packages through
   pkg-generic or by filesystem types, used by fs/common.mk;
 - SUMTOOL: defined by package mtd, used by filesystem jffs2;
 - TARGETS_ROOTFS: defined by filesystem types, used in the main
   Makefile.
But do not ignore this symbol:
 - UBINIZE_CONFIG_FILE_PATH: it is used only inside the file that
   defines it.

Keep using loose checks that warn about common mistakes while keep the
code simple.
As a consequence the check functions do not differentiate between
packages and filesystems so the symbol PACKAGE_UBI would not generate a
warning for the ubi filesystem neither the symbol ROOTFS_MTD would
generate a warning for the mtd package. But those kind of mistakes are
not common and are obvious in the code review, unlike typos i.e.
ROOTFS_UBl or PACKAGE_MID that would be hard to see in the code review.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
 utils/check-package             | 2 ++
 utils/checkpackagelib/lib_mk.py | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/utils/check-package b/utils/check-package
index 48ce956443..4c9eea0534 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -48,11 +48,13 @@ CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
     "boot/",
+    "fs/",
     "package/",
     "system/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
     "boot/barebox/barebox\.mk$",
+    "fs/common\.mk$",
     "package/doc-asciidoc\.mk$",
     "package/pkg-\S*\.mk$",
     ]))
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 2df2e1a884..1bec67bc2b 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -165,8 +165,11 @@ class TypoInPackageVariable(_CheckFunction):
         "LUA_RUN",
         "MKFS_JFFS2",
         "MKIMAGE_ARCH",
+        "PACKAGES_PERMISSIONS_TABLE",
         "PKG_CONFIG_HOST_BINARY",
+        "SUMTOOL",
         "TARGET_FINALIZE_HOOKS",
+        "TARGETS_ROOTFS",
         "XTENSA_CORE_NAME"]))
     PACKAGE_NAME = re.compile("/([^/]+)\.mk")
     VARIABLE = re.compile("^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=")
@@ -177,7 +180,7 @@ class TypoInPackageVariable(_CheckFunction):
         # linux tools do not use LINUX_TOOL_ prefix for variables
         package = package.replace("LINUX_TOOL_", "")
         self.package = package
-        self.REGEX = re.compile("^(HOST_)?({}_[A-Z0-9_]+)".format(package))
+        self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
         self.FIND_VIRTUAL = re.compile(
             "^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package))
         self.virtual = []
-- 
2.14.1

[Buildroot] [PATCH 09/36] linux/linux-ext-*.mk: fit file header into one line

[Ricardo Martincoski]

Make it follow the package coding style by removing redundant info.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Christian Stewart <christian@paral.in>
Cc: David Lechner <david@lechnology.com>
---
 linux/linux-ext-aufs.mk                 | 2 +-
 linux/linux-ext-ev3dev-linux-drivers.mk | 2 +-
 linux/linux-ext-fbtft.mk                | 2 +-
 linux/linux-ext-rtai.mk                 | 2 +-
 linux/linux-ext-xenomai.mk              | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/linux/linux-ext-aufs.mk b/linux/linux-ext-aufs.mk
index fb2f3560a7..d4bbb07196 100644
--- a/linux/linux-ext-aufs.mk
+++ b/linux/linux-ext-aufs.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux Aufs extensions
 #
 # Patch the linux kernel with aufs extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += aufs
diff --git a/linux/linux-ext-ev3dev-linux-drivers.mk b/linux/linux-ext-ev3dev-linux-drivers.mk
index c8afeeb1d5..3bb12db38d 100644
--- a/linux/linux-ext-ev3dev-linux-drivers.mk
+++ b/linux/linux-ext-ev3dev-linux-drivers.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux ev3dev extensions
 #
 # Patch the linux kernel with ev3dev extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += ev3dev-linux-drivers
diff --git a/linux/linux-ext-fbtft.mk b/linux/linux-ext-fbtft.mk
index 5eb3d944e8..cbc9c58ed3 100644
--- a/linux/linux-ext-fbtft.mk
+++ b/linux/linux-ext-fbtft.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux fbtft extensions
 #
 # Patch the linux kernel with fbtft extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += fbtft
diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index fb483aa80b..46e3dae3a7 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux RTAI extensions
 #
 # Patch the linux kernel with RTAI extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += rtai
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index 76a9786e4d..d066bb32ac 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux Adeos/Xenomai extensions
 #
-# Patch the linux kernel with xenomai extension
+# Patch the linux kernel with Adeos/Xenomai extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += xenomai
-- 
2.14.1

[Buildroot] [PATCH 10/36] linux/linux*.mk: fix code style

[Ricardo Martincoski]

Use only one space before backslash.
Remove consecutive empty line.
Indent with tabs.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 linux/linux-ext-rtai.mk |  4 ++--
 linux/linux.mk          | 23 +++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index 46e3dae3a7..50f79f8d50 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -20,8 +20,8 @@ endif
 define RTAI_PREPARE_KERNEL
 	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
 	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
-		$(APPLY_PATCHES) $(LINUX_DIR)				\
-			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/	\
+		$(APPLY_PATCHES) $(LINUX_DIR) \
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
 			hal-linux-$${kver}-*patch ; \
 	else \
 		echo "No RTAI patch for your kernel version" ; \
diff --git a/linux/linux.mk b/linux/linux.mk
index e98b25cb72..907ef2b315 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -373,8 +373,8 @@ define LINUX_BUILD_CMDS
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
 		cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then	\
-		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
+		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
 	fi
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
@@ -404,15 +404,14 @@ endif
 
 define LINUX_INSTALL_HOST_TOOLS
 	# Installing dtc (device tree compiler) as host tool, if selected
-	if grep -q "CONFIG_DTC=y" $(@D)/.config; then	\
-		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ;	\
-		if [ ! -e $(HOST_DIR)/bin/dtc ]; then	\
-			ln -sf linux-dtc $(HOST_DIR)/bin/dtc ;	\
-		fi	\
+	if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
+		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ; \
+		if [ ! -e $(HOST_DIR)/bin/dtc ]; then \
+			ln -sf linux-dtc $(HOST_DIR)/bin/dtc ; \
+		fi \
 	fi
 endef
 
-
 define LINUX_INSTALL_IMAGES_CMDS
 	$(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
 	$(call LINUX_INSTALL_DTB,$(BINARIES_DIR))
@@ -426,10 +425,10 @@ define LINUX_INSTALL_TARGET_CMDS
 	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
 		$(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
 	fi
 	$(LINUX_INSTALL_HOST_TOOLS)
 endef
@@ -484,7 +483,7 @@ endif
 
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
 $(error No kernel device tree source specified, check your \
-BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
+	BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
 endif
 
 endif # BR_BUILDING
-- 
2.14.1

[Buildroot] [PATCH 11/36] linux/linux.mk: use namespace for internal variables

[Ricardo Martincoski]

These three symbols:
KERNEL_ARCH_PATH
KERNEL_DTBS
KERNEL_DTS_NAME
are defined and used only inside this file, so use the LINUX_ namespace
for them.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 linux/linux.mk | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 907ef2b315..e8f50e690a 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -125,15 +125,15 @@ endif
 # going to be installed in the target filesystem.
 LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
 
-KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
+LINUX_KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
 
 # We keep only the .dts files, so that the user can specify both .dts
 # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
 # copied to arch/<arch>/boot/dts, but only the .dts files will
 # actually be generated as .dtb.
-KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
+LINUX_KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
 
-KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
+LINUX_KERNEL_DTBS = $(addsuffix .dtb,$(LINUX_KERNEL_DTS_NAME))
 
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
@@ -155,9 +155,9 @@ LINUX_IMAGE_NAME = zImage.epapr
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 LINUX_IMAGE_NAME = zImage
 else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y)
-LINUX_IMAGE_NAME = cuImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = cuImage.$(LINUX_KERNEL_DTS_NAME)
 else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y)
-LINUX_IMAGE_NAME = simpleImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = simpleImage.$(LINUX_KERNEL_DTS_NAME)
 else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y)
 LINUX_IMAGE_NAME = Image
 else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)
@@ -187,11 +187,11 @@ endif
 # for bzImage, arch/i386 and arch/x86_64 do not exist when copying the
 # defconfig file.
 ifeq ($(KERNEL_ARCH),i386)
-KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86
+LINUX_KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86
 else ifeq ($(KERNEL_ARCH),x86_64)
-KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86
+LINUX_KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86
 else
-KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH)
+LINUX_KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH)
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
@@ -201,7 +201,7 @@ LINUX_IMAGE_PATH = $(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ_BIN),y)
 LINUX_IMAGE_PATH = $(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else
-LINUX_IMAGE_PATH = $(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
+LINUX_IMAGE_PATH = $(LINUX_KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
 endif # BR2_LINUX_KERNEL_VMLINUX
 
 define LINUX_APPLY_LOCAL_PATCHES
@@ -323,14 +323,14 @@ endef
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
 ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),)
 define LINUX_BUILD_DTB
-	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTBS)
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_KERNEL_DTBS)
 endef
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),)
 define LINUX_INSTALL_DTB
 	# dtbs moved from arch/<ARCH>/boot to arch/<ARCH>/boot/dts since 3.8-rc1
 	cp $(addprefix \
-		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
-		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
+		$(LINUX_KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
+		$(addprefix $(LINUX_KERNEL_ARCH_PATH)/boot/dts/,$(LINUX_KERNEL_DTBS))),dts/),$(LINUX_KERNEL_DTBS)) \
 		$(1)
 endef
 endif # BR2_LINUX_KERNEL_APPENDED_DTB
@@ -340,8 +340,8 @@ endif # BR2_LINUX_KERNEL_DTS_SUPPORT
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
 # dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
 define LINUX_APPEND_DTB
-	(cd $(KERNEL_ARCH_PATH)/boot; \
-		for dtb in $(KERNEL_DTS_NAME); do \
+	(cd $(LINUX_KERNEL_ARCH_PATH)/boot; \
+		for dtb in $(LINUX_KERNEL_DTS_NAME); do \
 			if test -e $${dtb}.dtb ; then \
 				dtbpath=$${dtb}.dtb ; \
 			else \
@@ -359,10 +359,10 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
 LINUX_APPEND_DTB += ; \
 	MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\
 	sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
-	for dtb in $(KERNEL_DTS_NAME); do \
+	for dtb in $(LINUX_KERNEL_DTS_NAME); do \
 		$(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \
 			-T kernel -C none $${MKIMAGE_ARGS} \
-			-d $(KERNEL_ARCH_PATH)/boot/zImage.$${dtb} $(LINUX_IMAGE_PATH).$${dtb}; \
+			-d $(LINUX_KERNEL_ARCH_PATH)/boot/zImage.$${dtb} $(LINUX_IMAGE_PATH).$${dtb}; \
 	done
 endif
 endif
@@ -371,7 +371,7 @@ endif
 # configuration has changed.
 define LINUX_BUILD_CMDS
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
-		cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
+		cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(LINUX_KERNEL_ARCH_PATH)/boot/dts/)
 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
 		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
@@ -385,7 +385,7 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
 # appended DTBs.
 define LINUX_INSTALL_IMAGE
 	mkdir -p $(1)
-	cp $(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME).* $(1)
+	cp $(LINUX_KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME).* $(1)
 endef
 else
 # Otherwise, just install the unique image generated by the kernel
@@ -481,7 +481,7 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST
 endif
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
+ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(LINUX_KERNEL_DTS_NAME),y)
 $(error No kernel device tree source specified, check your \
 	BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
 endif
-- 
2.14.1

[Buildroot] [PATCH 12/36] check-package: enable for linux/

[Ricardo Martincoski]

This directory can benefit from this script to prevent common mistakes
when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the linux/ directory.
Ignore missing LINUX_EXT_ prefix as the variables for linux extensions
do not use it.
Ignore this symbol:
 - LINUX_EXTENSIONS: defined by each linux extension, used by
   linux/linux.mk.
But do not ignore these symbols:
 - KERNEL_ARCH_PATH, KERNEL_DTBS, KERNEL_DTS_NAME: they are used only
   inside the file that defines them.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 utils/check-package             | 1 +
 utils/checkpackagelib/lib_mk.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index 4c9eea0534..a5f5dc44c0 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -49,6 +49,7 @@ DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
     "boot/",
     "fs/",
+    "linux/",
     "package/",
     "system/",
     ]))
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 1bec67bc2b..1248457ef2 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -160,6 +160,7 @@ class TypoInPackageVariable(_CheckFunction):
         "ACLOCAL_HOST_DIR",
         "BR_CCACHE_INITIAL_SETUP",
         "BR_NO_CHECK_HASH_FOR",
+        "LINUX_EXTENSIONS",
         "LINUX_POST_PATCH_HOOKS",
         "LINUX_TOOLS",
         "LUA_RUN",
@@ -179,6 +180,8 @@ class TypoInPackageVariable(_CheckFunction):
         package = package.replace("-", "_").upper()
         # linux tools do not use LINUX_TOOL_ prefix for variables
         package = package.replace("LINUX_TOOL_", "")
+        # linux extensions do not use LINUX_EXT_ prefix for variables
+        package = package.replace("LINUX_EXT_", "")
         self.package = package
         self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
         self.FIND_VIRTUAL = re.compile(
-- 
2.14.1

[Buildroot] [PATCH 13/36] toolchain/wrapper: fix code style

[Ricardo Martincoski]

The header of the .mk file fits in one line, so rearrange it to be
similar to a header from a package.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 toolchain/toolchain-wrapper.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk
index 7f72a0cade..0b26037d48 100644
--- a/toolchain/toolchain-wrapper.mk
+++ b/toolchain/toolchain-wrapper.mk
@@ -1,4 +1,8 @@
-# This file contains the definition of the toolchain wrapper build commands
+################################################################################
+#
+# definition of the toolchain wrapper build commands
+#
+################################################################################
 
 # We use --hash-style=both to increase the compatibility of the generated
 # binary with older platforms, except for MIPS, where the only acceptable
-- 
2.14.1

[Buildroot] [PATCH 14/36] toolchain/toolchain.mk: fix code style

[Ricardo Martincoski]

Rearrange the header of the .mk file so it to be similar to a header
from a package. It doesn't fit in one line, so split the details to a
comment below the header.

GCONV_LIBS is only used inside this file, so rename it to start with
TOOLCHAIN_, following the namespace convention already used by packages.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 toolchain/toolchain.mk | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk
index 59fc905caf..6b2c93ced0 100644
--- a/toolchain/toolchain.mk
+++ b/toolchain/toolchain.mk
@@ -1,7 +1,11 @@
-# This file contains toolchain-related customisation of the content
-# of the target/ directory. Those customisations are added to the
-# TARGET_FINALIZE_HOOKS, to be applied just after all packages
-# have been built.
+################################################################################
+#
+# toolchain-related customisation of the content of the target/ directory
+#
+################################################################################
+
+# Those customisations are added to the TARGET_FINALIZE_HOOKS, to be applied
+# just after all packages have been built.
 
 # Install default nsswitch.conf file if the skeleton doesn't provide it
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
@@ -15,7 +19,7 @@ endif
 
 # Install the gconv modules
 ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
-GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
+TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
 define COPY_GCONV_LIBS
 	$(Q)found_gconv=no; \
 	for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \
@@ -27,14 +31,14 @@ define COPY_GCONV_LIBS
 		printf "Unable to find gconv modules\n" >&2; \
 		exit 1; \
 	fi; \
-	if [ -z "$(GCONV_LIBS)" ]; then \
+	if [ -z "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" ]; then \
 		$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
 				      $(TARGET_DIR)/usr/lib/gconv/gconv-modules && \
 		$(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \
 				   $(TARGET_DIR)/usr/lib/gconv \
 		|| exit 1; \
 	else \
-		for l in $(GCONV_LIBS); do \
+		for l in $(TOOLCHAIN_GLIBC_GCONV_LIBS); do \
 			$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \
 					      $(TARGET_DIR)/usr/lib/gconv/$${l}.so \
 			|| exit 1; \
@@ -47,7 +51,7 @@ define COPY_GCONV_LIBS
 				 || exit 1; \
 			done; \
 		done; \
-		./support/scripts/expunge-gconv-modules "$(GCONV_LIBS)" \
+		./support/scripts/expunge-gconv-modules "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \
 			<$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
 			>$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
 	fi
-- 
2.14.1

[Buildroot] [PATCH 15/36] check-package: enable for toolchain/

[Ricardo Martincoski]

The toolchain directory can benefit from this script to prevent common
mistakes when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the toolchain/ directory.
Accept toolchain-common.in as a valid Config.in name.
Ignore this symbol:
 - BR_LIBC: defined by the buildroot toolchain, used by gcc-final.mk.
But do not ignore this symbol:
 - GCONV_LIBS: it is used only inside the file that defines it.

Ignore toolchain/toolchain-external/pkg-toolchain-external.mk as it
declares a package infra and not a package itself.
Ignore toolchain/helpers.mk as it contains only helper functions.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Romain Naour <romain.naour@gmail.com>
---
 utils/check-package             | 5 ++++-
 utils/checkpackagelib/lib_mk.py | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/utils/check-package b/utils/check-package
index a5f5dc44c0..35a4a70858 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -44,7 +44,7 @@ def parse_args():
     return parser.parse_args()
 
 
-CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
+CONFIG_IN_FILENAME = re.compile("/Config\.\S*$|/toolchain-common.in$")
 DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
     "boot/",
@@ -52,12 +52,15 @@ DO_CHECK_INTREE = re.compile("|".join([
     "linux/",
     "package/",
     "system/",
+    "toolchain/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
     "boot/barebox/barebox\.mk$",
     "fs/common\.mk$",
     "package/doc-asciidoc\.mk$",
     "package/pkg-\S*\.mk$",
+    "toolchain/helpers\.mk$",
+    "toolchain/toolchain-external/pkg-toolchain-external\.mk$",
     ]))
 
 
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 1248457ef2..25e0b65c7f 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -159,6 +159,7 @@ class TypoInPackageVariable(_CheckFunction):
         "ACLOCAL_DIR",
         "ACLOCAL_HOST_DIR",
         "BR_CCACHE_INITIAL_SETUP",
+        "BR_LIBC",
         "BR_NO_CHECK_HASH_FOR",
         "LINUX_EXTENSIONS",
         "LINUX_POST_PATCH_HOOKS",
-- 
2.14.1

[Buildroot] [PATCH 16/36] check-package: enable for Config.in* in base dir

[Ricardo Martincoski]

These files can benefit from this script to prevent common mistakes when
submitting patches.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 utils/check-package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/check-package b/utils/check-package
index 35a4a70858..5faf413b85 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -44,8 +44,9 @@ def parse_args():
     return parser.parse_args()
 
 
-CONFIG_IN_FILENAME = re.compile("/Config\.\S*$|/toolchain-common.in$")
+CONFIG_IN_FILENAME = re.compile("Config\.\S*$|/toolchain-common.in$")
 DO_CHECK_INTREE = re.compile("|".join([
+    "Config.in",
     "arch/",
     "boot/",
     "fs/",
-- 
2.14.1

[Buildroot] [PATCH 17/36] docs/manual: add check-package to "Tips and tricks"

[Ricardo Martincoski]

And add two references to it: in "Submitting patches" and in "Adding new
packages to Buildroot" sections.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 docs/manual/adding-packages-tips.txt | 31 +++++++++++++++++++++++++++++++
 docs/manual/adding-packages.txt      |  2 ++
 docs/manual/contribute.txt           |  4 ++++
 3 files changed, 37 insertions(+)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 19577fa821..b13a7bef80 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -32,6 +32,37 @@ using the following rules:
   with `.` and `-` characters substituted with `_` (e.g.:
   +FOO_BAR_BOO_VERSION+).
 
+[[check-package]]
+==== How to check the coding style
+
+Buildroot provides a script in +utils/check-package+ that checks new or
+changed files for coding style. It is not a complete language validator,
+but it catches many common mistakes. It is meant to run in the actual
+files you created or modified, before creating the patch for submission.
+
+This script can be used for packages and also for package-like files:
+boot, fs, toolchain, ... ; but it does not check package infra types.
+
+To use it, run the +check-package+ script, by telling which files you
+created or changed:
+
+----
+$ ./utils/check-package package/new-package/*
+----
+
+If you have the +utils+ directory in your path you can also run:
+
+----
+$ cd package/new-package/
+$ check-package *
+----
+
+The tool can also be used for proprietary packages in a br2-external:
+
+----
+$ check-package -b /path/to/br2-ext-tree/package/my-package/*
+----
+
 [[testing-package]]
 ==== How to test your package
 
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index e8d40daee4..42870a8682 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -12,6 +12,8 @@ tuning their configuration.
 When you add a new package, be sure to test it in various conditions;
 see xref:testing-package[]
 
+Also check the new package for coding style; see xref:check-package[]
+
 include::adding-packages-directory.txt[]
 
 include::adding-packages-generic.txt[]
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 8bbc2b9eb7..b531ea987e 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -264,6 +264,10 @@ yourself to the DEVELOPERS file. This should be done in the same patch
 creating or modifying the package. See xref:DEVELOPERS[the DEVELOPERS file]
 for more information.
 
+Buildroot provides a handy tool to check for common coding style
+mistakes on files you created or modified, called +check-package+ (see
+xref:check-package[] for more information).
+
 ==== Preparing a patch series
 
 Starting from the changes committed in your local git view, _rebase_
-- 
2.14.1

[Buildroot] [PATCH 18/36] */Config.in*: remove consecutive empty lines

[Ricardo Martincoski]

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 Config.in                      | 1 -
 Config.in.legacy               | 1 -
 arch/Config.in.mips            | 1 -
 boot/barebox/barebox/Config.in | 1 -
 boot/syslinux/Config.in        | 1 -
 fs/jffs2/Config.in             | 1 -
 6 files changed, 6 deletions(-)

diff --git a/Config.in b/Config.in
index a74b24ae45..852c61ef3a 100644
--- a/Config.in
+++ b/Config.in
@@ -620,7 +620,6 @@ config BR2_SHARED_STATIC_LIBS
 
 endchoice
 
-
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
 	default "$(CONFIG_DIR)/local.mk"
diff --git a/Config.in.legacy b/Config.in.legacy
index 60f9148234..b1dca97e5e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -1164,7 +1164,6 @@ config BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL
 	  version provided in buildroot. And both can't coexist.
 	  It now uses OpenSSL as the only option.
 
-
 config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
 	bool "nginx http spdy module removed"
 	select BR2_LEGACY
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index f8e57bab33..5513edb180 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -115,7 +115,6 @@ config BR2_mips_p6600
 	select BR2_MIPS_CPU_MIPS64R6
 endchoice
 
-
 choice
 	prompt "Target ABI"
 	depends on BR2_mips64 || BR2_mips64el
diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in
index 0be26adf93..958e294e40 100644
--- a/boot/barebox/barebox/Config.in
+++ b/boot/barebox/barebox/Config.in
@@ -17,7 +17,6 @@ config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG
 	  Name of the board for which Barebox should be built, without
 	  the _defconfig suffix.
 
-
 config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
 	string "Configuration file path"
 	depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG
diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index da035498de..e969d53fd0 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -48,7 +48,6 @@ config BR2_TARGET_SYSLINUX_EFI
 	help
 	  Install the 'efi' image, to boot from an EFI environment.
 
-
 if BR2_TARGET_SYSLINUX_LEGACY_BIOS
 
 config BR2_TARGET_SYSLINUX_C32
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index 1010216bd1..f1703f4edd 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -98,7 +98,6 @@ config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	  the flash memory page size.  Using this option is only needed if Linux is
 	  configured to use a page size different than 4kB.
 
-
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
 	hex "Virtual memory page size"
 	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
-- 
2.14.1

[Buildroot] [PATCH 19/36] Config.in*: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 Config.in        | 8 ++++----
 Config.in.legacy | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Config.in b/Config.in
index 852c61ef3a..ca6010fd30 100644
--- a/Config.in
+++ b/Config.in
@@ -424,8 +424,8 @@ endif
 
 config BR2_STRIP_strip
 	bool "strip target binaries"
-	depends on !BR2_PACKAGE_HOST_ELF2FLT
 	default y
+	depends on !BR2_PACKAGE_HOST_ELF2FLT
 	help
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the normal 'strip' command. This allows to save
@@ -435,16 +435,16 @@ config BR2_STRIP_strip
 
 config BR2_STRIP_EXCLUDE_FILES
 	string "executables that should not be stripped"
-	depends on BR2_STRIP_strip
 	default ""
+	depends on BR2_STRIP_strip
 	help
 	  You may specify a space-separated list of binaries and
 	  libraries here that should not be stripped on the target.
 
 config BR2_STRIP_EXCLUDE_DIRS
 	string "directories that should be skipped when stripping"
-	depends on BR2_STRIP_strip
 	default ""
+	depends on BR2_STRIP_strip
 	help
 	  You may specify a space-separated list of directories that
 	  should be skipped when stripping. Binaries and libraries in
@@ -545,7 +545,6 @@ endchoice
 
 config BR2_GOOGLE_BREAKPAD_ENABLE
 	bool "Enable google-breakpad support"
-	select BR2_PACKAGE_GOOGLE_BREAKPAD
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
@@ -554,6 +553,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE
 	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
+	select BR2_PACKAGE_GOOGLE_BREAKPAD
 	help
 	  This option will enable the use of google breakpad, a library
 	  and tool suite that allows you to distribute an application to
diff --git a/Config.in.legacy b/Config.in.legacy
index b1dca97e5e..08a129106c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -1970,8 +1970,8 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	  name.
 
 config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS
-	depends on BR2_PACKAGE_PYTHON
 	bool "libsemanage python bindings removed"
+	depends on BR2_PACKAGE_PYTHON
 	select BR2_LEGACY
 	help
 	  This option has been removed, since the libsemanage Python
-- 
2.14.1

[Buildroot] [PATCH 20/36] arch/Config.in*: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 arch/Config.in         |  2 +-
 arch/Config.in.arc     |  2 +-
 arch/Config.in.arm     |  4 ++--
 arch/Config.in.bfin    |  2 +-
 arch/Config.in.m68k    |  2 +-
 arch/Config.in.mips    |  8 ++++----
 arch/Config.in.powerpc |  4 ++--
 arch/Config.in.sh      |  2 +-
 arch/Config.in.sparc   |  2 +-
 arch/Config.in.x86     | 30 +++++++++++++++---------------
 arch/Config.in.xtensa  |  8 ++++----
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/arch/Config.in b/arch/Config.in
index d3f63da34f..dd972bc0ee 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -376,8 +376,8 @@ endchoice
 # Set up flat binary type
 choice
 	prompt "FLAT Binary type"
-	depends on BR2_BINFMT_FLAT
 	default BR2_BINFMT_FLAT_ONE
+	depends on BR2_BINFMT_FLAT
 
 config BR2_BINFMT_FLAT_ONE
 	bool "One memory region"
diff --git a/arch/Config.in.arc b/arch/Config.in.arc
index 92503a0140..156384b9a5 100644
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -1,7 +1,7 @@
 choice
 	prompt "Target CPU"
-	depends on BR2_arc
 	default BR2_arc770d
+	depends on BR2_arc
 	help
 	    Specific CPU to use
 
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index b05e83e33c..c99a995db2 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -456,9 +456,9 @@ config BR2_ARM_ENABLE_VFP
 
 choice
 	prompt "Target ABI"
-	depends on BR2_arm || BR2_armeb
 	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2
 	default BR2_ARM_EABI
+	depends on BR2_arm || BR2_armeb
 	help
 	  Application Binary Interface to use. The Application Binary
 	  Interface describes the calling conventions (how arguments
@@ -746,7 +746,6 @@ config BR2_GCC_TARGET_ABI
 	default "lp64"		if BR2_aarch64 || BR2_aarch64_be
 
 config BR2_GCC_TARGET_FPU
-	depends on BR2_arm || BR2_armeb
 	default "vfp"		if BR2_ARM_FPU_VFPV2
 	default "vfpv3"		if BR2_ARM_FPU_VFPV3
 	default "vfpv3-d16"	if BR2_ARM_FPU_VFPV3D16
@@ -756,6 +755,7 @@ config BR2_GCC_TARGET_FPU
 	default "neon-vfpv4"	if BR2_ARM_FPU_NEON_VFPV4
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
+	depends on BR2_arm || BR2_armeb
 
 config BR2_GCC_TARGET_FLOAT_ABI
 	default "soft"		if BR2_ARM_SOFT_FLOAT
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index bd9589c71d..b570d388fd 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -1,7 +1,7 @@
 choice
 	prompt "Target CPU"
-	depends on BR2_bfin
 	default BR2_bf532
+	depends on BR2_bfin
 	help
 	  Specify target CPU
 config BR2_bf512
diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k
index c56031cb78..c134df2f14 100644
--- a/arch/Config.in.m68k
+++ b/arch/Config.in.m68k
@@ -15,8 +15,8 @@ config BR2_m68k_cf
 # coldfire variants will be added later
 choice
 	prompt "Target CPU"
-	depends on BR2_m68k
 	default BR2_m68k_68040
+	depends on BR2_m68k
 	help
 	  Specific CPU variant to use
 
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 5513edb180..cc11744f04 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -28,9 +28,9 @@ config BR2_MIPS_CPU_MIPS64R6
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default BR2_mips_32 if BR2_mips || BR2_mipsel
 	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	help
 	  Specific CPU variant to use
 
@@ -117,8 +117,8 @@ endchoice
 
 choice
 	prompt "Target ABI"
-	depends on BR2_mips64 || BR2_mips64el
 	default BR2_MIPS_NABI32
+	depends on BR2_mips64 || BR2_mips64el
 
 	help
 	  Application Binary Interface to use
@@ -144,8 +144,8 @@ config BR2_MIPS_SOFT_FLOAT
 
 choice
 	prompt "FP mode"
-	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	default BR2_MIPS_FP32_MODE_XX
+	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	help
 	  MIPS32 supports different FP modes (32,xx,64). Information about FP
 	  modes can be found here:
@@ -179,8 +179,8 @@ config BR2_MIPS_NAN_2008
 
 choice
 	prompt "Target NaN"
-	depends on BR2_mips_32r5 || BR2_mips_64r5
 	default BR2_MIPS_ENABLE_NAN_2008
+	depends on BR2_mips_32r5 || BR2_mips_64r5
 	help
 	  MIPS supports two different NaN encodings, legacy and 2008.
 	  Information about MIPS NaN encodings can be found here:
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 0968412647..7a452a630a 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -71,12 +71,12 @@ config BR2_powerpc_740
 	depends on !BR2_ARCH_IS_64
 config BR2_powerpc_7400
 	bool "7400"
-	select BR2_POWERPC_CPU_HAS_ALTIVEC
 	depends on !BR2_ARCH_IS_64
+	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_7450
 	bool "7450"
-	select BR2_POWERPC_CPU_HAS_ALTIVEC
 	depends on !BR2_ARCH_IS_64
+	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_750
 	bool "750"
 	depends on !BR2_ARCH_IS_64
diff --git a/arch/Config.in.sh b/arch/Config.in.sh
index deb7244f29..1cb2db90ad 100644
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -1,7 +1,7 @@
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_sh
 	default BR2_sh4
+	depends on BR2_sh
 	help
 	  Specific CPU variant to use
 
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index 9b6a6aa21a..b22b55142e 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -1,8 +1,8 @@
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_sparc || BR2_sparc64
 	default BR2_sparc_v8 if BR2_sparc
 	default BR2_sparc_v9 if BR2_sparc64
+	depends on BR2_sparc || BR2_sparc64
 	help
 	  Specific CPU variant to use
 
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index 8e623b3c2b..f7c53a0fae 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -20,8 +20,8 @@ config BR2_X86_CPU_HAS_AVX2
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_i386 || BR2_x86_64
 	default BR2_x86_i586 if BR2_i386
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  Specific CPU variant to use
 
@@ -50,35 +50,35 @@ config BR2_x86_pentiumpro
 	depends on !BR2_x86_64
 config BR2_x86_pentium_mmx
 	bool "pentium MMX"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium_m
 	bool "pentium mobile"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_pentium2
 	bool "pentium2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium3
 	bool "pentium3"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_pentium4
 	bool "pentium4"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
-	depends on !BR2_x86_64
 config BR2_x86_prescott
 	bool "prescott"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
-	depends on !BR2_x86_64
 config BR2_x86_nocona
 	bool "nocona"
 	select BR2_X86_CPU_HAS_MMX
@@ -140,21 +140,21 @@ config BR2_x86_silvermont
 	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_k6
 	bool "k6"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_k6_2
 	bool "k6-2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon
 	bool "athlon"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon_4
 	bool "athlon-4"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_opteron
 	bool "opteron"
 	select BR2_X86_CPU_HAS_MMX
@@ -198,21 +198,21 @@ config BR2_x86_geode
 	depends on !BR2_x86_64
 config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_c32
 	bool "Via C3-2 (Nehemiah cores)"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_winchip_c6
 	bool "IDT Winchip C6"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_winchip2
 	bool "IDT Winchip 2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 endchoice
 
 config BR2_ARCH
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 5d5bcb48f9..49e93a4774 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -1,15 +1,15 @@
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_xtensa
 	default BR2_xtensa_fsf
+	depends on BR2_xtensa
 
 config BR2_XTENSA_CUSTOM
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 	bool "Custom Xtensa processor configuration"
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 config BR2_xtensa_fsf
-	select BR2_ARCH_HAS_MMU_MANDATORY
 	bool "fsf - Default configuration"
+	select BR2_ARCH_HAS_MMU_MANDATORY
 
 endchoice
 
@@ -30,8 +30,8 @@ config BR2_XTENSA_OVERLAY_FILE
 
 choice
 	prompt "Target Architecture Endianness"
-	depends on BR2_XTENSA_CUSTOM
 	default BR2_XTENSA_LITTLE_ENDIAN
+	depends on BR2_XTENSA_CUSTOM
 
 config BR2_XTENSA_LITTLE_ENDIAN
 	bool "Little endian"
-- 
2.14.1

[Buildroot] [PATCH 21/36] boot/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 boot/at91bootstrap/Config.in     |  2 +-
 boot/at91bootstrap3/Config.in    |  2 +-
 boot/at91dataflashboot/Config.in |  2 +-
 boot/lpc32xxcdl/Config.in        |  2 +-
 boot/mxs-bootlets/Config.in      |  8 ++++----
 boot/uboot/Config.in             | 12 ++++++------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 57fdeda946..96cfdbc7e9 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_AT91BOOTSTRAP
-	depends on BR2_arm926t
 	bool "AT91 Bootstrap"
+	depends on BR2_arm926t
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index 237deb929c..bdc1e775a8 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_AT91BOOTSTRAP3
-	depends on BR2_arm926t || BR2_cortex_a5
 	bool "AT91 Bootstrap 3"
+	depends on BR2_arm926t || BR2_cortex_a5
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index 80b57a4ad0..4055f96410 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
 config BR2_TARGET_AT91DATAFLASHBOOT
-	depends on BR2_arm926t
 	bool "AT91 DataFlashBoot"
+	depends on BR2_arm926t
diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in
index ce7589c35c..97137aa7d4 100644
--- a/boot/lpc32xxcdl/Config.in
+++ b/boot/lpc32xxcdl/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_LPC32XXCDL
-	depends on BR2_arm926t
 	bool "LPC32XX CDL (kickstart and S1L)"
+	depends on BR2_arm926t
 
 if BR2_TARGET_LPC32XXCDL
 
diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in
index 4bb07a06f5..b3e392afa8 100644
--- a/boot/mxs-bootlets/Config.in
+++ b/boot/mxs-bootlets/Config.in
@@ -24,8 +24,8 @@ config BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT
 endchoice
 
 config BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL
-	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL
 	string "URL of custom bootlets tarball"
+	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL
 
 if BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT
 
@@ -43,16 +43,16 @@ choice
 	  Select which bootstream to generate
 
 config BR2_TARGET_MXS_BOOTLETS_BAREBOX
-	depends on BR2_TARGET_BAREBOX
 	bool "Barebox Bootloader"
+	depends on BR2_TARGET_BAREBOX
 
 config BR2_TARGET_MXS_BOOTLETS_LINUX
-	depends on BR2_LINUX_KERNEL
 	bool "Linux Kernel"
+	depends on BR2_LINUX_KERNEL
 
 config BR2_TARGET_MXS_BOOTLETS_UBOOT
-	depends on BR2_TARGET_UBOOT
 	bool "U-boot bootloader"
+	depends on BR2_TARGET_UBOOT
 
 endchoice
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 264f343767..d96e7f687f 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -199,23 +199,23 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
 	bool "u-boot-nand.bin"
 
 config BR2_TARGET_UBOOT_FORMAT_KWB
-	depends on BR2_arm
 	bool "u-boot.kwb (Marvell)"
+	depends on BR2_arm
 
 config BR2_TARGET_UBOOT_FORMAT_LDR
-	depends on BR2_bfin
 	bool "u-boot.ldr"
+	depends on BR2_bfin
 
 config BR2_TARGET_UBOOT_FORMAT_ELF
 	bool "u-boot.elf"
 
 config BR2_TARGET_UBOOT_FORMAT_SB
-	depends on BR2_arm
 	bool "u-boot.sb (Freescale i.MX28)"
+	depends on BR2_arm
 
 config BR2_TARGET_UBOOT_FORMAT_SD
-	depends on BR2_arm
 	bool "u-boot.sd (Freescale i.MX28)"
+	depends on BR2_arm
 	help
 	  This is Freescale i.MX28 SB format, with a header for booting
 	  from an SD card.
@@ -226,8 +226,8 @@ config BR2_TARGET_UBOOT_FORMAT_SD
 	  See doc/README.mxs (or doc/README.mx28_common before 2013.07)
 
 config BR2_TARGET_UBOOT_FORMAT_NAND
-	depends on BR2_arm
 	bool "u-boot.nand (Freescale i.MX28)"
+	depends on BR2_arm
 	help
 	  This is Freescale i.MX28 BootStream format (.sb), with a header
 	  for booting from a NAND flash.
@@ -303,10 +303,10 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
 endmenu
 
 config BR2_TARGET_UBOOT_OMAP_IFT
+	bool "produce a .ift signed image (OMAP)"
 	depends on BR2_TARGET_UBOOT_FORMAT_BIN
 	depends on BR2_arm || BR2_armeb
 	select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
-	bool "produce a .ift signed image (OMAP)"
 	help
 	  Use gpsign to produce an image of u-boot.bin signed with
 	  a Configuration Header for booting on OMAP processors.
-- 
2.14.1

[Buildroot] [PATCH 22/36] fs/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 fs/jffs2/Config.in | 6 +++---
 fs/tar/Config.in   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index f1703f4edd..208cabaa52 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -38,8 +38,8 @@ endchoice
 
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE
 	hex "Erase block size"
-	depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 	default 0x20000
+	depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 	help
 	  Set to erase size of memory
 
@@ -68,8 +68,8 @@ config BR2_TARGET_ROOTFS_JFFS2_PAD
 
 config BR2_TARGET_ROOTFS_JFFS2_PADSIZE
 	hex "Pad output size (0x0 = to end of EB)"
-	depends on BR2_TARGET_ROOTFS_JFFS2_PAD
 	default 0x0
+	depends on BR2_TARGET_ROOTFS_JFFS2_PAD
 	help
 	  Set to 0x0 to pad to end of erase block.
 
@@ -100,8 +100,8 @@ config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
 	hex "Virtual memory page size"
-	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	default 0x1000
+	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	help
 	  Set to virtual memory page size of target system (in bytes).  This value
 	  should match the virtual page size in Linux (i.e. this should have the
diff --git a/fs/tar/Config.in b/fs/tar/Config.in
index 2116edf143..a4e375c68b 100644
--- a/fs/tar/Config.in
+++ b/fs/tar/Config.in
@@ -50,8 +50,8 @@ endchoice
 
 config BR2_TARGET_ROOTFS_TAR_OPTIONS
 	string "other random options to pass to tar"
-	depends on BR2_TARGET_ROOTFS_TAR
 	default ""
+	depends on BR2_TARGET_ROOTFS_TAR
 	help
 	  Any other flags you want to pass to tar
 	  Refer to tar --help for details
-- 
2.14.1

[Buildroot] [PATCH 23/36] package/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 package/mono/Config.in    | 2 +-
 package/php/Config.in     | 8 ++++----
 package/systemd/Config.in | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/mono/Config.in b/package/mono/Config.in
index d162237086..63208fef49 100644
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -5,9 +5,9 @@ config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	bool
-	depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 	default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
 		      BR2_mipsel || BR2_powerpc || BR2_x86_64)
+	depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MONO
 	bool "mono"
diff --git a/package/php/Config.in b/package/php/Config.in
index 11514e04b1..2469573541 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_PHP
 	bool "php"
+	# PHP uses -export-dynamic, which breaks with elf2flt with a
+	# message like "ld.real: section .junk LMA [...,...] overlaps
+	# section .text LMA [...,...]"
+	depends on !BR2_BINFMT_FLAT
 	select BR2_PACKAGE_PHP_SAPI_CGI if \
 	       !BR2_PACKAGE_PHP_SAPI_APACHE && \
 	       !BR2_PACKAGE_PHP_SAPI_CLI && \
 	       !BR2_PACKAGE_PHP_SAPI_FPM &&  \
 	       BR2_USE_MMU
 	select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU
-	# PHP uses -export-dynamic, which breaks with elf2flt with a
-	# message like "ld.real: section .junk LMA [...,...] overlaps
-	# section .text LMA [...,...]"
-	depends on !BR2_BINFMT_FLAT
 	help
 	  PHP  is a widely-used general-purpose scripting
 	  language that is especially suited for Web development
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 420c78493d..c5a109675c 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -191,8 +191,8 @@ config BR2_PACKAGE_SYSTEMD_MACHINED
 
 config BR2_PACKAGE_SYSTEMD_MYHOSTNAME
 	bool "enable myhostname NSS plugin"
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	default y
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	help
 	  nss-myhostname is a plug-in module for the GNU Name Service
 	  Switch (NSS) functionality of the GNU C Library (glibc),
@@ -247,8 +247,8 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED
 
 config BR2_PACKAGE_SYSTEMD_RESOLVED
 	bool "enable resolve daemon"
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	default y
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	help
 	  systemd-resolved is a system service that provides network
 	  name resolution to local applications. It implements a
-- 
2.14.1

[Buildroot] [PATCH 24/36] toolchain/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 toolchain/Config.in                                          |  2 +-
 toolchain/toolchain-buildroot/Config.in                      |  2 +-
 .../toolchain-external-custom/Config.in.options              | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index bf1166b601..a47ffbd2d7 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -42,8 +42,8 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
-	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	depends on BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 9668f8d41a..0ab7e8db97 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -27,13 +27,13 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	bool "uClibc-ng"
-	select BR2_TOOLCHAIN_USES_UCLIBC
 	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
 		   BR2_arm     || BR2_armeb    || \
 		   BR2_bfin    || BR2_i386   || BR2_m68k   || BR2_microblaze || \
 		   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
 		   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4	   || \
 		   BR2_sh4eb   || BR2_sparc   || BR2_xtensa || BR2_x86_64
+	select BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  This option selects uClibc-ng as the C library for the
 	  cross-compilation toolchain.
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 70c7d8e3c3..6c12b1619c 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -320,8 +320,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LOCALE
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 	bool "Toolchain has threads support?"
-	select BR2_TOOLCHAIN_HAS_THREADS
 	default y
+	select BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Select this option if your external toolchain has thread
 	  support. If you don't know, leave the default value,
@@ -331,8 +331,8 @@ if BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
 	bool "Toolchain has threads debugging support?"
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	default y
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	help
 	  Select this option if your external toolchain has thread
 	  debugging support. If you don't know, leave the default
@@ -340,8 +340,8 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL
 	bool "Toolchain has NPTL threads support?"
-	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	default y
+	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	help
 	  Select this option if your external toolchain uses the NPTL
 	  (Native Posix Thread Library) implementation of Posix
@@ -354,9 +354,9 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP
 	bool "Toolchain has SSP support?"
-	select BR2_TOOLCHAIN_HAS_SSP
 	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	default y if BR2_TOOLCHAIN_EXTERNAL_MUSL
+	select BR2_TOOLCHAIN_HAS_SSP
 	help
 	  Selection this option if your external toolchain has Stack
 	  Smashing Protection support enabled. If you don't know,
@@ -365,9 +365,9 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
 	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Select this option if your external toolchain supports
 	  RPC. If you don't know, leave the default value, Buildroot
-- 
2.14.1

[Buildroot] [PATCH 25/36] Config.in*: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 Config.in        |  27 +++---
 Config.in.legacy | 289 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 176 insertions(+), 140 deletions(-)

diff --git a/Config.in b/Config.in
index ca6010fd30..71b9f60e5b 100644
--- a/Config.in
+++ b/Config.in
@@ -175,8 +175,8 @@ config BR2_TAR_OPTIONS
 	default ""
 	help
 	  Options to pass to tar when extracting the sources.
-	  E.g. " -v --exclude='*.svn*'" to exclude all .svn internal files
-	  and to be verbose.
+	  E.g. " -v --exclude='*.svn*'" to exclude all .svn internal
+	  files and to be verbose.
 
 endmenu
 
@@ -667,7 +667,8 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH
 
 	  Note that this mechanism is available for both the internal
 	  toolchain (through the toolchain wrapper and binutils patches)
-	  and external toolchain backends (through the toolchain wrapper).
+	  and external toolchain backends (through the toolchain
+	  wrapper).
 
 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
@@ -751,9 +752,9 @@ choice
 	bool "RELRO Protection"
 	depends on BR2_SHARED_LIBS
 	help
-	  Enable a link-time protection know as RELRO (RELocation Read Only)
-	  which helps to protect from certain type of exploitation techniques
-	  altering the content of some ELF sections.
+	  Enable a link-time protection know as RELRO (RELocation Read
+	  Only) which helps to protect from certain type of exploitation
+	  techniques altering the content of some ELF sections.
 
 config BR2_RELRO_NONE
 	bool "None"
@@ -769,9 +770,9 @@ config BR2_RELRO_PARTIAL
 config BR2_RELRO_FULL
 	bool "Full"
 	help
-	  This option includes the partial configuration, but also
-	  marks the GOT as read-only at the cost of initialization time
-	  during program loading, i.e every time an executable is started.
+	  This option includes the partial configuration, but also marks
+	  the GOT as read-only at the cost of initialization time during
+	  program loading, i.e every time an executable is started.
 
 endchoice
 
@@ -784,10 +785,10 @@ choice
 	depends on !BR2_OPTIMIZE_0
 	help
 	  Enable the _FORTIFY_SOURCE macro which introduces additional
-	  checks to detect buffer-overflows in the following standard library
-	  functions: memcpy, mempcpy, memmove, memset, strcpy, stpcpy,
-	  strncpy, strcat, strncat, sprintf, vsprintf, snprintf, vsnprintf,
-	  gets.
+	  checks to detect buffer-overflows in the following standard
+	  library functions: memcpy, mempcpy, memmove, memset, strcpy,
+	  stpcpy, strncpy, strcat, strncat, sprintf, vsprintf, snprintf,
+	  vsnprintf, gets.
 
 	  NOTE: This feature requires an optimization level of s/1/2/3/g
 
diff --git a/Config.in.legacy b/Config.in.legacy
index 08a129106c..fa083eaf79 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -99,11 +99,11 @@ if !BR2_SKIP_LEGACY
 config BR2_LEGACY
 	bool
 	help
-	  This option is selected automatically when your old .config uses an
-	  option that no longer exists in current buildroot. In that case, the
-	  build will fail. Look for config options which are selected in the
-	  menu below: they no longer exist and should be replaced by something
-	  else.
+	  This option is selected automatically when your old .config
+	  uses an option that no longer exists in current buildroot. In
+	  that case, the build will fail. Look for config options which
+	  are selected in the menu below: they no longer exist and
+	  should be replaced by something else.
 
 # This comment fits exactly in a 80-column display
 comment "Legacy detected: check the content of the menu below"
@@ -566,18 +566,18 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
 	select BR2_LEGACY
 	help
 	  The Sourcery CodeBench toolchain for the sh architecture has
-	  been removed, since it uses glibc older than 2.17 that requires
-	  -lrt to link executables using clock_* system calls. This makes
-	  this toolchain difficult to maintain over time.
+	  been removed, since it uses glibc older than 2.17 that
+	  requires -lrt to link executables using clock_* system calls.
+	  This makes this toolchain difficult to maintain over time.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86
 	bool "x86 Sourcery toolchain has been removed"
 	select BR2_LEGACY
 	help
 	  The Sourcery CodeBench toolchain for the x86 architecture has
-	  been removed, since it uses glibc older than 2.17 that requires
-	  -lrt to link executables using clock_* system calls. This makes
-	  this toolchain difficult to maintain over time.
+	  been removed, since it uses glibc older than 2.17 that
+	  requires -lrt to link executables using clock_* system calls.
+	  This makes this toolchain difficult to maintain over time.
 
 config BR2_GCC_VERSION_4_8_X
 	bool "gcc 4.8.x support removed"
@@ -672,10 +672,10 @@ config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS
 	int "extra size in blocks has been removed"
 	default 0
 	help
-	  Since the support for auto calculation of the filesystem size has been
-	  removed, this option is now useless and must be 0.
-	  You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS matchs
-	  your needs.
+	  Since the support for auto calculation of the filesystem size
+	  has been removed, this option is now useless and must be 0.
+	  You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS
+	  matchs your needs.
 
 config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS_WRAP
 	bool
@@ -703,14 +703,16 @@ config BR2_NBD_CLIENT
 	select BR2_LEGACY
 	select BR2_PACKAGE_NBD_CLIENT
 	help
-	  The nbd client option has been renamed to BR2_PACKAGE_NBD_CLIENT.
+	  The nbd client option has been renamed to
+	  BR2_PACKAGE_NBD_CLIENT.
 
 config BR2_NBD_SERVER
 	bool "nbd server option was renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_NBD_SERVER
 	help
-	  The nbd server option has been renamed to BR2_PACKAGE_NBD_SERVER.
+	  The nbd server option has been renamed to
+	  BR2_PACKAGE_NBD_SERVER.
 
 config BR2_PACKAGE_GMOCK
 	bool "gmock merged into gtest package"
@@ -805,8 +807,8 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
 	help
 	  The support for the prebuilt toolchain based on the Musl C
 	  library provided by the musl-cross project has been removed.
-	  Upstream doesn't provide any prebuilt toolchain anymore, use the
-	  Buildroot toolchain instead.
+	  Upstream doesn't provide any prebuilt toolchain anymore, use
+	  the Buildroot toolchain instead.
 
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "uClibc tests now in uclibc-ng-test"
@@ -957,8 +959,8 @@ config BR2_PACKAGE_IPKG
 	select BR2_LEGACY
 	help
 	  ipkg dates back to the early 2000s when Compaq started the
-	  handhelds.org project and it hasn't seen development since 2006.
-	  Use opkg as a replacement.
+	  handhelds.org project and it hasn't seen development since
+	  2006. Use opkg as a replacement.
 
 config BR2_GCC_VERSION_4_7_X
 	bool "gcc 4.7.x support removed"
@@ -1030,8 +1032,9 @@ config BR2_KERNEL_HEADERS_3_19
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.19.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.19.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1040,8 +1043,8 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
 	select BR2_LEGACY
 	select BR2_PACKAGE_EFL
 	help
-	  With EFL 1.18, libevas-generic-loaders is now provided by the efl
-	  package.
+	  With EFL 1.18, libevas-generic-loaders is now provided by the
+	  efl package.
 
 config BR2_PACKAGE_ELEMENTARY
 	bool "elementary package removed"
@@ -1053,8 +1056,9 @@ config BR2_PACKAGE_ELEMENTARY
 config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 	bool "Linux kernel local directory option removed"
 	help
-	  The option to select a local directory as the source of the Linux
-	  kernel has been removed. It hurts reproducibility of builds.
+	  The option to select a local directory as the source of the
+	  Linux kernel has been removed. It hurts reproducibility of
+	  builds.
 
 	  In case you were using this option during development of your
 	  Linux kernel, use the override mechanism instead.
@@ -1092,14 +1096,16 @@ config BR2_PACKAGE_LIBFSLVPUWRAP
 	select BR2_LEGACY
 	select BR2_PACKAGE_IMX_VPUWRAP
 	help
-	  The libfslvpuwrap has been renamed to match the renamed package.
+	  The libfslvpuwrap has been renamed to match the renamed
+	  package.
 
 config BR2_PACKAGE_LIBFSLPARSER
 	bool "libfslparser has been renamed to imx-parser"
 	select BR2_LEGACY
 	select BR2_PACKAGE_IMX_PARSER
 	help
-	  The libfslparser has been renamed to match the renamed package.
+	  The libfslparser has been renamed to match the renamed
+	  package.
 
 config BR2_PACKAGE_LIBFSLCODEC
 	bool "libfslcodec has been renamed to imx-codec"
@@ -1246,8 +1252,9 @@ config BR2_KERNEL_HEADERS_3_17
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.17.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.17.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1350,8 +1357,8 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
 	bool "openpowerlink debug option has been removed"
 	select BR2_LEGACY
 	help
-	  This option depends on BR2_ENABLE_DEBUG which should not be used
-	  by packages anymore.
+	  This option depends on BR2_ENABLE_DEBUG which should not be
+	  used by packages anymore.
 
 config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
 	bool "openpowerlink package has been updated"
@@ -1393,10 +1400,11 @@ config BR2_KERNEL_HEADERS_3_16
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	Version 3.16.x of the Linux kernel headers have been deprecated
-	for more than four buildroot releases and are now removed.
-	As an alternative, version 3.12.x of the headers have been
-	automatically selected in your configuration.
+	  Version 3.16.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_PYTHON_PYXML
 	bool "python-pyxml package has been removed"
@@ -1409,9 +1417,9 @@ config BR2_PACKAGE_PYTHON_PYXML
 config BR2_ENABLE_SSP
 	bool "Stack Smashing protection now has different levels"
 	help
-	  The protection offered by SSP can now be selected from different
-	  protection levels. Be sure to review the SSP level in the build
-	  options menu.
+	  The protection offered by SSP can now be selected from
+	  different protection levels. Be sure to review the SSP level
+	  in the build options menu.
 
 config BR2_PACKAGE_DIRECTFB_CLE266
 	bool "cle266 driver for directfb removed"
@@ -1434,8 +1442,8 @@ config BR2_PACKAGE_LIBELEMENTARY
 	select BR2_LEGACY
 	select BR2_PACKAGE_ELEMENTARY
 	help
-	  The libelementary package has been renamed to match the upstream
-	  name.
+	  The libelementary package has been renamed to match the
+	  upstream name.
 
 config BR2_PACKAGE_LIBEINA
 	bool "libeina package has been removed"
@@ -1513,8 +1521,8 @@ config BR2_PACKAGE_INFOZIP
 	select BR2_PACKAGE_ZIP
 	help
 	  Info-Zip's Zip package has been renamed from infozip to zip,
-	  to avoid ambiguities with Info-Zip's UnZip which has been added
-	  in the unzip package.
+	  to avoid ambiguities with Info-Zip's UnZip which has been
+	  added in the unzip package.
 
 config BR2_BR2_PACKAGE_NODEJS_0_10_X
 	bool "nodejs 0.10.x option removed"
@@ -1522,9 +1530,10 @@ config BR2_BR2_PACKAGE_NODEJS_0_10_X
 	select BR2_PACKAGE_NODEJS
 	help
 	  nodejs 0.10.x option has been removed.  0.10.x is now
-	  automatically chosen for ARMv5 architectures only and the latest
-	  nodejs for all other supported architectures. The correct nodejs
-	  version has been automatically selected in your configuration.
+	  automatically chosen for ARMv5 architectures only and the
+	  latest nodejs for all other supported architectures. The
+	  correct nodejs version has been automatically selected in your
+	  configuration.
 
 config BR2_BR2_PACKAGE_NODEJS_0_12_X
 	bool "nodejs version 0.12.x has been removed"
@@ -1560,24 +1569,24 @@ config BR2_PACKAGE_MEDIA_CTL
 	select BR2_PACKAGE_LIBV4L
 	select BR2_PACKAGE_LIBV4L_UTILS
 	help
-	  media-ctl source and developement have been moved to
-	  v4l-utils since June 2014. For an up-to-date media-ctl
-	  version select BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS.
+	  media-ctl source and developement have been moved to v4l-utils
+	  since June 2014. For an up-to-date media-ctl version select
+	  BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS.
 
 config BR2_PACKAGE_SCHIFRA
 	bool "schifra package has been removed"
 	select BR2_LEGACY
 	help
-	  Schifra package has been maked broken since 2014.11 release and
-	  haven't been fixed since then.
+	  Schifra package has been maked broken since 2014.11 release
+	  and haven't been fixed since then.
 
 config BR2_PACKAGE_ZXING
 	bool "zxing option has been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_ZXING_CPP
 	help
-	  ZXing no longer provides the cpp bindings, it has been renamed to
-	  BR2_PACKAGE_ZXING_CPP which uses a new upstream.
+	  ZXing no longer provides the cpp bindings, it has been renamed
+	  to BR2_PACKAGE_ZXING_CPP which uses a new upstream.
 
 # Since FreeRDP has new dependencies, protect this legacy to avoid the
 # infamous "unmet direct dependencies" kconfig error.
@@ -1609,8 +1618,9 @@ config BR2_KERNEL_HEADERS_3_11
 	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
-	  Version 3.11.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.11.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.10.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1619,8 +1629,9 @@ config BR2_KERNEL_HEADERS_3_13
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.13.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.13.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1629,8 +1640,9 @@ config BR2_KERNEL_HEADERS_3_15
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.15.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.15.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -2058,8 +2070,9 @@ config BR2_TARGET_GENERIC_PASSWD_DES
 	bool "Encoding passwords with DES has been removed"
 	select BR2_LEGACY
 	help
-	  Paswords can now only be encoded with either of md5, sha256 or sha512.
-	  The default is md5, which is stronger that DES (but still pretty weak).
+	  Paswords can now only be encoded with either of md5, sha256 or
+	  sha512. The default is md5, which is stronger that DES (but
+	  still pretty weak).
 
 config BR2_PACKAGE_GTK2_THEME_HICOLOR
 	bool "hicolor (default theme) is a duplicate"
@@ -2083,16 +2096,17 @@ config BR2_PACKAGE_LIBGC
 	select BR2_LEGACY
 	select BR2_PACKAGE_BDWGC
 	help
-	  libgc has been removed because we have the same package under a
-	  different name, bdwgc.
+	  libgc has been removed because we have the same package under
+	  a different name, bdwgc.
 
 config BR2_PACKAGE_WDCTL
 	bool "util-linux' wdctl option has been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_UTIL_LINUX_WDCTL
 	help
-	  util-linux' wdctl option has been renamed to BR2_PACKAGE_UTIL_LINUX_WDCTL
-	  to be aligned with how the other options are named.
+	  util-linux' wdctl option has been renamed to
+	  BR2_PACKAGE_UTIL_LINUX_WDCTL to be aligned with how the other
+	  options are named.
 
 config BR2_PACKAGE_UTIL_LINUX_ARCH
 	bool "util-linux' arch option has been removed"
@@ -2112,16 +2126,17 @@ config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
 	select BR2_LEGACY
 	select BR2_PACKAGE_BZIP2
 	help
-	  The bzip2 payloads option rely entirely on the dependant package bzip2.
-	  So, you need to select it to enable this feature.
+	  The bzip2 payloads option rely entirely on the dependant
+	  package bzip2. So, you need to select it to enable this
+	  feature.
 
 config BR2_PACKAGE_RPM_XZ_PAYLOADS
 	bool "rpm's xz payloads option has been removed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_XZ
 	help
-	  The xz payloads option rely entirely on the dependant package xz.
-	  So, you need to select it to enable this feature.
+	  The xz payloads option rely entirely on the dependant package
+	  xz. So, you need to select it to enable this feature.
 
 config BR2_PACKAGE_M4
 	bool "m4 target package removed"
@@ -2176,9 +2191,9 @@ config BR2_PACKAGE_STRONGSWAN_TOOLS
 	select BR2_PACKAGE_STRONGSWAN_PKI
 	select BR2_PACKAGE_STRONGSWAN_SCEP
 	help
-	  The tools option has been removed upstream and the different tools
-	  have been split between the pki and scep options, with others
-	  deprecated.
+	  The tools option has been removed upstream and the different
+	  tools have been split between the pki and scep options, with
+	  others deprecated.
 
 config BR2_PACKAGE_XBMC_ADDON_XVDR
 	bool "xbmc-addon-xvdr removed"
@@ -2193,126 +2208,144 @@ config BR2_PACKAGE_XBMC_PVR_ADDONS
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_PVR_ADDONS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_ALSA_LIB
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_ALSA_LIB
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_AVAHI
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_AVAHI
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_DBUS
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_DBUS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBBLURAY
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBBLURAY
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_GOOM
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_GOOM
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_RSXS
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_RSXS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBCEC
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBCEC
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBMICROHTTPD
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBMICROHTTPD
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBNFS
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBNFS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_RTMPDUMP
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_RTMPDUMP
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBSHAIRPLAY
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBSHAIRPLAY
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBSMBCLIENT
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBSMBCLIENT
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBTHEORA
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBTHEORA
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBUSB
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBUSB
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBVA
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBVA
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_WAVPACK
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_WAVPACK
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PREFER_STATIC_LIB
 	bool "static library option renamed"
@@ -2390,8 +2423,8 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XC5000
 	select BR2_PACKAGE_LINUX_FIRMWARE_XCx000
 	help
 	  The Xceive xc5000 option now also handles older firmwares from
-	  Xceive (the xc4000 series), as well as new firmwares (the xc5000c)
-	  from Cresta, who bought Xceive.
+	  Xceive (the xc4000 series), as well as new firmwares (the
+	  xc5000c) from Cresta, who bought Xceive.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4
 	bool "Chelsio T4 option has been renamed"
@@ -2432,9 +2465,9 @@ config BR2_PACKAGE_LIBELF
 	select BR2_PACKAGE_ELFUTILS
 	select BR2_LEGACY
 	help
-	  The libelf package provided an old version of the libelf library
-	  and is deprecated. The libelf library is now provided by the
-	  elfutils package.
+	  The libelf package provided an old version of the libelf
+	  library and is deprecated. The libelf library is now provided
+	  by the elfutils package.
 
 config BR2_KERNEL_HEADERS_3_8
 	bool "kernel headers version 3.8.x are no longer supported"
@@ -2461,7 +2494,8 @@ config BR2_PACKAGE_PROCPS
 	select BR2_PACKAGE_PROCPS_NG
 	select BR2_LEGACY
 	help
-	  The procps package has been replaced by the equivalent procps-ng.
+	  The procps package has been replaced by the equivalent
+	  procps-ng.
 
 config BR2_BINUTILS_VERSION_2_20_1
 	bool "binutils 2.20.1 has been removed"
@@ -2548,40 +2582,40 @@ config BR2_PACKAGE_LIBV4L_DECODE_TM6000
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
 	bool "ir-keytable"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
 	bool "v4l2-compliance"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_V4L2_CTL
 	bool "v4l2-ctl"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_V4L2_DBG
 	bool "v4l2-dbg"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 ###############################################################################
 comment "Legacy options removed in 2014.05"
@@ -2629,8 +2663,8 @@ config BR2_PACKAGE_TZDATA_ZONELIST
 	string "tzdata: the timezone list option has been renamed"
 	help
 	  The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to
-	  BR2_TARGET_TZ_ZONELIST, and moved to the "System configuration"
-	  menu. You'll need to select BR2_TARGET_TZ_INFO.
+	  BR2_TARGET_TZ_ZONELIST, and moved to the "System
+	  configuration" menu. You'll need to select BR2_TARGET_TZ_INFO.
 
 config BR2_PACKAGE_TZDATA_ZONELIST_WRAP
 	bool
@@ -2642,8 +2676,8 @@ config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
 	select BR2_LEGACY
 	help
 	  The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been
-	  renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to select
-	  it in the corresponding choice.
+	  renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to
+	  select it in the corresponding choice.
 
 config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	bool "Lua command-line editing using readline has been renamed"
@@ -2707,8 +2741,8 @@ config BR2_PACKAGE_UDEV
 	  'systemd' as init system, 'eudev' should be selected, which is
 	  the case if '/dev management' is set to 'Dynamic using eudev'.
 
-	  If you are using 'systemd', its internal implementation of 'udev'
-	  is used.
+	  If you are using 'systemd', its internal implementation of
+	  'udev' is used.
 
 config BR2_PACKAGE_UDEV_RULES_GEN
 	bool "udev rules generation handled by provider"
@@ -2724,8 +2758,8 @@ config BR2_PACKAGE_UDEV_RULES_GEN
 	  '/dev management' is set to 'Dynamic using eudev' to get
 	  the same behaviour as in your old configuration.
 
-	  If you are using 'systemd', it internal implementation of 'udev'
-	  will generate the rules.
+	  If you are using 'systemd', it internal implementation of
+	  'udev' will generate the rules.
 
 config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "udev extras removed"
@@ -2832,23 +2866,23 @@ config BR2_HAVE_DOCUMENTATION
 	bool "support for documentation on target has been removed"
 	select BR2_LEGACY
 	help
-	  Support for documentation on target has been removed since it has
-	  been deprecated for more than four buildroot releases.
+	  Support for documentation on target has been removed since it
+	  has been deprecated for more than four buildroot releases.
 
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake target package has been removed"
 	select BR2_LEGACY
 	help
-	  The 'automake' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
+	  The 'automake' target package has been removed since it has
+	  been deprecated for more than four buildroot releases.
 	  Note: the host automake still exists.
 
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf target package has been removed"
 	select BR2_LEGACY
 	help
-	  The 'autoconf' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
+	  The 'autoconf' target package has been removed since it has
+	  been deprecated for more than four buildroot releases.
 	  Note: the host autoconf still exists.
 
 config BR2_PACKAGE_XSTROKE
@@ -2864,7 +2898,8 @@ config BR2_PACKAGE_LZMA
 	help
 	  The 'lzma' target package has been removed since it has been
 	  deprecated for more than four buildroot releases.
-	  Note: generating lzma-compressed rootfs images is still supported.
+	  Note: generating lzma-compressed rootfs images is still
+	  supported.
 
 config BR2_PACKAGE_TTCP
 	bool "ttcp has been removed"
@@ -2878,9 +2913,9 @@ config BR2_PACKAGE_LIBNFC_LLCP
 	select BR2_LEGACY
 	select BR2_PACKAGE_LIBLLCP
 	help
-	  The 'libnfc-llcp' package has been removed since upstream renamed
-	  to 'libllcp'. We have added a new package for 'libllcp' and bumped
-	  the version at the same time.
+	  The 'libnfc-llcp' package has been removed since upstream
+	  renamed to 'libllcp'. We have added a new package for
+	  'libllcp' and bumped the version at the same time.
 
 config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL client renamed to MySQL"
@@ -2946,8 +2981,8 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY
 	help
 	  The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which
 	  led to problems with other packages that need the full lvm2
-	  suite. Therefore, the option has been replaced with the positive
-	  BR2_PACKAGE_LVM2_STANDARD_INSTALL option.
+	  suite. Therefore, the option has been replaced with the
+	  positive BR2_PACKAGE_LVM2_STANDARD_INSTALL option.
 
 # Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in
 # in order to automatically propagate old configs
-- 
2.14.1

[Buildroot] [PATCH 26/36] arch/Config.in*: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 arch/Config.in        | 97 ++++++++++++++++++++++++++++-----------------------
 arch/Config.in.mips   |  4 +--
 arch/Config.in.xtensa | 12 +++----
 3 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/arch/Config.in b/arch/Config.in
index dd972bc0ee..65448e9339 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -28,24 +28,25 @@ config BR2_arcle
 	bool "ARC (little endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs
-	  that can be used from deeply embedded to high performance host
-	  applications. Little endian.
+	  Synopsys' DesignWare ARC Processor Cores are a family of
+	  32-bit CPUs that can be used from deeply embedded to high
+	  performance host applications. Little endian.
 
 config BR2_arceb
 	bool "ARC (big endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs
-	  that can be used from deeply embedded to high performance host
-	  applications. Big endian.
+	  Synopsys' DesignWare ARC Processor Cores are a family of
+	  32-bit CPUs that can be used from deeply embedded to high
+	  performance host applications. Big endian.
 
 config BR2_arm
 	bool "ARM (little endian)"
 	# MMU support is set by the subarchitecture file, arch/Config.in.arm
 	help
-	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
-	  set architecture (ISA) developed by ARM Holdings. Little endian.
+	  ARM is a 32-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by ARM Holdings.
+	  Little endian.
 	  http://www.arm.com/
 	  http://en.wikipedia.org/wiki/ARM
 
@@ -53,8 +54,9 @@ config BR2_armeb
 	bool "ARM (big endian)"
 	# MMU support is set by the subarchitecture file, arch/Config.in.arm
 	help
-	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
-	  set architecture (ISA) developed by ARM Holdings. Big endian.
+	  ARM is a 32-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by ARM Holdings.
+	  Big endian.
 	  http://www.arm.com/
 	  http://en.wikipedia.org/wiki/ARM
 
@@ -81,8 +83,8 @@ config BR2_bfin
 	select BR2_ARCH_HAS_FDPIC_SUPPORT
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	help
-	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
-	  manufactured and marketed by Analog Devices.
+	  The Blackfin is a family of 16 or 32-bit microprocessors
+	  developed, manufactured and marketed by Analog Devices.
 	  http://www.analog.com/
 	  http://en.wikipedia.org/wiki/Blackfin
 
@@ -113,8 +115,8 @@ config BR2_microblazeel
 	bool "Microblaze AXI (little endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus
-	  based architecture (little endian)
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI
+	  bus based architecture (little endian)
 	  http://www.xilinx.com
 	  http://en.wikipedia.org/wiki/Microblaze
 
@@ -122,8 +124,8 @@ config BR2_microblazebe
 	bool "Microblaze non-AXI (big endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus
-	  based architecture (non-AXI, big endian)
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB
+	  bus based architecture (non-AXI, big endian)
 	  http://www.xilinx.com
 	  http://en.wikipedia.org/wiki/Microblaze
 
@@ -131,7 +133,8 @@ config BR2_mips
 	bool "MIPS (big endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -139,7 +142,8 @@ config BR2_mipsel
 	bool "MIPS (little endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -148,7 +152,8 @@ config BR2_mips64
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -157,7 +162,8 @@ config BR2_mips64el
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -180,8 +186,8 @@ config BR2_powerpc
 	bool "PowerPC"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  Big endian.
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
+	  alliance. Big endian.
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
@@ -190,8 +196,8 @@ config BR2_powerpc64
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  Big endian.
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
+	  alliance. Big endian.
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
@@ -200,8 +206,8 @@ config BR2_powerpc64le
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  Little endian.
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
+	  alliance. Little endian.
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
@@ -209,8 +215,9 @@ config BR2_sh
 	bool "SuperH"
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	help
-	  SuperH (or SH) is a 32-bit reduced instruction set computer (RISC)
-	  instruction set architecture (ISA) developed by Hitachi.
+	  SuperH (or SH) is a 32-bit reduced instruction set computer
+	  (RISC) instruction set architecture (ISA) developed by
+	  Hitachi.
 	  http://www.hitachi.com/
 	  http://en.wikipedia.org/wiki/SuperH
 
@@ -218,8 +225,9 @@ config BR2_sparc
 	bool "SPARC"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  SPARC (from Scalable Processor Architecture) is a RISC instruction
-	  set architecture (ISA) developed by Sun Microsystems.
+	  SPARC (from Scalable Processor Architecture) is a RISC
+	  instruction set architecture (ISA) developed by Sun
+	  Microsystems.
 	  http://www.oracle.com/sun
 	  http://en.wikipedia.org/wiki/Sparc
 
@@ -228,8 +236,9 @@ config BR2_sparc64
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  SPARC (from Scalable Processor Architecture) is a RISC instruction
-	  set architecture (ISA) developed by Sun Microsystems.
+	  SPARC (from Scalable Processor Architecture) is a RISC
+	  instruction set architecture (ISA) developed by Sun
+	  Microsystems.
 	  http://www.oracle.com/sun
 	  http://en.wikipedia.org/wiki/Sparc
 
@@ -349,27 +358,27 @@ config BR2_BINFMT_ELF
 	depends on BR2_USE_MMU
 	select BR2_BINFMT_SUPPORTS_SHARED
 	help
-	  ELF (Executable and Linkable Format) is a format for libraries and
-	  executables used across different architectures and operating
-	  systems.
+	  ELF (Executable and Linkable Format) is a format for libraries
+	  and executables used across different architectures and
+	  operating systems.
 
 config BR2_BINFMT_FDPIC
 	bool "FDPIC"
 	depends on BR2_ARCH_HAS_FDPIC_SUPPORT
 	select BR2_BINFMT_SUPPORTS_SHARED
 	help
-	  ELF FDPIC binaries are based on ELF, but allow the individual load
-	  segments of a binary to be located in memory independently of each
-	  other. This makes this format ideal for use in environments where no
-	  MMU is available.
+	  ELF FDPIC binaries are based on ELF, but allow the individual
+	  load segments of a binary to be located in memory
+	  independently of each other. This makes this format ideal for
+	  use in environments where no MMU is available.
 
 config BR2_BINFMT_FLAT
 	bool "FLAT"
 	depends on !BR2_USE_MMU
 	help
-	  FLAT binary is a relatively simple and lightweight executable format
-	  based on the original a.out format. It is widely used in environment
-	  where no MMU is available.
+	  FLAT binary is a relatively simple and lightweight executable
+	  format based on the original a.out format. It is widely used
+	  in environment where no MMU is available.
 
 endchoice
 
@@ -393,8 +402,8 @@ config BR2_BINFMT_FLAT_SEP_DATA
 	# absolute jump" or "error: value -yyyyy out of range".
 	depends on BR2_bfin
 	help
-	  Allow for the data and text segments to be separated and placed in
-	  different regions of memory.
+	  Allow for the data and text segments to be separated and
+	  placed in different regions of memory.
 
 config BR2_BINFMT_FLAT_SHARED
 	bool "Shared binary"
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index cc11744f04..e45299f818 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -147,8 +147,8 @@ choice
 	default BR2_MIPS_FP32_MODE_XX
 	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	help
-	  MIPS32 supports different FP modes (32,xx,64). Information about FP
-	  modes can be found here:
+	  MIPS32 supports different FP modes (32,xx,64). Information
+	  about FP modes can be found here:
 	  https://sourceware.org/binutils/docs/as/MIPS-Options.html
 	  https://dmz-portal.imgtec.com/wiki/MIPS_O32_ABI_-_FR0_and_FR1_Interlinking#5._Generating_modeless_code
 
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 49e93a4774..14049480ec 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -20,13 +20,13 @@ config BR2_XTENSA_OVERLAY_FILE
 	  Enter the path to the overlay tarball for a custom processor
 	  configuration.
 
-	  These overlay files are tar packages with updated configuration
-	  files for various toolchain packages and Xtensa processor
-	  configurations. They are provided by the processor vendor or
-	  directly from Tensilica.
+	  These overlay files are tar packages with updated
+	  configuration files for various toolchain packages and Xtensa
+	  processor configurations. They are provided by the processor
+	  vendor or directly from Tensilica.
 
-	  The path can be either absolute, or relative to the top directory
-	  of buildroot.
+	  The path can be either absolute, or relative to the top
+	  directory of buildroot.
 
 choice
 	prompt "Target Architecture Endianness"
-- 
2.14.1

[Buildroot] [PATCH 27/36] boot/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 boot/at91bootstrap/Config.in  |  6 ++++--
 boot/at91bootstrap3/Config.in | 10 ++++++----
 boot/uboot/Config.in          | 43 ++++++++++++++++++++++---------------------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 96cfdbc7e9..0f6430fd8d 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -4,9 +4,11 @@ config BR2_TARGET_AT91BOOTSTRAP
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
-	  - Device initialization such as clock configuration, PIO settings...
+	  - Device initialization such as clock configuration, PIO
+	    settings...
 	  - Peripheral drivers such as PIO, PMC or SDRAMC...
-	  - Physical media algorithm such as DataFlash, NandFlash, NOR Flash...
+	  - Physical media algorithm such as DataFlash, NandFlash, NOR
+	    Flash...
 
 if	BR2_TARGET_AT91BOOTSTRAP
 
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index bdc1e775a8..614363c9a6 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -4,9 +4,11 @@ config BR2_TARGET_AT91BOOTSTRAP3
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
-	  - Device initialization such as clock configuration, PIO settings...
+	  - Device initialization such as clock configuration, PIO
+	    settings...
 	  - Peripheral drivers such as PIO, PMC or SDRAMC...
-	  - Physical media algorithm such as DataFlash, NandFlash, NOR Flash...
+	  - Physical media algorithm such as DataFlash, NandFlash, NOR
+	    Flash...
 
 if BR2_TARGET_AT91BOOTSTRAP3
 
@@ -20,8 +22,8 @@ config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
 config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
 	bool "Custom Git repository"
 	help
-	  This option allows Buildroot to get the AT91 Bootstrap 3 source
-	  code from a Git repository.
+	  This option allows Buildroot to get the AT91 Bootstrap 3
+	  source code from a Git repository.
 
 endchoice
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index d96e7f687f..19cf12a073 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -11,14 +11,14 @@ choice
 config BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
 	bool "Legacy"
 	help
-	  Select this option if you use an old U-Boot (older than 2015.04),
-	  so that we use the old build system.
+	  Select this option if you use an old U-Boot (older than
+	  2015.04), so that we use the old build system.
 
 config BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
 	bool "Kconfig"
 	help
-	  Select this option if you use a recent U-Boot version (2015.04 or
-	  newer), so that we use the Kconfig build system.
+	  Select this option if you use a recent U-Boot version (2015.04
+	  or newer), so that we use the Kconfig build system.
 
 endchoice
 
@@ -27,9 +27,9 @@ config BR2_TARGET_UBOOT_BOARDNAME
 	string "U-Boot board name"
 	help
 	  One of U-Boot supported boards to be built.
-	  This will be suffixed with _config to meet U-Boot standard naming.
-	  See boards.cfg in U-Boot source code for the list of available
-	  configurations.
+	  This will be suffixed with _config to meet U-Boot standard
+	  naming. See boards.cfg in U-Boot source code for the list of
+	  available configurations.
 endif
 
 choice
@@ -79,8 +79,8 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
 		if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""  # legacy
 	help
-	  Revision to use in the typical format used by Git/Mercurial/Subversion
-	  E.G. a sha id, a tag, branch, ..
+	  Revision to use in the typical format used by
+	  Git/Mercurial/Subversion E.G. a sha id, a tag, branch, ..
 
 endif
 
@@ -229,25 +229,25 @@ config BR2_TARGET_UBOOT_FORMAT_NAND
 	bool "u-boot.nand (Freescale i.MX28)"
 	depends on BR2_arm
 	help
-	  This is Freescale i.MX28 BootStream format (.sb), with a header
-	  for booting from a NAND flash.
+	  This is Freescale i.MX28 BootStream format (.sb), with a
+	  header for booting from a NAND flash.
 
 	  U-boot includes an mxsboot tool to generate this format,
 	  starting from 2011.12.
 
-	  There are two possibilities when preparing an image writable to
-	  NAND flash:
-	  1) The NAND was not written at all yet or the BCB (Boot Control
-	  Blocks) is broken. In this case, the NAND image 'u-boot.nand'
-	  needs to written.
+	  There are two possibilities when preparing an image writable
+	  to NAND flash:
+	  1) The NAND was not written at all yet or the BCB (Boot
+	  Control Blocks) is broken. In this case, the NAND image
+	  'u-boot.nand' needs to written.
 	  2) The NAND flash was already written with a good BCB. This
 	  applies after 'u-boot.nand' was correctly written. There is no
-	  need to write the BCB again. In this case, the bootloader can be
-	  upgraded by writing 'u-boot.sb'.
+	  need to write the BCB again. In this case, the bootloader can
+	  be upgraded by writing 'u-boot.sb'.
 
 	  To satisfy both cases, the 'u-boot.nand' image obtained from
-	  mxsboot as well as the U-Boot make target 'u-boot.sb' are copied
-	  to the binaries directory.
+	  mxsboot as well as the U-Boot make target 'u-boot.sb' are
+	  copied to the binaries directory.
 
 	  See doc/README.mxs (or doc/README.mx28_common before 2013.07)
 
@@ -295,7 +295,8 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
 	depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
 	help
 	  In case the U-Boot binary for the target platform is not among
-	  the default names, one or more custom names can be listed here.
+	  the default names, one or more custom names can be listed
+	  here.
 	  Use space to separate multiple names.
 	  Example:
 	  u-boot_magic.bin
-- 
2.14.1

[Buildroot] [PATCH 28/36] fs/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 fs/cpio/Config.in      |  6 +++---
 fs/ext2/Config.in      | 22 ++++++++++++----------
 fs/initramfs/Config.in |  3 ++-
 fs/jffs2/Config.in     | 16 +++++++++-------
 fs/ubi/Config.in       | 11 ++++++-----
 5 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in
index 679959d222..83a7fa5824 100644
--- a/fs/cpio/Config.in
+++ b/fs/cpio/Config.in
@@ -1,9 +1,9 @@
 config BR2_TARGET_ROOTFS_CPIO
 	bool "cpio the root filesystem (for use as an initial RAM filesystem)"
 	help
-	  Build a cpio archive of the root filesystem.  This is typically
-	  used for an initial RAM filesystem that is passed to the kernel
-	  by the bootloader.
+	  Build a cpio archive of the root filesystem. This is typically
+	  used for an initial RAM filesystem that is passed to the
+	  kernel by the bootloader.
 
 if BR2_TARGET_ROOTFS_CPIO
 
diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index 27ad69fde9..74bacc1141 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -49,11 +49,11 @@ config BR2_TARGET_ROOTFS_EXT2_SIZE
 	default BR2_TARGET_ROOTFS_EXT2_BLOCKS if BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP # legacy 2017.08
 	default "60M"
 	help
-	  The size of the filesystem image. If it does not have a suffix,
-	  it is interpreted as power-of-two kilobytes. If it is suffixed
-	  by 'k', 'm', 'g', 't' (either upper-case or lower-case), then
-	  it is interpreted in power-of-two kilobytes, megabytes,
-	  gigabytes, terabytes, etc.
+	  The size of the filesystem image. If it does not have a
+	  suffix, it is interpreted as power-of-two kilobytes. If it is
+	  suffixed by 'k', 'm', 'g', 't' (either upper-case or
+	  lower-case), then it is interpreted in power-of-two kilobytes,
+	  megabytes, gigabytes, terabytes, etc.
 
 config BR2_TARGET_ROOTFS_EXT2_INODES
 	int "exact number of inodes (leave at 0 for auto calculation)"
@@ -65,15 +65,16 @@ config BR2_TARGET_ROOTFS_EXT2_RESBLKS
 	help
 	  The number of blocks on the filesystem (as a percentage of the
 	  total number of blocks), that are reserved for use by root.
-	  Traditionally, this has been 5%, and all ext-related tools still
-	  default to reserving 5% when creating a new ext filesystem.
+	  Traditionally, this has been 5%, and all ext-related tools
+	  still default to reserving 5% when creating a new ext
+	  filesystem.
 
 config BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS
 	string "additional mke2fs options"
 	default "-O ^64bit"
 	help
-	  Specify a space-separated list of mke2fs options, including any
-	  ext2/3/4 filesystem features.
+	  Specify a space-separated list of mke2fs options, including
+	  any ext2/3/4 filesystem features.
 
 	  For more information about the mke2fs options, see the manual
 	  page mke2fs(8).
@@ -91,7 +92,8 @@ choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_EXT2_NONE
 	help
-	  Select compressor for ext2/3/4 filesystem of the root filesystem
+	  Select compressor for ext2/3/4 filesystem of the root
+	  filesystem
 
 config BR2_TARGET_ROOTFS_EXT2_NONE
 	bool "no compression"
diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index 8ed9f7ebb5..9d5a3f92e6 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -10,7 +10,8 @@ config BR2_TARGET_ROOTFS_INITRAMFS
 	  A rootfs.cpio file will be generated in the images/ directory.
 	  This is the archive that will be included in the kernel image.
 	  The default rootfs compression set in the kernel configuration
-	  is used, regardless of how buildroot's cpio archive is configured.
+	  is used, regardless of how buildroot's cpio archive is
+	  configured.
 
 	  Note that enabling initramfs together with another filesystem
 	  formats doesn't make sense: you would end up having two
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index 208cabaa52..44c0b10446 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -94,18 +94,20 @@ config BR2_TARGET_ROOTFS_JFFS2_SUMMARY
 config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	bool "Select custom virtual memory page size"
 	help
-	  Use a custom virtual memory page size.  Note that this is not related to
-	  the flash memory page size.  Using this option is only needed if Linux is
-	  configured to use a page size different than 4kB.
+	  Use a custom virtual memory page size. Note that this is not
+	  related to the flash memory page size. Using this option is
+	  only needed if Linux is configured to use a page size
+	  different than 4kB.
 
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
 	hex "Virtual memory page size"
 	default 0x1000
 	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	help
-	  Set to virtual memory page size of target system (in bytes).  This value
-	  should match the virtual page size in Linux (i.e. this should have the
-	  same value as the value of the PAGE_SIZE macro in Linux).  It is not
-	  related to the flash memory page size.
+	  Set to virtual memory page size of target system (in bytes).
+	  This value should match the virtual page size in Linux (i.e.
+	  this should have the same value as the value of the PAGE_SIZE
+	  macro in Linux). It is not related to the flash memory page
+	  size.
 
 endif
diff --git a/fs/ubi/Config.in b/fs/ubi/Config.in
index 5fa2f1f61d..85b1c56bb0 100644
--- a/fs/ubi/Config.in
+++ b/fs/ubi/Config.in
@@ -18,8 +18,9 @@ config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 	int "sub-page size"
 	default 512
 	help
-	  Tells ubinize that the flash supports sub-pages and the sub-page
-	  size. Use 0 if sub-pages are not supported on flash chip.
+	  Tells ubinize that the flash supports sub-pages and the
+	  sub-page size. Use 0 if sub-pages are not supported on flash
+	  chip.
 	  The value provided here is passed to the -s/--sub-page-size
 	  option of ubinize.
 
@@ -28,9 +29,9 @@ config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
 	help
 	  Select this option to use a custom ubinize configuration file,
 	  rather than the default configuration used by Buildroot (which
-	  defines a single dynamic volume marked as auto-resize).  Passing
-	  a custom ubinize configuration file allows you to create several
-	  volumes, specify volume types, etc.
+	  defines a single dynamic volume marked as auto-resize).
+	  Passing a custom ubinize configuration file allows you to
+	  create several volumes, specify volume types, etc.
 
 	  As a convenience, buildroot replaces the string
 	  "BR2_ROOTFS_UBIFS_PATH" with the path to the built ubifs file.
-- 
2.14.1

[Buildroot] [PATCH 29/36] linux/Config.*: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 linux/Config.ext.in | 15 +++++++++------
 linux/Config.in     | 43 +++++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 011dffb0b1..acc8a04742 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -117,14 +117,17 @@ config BR2_LINUX_KERNEL_EXT_AUFS_VERSION
 	string "aufs-standalone version"
 	default ""
 	help
-	  The version you choose must match that of your kernel. Usually,
-	  the sha1 of the cset you want to use; avoid using a branch name
-	  as this yields non-reproducible builds.
+	  The version you choose must match that of your kernel.
+	  Usually, the sha1 of the cset you want to use; avoid using a
+	  branch name as this yields non-reproducible builds.
 
-	  See the following resources to see what versions are available:
+	  See the following resources to see what versions are
+	  available:
 
-	  For aufs3.x: https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/
-	  For aufs4.x: https://github.com/sfjro/aufs4-standalone/branches/all
+	  For aufs3.x:
+	  https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/
+	  For aufs4.x:
+	  https://github.com/sfjro/aufs4-standalone/branches/all
 
 endif # aufs
 
diff --git a/linux/Config.in b/linux/Config.in
index 040a2341f9..424a862c7f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -61,13 +61,13 @@ config BR2_LINUX_KERNEL_CUSTOM_VERSION
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL
 	bool "Custom tarball"
 	help
-	  This option allows to specify a URL pointing to a kernel source
-	  tarball. This URL can use any protocol recognized by Buildroot,
-	  like http://, ftp://, file:// or scp://.
+	  This option allows to specify a URL pointing to a kernel
+	  source tarball. This URL can use any protocol recognized by
+	  Buildroot, like http://, ftp://, file:// or scp://.
 
-	  When pointing to a local tarball using file://, you may want to
-	  use a make variable like $(TOPDIR) to reference the root of the
-	  Buildroot tree.
+	  When pointing to a local tarball using file://, you may want
+	  to use a make variable like $(TOPDIR) to reference the root of
+	  the Buildroot tree.
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT
 	bool "Custom Git repository"
@@ -109,8 +109,8 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION \
 		if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != ""  # legacy
 	help
-	  Revision to use in the typical format used by Git/Mercurial/Subversion
-	  E.G. a sha id, a tag, branch, ..
+	  Revision to use in the typical format used by
+	  Git/Mercurial/Subversion E.G. a sha id, a tag, branch, ..
 
 endif
 
@@ -175,7 +175,8 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	  Path to the kernel configuration file
 
 	  Note: this can be a defconfig file or a complete .config file,
-	  which can later be saved back with make linux-update-(def)config.
+	  which can later be saved back with make
+	  linux-update-(def)config.
 
 config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES
 	string "Additional configuration fragment files"
@@ -284,9 +285,9 @@ endchoice
 choice
 	prompt "Kernel compression format"
 	help
-	  This selection will just ensure that the correct host tools are built.
-	  The actual compression for the kernel should be selected in the
-	  kernel configuration menu.
+	  This selection will just ensure that the correct host tools
+	  are built. The actual compression for the kernel should be
+	  selected in the kernel configuration menu.
 
 config BR2_LINUX_KERNEL_GZIP
 	bool "gzip compression"
@@ -317,8 +318,9 @@ config BR2_LINUX_KERNEL_IMAGE_NAME
 	depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
 	help
 	  The filename of the kernel image, if it is different from the
-	  make target (above). Only Xtensa uses a filename different from
-	  the make target. Defaults to BR2_LINUX_KERNEL_IMAGE_TARGET_NAME.
+	  make target (above). Only Xtensa uses a filename different
+	  from the make target. Defaults to
+	  BR2_LINUX_KERNEL_IMAGE_TARGET_NAME.
 
 	  If unsure, leave it empty.
 
@@ -327,18 +329,19 @@ config BR2_LINUX_KERNEL_UIMAGE_LOADADDR
 	depends on BR2_arm || BR2_armeb
 	depends on BR2_LINUX_KERNEL_UIMAGE || BR2_LINUX_KERNEL_APPENDED_UIMAGE
 	help
-	  If your ARM system's Linux kernel is configured with the new (3.7+)
-	  multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y in your
-	  kernel config), then it is necessary to specify a kernel load address
-	  when building the uImage. This should be a hexadecimal string
-	  beginning with 0x, for example: 0x00008000.
+	  If your ARM system's Linux kernel is configured with the new
+	  (3.7+) multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y
+	  in your kernel config), then it is necessary to specify a
+	  kernel load address when building the uImage. This should be a
+	  hexadecimal string beginning with 0x, for example: 0x00008000.
 
 	  If unsure, let this option empty.
 
 config BR2_LINUX_KERNEL_DTS_SUPPORT
 	bool "Build a Device Tree Blob (DTB)"
 	help
-	  Compile one or more device tree sources into device tree blobs.
+	  Compile one or more device tree sources into device tree
+	  blobs.
 	  Select the dts files to compile in the options below.
 
 if BR2_LINUX_KERNEL_DTS_SUPPORT
-- 
2.14.1

[Buildroot] [PATCH 30/36] system/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 system/Config.in | 122 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 58 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 7b36516cc7..d14a864ca5 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -92,9 +92,9 @@ config BR2_TARGET_GENERIC_PASSWD_SHA512
 	help
 	  Use SHA512 to encode passwords.
 
-	  Extremely strong, but not ubiquitous, although available in glibc
-	  for some time now. Choose only if you are sure your C library
-	  understands SHA512 passwords.
+	  Extremely strong, but not ubiquitous, although available in
+	  glibc for some time now. Choose only if you are sure your C
+	  library understands SHA512 passwords.
 
 endchoice # Passwd encoding
 
@@ -219,9 +219,9 @@ config BR2_ROOTFS_MERGED_USR
 	  is the historical UNIX way. In this case, /usr can be a
 	  filesystem on a partition separate from / .
 
-	  If you say 'y' here, then /bin, /sbin and /lib will be symlinks
-	  to their counterparts in /usr. In this case, /usr can not be a
-	  separate filesystem.
+	  If you say 'y' here, then /bin, /sbin and /lib will be
+	  symlinks to their counterparts in /usr. In this case, /usr can
+	  not be a separate filesystem.
 
 config BR2_TARGET_ENABLE_ROOT_LOGIN
 	bool "Enable root login with password"
@@ -230,10 +230,10 @@ config BR2_TARGET_ENABLE_ROOT_LOGIN
 	help
 	  Allow root to log in with a password.
 
-	  If not enabled, root will not be able to log in with a password.
-	  However, if you have an ssh server and you add an ssh key, you
-	  can still allow root to log in. Alternatively, you can use sudo
-	  to become root.
+	  If not enabled, root will not be able to log in with a
+	  password. However, if you have an ssh server and you add an
+	  ssh key, you can still allow root to log in. Alternatively,
+	  you can use sudo to become root.
 
 config BR2_TARGET_GENERIC_ROOT_PASSWD
 	string "Root password"
@@ -242,25 +242,28 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD
 	help
 	  Set the initial root password.
 
-	  If set to empty (the default), then no root password will be set,
-	  and root will need no password to log in.
+	  If set to empty (the default), then no root password will be
+	  set, and root will need no password to log in.
 
-	  If the password starts with any of $1$, $5$ or $6$, it is considered
-	  to be already crypt-encoded with respectively md5, sha256 or sha512.
-	  Any other value is taken to be a clear-text value, and is crypt-encoded
-	  as per the "Passwords encoding" scheme, above.
+	  If the password starts with any of $1$, $5$ or $6$, it is
+	  considered to be already crypt-encoded with respectively md5,
+	  sha256 or sha512.  Any other value is taken to be a clear-text
+	  value, and is crypt-encoded as per the "Passwords encoding"
+	  scheme, above.
 
-	  Note: "$" signs in the hashed password must be doubled. For example,
-	  if the hashed password is "$1$longsalt$v35DIIeMo4yUfI23yditq0",
-	  then you must enter it as "$$1$$longsalt$$v35DIIeMo4yUfI23yditq0"
-	  (this is necessary otherwise make would attempt to interpret the $
-	  as a variable expansion).
+	  Note: "$" signs in the hashed password must be doubled. For
+	  example, if the hashed password is
+	  "$1$longsalt$v35DIIeMo4yUfI23yditq0", then you must enter it
+	  as "$$1$$longsalt$$v35DIIeMo4yUfI23yditq0" (this is necessary
+	  otherwise make would attempt to interpret the $ as a variable
+	  expansion).
 
 	  WARNING! WARNING!
 	  The password appears as-is in the .config file, and may appear
-	  in the build log! Avoid using a valuable password if either the
-	  .config file or the build log may be distributed, or at the
-	  very least use a strong cryptographic hash for your password!
+	  in the build log! Avoid using a valuable password if either
+	  the .config file or the build log may be distributed, or at
+	  the very least use a strong cryptographic hash for your
+	  password!
 
 choice
 	bool "/bin/sh"
@@ -375,10 +378,10 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
 	default y
 	help
 	  The root filesystem is typically mounted read-only at boot.
-	  By default, buildroot remounts it in read-write mode early during the
-	  boot process.
-	  Say no here if you would rather like your root filesystem to remain
-	  read-only.
+	  By default, buildroot remounts it in read-write mode early
+	  during the boot process.
+	  Say no here if you would rather like your root filesystem to
+	  remain read-only.
 	  If unsure, say Y.
 
 config BR2_SYSTEM_DHCP
@@ -391,8 +394,9 @@ config BR2_SYSTEM_DHCP
 
 	  If left empty, no automatic DHCP requests will take place.
 
-	  For more complicated network setups use an overlay to overwrite
-	  /etc/network/interfaces or add a networkd configuration file.
+	  For more complicated network setups use an overlay to
+	  overwrite /etc/network/interfaces or add a networkd
+	  configuration file.
 
 comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd"
 	depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || BR2_PACKAGE_SYSTEMD_NETWORKD)
@@ -468,18 +472,19 @@ config BR2_TARGET_TZ_ZONELIST
 	help
 	  Space-separated list of time zones to compile.
 
-	  The value "default" includes all commonly used time zones. Note
-	  that this set consumes around 5.5M for glibc and 2.1M for uClibc.
+	  The value "default" includes all commonly used time zones.
+	  Note that this set consumes around 5.5M for glibc and 2.1M for
+	  uClibc.
 
-	  The full list is the list of files in the time zone database source,
-	  not including the build and .tab files.
+	  The full list is the list of files in the time zone database
+	  source, not including the build and .tab files.
 
 config BR2_TARGET_LOCALTIME
 	string "default local time"
 	default "Etc/UTC"
 	help
-	  The time zone to install as the default local time, expressed as a
-	  tzdata location, such as:
+	  The time zone to install as the default local time, expressed
+	  as a tzdata location, such as:
 	    Etc/UTC             (the default)
 	    GMT
 	    Europe/Paris
@@ -506,24 +511,24 @@ config BR2_ROOTFS_OVERLAY
 	  root filesystem after the build has finished and before it is
 	  packed into the selected filesystem images.
 
-	  They are copied as-is into the rootfs, excluding files ending with
-	  ~ and .git, .svn and .hg directories.
+	  They are copied as-is into the rootfs, excluding files ending
+	  with ~ and .git, .svn and .hg directories.
 
 config BR2_ROOTFS_POST_BUILD_SCRIPT
 	string "Custom scripts to run before creating filesystem images"
 	default ""
 	help
-	  Specify a space-separated list of scripts to be run after the build
-	  has finished and before Buildroot starts packing the files into
-	  selected filesystem images.
+	  Specify a space-separated list of scripts to be run after the
+	  build has finished and before Buildroot starts packing the
+	  files into selected filesystem images.
 
-	  This gives users the opportunity to do board-specific cleanups,
-	  add-ons and the like, so the generated files can be used directly
-	  without further processing.
+	  This gives users the opportunity to do board-specific
+	  cleanups, add-ons and the like, so the generated files can be
+	  used directly without further processing.
 
-	  These scripts are called with the target directory name as first
-	  argument. Make sure the exit code of those scripts are 0, otherwise
-	  make will stop after calling them.
+	  These scripts are called with the target directory name as
+	  first argument. Make sure the exit code of those scripts are
+	  0, otherwise make will stop after calling them.
 
 config BR2_ROOTFS_POST_FAKEROOT_SCRIPT
 	string "Custom scripts to run inside the fakeroot environment"
@@ -548,8 +553,9 @@ config BR2_ROOTFS_POST_FAKEROOT_SCRIPT
 	        to create arbitrary entries statically in /dev
 
 	    - BR2_ROOTFS_DEVICE_TABLE
-	        to set arbitrary permissions as well as extended attributes
-	        (such as capabilities) on files and directories,
+	        to set arbitrary permissions as well as extended
+	        attributes (such as capabilities) on files and
+	        directories,
 
 	    - BR2_ROOTFS_USERS_TABLES:
 	        to create arbitrary users and their home directories
@@ -581,16 +587,16 @@ config BR2_ROOTFS_POST_SCRIPT_ARGS
 		|| BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" \
 		|| BR2_ROOTFS_POST_IMAGE_SCRIPT != ""
 	help
-	  Pass these additional arguments to each post-build or post-image
-	  scripts.
+	  Pass these additional arguments to each post-build or
+	  post-image scripts.
 
-	  Note that all the post-build and post-image scripts will be passed
-	  the same set of arguments, you can not pass different arguments to
-	  each script.
+	  Note that all the post-build and post-image scripts will be
+	  passed the same set of arguments, you can not pass different
+	  arguments to each script.
 
-	  Note also, as stated in their respective help text, that the first
-	  argument to each post-build or post-image script is the target
-	  directory / images directory. The arguments in this option will be
-	  passed *after* those.
+	  Note also, as stated in their respective help text, that the
+	  first argument to each post-build or post-image script is the
+	  target directory / images directory. The arguments in this
+	  option will be passed *after* those.
 
 endmenu
-- 
2.14.1

[Buildroot] [PATCH 31/36] toolchain/{*/Config.in, *.in}: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 toolchain/toolchain-common.in                                 | 10 ++++++----
 toolchain/toolchain-external/Config.in                        | 11 ++++++-----
 .../toolchain-external-codescape-img-mips/Config.in           |  6 ++++--
 .../toolchain-external-codescape-mti-mips/Config.in           |  6 ++++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 8941e0f3cd..6b07fb88ae 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -65,7 +65,8 @@ config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
 	  The gconv libraries are used to convert between different
 	  character sets (charsets).
 
-	  Say 'y' if you need to store and/or display different charsets.
+	  Say 'y' if you need to store and/or display different
+	  charsets.
 
 config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST
 	string "Gconv libraries to copy"
@@ -103,10 +104,11 @@ config BR2_TARGET_OPTIMIZATION
 config BR2_TARGET_LDFLAGS
 	string "Target linker options"
 	help
-	  Extra options to pass to the linker when building for the target.
+	  Extra options to pass to the linker when building for the
+	  target.
 
-	  Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib')
-	  are not supported.
+	  Note that options with a '$' sign (eg.
+	  -Wl,-rpath='$ORIGIN/../lib') are not supported.
 
 config BR2_ECLIPSE_REGISTER
 	bool "Register toolchain within Eclipse Buildroot plug-in"
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c4063b177b..6759e5cefa 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -53,15 +53,16 @@ choice
 config BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
 	bool "Toolchain to be downloaded and installed"
 	help
-	  Select this option if you want Buildroot to download and install the
-	  toolchain. If you have selected a custom toolchain, specify the URL
-	  in BR2_TOOLCHAIN_EXTERNAL_URL.
+	  Select this option if you want Buildroot to download and
+	  install the toolchain. If you have selected a custom
+	  toolchain, specify the URL in BR2_TOOLCHAIN_EXTERNAL_URL.
 
 config BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED
 	bool "Pre-installed toolchain"
 	help
-	  Select this option if you want to use a pre-installed toolchain.
-	  Specify the path to this toolchain in BR2_TOOLCHAIN_EXTERNAL_PATH.
+	  Select this option if you want to use a pre-installed
+	  toolchain. Specify the path to this toolchain in
+	  BR2_TOOLCHAIN_EXTERNAL_PATH.
 
 endchoice
 
diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
index 8b2eab0ad2..2bfa567672 100644
--- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
+++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
@@ -30,12 +30,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r6' Target Architecture Variant
 	      Enable 'Use soft-float'
-	    - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS
+	    - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r6' Target Architecture Variant
 	      Disable 'Use soft-float'
 	      Set BR2_TARGET_OPTIMIZATION to '-mmicromips'
-	    - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, microMIPS
+	    - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r6' Target Architecture Variant
 	      Enable 'Use soft-float'
diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
index db191fd1be..5d466a58f4 100644
--- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
+++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
@@ -41,12 +41,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r2' Target Architecture Variant
 	      Enable 'Use soft-float'
-	    - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS
+	    - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r2' Target Architecture Variant
 	      Enable 'Use soft-float'
 	      Set BR2_TARGET_OPTIMIZATION to '-mmicromips'
-	    - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, microMIPS
+	    - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r2' Target Architecture Variant
 	      Disable 'Use soft-float'
-- 
2.14.1

[Buildroot] [PATCH 33/36] package/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
These packages were generated by scanpypi, so let's fix the tool in the
next patch.
---
 package/python-functools32/Config.in | 4 ++--
 package/python-jsonmodels/Config.in  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in
index cc12557edc..606341d828 100644
--- a/package/python-functools32/Config.in
+++ b/package/python-functools32/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_PYTHON_FUNCTOOLS32
 	bool "python-functools32"
 	depends on BR2_PACKAGE_PYTHON
 	help
-	  Backport of the functools module from Python 3.2.3 for use on 2.7
-	  and PyPy.
+	  Backport of the functools module from Python 3.2.3 for use on
+	  2.7 and PyPy.
 
 	  https://github.com/MiCHiLU/python-functools32
diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in
index d840e2acfe..f66982874a 100644
--- a/package/python-jsonmodels/Config.in
+++ b/package/python-jsonmodels/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_JSONMODELS
 	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
-	  Models to make easier to deal with structures that are converted
-	  to, or read from JSON.
+	  Models to make easier to deal with structures that are
+	  converted to, or read from JSON.
 
 	  https://github.com/beregond/jsonmodels
-- 
2.14.1

[Buildroot] [PATCH 34/36] scanpypi: generate help text compliant to check-package

[Ricardo Martincoski]

Each line must fit in <tab><2 spaces><62 chars>.
The default width for textwrap.wrap() is 70, so explicit set it to 62.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
 utils/scanpypi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/scanpypi b/utils/scanpypi
index 505ba0a246..6a3cdcc666 100755
--- a/utils/scanpypi
+++ b/utils/scanpypi
@@ -583,7 +583,7 @@ class BuildrootPackage():
 
         lines.append('\thelp\n')
 
-        help_lines = textwrap.wrap(self.metadata['info']['summary'],
+        help_lines = textwrap.wrap(self.metadata['info']['summary'], 62,
                                    initial_indent='\t  ',
                                    subsequent_indent='\t  ')
 
-- 
2.14.1

[Buildroot] [PATCH 35/36] utils/checkpackagelib: exclude four files from Config.in indentation check

[Ricardo Martincoski]

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

package/Config.in, package/Config.in.host, package/x11r7/Config.in and
package/kodi/Config.in do not comply with the normal Config.in
indentation rules. However, this violation of the rule is legitimate, so
let's skip them in check-package for this specific indentation check.

This removes the last 2197 remaining warnings on Config.in files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Ricardo: rebase patch to use relative paths passed by the main script,
          fix flake8 warnings, add package/Config.* to the list]
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
NOTE: this patch depends on the first one that introduces the use of
relative paths by the main script when testing intree files.

original patch: http://patchwork.ozlabs.org/patch/849882/
---
 utils/checkpackagelib/lib_config.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 11d885f8c7..1d273f1c5f 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -132,6 +132,12 @@ class Indent(_CheckFunction):
                         text]
         elif entry in entries_that_should_not_be_indented:
             if not text.startswith(entry):
+                # four Config.in files have a special but legitimate indentation rule
+                if self.filename in ["package/Config.in",
+                                     "package/Config.in.host",
+                                     "package/kodi/Config.in",
+                                     "package/x11r7/Config.in"]:
+                    return
                 return ["{}:{}: should not be indented"
                         .format(self.filename, lineno),
                         text]
-- 
2.14.1

[Buildroot] [PATCH 36/36] .gitlab-ci.yml: extend check-package test to Config.* files

[Ricardo Martincoski]

Now that all issues in Config.in files have been fixed, let's try to
make sure we don't introduce new ones by checking regularly these files
issues in Gitlab CI.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
 .gitlab-ci.yml    | 3 ++-
 .gitlab-ci.yml.in | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 952fffaf88..8489f8c45c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,8 @@ check-DEVELOPERS:
 
 check-package:
     script:
-        - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} +
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name 'toolchain-common.in' \)
+            -exec ./utils/check-package {} +
 
 .defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to
diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in
index cb3eb715f2..578e13f532 100644
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -32,7 +32,8 @@ check-DEVELOPERS:
 
 check-package:
     script:
-        - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} +
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name 'toolchain-common.in' \)
+            -exec ./utils/check-package {} +
 
 .defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to
-- 
2.14.1

[Buildroot] [PATCH 11/36] linux/linux.mk: use namespace for internal variables

[Thomas Petazzoni]

Hello,

Thanks for this great cleanup series!

On Fri, 30 Mar 2018 23:22:36 -0300, Ricardo Martincoski wrote:
> These three symbols:
> KERNEL_ARCH_PATH
> KERNEL_DTBS
> KERNEL_DTS_NAME
> are defined and used only inside this file, so use the LINUX_ namespace
> for them.

Should we name them just LINUX_ARCH_PATH, LINUX_DTBS and
LINUX_DTS_NAME, instead of LINUX_KERNEL_ARCH_PATH, LINUX_KERNEL_DTBS,
etc. ? This would make them more consistent with the other variables
that already exist: LINUX_VERSION_PROBE, LINUX_IMAGE_NAME, etc.

I.e, the prefix should be just LINUX_ and not LINUX_KERNEL_.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 14/36] toolchain/toolchain.mk: fix code style

[Thomas Petazzoni]

Hello,

On Fri, 30 Mar 2018 23:22:39 -0300, Ricardo Martincoski wrote:

>  # Install the gconv modules
>  ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
> -GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
> +TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
>  define COPY_GCONV_LIBS

Perhaps the name of this variable should also be name-spaced:
TOOLCHAIN_GLIBC_COPY_GCONV_LIBS or something like that.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 15/36] check-package: enable for toolchain/

[Thomas Petazzoni]

Hello,

On Fri, 30 Mar 2018 23:22:40 -0300, Ricardo Martincoski wrote:
> The toolchain directory can benefit from this script to prevent common
> mistakes when submitting patches.
> 
> In order to accomplish this:
> Do not ignore anymore files from the toolchain/ directory.
> Accept toolchain-common.in as a valid Config.in name.
> Ignore this symbol:
>  - BR_LIBC: defined by the buildroot toolchain, used by gcc-final.mk.
> But do not ignore this symbol:
>  - GCONV_LIBS: it is used only inside the file that defines it.

You're not actually ignoring this variable in this patch, and you
instead fixed it in PATCH 14/36 to have a TOOLCHAIN_ prefix.

> Ignore toolchain/toolchain-external/pkg-toolchain-external.mk as it
> declares a package infra and not a package itself.
> Ignore toolchain/helpers.mk as it contains only helper functions.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Romain Naour <romain.naour@gmail.com>
> ---
>  utils/check-package             | 5 ++++-
>  utils/checkpackagelib/lib_mk.py | 1 +
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/utils/check-package b/utils/check-package
> index a5f5dc44c0..35a4a70858 100755
> --- a/utils/check-package
> +++ b/utils/check-package
> @@ -44,7 +44,7 @@ def parse_args():
>      return parser.parse_args()
>  
>  
> -CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
> +CONFIG_IN_FILENAME = re.compile("/Config\.\S*$|/toolchain-common.in$")

Not directly related to your series, but I believe this
toolchain-common.in file is silly. It is just included by
toolchain/Config.in, and toolchain/Config.in is not that long. We
should bring back the toolchain-common.in contents in
toolchain/Config.in, and stop having this odd toolchain-common.in.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 15/36] check-package: enable for toolchain/

[Arnout Vandecappelle]

On 31-03-18 08:38, Thomas Petazzoni wrote:
> Hello,
> 
> On Fri, 30 Mar 2018 23:22:40 -0300, Ricardo Martincoski wrote:
[snip]
>> -CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
>> +CONFIG_IN_FILENAME = re.compile("/Config\.\S*$|/toolchain-common.in$")
> 
> Not directly related to your series, but I believe this
> toolchain-common.in file is silly. It is just included by
> toolchain/Config.in, and toolchain/Config.in is not that long. We
> should bring back the toolchain-common.in contents in
> toolchain/Config.in, and stop having this odd toolchain-common.in.

 +1 to that! And if you encounter other oddities like that, feel free to fix
them as well. package/Makefile.in is also one that is odd IMO.

 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 11/36] linux/linux.mk: use namespace for internal variables

[Ricardo Martincoski]

Hello,

On Sat, Mar 31, 2018 at 03:20 AM, Thomas Petazzoni wrote:

> Should we name them just LINUX_ARCH_PATH, LINUX_DTBS and
> LINUX_DTS_NAME, instead of LINUX_KERNEL_ARCH_PATH, LINUX_KERNEL_DTBS,
> etc. ? This would make them more consistent with the other variables
> that already exist: LINUX_VERSION_PROBE, LINUX_IMAGE_NAME, etc.
> 
> I.e, the prefix should be just LINUX_ and not LINUX_KERNEL_.

Sure, I will do.


Regards,
Ricardo

[Buildroot] [PATCH 14/36] toolchain/toolchain.mk: fix code style

[Ricardo Martincoski]

Hello,

On Sat, Mar 31, 2018 at 03:21 AM, Thomas Petazzoni wrote:

>>  define COPY_GCONV_LIBS
> 
> Perhaps the name of this variable should also be name-spaced:
> TOOLCHAIN_GLIBC_COPY_GCONV_LIBS or something like that.

Indeed. Other packages already use namespace for hooks, i.e.:
PYTHON3_CREATE_PYC_FILES
SKELETON_INIT_COMMON_SET_HOSTNAME
I will do.


Regards,
Ricardo

[Buildroot] [PATCH 15/36] check-package: enable for toolchain/

[Ricardo Martincoski]

Hello,

On Sat, Mar 31, 2018 at 03:38 AM, Thomas Petazzoni wrote:

>> But do not ignore this symbol:
>>  - GCONV_LIBS: it is used only inside the file that defines it.
> 
> You're not actually ignoring this variable in this patch, and you
> instead fixed it in PATCH 14/36 to have a TOOLCHAIN_ prefix.

I will remove this text from this patch and also from patches 8 and 12.
I first created the series changing the check-package and then fixing the
package files.
When I rebased before sending, to allow partial apply of the series, the info
"do not ignore this symbol" became obsolete since it is fixed in a previous
patch).

>> -CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
>> +CONFIG_IN_FILENAME = re.compile("/Config\.\S*$|/toolchain-common.in$")
> 
> Not directly related to your series, but I believe this
> toolchain-common.in file is silly. It is just included by
> toolchain/Config.in, and toolchain/Config.in is not that long. We
> should bring back the toolchain-common.in contents in
> toolchain/Config.in, and stop having this odd toolchain-common.in.

OK. I will do.


Regards,
Ricardo

[Buildroot] [PATCH 15/36] check-package: enable for toolchain/

[Ricardo Martincoski]

Hello,

On Sat, Mar 31, 2018 at 05:48 AM, Arnout Vandecappelle wrote:

> On 31-03-18 08:38, Thomas Petazzoni wrote:
>> On Fri, 30 Mar 2018 23:22:40 -0300, Ricardo Martincoski wrote:
>>> +CONFIG_IN_FILENAME = re.compile("/Config\.\S*$|/toolchain-common.in$")
>> 
>> Not directly related to your series, but I believe this
>> toolchain-common.in file is silly. It is just included by
>> toolchain/Config.in, and toolchain/Config.in is not that long. We
>> should bring back the toolchain-common.in contents in
>> toolchain/Config.in, and stop having this odd toolchain-common.in.
> 
>  +1 to that! And if you encounter other oddities like that, feel free to fix

ACK

> them as well. package/Makefile.in is also one that is odd IMO.

I agree.
This is the last Makefile.in remaining from the commit 14 years ago.
I can do this (if anyone don't do it first).
The hard part is to find the best name.

1) package/common.mk
 - used for boot and fs, include all .mk in the subdirs

2) package/package.mk
 - used for linux, system and toolchain

3) package/pkg-common.mk

I prefer the last one because:
 - it defines common stuff;
 - it includes package/pkg-*.mk, and the Makefile in basedir includes
   package/*/*.mk, so I don't think it is too similar to boot and fs;
 - it seems more related to package infras then to packages.


Regards,
Ricardo

[Buildroot] [PATCH v2 00/37] check-package: allow to check other directories v2

[Ricardo Martincoski]

Hello,

This series do some improvements to check-package:
 - enable checking directories other than package/;
 - add an entry to the manual;
 - change scanpypi to avoid new help text warnings;
 - fix the warnings that would show in the Gitlab CI job;
 - enable checking Config.in files in the Gitlab CI job.

Any subset 1..N of these patches can be applied without changing the result of
the Gitlab CI job because I first corrected the style then I added the check.

Patch 1 changes the main check-package script to make it more friendly to add
support to check directories other than package.

Patches 2 to 17 add support to check style in other directories:
 - arch/ and system/ (2),
 - boot/ (3 to 4),
 - fs/ (5 to 8),
 - linux/ (9 to 12),
 - toolchain/ (13 to 16),
 - Config.in* in the base dir (17).

Patch 18 adds an entry for check-package in the manual. The reason to it not be
patch 2 is because I added this text: "This script can be used for packages and
also for package-like files: boot, fs, toolchain, ...".

Patches 19 to 37 aim to add the style check for Config.in in Gitlab job CI.
Patches 19 to 34 fix all remaining style warnings for Config.in files after the
other directories were enabled in check-package. I tried to split the patches to
make the review easier but without creating a patch for each package, as it
would make this series really large. If you prefer other split between the
patches let me know.
Patch 35 changes scanpypi to generate help text compliant to check-package
(avoiding the need for patches as 34 in the future).
Patch 36 excludes 4 special Config.in files from the indentation check.
Patch 37 adds the Config.in files to be checked in Gitlab CI job.

This is how the Gitlab CI job output would look like with only the changes to
check-package applied and not the fix to package files:
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/60529355

The resulting Gitlab CI job with the entire series applied is here:
https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/60525415
which is part of a full build:
https://gitlab.com/RicardoMartincoski/buildroot/pipelines/19796941

Regards,
Ricardo

-- 
Changes v1 -> v2:
  - new patch merging toolchain-common.in back to Config.in (suggested by Thomas
    Petazzoni);
  - patch 11: use prefix LINUX_ instead of LINUX_KERNEL_  (suggested by Thomas
    Petazzoni);
  - patch 14: also COPY_GCONV_LIBS -> TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
    (suggested by Thomas Petazzoni);
  - remove spurious info from commit log (I first created the series changing
    the check-package and then fixing the package files; when I rebased to allow
    partial apply of the series, the info "do not ignore this symbol" in the
    check-package patches became obsolete since the symbol is renamed in a
    previous patch).

-- 
Ricardo Martincoski (36):
  check-package: prepare to extend to other directories
  check-package: enable for arch/ and system/
  boot/*/*.mk: fix code style
  check-package: enable for boot/
  fs/yaffs2: fix code style
  fs/ubi: use namespace for internal variable
  fs/*/*.mk: fix code style
  check-package: enable for fs/
  linux/linux-ext-*.mk: fit file header into one line
  linux/linux*.mk: fix code style
  linux/linux.mk: use namespace for internal variables
  check-package: enable for linux/
  toolchain: merge toolchain-common.in to Config.in
  toolchain/wrapper: fix code style
  toolchain/toolchain.mk: fix code style
  check-package: enable for toolchain/
  check-package: enable for Config.in* in base dir
  docs/manual: add check-package to "Tips and tricks"
  */Config.in*: remove consecutive empty lines
  Config.in*: fix attributes order
  arch/Config.in*: fix attributes order
  boot/*/Config.in: fix attributes order
  fs/*/Config.in: fix attributes order
  package/*/Config.in: fix attributes order
  toolchain/*/Config.in: fix attributes order
  Config.in*: re-wrap help text
  arch/Config.in*: re-wrap help text
  boot/*/Config.in: re-wrap help text
  fs/*/Config.in: re-wrap help text
  linux/Config.*: re-wrap help text
  system/Config.in: re-wrap help text
  toolchain/*/Config.in: re-wrap help text
  qemu/Config.in.host: fix overindented depends on
  package/*/Config.in: re-wrap help text
  scanpypi: generate help text compliant to check-package
  .gitlab-ci.yml: extend check-package test to Config.* files

Thomas Petazzoni (1):
  utils/checkpackagelib: exclude four files from Config.in indentation
    check

 .gitlab-ci.yml                                     |   3 +-
 .gitlab-ci.yml.in                                  |   3 +-
 Config.in                                          |  36 +-
 Config.in.legacy                                   | 292 +++++++------
 arch/Config.in                                     |  99 +++--
 arch/Config.in.arc                                 |   2 +-
 arch/Config.in.arm                                 |   4 +-
 arch/Config.in.bfin                                |   2 +-
 arch/Config.in.m68k                                |   2 +-
 arch/Config.in.mips                                |  13 +-
 arch/Config.in.powerpc                             |   4 +-
 arch/Config.in.sh                                  |   2 +-
 arch/Config.in.sparc                               |   2 +-
 arch/Config.in.x86                                 |  30 +-
 arch/Config.in.xtensa                              |  20 +-
 boot/at91bootstrap/Config.in                       |   8 +-
 boot/at91bootstrap3/Config.in                      |  12 +-
 boot/at91dataflashboot/Config.in                   |   2 +-
 boot/barebox/barebox/Config.in                     |   1 -
 boot/lpc32xxcdl/Config.in                          |   2 +-
 boot/lpc32xxcdl/lpc32xxcdl.mk                      |   8 +-
 boot/mxs-bootlets/Config.in                        |   8 +-
 boot/syslinux/Config.in                            |   1 -
 boot/syslinux/syslinux.mk                          |   2 +-
 boot/uboot/Config.in                               |  55 +--
 boot/uboot/uboot.mk                                |  14 +-
 docs/manual/adding-packages-directory.txt          |   4 +-
 docs/manual/adding-packages-tips.txt               |  31 ++
 docs/manual/adding-packages.txt                    |   2 +
 docs/manual/contribute.txt                         |   4 +
 fs/cpio/Config.in                                  |   6 +-
 fs/ext2/Config.in                                  |  22 +-
 fs/initramfs/Config.in                             |   3 +-
 fs/initramfs/initramfs.mk                          |   3 +-
 fs/iso9660/iso9660.mk                              |   1 -
 fs/jffs2/Config.in                                 |  23 +-
 fs/tar/Config.in                                   |   2 +-
 fs/ubi/Config.in                                   |  11 +-
 fs/ubi/ubi.mk                                      |   6 +-
 fs/yaffs2/{yaffs.mk => yaffs2.mk}                  |   0
 linux/Config.ext.in                                |  15 +-
 linux/Config.in                                    |  43 +-
 linux/linux-ext-aufs.mk                            |   2 +-
 linux/linux-ext-ev3dev-linux-drivers.mk            |   2 +-
 linux/linux-ext-fbtft.mk                           |   2 +-
 linux/linux-ext-rtai.mk                            |   6 +-
 linux/linux-ext-xenomai.mk                         |   4 +-
 linux/linux.mk                                     |  61 ++-
 package/mono/Config.in                             |   2 +-
 package/php/Config.in                              |   8 +-
 package/python-functools32/Config.in               |   4 +-
 package/python-jsonmodels/Config.in                |   4 +-
 package/qemu/Config.in.host                        |   2 +-
 package/systemd/Config.in                          |   4 +-
 system/Config.in                                   | 122 +++---
 toolchain/Config.in                                | 475 ++++++++++++++++++++-
 toolchain/toolchain-buildroot/Config.in            |   2 +-
 toolchain/toolchain-common.in                      | 469 --------------------
 toolchain/toolchain-external/Config.in             |  11 +-
 .../Config.in                                      |   6 +-
 .../Config.in                                      |   6 +-
 .../toolchain-external-custom/Config.in.options    |  12 +-
 toolchain/toolchain-wrapper.mk                     |   6 +-
 toolchain/toolchain.mk                             |  24 +-
 utils/check-package                                |  45 +-
 utils/checkpackagelib/lib_config.py                |   6 +
 utils/checkpackagelib/lib_mk.py                    |   9 +-
 utils/scanpypi                                     |   2 +-
 68 files changed, 1129 insertions(+), 970 deletions(-)
 rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%)
 delete mode 100644 toolchain/toolchain-common.in

-- 
2.14.1

[Buildroot] [PATCH v2 01/37] check-package: prepare to extend to other directories

[Ricardo Martincoski]

Currently the script only checks files inside the package/ directory.
Upcoming patches will enable it for other directories.

In order to reliably test for file names, i.e. the Config.in in the base
directory, normalize the path of files to check to a relative path to
the base directory.

Rename the variable that holds the compiled regexp to better represent
its content and rearrange how it is declared to make easy to later add
new directories to check. As a consequence the files that declare
package infra types would not be ignored anymore, so create a new
variable to list the files intree to be ignored during the check. The
same variable will be used by upcoming patches to ignore other files.
Ignore pkg-*.mk and doc-asciidoc.mk since they are package infra files.

In order to not produce weird results when used for files outside the
tree (i.e. in a private br2-external) add an explicit command line
option (-b) that bypasses any checks that would make a file be ignored
by the path that contains it.
When in this out-of-tree mode, the user is responsible for providing a
list of files to check that do not contain files the script does not
understand, e.g. package infra files.

As a result of this patch, besides the known use:
$ ./utils/check-package package/new-package/*
someone with the utils/ directory in the path can now also run:
$ cd package/new-package/
$ check-package *
or
$ check-package -b /path/to/br2-ext-tree/package/staging-package/*

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 utils/check-package | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/utils/check-package b/utils/check-package
index a87a74decc..d2457c706c 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -4,6 +4,7 @@
 from __future__ import print_function
 import argparse
 import inspect
+import os
 import re
 import sys
 
@@ -24,6 +25,9 @@ def parse_args():
     parser.add_argument("files", metavar="F", type=str, nargs="*",
                         help="list of files")
 
+    parser.add_argument("--br2-external", "-b", dest='intree_only', action="store_false",
+                        help="do not apply the pathname filters used for intree files")
+
     parser.add_argument("--manual-url", action="store",
                         default="http://nightly.buildroot.org/",
                         help="default: %(default)s")
@@ -41,12 +45,21 @@ def parse_args():
 
 
 CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
-FILE_IS_FROM_A_PACKAGE = re.compile("package/[^/]*/")
+DO_CHECK_INTREE = re.compile("|".join([
+    "package/",
+    ]))
+DO_NOT_CHECK_INTREE = re.compile("|".join([
+    "package/doc-asciidoc\.mk$",
+    "package/pkg-\S*\.mk$",
+    ]))
 
 
 def get_lib_from_filename(fname):
-    if FILE_IS_FROM_A_PACKAGE.search(fname) is None:
-        return None
+    if flags.intree_only:
+        if DO_CHECK_INTREE.match(fname) is None:
+            return None
+        if DO_NOT_CHECK_INTREE.match(fname):
+            return None
     if CONFIG_IN_FILENAME.search(fname):
         return checkpackagelib.lib_config
     if fname.endswith(".hash"):
@@ -117,7 +130,16 @@ def __main__():
     global flags
     flags = parse_args()
 
-    if len(flags.files) == 0:
+    if flags.intree_only:
+        # change all paths received to be relative to the base dir
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        files_to_check = [os.path.relpath(os.path.abspath(f), base_dir) for f in flags.files]
+        # move current dir so the script find the files
+        os.chdir(base_dir)
+    else:
+        files_to_check = flags.files
+
+    if len(files_to_check) == 0:
         print("No files to check style")
         sys.exit(1)
 
@@ -125,7 +147,7 @@ def __main__():
     total_warnings = 0
     total_lines = 0
 
-    for fname in flags.files:
+    for fname in files_to_check:
         nwarnings, nlines = check_file_using_lib(fname)
         total_warnings += nwarnings
         total_lines += nlines
-- 
2.14.1

[Buildroot] [PATCH v2 02/37] check-package: enable for arch/ and system/

[Ricardo Martincoski]

These directories can benefit from this script to prevent common
mistakes when submitting patches.

In order to accomplish this:
Do not ignore anymore files from these directories.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
Changes v1 -> v2:
  - no changes
---
 utils/check-package | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index d2457c706c..8d10affabd 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -46,7 +46,9 @@ def parse_args():
 
 CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
+    "arch/",
     "package/",
+    "system/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
     "package/doc-asciidoc\.mk$",
-- 
2.14.1

[Buildroot] [PATCH v2 03/37] boot/*/*.mk: fix code style

[Ricardo Martincoski]

Use only one space before backslash.
Indent with tabs.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 boot/lpc32xxcdl/lpc32xxcdl.mk |  8 ++++----
 boot/syslinux/syslinux.mk     |  2 +-
 boot/uboot/uboot.mk           | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index 04c1c7f060..30afed050b 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -33,10 +33,10 @@ LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag
 endif
 
 LPC32XXCDL_BUILD_FLAGS = \
-	CROSS_COMPILE=$(TARGET_CROSS)           \
-	NXPMCU_WINBASE=$(@D)                    \
-	NXPMCU_SOFTWARE=$(@D)                   \
-	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME)  \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	NXPMCU_WINBASE=$(@D) \
+	NXPMCU_SOFTWARE=$(@D) \
+	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
 	CSP=lpc32xx TOOL=gnu GEN=lpc
 
 LPC32XXCDL_BOARD_STARTUP_DIR = \
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 13496414dd..67bc69254e 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -59,7 +59,7 @@ define SYSLINUX_BUILD_CMDS
 		CC_FOR_BUILD="$(HOSTCC)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
-            $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)
+		$(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)
 endef
 
 # While the actual bootloader is compiled for the target, several
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index b7032d5901..24d3e4ef54 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -202,8 +202,8 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE
 
 ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
 define UBOOT_CONFIGURE_CMDS
-	$(TARGET_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS)		\
+	$(TARGET_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
 		$(UBOOT_BOARD_NAME)_config
 endef
 else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y)
@@ -230,16 +230,16 @@ define UBOOT_BUILD_CMDS
 	$(if $(UBOOT_CUSTOM_DTS_PATH),
 		cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
 	)
-	$(TARGET_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
+	$(TARGET_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
 		$(UBOOT_MAKE_TARGET)
 	$(if $(BR2_TARGET_UBOOT_FORMAT_SD),
 		$(@D)/tools/mxsboot sd $(@D)/u-boot.sb $(@D)/u-boot.sd)
 	$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
 		$(@D)/tools/mxsboot \
-			-w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE)	\
-			-o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE)	\
-			-e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE)	\
+			-w $(BR2_TARGET_UBOOT_FORMAT_NAND_PAGE_SIZE) \
+			-o $(BR2_TARGET_UBOOT_FORMAT_NAND_OOB_SIZE) \
+			-e $(BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE) \
 			nand $(@D)/u-boot.sb $(@D)/u-boot.nand)
 endef
 
-- 
2.14.1

[Buildroot] [PATCH v2 04/37] check-package: enable for boot/

[Ricardo Martincoski]

This directory can benefit from this script to prevent common mistakes
when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the boot/ directory.
Ignore boot/barebox/barebox.mk as it declares a package infra and not a
package itself.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 utils/check-package | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index 8d10affabd..48ce956443 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -47,10 +47,12 @@ def parse_args():
 CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
+    "boot/",
     "package/",
     "system/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
+    "boot/barebox/barebox\.mk$",
     "package/doc-asciidoc\.mk$",
     "package/pkg-\S*\.mk$",
     ]))
-- 
2.14.1

[Buildroot] [PATCH v2 05/37] fs/yaffs2: fix code style

[Ricardo Martincoski]

Rename the .mk to follow the convention. The variables inside it already
use the correct name.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 fs/yaffs2/{yaffs.mk => yaffs2.mk} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%)

diff --git a/fs/yaffs2/yaffs.mk b/fs/yaffs2/yaffs2.mk
similarity index 100%
rename from fs/yaffs2/yaffs.mk
rename to fs/yaffs2/yaffs2.mk
-- 
2.14.1

[Buildroot] [PATCH v2 06/37] fs/ubi: use namespace for internal variable

[Ricardo Martincoski]

UBINIZE_CONFIG_FILE_PATH is only used inside this file, so rename it to
start with UBI_, following the namespace convention already used by
common packages.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 fs/ubi/ubi.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ubi/ubi.mk b/fs/ubi/ubi.mk
index c78feda5a3..9874e73ff6 100644
--- a/fs/ubi/ubi.mk
+++ b/fs/ubi/ubi.mk
@@ -15,16 +15,16 @@ UBI_UBINIZE_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_OPTS))
 ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 
 ifeq ($(BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG),y)
-UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE))
+UBI_UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE))
 else
-UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg
+UBI_UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg
 endif
 
 # don't use sed -i as it misbehaves on systems with SELinux enabled when this is
 # executed through fakeroot (see #9386)
 define ROOTFS_UBI_CMD
 	sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
-		$(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
+		$(UBI_UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
 	$(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
 	rm $(BUILD_DIR)/ubinize.cfg
 endef
-- 
2.14.1

[Buildroot] [PATCH v2 07/37] fs/*/*.mk: fix code style

[Ricardo Martincoski]

The header of the initramfs.mk file fits in one line, so rearrange it.
Remove consecutive empty line.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 fs/initramfs/initramfs.mk | 3 +--
 fs/iso9660/iso9660.mk     | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk
index b8dee18ec5..c751093214 100644
--- a/fs/initramfs/initramfs.mk
+++ b/fs/initramfs/initramfs.mk
@@ -1,7 +1,6 @@
 ################################################################################
 #
-# Build a kernel with an integrated initial ramdisk
-# filesystem based on cpio.
+# Build a kernel with an integrated initial ramdisk filesystem based on cpio.
 #
 ################################################################################
 
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index b33cf4cd8a..a129655ce3 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -128,7 +128,6 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
 
 endif # ROOTFS_ISO9660_USE_INITRD
 
-
 define ROOTFS_ISO9660_CMD
 	$(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
-- 
2.14.1

[Buildroot] [PATCH v2 08/37] check-package: enable for fs/

[Ricardo Martincoski]

The filesystem types can benefit from this script to prevent common
mistakes when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the fs/ directory.
Ignore fs/common.mk as it declares a package infra and not a package itself.
Register the ROOTFS_ as a valid prefix for variables.
Ignore these symbols:
 - PACKAGES_PERMISSIONS_TABLE: defined either by packages through
   pkg-generic or by filesystem types, used by fs/common.mk;
 - SUMTOOL: defined by package mtd, used by filesystem jffs2;
 - TARGETS_ROOTFS: defined by filesystem types, used in the main
   Makefile.

Keep using loose checks that warn about common mistakes while keep the
code simple.
As a consequence the check functions do not differentiate between
packages and filesystems so the symbol PACKAGE_UBI would not generate a
warning for the ubi filesystem neither the symbol ROOTFS_MTD would
generate a warning for the mtd package. But those kind of mistakes are
not common and are obvious in the code review, unlike typos i.e.
ROOTFS_UBl or PACKAGE_MID that would be hard to see in the code review.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
Changes v1 -> v2:
  - remove spurious info from commit log (I first created the series
    changing the check-package and then fixing the package files; when I
    rebased to allow partial apply of the series, the info "do not
    ignore this symbol" became obsolete since it is fixed in a previous
    patch);
---
 utils/check-package             | 2 ++
 utils/checkpackagelib/lib_mk.py | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/utils/check-package b/utils/check-package
index 48ce956443..4c9eea0534 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -48,11 +48,13 @@ CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
     "boot/",
+    "fs/",
     "package/",
     "system/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
     "boot/barebox/barebox\.mk$",
+    "fs/common\.mk$",
     "package/doc-asciidoc\.mk$",
     "package/pkg-\S*\.mk$",
     ]))
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index cfd4d05117..58de4fd3cb 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -165,8 +165,11 @@ class TypoInPackageVariable(_CheckFunction):
         "LUA_RUN",
         "MKFS_JFFS2",
         "MKIMAGE_ARCH",
+        "PACKAGES_PERMISSIONS_TABLE",
         "PKG_CONFIG_HOST_BINARY",
+        "SUMTOOL",
         "TARGET_FINALIZE_HOOKS",
+        "TARGETS_ROOTFS",
         "XTENSA_CORE_NAME"]))
     PACKAGE_NAME = re.compile("/([^/]+)\.mk")
     VARIABLE = re.compile("^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=")
@@ -177,7 +180,7 @@ class TypoInPackageVariable(_CheckFunction):
         # linux tools do not use LINUX_TOOL_ prefix for variables
         package = package.replace("LINUX_TOOL_", "")
         self.package = package
-        self.REGEX = re.compile("^(HOST_)?({}_[A-Z0-9_]+)".format(package))
+        self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
         self.FIND_VIRTUAL = re.compile(
             "^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package))
         self.virtual = []
-- 
2.14.1

[Buildroot] [PATCH v2 09/37] linux/linux-ext-*.mk: fit file header into one line

[Ricardo Martincoski]

Make it follow the package coding style by removing redundant info.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Christian Stewart <christian@paral.in>
Cc: David Lechner <david@lechnology.com>
---
Changes v1 -> v2:
  - no changes
---
 linux/linux-ext-aufs.mk                 | 2 +-
 linux/linux-ext-ev3dev-linux-drivers.mk | 2 +-
 linux/linux-ext-fbtft.mk                | 2 +-
 linux/linux-ext-rtai.mk                 | 2 +-
 linux/linux-ext-xenomai.mk              | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/linux/linux-ext-aufs.mk b/linux/linux-ext-aufs.mk
index fb2f3560a7..d4bbb07196 100644
--- a/linux/linux-ext-aufs.mk
+++ b/linux/linux-ext-aufs.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux Aufs extensions
 #
 # Patch the linux kernel with aufs extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += aufs
diff --git a/linux/linux-ext-ev3dev-linux-drivers.mk b/linux/linux-ext-ev3dev-linux-drivers.mk
index c8afeeb1d5..3bb12db38d 100644
--- a/linux/linux-ext-ev3dev-linux-drivers.mk
+++ b/linux/linux-ext-ev3dev-linux-drivers.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux ev3dev extensions
 #
 # Patch the linux kernel with ev3dev extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += ev3dev-linux-drivers
diff --git a/linux/linux-ext-fbtft.mk b/linux/linux-ext-fbtft.mk
index 5eb3d944e8..cbc9c58ed3 100644
--- a/linux/linux-ext-fbtft.mk
+++ b/linux/linux-ext-fbtft.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux fbtft extensions
 #
 # Patch the linux kernel with fbtft extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += fbtft
diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index fb483aa80b..46e3dae3a7 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux RTAI extensions
 #
 # Patch the linux kernel with RTAI extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += rtai
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index 76a9786e4d..d066bb32ac 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -1,7 +1,7 @@
 ################################################################################
-# Linux Adeos/Xenomai extensions
 #
-# Patch the linux kernel with xenomai extension
+# Patch the linux kernel with Adeos/Xenomai extension
+#
 ################################################################################
 
 LINUX_EXTENSIONS += xenomai
-- 
2.14.1

[Buildroot] [PATCH v2 10/37] linux/linux*.mk: fix code style

[Ricardo Martincoski]

Use only one space before backslash.
Remove consecutive empty line.
Indent with tabs.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - rebased
---
 linux/linux-ext-rtai.mk |  4 ++--
 linux/linux.mk          | 25 ++++++++++++-------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
index 46e3dae3a7..50f79f8d50 100644
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -20,8 +20,8 @@ endif
 define RTAI_PREPARE_KERNEL
 	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
 	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
-		$(APPLY_PATCHES) $(LINUX_DIR)				\
-			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/	\
+		$(APPLY_PATCHES) $(LINUX_DIR) \
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
 			hal-linux-$${kver}-*patch ; \
 	else \
 		echo "No RTAI patch for your kernel version" ; \
diff --git a/linux/linux.mk b/linux/linux.mk
index cf1cae7cc0..02796d8bb2 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -371,11 +371,11 @@ endif
 # configuration has changed.
 define LINUX_BUILD_CMDS
 	@for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \
-		cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ;   \
+		cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \
 	done
 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then	\
-		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
+		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
 	fi
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
@@ -405,15 +405,14 @@ endif
 
 define LINUX_INSTALL_HOST_TOOLS
 	# Installing dtc (device tree compiler) as host tool, if selected
-	if grep -q "CONFIG_DTC=y" $(@D)/.config; then	\
-		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ;	\
-		if [ ! -e $(HOST_DIR)/bin/dtc ]; then	\
-			ln -sf linux-dtc $(HOST_DIR)/bin/dtc ;	\
-		fi	\
+	if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
+		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ; \
+		if [ ! -e $(HOST_DIR)/bin/dtc ]; then \
+			ln -sf linux-dtc $(HOST_DIR)/bin/dtc ; \
+		fi \
 	fi
 endef
 
-
 define LINUX_INSTALL_IMAGES_CMDS
 	$(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
 	$(call LINUX_INSTALL_DTB,$(BINARIES_DIR))
@@ -427,10 +426,10 @@ define LINUX_INSTALL_TARGET_CMDS
 	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
 		$(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
 	fi
 	$(LINUX_INSTALL_HOST_TOOLS)
 endef
@@ -485,7 +484,7 @@ endif
 
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:)
 $(error No kernel device tree source specified, check your \
-BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings)
+	BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings)
 endif
 
 endif # BR_BUILDING
-- 
2.14.1

[Buildroot] [PATCH v2 11/37] linux/linux.mk: use namespace for internal variables

[Ricardo Martincoski]

These three symbols:
KERNEL_ARCH_PATH
KERNEL_DTBS
KERNEL_DTS_NAME
are defined and used only inside this file, so use the LINUX_ namespace
for them instead of KERNEL_.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - use prefix LINUX_ instead of LINUX_KERNEL_  (suggested by Thomas
    Petazzoni);
  - rebased;
---
 linux/linux.mk | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 02796d8bb2..7609a15f23 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -125,15 +125,15 @@ endif
 # going to be installed in the target filesystem.
 LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
 
-KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
+LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
 
 # We keep only the .dts files, so that the user can specify both .dts
 # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
 # copied to arch/<arch>/boot/dts, but only the .dts files will
 # actually be generated as .dtb.
-KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
+LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
 
-KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
+LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME))
 
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
 LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
@@ -155,9 +155,9 @@ LINUX_IMAGE_NAME = zImage.epapr
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 LINUX_IMAGE_NAME = zImage
 else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y)
-LINUX_IMAGE_NAME = cuImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = cuImage.$(LINUX_DTS_NAME)
 else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y)
-LINUX_IMAGE_NAME = simpleImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = simpleImage.$(LINUX_DTS_NAME)
 else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y)
 LINUX_IMAGE_NAME = Image
 else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)
@@ -187,11 +187,11 @@ endif
 # for bzImage, arch/i386 and arch/x86_64 do not exist when copying the
 # defconfig file.
 ifeq ($(KERNEL_ARCH),i386)
-KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86
+LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86
 else ifeq ($(KERNEL_ARCH),x86_64)
-KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/x86
+LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86
 else
-KERNEL_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH)
+LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH)
 endif
 
 ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
@@ -201,7 +201,7 @@ LINUX_IMAGE_PATH = $(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ_BIN),y)
 LINUX_IMAGE_PATH = $(LINUX_DIR)/$(LINUX_IMAGE_NAME)
 else
-LINUX_IMAGE_PATH = $(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
+LINUX_IMAGE_PATH = $(LINUX_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME)
 endif # BR2_LINUX_KERNEL_VMLINUX
 
 define LINUX_APPLY_LOCAL_PATCHES
@@ -323,14 +323,14 @@ endef
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
 ifeq ($(BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT),)
 define LINUX_BUILD_DTB
-	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(KERNEL_DTBS)
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_DTBS)
 endef
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),)
 define LINUX_INSTALL_DTB
 	# dtbs moved from arch/<ARCH>/boot to arch/<ARCH>/boot/dts since 3.8-rc1
 	cp $(addprefix \
-		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
-		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
+		$(LINUX_ARCH_PATH)/boot/$(if $(wildcard \
+		$(addprefix $(LINUX_ARCH_PATH)/boot/dts/,$(LINUX_DTBS))),dts/),$(LINUX_DTBS)) \
 		$(1)
 endef
 endif # BR2_LINUX_KERNEL_APPENDED_DTB
@@ -340,8 +340,8 @@ endif # BR2_LINUX_KERNEL_DTS_SUPPORT
 ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
 # dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
 define LINUX_APPEND_DTB
-	(cd $(KERNEL_ARCH_PATH)/boot; \
-		for dtb in $(KERNEL_DTS_NAME); do \
+	(cd $(LINUX_ARCH_PATH)/boot; \
+		for dtb in $(LINUX_DTS_NAME); do \
 			if test -e $${dtb}.dtb ; then \
 				dtbpath=$${dtb}.dtb ; \
 			else \
@@ -359,10 +359,10 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)
 LINUX_APPEND_DTB += ; \
 	MKIMAGE_ARGS=`$(MKIMAGE) -l $(LINUX_IMAGE_PATH) |\
 	sed -n -e 's/Image Name:[ ]*\(.*\)/-n \1/p' -e 's/Load Address:/-a/p' -e 's/Entry Point:/-e/p'`; \
-	for dtb in $(KERNEL_DTS_NAME); do \
+	for dtb in $(LINUX_DTS_NAME); do \
 		$(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux \
 			-T kernel -C none $${MKIMAGE_ARGS} \
-			-d $(KERNEL_ARCH_PATH)/boot/zImage.$${dtb} $(LINUX_IMAGE_PATH).$${dtb}; \
+			-d $(LINUX_ARCH_PATH)/boot/zImage.$${dtb} $(LINUX_IMAGE_PATH).$${dtb}; \
 	done
 endif
 endif
@@ -371,7 +371,7 @@ endif
 # configuration has changed.
 define LINUX_BUILD_CMDS
 	@for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \
-		cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \
+		cp -f $${dts} $(LINUX_ARCH_PATH)/boot/dts/ ; \
 	done
 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
@@ -386,7 +386,7 @@ ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB),y)
 # appended DTBs.
 define LINUX_INSTALL_IMAGE
 	mkdir -p $(1)
-	cp $(KERNEL_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME).* $(1)
+	cp $(LINUX_ARCH_PATH)/boot/$(LINUX_IMAGE_NAME).* $(1)
 endef
 else
 # Otherwise, just install the unique image generated by the kernel
@@ -482,7 +482,7 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST
 endif
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:)
+ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(LINUX_DTS_NAME)),y:)
 $(error No kernel device tree source specified, check your \
 	BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings)
 endif
-- 
2.14.1

[Buildroot] [PATCH v2 12/37] check-package: enable for linux/

[Ricardo Martincoski]

This directory can benefit from this script to prevent common mistakes
when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the linux/ directory.
Ignore missing LINUX_EXT_ prefix as the variables for linux extensions
do not use it.
Ignore this symbol:
 - LINUX_EXTENSIONS: defined by each linux extension, used by
   linux/linux.mk.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - remove spurious info from commit log (I first created the series
    changing the check-package and then fixing the package files; when I
    rebased to allow partial apply of the series, the info "do not
    ignore this symbol" became obsolete since it is fixed in a previous
    patch);
---
 utils/check-package             | 1 +
 utils/checkpackagelib/lib_mk.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index 4c9eea0534..a5f5dc44c0 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -49,6 +49,7 @@ DO_CHECK_INTREE = re.compile("|".join([
     "arch/",
     "boot/",
     "fs/",
+    "linux/",
     "package/",
     "system/",
     ]))
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 58de4fd3cb..9989556e95 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -160,6 +160,7 @@ class TypoInPackageVariable(_CheckFunction):
         "ACLOCAL_HOST_DIR",
         "BR_CCACHE_INITIAL_SETUP",
         "BR_NO_CHECK_HASH_FOR",
+        "LINUX_EXTENSIONS",
         "LINUX_POST_PATCH_HOOKS",
         "LINUX_TOOLS",
         "LUA_RUN",
@@ -179,6 +180,8 @@ class TypoInPackageVariable(_CheckFunction):
         package = package.replace("-", "_").upper()
         # linux tools do not use LINUX_TOOL_ prefix for variables
         package = package.replace("LINUX_TOOL_", "")
+        # linux extensions do not use LINUX_EXT_ prefix for variables
+        package = package.replace("LINUX_EXT_", "")
         self.package = package
         self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
         self.FIND_VIRTUAL = re.compile(
-- 
2.14.1

[Buildroot] [PATCH v2 13/37] toolchain: merge toolchain-common.in to Config.in

[Ricardo Martincoski]

toolchain-common.in is a Config.in file with an uncommon name.
It is just included by toolchain/Config.in, and toolchain/Config.in is
not that long, so instead of renaming the file, merge it to
toolchain/Config.in.

Move the raw contents from the file to the exact location it is
currently included in order to not change the order in the menu.

Update the references in the manual as well.

Suggested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - new patch  (suggested by Thomas Petazzoni);
---
 docs/manual/adding-packages-directory.txt |   4 +-
 toolchain/Config.in                       | 471 +++++++++++++++++++++++++++++-
 toolchain/toolchain-common.in             | 469 -----------------------------
 3 files changed, 472 insertions(+), 472 deletions(-)
 delete mode 100644 toolchain/toolchain-common.in

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index c9857a80d3..f5e1e313d5 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -292,13 +292,13 @@ use in the comment.
 
 * Kernel headers
 ** Dependency symbol: +BR2_TOOLCHAIN_HEADERS_AT_LEAST_X_Y+, (replace
-   +X_Y+ with the proper version, see +toolchain/toolchain-common.in+)
+   +X_Y+ with the proper version, see +toolchain/Config.in+)
 ** Comment string: +headers >= X.Y+ and/or `headers <= X.Y` (replace
    +X.Y+ with the proper version)
 
 * GCC version
 ** Dependency symbol: +BR2_TOOLCHAIN_GCC_AT_LEAST_X_Y+, (replace
-   +X_Y+ with the proper version, see +toolchain/toolchain-common.in+)
+   +X_Y+ with the proper version, see +toolchain/Config.in+)
 ** Comment string: +gcc >= X.Y+ and/or `gcc <= X.Y` (replace
    +X.Y+ with the proper version)
 
diff --git a/toolchain/Config.in b/toolchain/Config.in
index bf1166b601..91035c71d7 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -56,6 +56,475 @@ endchoice
 
 source "toolchain/toolchain-buildroot/Config.in"
 source "toolchain/toolchain-external/Config.in"
-source "toolchain/toolchain-common.in"
+
+# Generic toolchain options
+
+# we want gdb config in the middle of both source and external
+# toolchains, but mconf won't let us source the same file twice,
+# so put it here instead
+source "package/gdb/Config.in.host"
+
+comment "Toolchain Generic Options"
+
+# https://sourceware.org/bugzilla/show_bug.cgi?id=19615
+# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1).
+config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615
+	bool
+
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
+# exception_ptr, nested_exception, and future from libstdc++ are not
+# available for architectures not supporting always lock-free atomic
+# ints before GCC 7
+config BR2_TOOLCHAIN_HAS_GCC_BUG_64735
+	bool
+	default y if BR2_nios2
+	default y if BR2_ARM_CPU_ARMV4
+	default y if BR2_ARM_CPU_ARMV5
+	default y if BR2_sparc_v8
+	default y if BR2_m68k_cf5208
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7
+
+config BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	bool
+
+config BR2_USE_WCHAR
+	bool
+
+config BR2_ENABLE_LOCALE
+	bool
+
+config BR2_INSTALL_LIBSTDCPP
+	bool
+
+config BR2_TOOLCHAIN_HAS_FORTRAN
+	bool
+
+config BR2_TOOLCHAIN_HAS_THREADS
+	bool
+
+config BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	bool
+
+config BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	bool
+
+config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
+	bool
+
+config BR2_TOOLCHAIN_HAS_SSP
+	bool
+
+config BR2_TOOLCHAIN_SUPPORTS_PIE
+	bool
+
+config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
+	bool "Copy gconv libraries"
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	help
+	  The gconv libraries are used to convert between different
+	  character sets (charsets).
+
+	  Say 'y' if you need to store and/or display different charsets.
+
+config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST
+	string "Gconv libraries to copy"
+	depends on BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
+	help
+	  Set to the list of gconv libraries to copy.
+	  Leave empty to copy all gconv libraries.
+
+	  Specify only the basename of the libraries, leave
+	  out the .so extension. Eg.:
+	    IBM850 ISO8859-15 UNICODE
+
+	  Note: the full set of gconv libs are ~8MiB (on ARM).
+
+# This boolean is true if the toolchain provides a built-in full
+# featured gettext implementation (glibc), and false if only a stub
+# gettext implementation is provided (uclibc, musl)
+config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
+	bool
+
+config BR2_USE_MMU
+	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
+	default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY
+	help
+	  If your target has a MMU, you should say Y here.  If you
+	  are unsure, just say Y.
+
+config BR2_TARGET_OPTIMIZATION
+	string "Target Optimizations"
+	default ""
+	help
+	  Optimizations to use when building for the target host.
+	  NOTE: gcc optimization level is defined in build options.
+
+config BR2_TARGET_LDFLAGS
+	string "Target linker options"
+	help
+	  Extra options to pass to the linker when building for the target.
+
+	  Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib')
+	  are not supported.
+
+config BR2_ECLIPSE_REGISTER
+	bool "Register toolchain within Eclipse Buildroot plug-in"
+	help
+	  This options tells Buildroot to generate the necessary
+	  configuration files to make your toolchain appear within
+	  Eclipse, through the Eclipse Buildroot plugin.
+
+# Options for packages to depend on, if they require at least a
+# specific version of the kernel headers.
+# Toolchains should choose the adequate option (ie. the highest
+# version, not all of them).
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	bool
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+
+# This order guarantees that the highest version is set, as kconfig
+# stops affecting a value on the first matching default.
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST
+	string
+	default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+	default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+	default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+	default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+	default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+	default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+	default "4.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
+	default "4.8"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
+	default "4.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
+	default "4.6"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
+	default "4.5"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
+	default "4.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
+	default "4.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
+	default "4.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
+	default "4.1"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
+	default "4.0"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
+	default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+	default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+	default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+	default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
+	default "3.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
+	default "3.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
+	default "3.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
+	default "3.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+	default "3.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
+	default "3.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+	default "3.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+	default "3.8"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
+	default "3.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	default "3.6"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
+	default "3.5"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
+	default "3.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+	default "3.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
+	default "3.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+	default "3.1"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1
+	default "3.0"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	default "2.6"
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
+	bool
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_5
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
+
+config BR2_TOOLCHAIN_GCC_AT_LEAST_7
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+
+# This order guarantees that the highest version is set, as kconfig
+# stops affecting a value on the first matching default.
+config BR2_TOOLCHAIN_GCC_AT_LEAST
+	string
+	default "7"	if BR2_TOOLCHAIN_GCC_AT_LEAST_7
+	default "6"	if BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	default "5"	if BR2_TOOLCHAIN_GCC_AT_LEAST_5
+	default "4.9"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	default "4.8"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	default "4.7"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	default "4.6"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
+	default "4.5"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+	default "4.4"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
+	default "4.3"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
+
+config BR2_TOOLCHAIN_HAS_MNAN_OPTION
+	bool
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_TOOLCHAIN_HAS_SYNC_1
+	bool
+	default y
+	depends on !BR2_bfin
+	depends on !BR2_m68k_cf
+	depends on !BR2_microblaze
+	depends on !BR2_sparc
+	depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT)
+
+config BR2_TOOLCHAIN_HAS_SYNC_2
+	bool
+	default y if BR2_TOOLCHAIN_HAS_SYNC_1
+
+config BR2_TOOLCHAIN_HAS_SYNC_4
+	bool
+	default y
+	depends on !BR2_m68k_cf
+	depends on !BR2_sparc
+	depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT)
+
+# The availability of __sync for 8-byte types on ARM is somewhat
+# complicated:
+#
+#  - It appeared in gcc starting with gcc 4.7.
+#
+#  - On ARMv7, there is no problem, it can be directly implemented in
+#    userspace.
+#
+#  - On < ARMv7, it requires help from the kernel. Unfortunately, the
+#    libgcc code implementing 8-byte __sync with the help from the
+#    kernel calls __write() when a failure occurs, which is a function
+#    internal to glibc, not available in uClibc and musl. This means
+#    that the 8-byte __sync operations are not available on < ARMv7
+#    with uClibc and musl. This problem was fixed as part of gcc
+#    PR68059, which was backported to the gcc 5 branch, but isn't yet
+#    part of any gcc 5.x release.
+#
+config BR2_TOOLCHAIN_ARM_HAS_SYNC_8
+	bool
+	default y
+	depends on BR2_arm || BR2_armeb
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_ARM_CPU_ARMV7A
+
+# 8-byte intrinsics available on most x86 CPUs, except a few old ones
+config BR2_TOOLCHAIN_X86_HAS_SYNC_8
+	bool
+	default y
+	depends on BR2_i386
+	depends on !BR2_x86_i486
+	depends on !BR2_x86_c3
+	depends on !BR2_x86_winchip_c6
+	depends on !BR2_x86_winchip2
+
+# 8-byte intrinsics available:
+#  - On all 64 bits architecture
+#  - On a certain combinations of ARM platforms
+#  - On certain x86 32 bits CPUs
+config BR2_TOOLCHAIN_HAS_SYNC_8
+	bool
+	default y if BR2_ARCH_IS_64
+	default y if BR2_TOOLCHAIN_ARM_HAS_SYNC_8
+	default y if BR2_TOOLCHAIN_X86_HAS_SYNC_8
+
+# libatomic is available since gcc 4.8, when thread support is
+# enabled. Also, libatomic doesn't recognize "uclinux" as a valid OS
+# part of the tuple, and is therefore not build on uclinux targets,
+# which is why BR2_BINFMT_FLAT configurations are excluded.
+config BR2_TOOLCHAIN_HAS_LIBATOMIC
+	bool
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \
+		BR2_TOOLCHAIN_HAS_THREADS && \
+		!BR2_BINFMT_FLAT
+
+# __atomic intrinsics are available:
+# - with gcc 4.8, either through built-ins or libatomic, on all
+#   architectures. Since we don't want to separate the cases where
+#   libatomic is needed vs. not needed, we simplify thing and only
+#   support situations where libatomic is available, even if on some
+#   architectures libatomic is not strictly needed as all __atomic
+#   intrinsics might be built-in. The only case where libatomic is
+#   missing entirely is when the toolchain does not have support for
+#   threads. However, a package that does not need threads but still
+#   uses atomics is quite a corner case, which does not warrant the
+#   added complexity.
+# - with gcc 4.7, libatomic did not exist, so only built-ins are
+#   available. This means that __atomic can only be used in a subset
+#   of the architectures
+config BR2_TOOLCHAIN_HAS_ATOMIC
+	bool
+	default y if BR2_TOOLCHAIN_HAS_LIBATOMIC
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_arm
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_armeb
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_xtensa
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_ARCH_IS_64
+
+# - libquadmath is not needed/available on all architectures (but gcc
+#   correctly handles this already).
+# - At least, libquadmath is available on:
+#   - i*86
+#   - x86_64
+# - When available, libquadmath requires wchar support.
+config BR2_TOOLCHAIN_HAS_LIBQUADMATH
+	bool
+	default y if BR2_i386 || BR2_x86_64
 
 endmenu
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
deleted file mode 100644
index 8941e0f3cd..0000000000
--- a/toolchain/toolchain-common.in
+++ /dev/null
@@ -1,469 +0,0 @@
-# Generic toolchain options
-
-# we want gdb config in the middle of both source and external
-# toolchains, but mconf won't let us source the same file twice,
-# so put it here instead
-source "package/gdb/Config.in.host"
-
-comment "Toolchain Generic Options"
-
-# https://sourceware.org/bugzilla/show_bug.cgi?id=19615
-# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1).
-config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615
-	bool
-
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
-# exception_ptr, nested_exception, and future from libstdc++ are not
-# available for architectures not supporting always lock-free atomic
-# ints before GCC 7
-config BR2_TOOLCHAIN_HAS_GCC_BUG_64735
-	bool
-	default y if BR2_nios2
-	default y if BR2_ARM_CPU_ARMV4
-	default y if BR2_ARM_CPU_ARMV5
-	default y if BR2_sparc_v8
-	default y if BR2_m68k_cf5208
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7
-
-config BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	bool
-
-config BR2_USE_WCHAR
-	bool
-
-config BR2_ENABLE_LOCALE
-	bool
-
-config BR2_INSTALL_LIBSTDCPP
-	bool
-
-config BR2_TOOLCHAIN_HAS_FORTRAN
-	bool
-
-config BR2_TOOLCHAIN_HAS_THREADS
-	bool
-
-config BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	bool
-
-config BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	bool
-
-config BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
-	bool
-
-config BR2_TOOLCHAIN_HAS_SSP
-	bool
-
-config BR2_TOOLCHAIN_SUPPORTS_PIE
-	bool
-
-config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
-	bool "Copy gconv libraries"
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	help
-	  The gconv libraries are used to convert between different
-	  character sets (charsets).
-
-	  Say 'y' if you need to store and/or display different charsets.
-
-config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST
-	string "Gconv libraries to copy"
-	depends on BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
-	help
-	  Set to the list of gconv libraries to copy.
-	  Leave empty to copy all gconv libraries.
-
-	  Specify only the basename of the libraries, leave
-	  out the .so extension. Eg.:
-	    IBM850 ISO8859-15 UNICODE
-
-	  Note: the full set of gconv libs are ~8MiB (on ARM).
-
-# This boolean is true if the toolchain provides a built-in full
-# featured gettext implementation (glibc), and false if only a stub
-# gettext implementation is provided (uclibc, musl)
-config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
-	bool
-
-config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
-	default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY
-	help
-	  If your target has a MMU, you should say Y here.  If you
-	  are unsure, just say Y.
-
-config BR2_TARGET_OPTIMIZATION
-	string "Target Optimizations"
-	default ""
-	help
-	  Optimizations to use when building for the target host.
-	  NOTE: gcc optimization level is defined in build options.
-
-config BR2_TARGET_LDFLAGS
-	string "Target linker options"
-	help
-	  Extra options to pass to the linker when building for the target.
-
-	  Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib')
-	  are not supported.
-
-config BR2_ECLIPSE_REGISTER
-	bool "Register toolchain within Eclipse Buildroot plug-in"
-	help
-	  This options tells Buildroot to generate the necessary
-	  configuration files to make your toolchain appear within
-	  Eclipse, through the Eclipse Buildroot plugin.
-
-# Options for packages to depend on, if they require@least a
-# specific version of the kernel headers.
-# Toolchains should choose the adequate option (ie. the highest
-# version, not all of them).
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
-	bool
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
-
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-
-# This order guarantees that the highest version is set, as kconfig
-# stops affecting a value on the first matching default.
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST
-	string
-	default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
-	default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-	default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
-	default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
-	default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
-	default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
-	default "4.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
-	default "4.8"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
-	default "4.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
-	default "4.6"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
-	default "4.5"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
-	default "4.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
-	default "4.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
-	default "4.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
-	default "4.1"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
-	default "4.0"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
-	default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
-	default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
-	default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
-	default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
-	default "3.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
-	default "3.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14
-	default "3.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13
-	default "3.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-	default "3.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11
-	default "3.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
-	default "3.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
-	default "3.8"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
-	default "3.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
-	default "3.6"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
-	default "3.5"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
-	default "3.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
-	default "3.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
-	default "3.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-	default "3.1"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1
-	default "3.0"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
-	default "2.6"
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
-	bool
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_5
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_6
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
-
-config BR2_TOOLCHAIN_GCC_AT_LEAST_7
-	bool
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
-
-# This order guarantees that the highest version is set, as kconfig
-# stops affecting a value on the first matching default.
-config BR2_TOOLCHAIN_GCC_AT_LEAST
-	string
-	default "7"	if BR2_TOOLCHAIN_GCC_AT_LEAST_7
-	default "6"	if BR2_TOOLCHAIN_GCC_AT_LEAST_6
-	default "5"	if BR2_TOOLCHAIN_GCC_AT_LEAST_5
-	default "4.9"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-	default "4.8"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
-	default "4.7"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-	default "4.6"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
-	default "4.5"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
-	default "4.4"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
-	default "4.3"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
-
-config BR2_TOOLCHAIN_HAS_MNAN_OPTION
-	bool
-	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-
-config BR2_TOOLCHAIN_HAS_SYNC_1
-	bool
-	default y
-	depends on !BR2_bfin
-	depends on !BR2_m68k_cf
-	depends on !BR2_microblaze
-	depends on !BR2_sparc
-	depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT)
-
-config BR2_TOOLCHAIN_HAS_SYNC_2
-	bool
-	default y if BR2_TOOLCHAIN_HAS_SYNC_1
-
-config BR2_TOOLCHAIN_HAS_SYNC_4
-	bool
-	default y
-	depends on !BR2_m68k_cf
-	depends on !BR2_sparc
-	depends on !(BR2_arc && !BR2_ARC_ATOMIC_EXT)
-
-# The availability of __sync for 8-byte types on ARM is somewhat
-# complicated:
-#
-#  - It appeared in gcc starting with gcc 4.7.
-#
-#  - On ARMv7, there is no problem, it can be directly implemented in
-#    userspace.
-#
-#  - On < ARMv7, it requires help from the kernel. Unfortunately, the
-#    libgcc code implementing 8-byte __sync with the help from the
-#    kernel calls __write() when a failure occurs, which is a function
-#    internal to glibc, not available in uClibc and musl. This means
-#    that the 8-byte __sync operations are not available on < ARMv7
-#    with uClibc and musl. This problem was fixed as part of gcc
-#    PR68059, which was backported to the gcc 5 branch, but isn't yet
-#    part of any gcc 5.x release.
-#
-config BR2_TOOLCHAIN_ARM_HAS_SYNC_8
-	bool
-	default y
-	depends on BR2_arm || BR2_armeb
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_ARM_CPU_ARMV7A
-
-# 8-byte intrinsics available on most x86 CPUs, except a few old ones
-config BR2_TOOLCHAIN_X86_HAS_SYNC_8
-	bool
-	default y
-	depends on BR2_i386
-	depends on !BR2_x86_i486
-	depends on !BR2_x86_c3
-	depends on !BR2_x86_winchip_c6
-	depends on !BR2_x86_winchip2
-
-# 8-byte intrinsics available:
-#  - On all 64 bits architecture
-#  - On a certain combinations of ARM platforms
-#  - On certain x86 32 bits CPUs
-config BR2_TOOLCHAIN_HAS_SYNC_8
-	bool
-	default y if BR2_ARCH_IS_64
-	default y if BR2_TOOLCHAIN_ARM_HAS_SYNC_8
-	default y if BR2_TOOLCHAIN_X86_HAS_SYNC_8
-
-# libatomic is available since gcc 4.8, when thread support is
-# enabled. Also, libatomic doesn't recognize "uclinux" as a valid OS
-# part of the tuple, and is therefore not build on uclinux targets,
-# which is why BR2_BINFMT_FLAT configurations are excluded.
-config BR2_TOOLCHAIN_HAS_LIBATOMIC
-	bool
-	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \
-		BR2_TOOLCHAIN_HAS_THREADS && \
-		!BR2_BINFMT_FLAT
-
-# __atomic intrinsics are available:
-# - with gcc 4.8, either through built-ins or libatomic, on all
-#   architectures. Since we don't want to separate the cases where
-#   libatomic is needed vs. not needed, we simplify thing and only
-#   support situations where libatomic is available, even if on some
-#   architectures libatomic is not strictly needed as all __atomic
-#   intrinsics might be built-in. The only case where libatomic is
-#   missing entirely is when the toolchain does not have support for
-#   threads. However, a package that does not need threads but still
-#   uses atomics is quite a corner case, which does not warrant the
-#   added complexity.
-# - with gcc 4.7, libatomic did not exist, so only built-ins are
-#   available. This means that __atomic can only be used in a subset
-#   of the architectures
-config BR2_TOOLCHAIN_HAS_ATOMIC
-	bool
-	default y if BR2_TOOLCHAIN_HAS_LIBATOMIC
-	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_arm
-	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_armeb
-	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_xtensa
-	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 && BR2_ARCH_IS_64
-
-# - libquadmath is not needed/available on all architectures (but gcc
-#   correctly handles this already).
-# - At least, libquadmath is available on:
-#   - i*86
-#   - x86_64
-# - When available, libquadmath requires wchar support.
-config BR2_TOOLCHAIN_HAS_LIBQUADMATH
-	bool
-	default y if BR2_i386 || BR2_x86_64
-- 
2.14.1

[Buildroot] [PATCH v2 14/37] toolchain/wrapper: fix code style

[Ricardo Martincoski]

The header of the .mk file fits in one line, so rearrange it to be
similar to a header from a package.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - no changes
---
 toolchain/toolchain-wrapper.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk
index 7f72a0cade..0b26037d48 100644
--- a/toolchain/toolchain-wrapper.mk
+++ b/toolchain/toolchain-wrapper.mk
@@ -1,4 +1,8 @@
-# This file contains the definition of the toolchain wrapper build commands
+################################################################################
+#
+# definition of the toolchain wrapper build commands
+#
+################################################################################
 
 # We use --hash-style=both to increase the compatibility of the generated
 # binary with older platforms, except for MIPS, where the only acceptable
-- 
2.14.1

[Buildroot] [PATCH v2 15/37] toolchain/toolchain.mk: fix code style

[Ricardo Martincoski]

Rearrange the header of the .mk file so it becomes similar to a header
from a package. It doesn't fit in one line, so split the details to a
comment below the header.

GCONV_LIBS is only used inside this file, so rename it to start with
TOOLCHAIN_, following the namespace convention already used by packages.

Rename the hook COPY_GCONV_LIBS to TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
following the convention used for hooks in packages.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - also COPY_GCONV_LIBS -> TOOLCHAIN_GLIBC_COPY_GCONV_LIBS  (suggested
    by Thomas Petazzoni);
  - fix commit log "it to be similar" -> "it becomes similar";
---
 toolchain/toolchain.mk | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk
index 59fc905caf..e7451e2643 100644
--- a/toolchain/toolchain.mk
+++ b/toolchain/toolchain.mk
@@ -1,7 +1,11 @@
-# This file contains toolchain-related customisation of the content
-# of the target/ directory. Those customisations are added to the
-# TARGET_FINALIZE_HOOKS, to be applied just after all packages
-# have been built.
+################################################################################
+#
+# toolchain-related customisation of the content of the target/ directory
+#
+################################################################################
+
+# Those customisations are added to the TARGET_FINALIZE_HOOKS, to be applied
+# just after all packages have been built.
 
 # Install default nsswitch.conf file if the skeleton doesn't provide it
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
@@ -15,8 +19,8 @@ endif
 
 # Install the gconv modules
 ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
-GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
-define COPY_GCONV_LIBS
+TOOLCHAIN_GLIBC_GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
+define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
 	$(Q)found_gconv=no; \
 	for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \
 		[ -d "$(STAGING_DIR)/usr/lib/$${d}/gconv" ] || continue; \
@@ -27,14 +31,14 @@ define COPY_GCONV_LIBS
 		printf "Unable to find gconv modules\n" >&2; \
 		exit 1; \
 	fi; \
-	if [ -z "$(GCONV_LIBS)" ]; then \
+	if [ -z "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" ]; then \
 		$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
 				      $(TARGET_DIR)/usr/lib/gconv/gconv-modules && \
 		$(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \
 				   $(TARGET_DIR)/usr/lib/gconv \
 		|| exit 1; \
 	else \
-		for l in $(GCONV_LIBS); do \
+		for l in $(TOOLCHAIN_GLIBC_GCONV_LIBS); do \
 			$(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \
 					      $(TARGET_DIR)/usr/lib/gconv/$${l}.so \
 			|| exit 1; \
@@ -47,10 +51,10 @@ define COPY_GCONV_LIBS
 				 || exit 1; \
 			done; \
 		done; \
-		./support/scripts/expunge-gconv-modules "$(GCONV_LIBS)" \
+		./support/scripts/expunge-gconv-modules "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \
 			<$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
 			>$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
 	fi
 endef
-TOOLCHAIN_TARGET_FINALIZE_HOOKS += COPY_GCONV_LIBS
+TOOLCHAIN_TARGET_FINALIZE_HOOKS += TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
 endif
-- 
2.14.1

[Buildroot] [PATCH v2 16/37] check-package: enable for toolchain/

[Ricardo Martincoski]

The toolchain directory can benefit from this script to prevent common
mistakes when submitting patches.

In order to accomplish this:
Do not ignore anymore files from the toolchain/ directory.
Ignore this symbol:
 - BR_LIBC: defined by the buildroot toolchain, used by gcc-final.mk.

Ignore toolchain/toolchain-external/pkg-toolchain-external.mk as it
declares a package infra and not a package itself.
Ignore toolchain/helpers.mk as it contains only helper functions.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - rebase after toolchain-common.in was merged to Config.in;
  - remove spurious info from commit log (I first created the series
    changing the check-package and then fixing the package files; when I
    rebased to allow partial apply of the series, the info "do not
    ignore this symbol" became obsolete since it is fixed in a previous
    patch);
---
 utils/check-package             | 3 +++
 utils/checkpackagelib/lib_mk.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/utils/check-package b/utils/check-package
index a5f5dc44c0..dd3a4bb7e8 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -52,12 +52,15 @@ DO_CHECK_INTREE = re.compile("|".join([
     "linux/",
     "package/",
     "system/",
+    "toolchain/",
     ]))
 DO_NOT_CHECK_INTREE = re.compile("|".join([
     "boot/barebox/barebox\.mk$",
     "fs/common\.mk$",
     "package/doc-asciidoc\.mk$",
     "package/pkg-\S*\.mk$",
+    "toolchain/helpers\.mk$",
+    "toolchain/toolchain-external/pkg-toolchain-external\.mk$",
     ]))
 
 
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index 9989556e95..86e9aa2d97 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -159,6 +159,7 @@ class TypoInPackageVariable(_CheckFunction):
         "ACLOCAL_DIR",
         "ACLOCAL_HOST_DIR",
         "BR_CCACHE_INITIAL_SETUP",
+        "BR_LIBC",
         "BR_NO_CHECK_HASH_FOR",
         "LINUX_EXTENSIONS",
         "LINUX_POST_PATCH_HOOKS",
-- 
2.14.1

[Buildroot] [PATCH v2 17/37] check-package: enable for Config.in* in base dir

[Ricardo Martincoski]

These files can benefit from this script to prevent common mistakes when
submitting patches.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
Changes v1 -> v2:
  - rebase after toolchain-common.in was merged to Config.in
---
 utils/check-package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/check-package b/utils/check-package
index dd3a4bb7e8..d9b719783d 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -44,8 +44,9 @@ def parse_args():
     return parser.parse_args()
 
 
-CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
+CONFIG_IN_FILENAME = re.compile("Config\.\S*$")
 DO_CHECK_INTREE = re.compile("|".join([
+    "Config.in",
     "arch/",
     "boot/",
     "fs/",
-- 
2.14.1

[Buildroot] [PATCH v2 18/37] docs/manual: add check-package to "Tips and tricks"

[Ricardo Martincoski]

And add two references to it: in "Submitting patches" and in "Adding new
packages to Buildroot" sections.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
Changes v1 -> v2:
  - no changes
---
 docs/manual/adding-packages-tips.txt | 31 +++++++++++++++++++++++++++++++
 docs/manual/adding-packages.txt      |  2 ++
 docs/manual/contribute.txt           |  4 ++++
 3 files changed, 37 insertions(+)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index 19577fa821..b13a7bef80 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -32,6 +32,37 @@ using the following rules:
   with `.` and `-` characters substituted with `_` (e.g.:
   +FOO_BAR_BOO_VERSION+).
 
+[[check-package]]
+==== How to check the coding style
+
+Buildroot provides a script in +utils/check-package+ that checks new or
+changed files for coding style. It is not a complete language validator,
+but it catches many common mistakes. It is meant to run in the actual
+files you created or modified, before creating the patch for submission.
+
+This script can be used for packages and also for package-like files:
+boot, fs, toolchain, ... ; but it does not check package infra types.
+
+To use it, run the +check-package+ script, by telling which files you
+created or changed:
+
+----
+$ ./utils/check-package package/new-package/*
+----
+
+If you have the +utils+ directory in your path you can also run:
+
+----
+$ cd package/new-package/
+$ check-package *
+----
+
+The tool can also be used for proprietary packages in a br2-external:
+
+----
+$ check-package -b /path/to/br2-ext-tree/package/my-package/*
+----
+
 [[testing-package]]
 ==== How to test your package
 
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index c642146287..76fca6bf8c 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -12,6 +12,8 @@ tuning their configuration.
 When you add a new package, be sure to test it in various conditions;
 see xref:testing-package[]
 
+Also check the new package for coding style; see xref:check-package[]
+
 include::adding-packages-directory.txt[]
 
 include::adding-packages-generic.txt[]
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 8bbc2b9eb7..b531ea987e 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -264,6 +264,10 @@ yourself to the DEVELOPERS file. This should be done in the same patch
 creating or modifying the package. See xref:DEVELOPERS[the DEVELOPERS file]
 for more information.
 
+Buildroot provides a handy tool to check for common coding style
+mistakes on files you created or modified, called +check-package+ (see
+xref:check-package[] for more information).
+
 ==== Preparing a patch series
 
 Starting from the changes committed in your local git view, _rebase_
-- 
2.14.1

[Buildroot] [PATCH v2 19/37] */Config.in*: remove consecutive empty lines

[Ricardo Martincoski]

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 Config.in                      | 1 -
 Config.in.legacy               | 1 -
 arch/Config.in.mips            | 1 -
 boot/barebox/barebox/Config.in | 1 -
 boot/syslinux/Config.in        | 1 -
 fs/jffs2/Config.in             | 1 -
 6 files changed, 6 deletions(-)

diff --git a/Config.in b/Config.in
index a74b24ae45..852c61ef3a 100644
--- a/Config.in
+++ b/Config.in
@@ -620,7 +620,6 @@ config BR2_SHARED_STATIC_LIBS
 
 endchoice
 
-
 config BR2_PACKAGE_OVERRIDE_FILE
 	string "location of a package override file"
 	default "$(CONFIG_DIR)/local.mk"
diff --git a/Config.in.legacy b/Config.in.legacy
index 60f9148234..b1dca97e5e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -1164,7 +1164,6 @@ config BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL
 	  version provided in buildroot. And both can't coexist.
 	  It now uses OpenSSL as the only option.
 
-
 config BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE
 	bool "nginx http spdy module removed"
 	select BR2_LEGACY
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index f8e57bab33..5513edb180 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -115,7 +115,6 @@ config BR2_mips_p6600
 	select BR2_MIPS_CPU_MIPS64R6
 endchoice
 
-
 choice
 	prompt "Target ABI"
 	depends on BR2_mips64 || BR2_mips64el
diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in
index 0be26adf93..958e294e40 100644
--- a/boot/barebox/barebox/Config.in
+++ b/boot/barebox/barebox/Config.in
@@ -17,7 +17,6 @@ config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG
 	  Name of the board for which Barebox should be built, without
 	  the _defconfig suffix.
 
-
 config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE
 	string "Configuration file path"
 	depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG
diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index da035498de..e969d53fd0 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -48,7 +48,6 @@ config BR2_TARGET_SYSLINUX_EFI
 	help
 	  Install the 'efi' image, to boot from an EFI environment.
 
-
 if BR2_TARGET_SYSLINUX_LEGACY_BIOS
 
 config BR2_TARGET_SYSLINUX_C32
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index 1010216bd1..f1703f4edd 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -98,7 +98,6 @@ config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	  the flash memory page size.  Using this option is only needed if Linux is
 	  configured to use a page size different than 4kB.
 
-
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
 	hex "Virtual memory page size"
 	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
-- 
2.14.1

[Buildroot] [PATCH v2 20/37] Config.in*: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 Config.in        | 8 ++++----
 Config.in.legacy | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Config.in b/Config.in
index 852c61ef3a..ca6010fd30 100644
--- a/Config.in
+++ b/Config.in
@@ -424,8 +424,8 @@ endif
 
 config BR2_STRIP_strip
 	bool "strip target binaries"
-	depends on !BR2_PACKAGE_HOST_ELF2FLT
 	default y
+	depends on !BR2_PACKAGE_HOST_ELF2FLT
 	help
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the normal 'strip' command. This allows to save
@@ -435,16 +435,16 @@ config BR2_STRIP_strip
 
 config BR2_STRIP_EXCLUDE_FILES
 	string "executables that should not be stripped"
-	depends on BR2_STRIP_strip
 	default ""
+	depends on BR2_STRIP_strip
 	help
 	  You may specify a space-separated list of binaries and
 	  libraries here that should not be stripped on the target.
 
 config BR2_STRIP_EXCLUDE_DIRS
 	string "directories that should be skipped when stripping"
-	depends on BR2_STRIP_strip
 	default ""
+	depends on BR2_STRIP_strip
 	help
 	  You may specify a space-separated list of directories that
 	  should be skipped when stripping. Binaries and libraries in
@@ -545,7 +545,6 @@ endchoice
 
 config BR2_GOOGLE_BREAKPAD_ENABLE
 	bool "Enable google-breakpad support"
-	select BR2_PACKAGE_GOOGLE_BREAKPAD
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
@@ -554,6 +553,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE
 	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
+	select BR2_PACKAGE_GOOGLE_BREAKPAD
 	help
 	  This option will enable the use of google breakpad, a library
 	  and tool suite that allows you to distribute an application to
diff --git a/Config.in.legacy b/Config.in.legacy
index b1dca97e5e..08a129106c 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -1970,8 +1970,8 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	  name.
 
 config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS
-	depends on BR2_PACKAGE_PYTHON
 	bool "libsemanage python bindings removed"
+	depends on BR2_PACKAGE_PYTHON
 	select BR2_LEGACY
 	help
 	  This option has been removed, since the libsemanage Python
-- 
2.14.1

[Buildroot] [PATCH v2 21/37] arch/Config.in*: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 arch/Config.in         |  2 +-
 arch/Config.in.arc     |  2 +-
 arch/Config.in.arm     |  4 ++--
 arch/Config.in.bfin    |  2 +-
 arch/Config.in.m68k    |  2 +-
 arch/Config.in.mips    |  8 ++++----
 arch/Config.in.powerpc |  4 ++--
 arch/Config.in.sh      |  2 +-
 arch/Config.in.sparc   |  2 +-
 arch/Config.in.x86     | 30 +++++++++++++++---------------
 arch/Config.in.xtensa  |  8 ++++----
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/arch/Config.in b/arch/Config.in
index d3f63da34f..dd972bc0ee 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -376,8 +376,8 @@ endchoice
 # Set up flat binary type
 choice
 	prompt "FLAT Binary type"
-	depends on BR2_BINFMT_FLAT
 	default BR2_BINFMT_FLAT_ONE
+	depends on BR2_BINFMT_FLAT
 
 config BR2_BINFMT_FLAT_ONE
 	bool "One memory region"
diff --git a/arch/Config.in.arc b/arch/Config.in.arc
index 92503a0140..156384b9a5 100644
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -1,7 +1,7 @@
 choice
 	prompt "Target CPU"
-	depends on BR2_arc
 	default BR2_arc770d
+	depends on BR2_arc
 	help
 	    Specific CPU to use
 
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index b05e83e33c..c99a995db2 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -456,9 +456,9 @@ config BR2_ARM_ENABLE_VFP
 
 choice
 	prompt "Target ABI"
-	depends on BR2_arm || BR2_armeb
 	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2
 	default BR2_ARM_EABI
+	depends on BR2_arm || BR2_armeb
 	help
 	  Application Binary Interface to use. The Application Binary
 	  Interface describes the calling conventions (how arguments
@@ -746,7 +746,6 @@ config BR2_GCC_TARGET_ABI
 	default "lp64"		if BR2_aarch64 || BR2_aarch64_be
 
 config BR2_GCC_TARGET_FPU
-	depends on BR2_arm || BR2_armeb
 	default "vfp"		if BR2_ARM_FPU_VFPV2
 	default "vfpv3"		if BR2_ARM_FPU_VFPV3
 	default "vfpv3-d16"	if BR2_ARM_FPU_VFPV3D16
@@ -756,6 +755,7 @@ config BR2_GCC_TARGET_FPU
 	default "neon-vfpv4"	if BR2_ARM_FPU_NEON_VFPV4
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
+	depends on BR2_arm || BR2_armeb
 
 config BR2_GCC_TARGET_FLOAT_ABI
 	default "soft"		if BR2_ARM_SOFT_FLOAT
diff --git a/arch/Config.in.bfin b/arch/Config.in.bfin
index bd9589c71d..b570d388fd 100644
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -1,7 +1,7 @@
 choice
 	prompt "Target CPU"
-	depends on BR2_bfin
 	default BR2_bf532
+	depends on BR2_bfin
 	help
 	  Specify target CPU
 config BR2_bf512
diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k
index c56031cb78..c134df2f14 100644
--- a/arch/Config.in.m68k
+++ b/arch/Config.in.m68k
@@ -15,8 +15,8 @@ config BR2_m68k_cf
 # coldfire variants will be added later
 choice
 	prompt "Target CPU"
-	depends on BR2_m68k
 	default BR2_m68k_68040
+	depends on BR2_m68k
 	help
 	  Specific CPU variant to use
 
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 5513edb180..cc11744f04 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -28,9 +28,9 @@ config BR2_MIPS_CPU_MIPS64R6
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	default BR2_mips_32 if BR2_mips || BR2_mipsel
 	default BR2_mips_64 if BR2_mips64 || BR2_mips64el
+	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	help
 	  Specific CPU variant to use
 
@@ -117,8 +117,8 @@ endchoice
 
 choice
 	prompt "Target ABI"
-	depends on BR2_mips64 || BR2_mips64el
 	default BR2_MIPS_NABI32
+	depends on BR2_mips64 || BR2_mips64el
 
 	help
 	  Application Binary Interface to use
@@ -144,8 +144,8 @@ config BR2_MIPS_SOFT_FLOAT
 
 choice
 	prompt "FP mode"
-	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	default BR2_MIPS_FP32_MODE_XX
+	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	help
 	  MIPS32 supports different FP modes (32,xx,64). Information about FP
 	  modes can be found here:
@@ -179,8 +179,8 @@ config BR2_MIPS_NAN_2008
 
 choice
 	prompt "Target NaN"
-	depends on BR2_mips_32r5 || BR2_mips_64r5
 	default BR2_MIPS_ENABLE_NAN_2008
+	depends on BR2_mips_32r5 || BR2_mips_64r5
 	help
 	  MIPS supports two different NaN encodings, legacy and 2008.
 	  Information about MIPS NaN encodings can be found here:
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 0968412647..7a452a630a 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -71,12 +71,12 @@ config BR2_powerpc_740
 	depends on !BR2_ARCH_IS_64
 config BR2_powerpc_7400
 	bool "7400"
-	select BR2_POWERPC_CPU_HAS_ALTIVEC
 	depends on !BR2_ARCH_IS_64
+	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_7450
 	bool "7450"
-	select BR2_POWERPC_CPU_HAS_ALTIVEC
 	depends on !BR2_ARCH_IS_64
+	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_750
 	bool "750"
 	depends on !BR2_ARCH_IS_64
diff --git a/arch/Config.in.sh b/arch/Config.in.sh
index deb7244f29..1cb2db90ad 100644
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -1,7 +1,7 @@
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_sh
 	default BR2_sh4
+	depends on BR2_sh
 	help
 	  Specific CPU variant to use
 
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index 9b6a6aa21a..b22b55142e 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -1,8 +1,8 @@
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_sparc || BR2_sparc64
 	default BR2_sparc_v8 if BR2_sparc
 	default BR2_sparc_v9 if BR2_sparc64
+	depends on BR2_sparc || BR2_sparc64
 	help
 	  Specific CPU variant to use
 
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index 8e623b3c2b..f7c53a0fae 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -20,8 +20,8 @@ config BR2_X86_CPU_HAS_AVX2
 
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_i386 || BR2_x86_64
 	default BR2_x86_i586 if BR2_i386
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  Specific CPU variant to use
 
@@ -50,35 +50,35 @@ config BR2_x86_pentiumpro
 	depends on !BR2_x86_64
 config BR2_x86_pentium_mmx
 	bool "pentium MMX"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium_m
 	bool "pentium mobile"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_pentium2
 	bool "pentium2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_pentium3
 	bool "pentium3"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_pentium4
 	bool "pentium4"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
-	depends on !BR2_x86_64
 config BR2_x86_prescott
 	bool "prescott"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
-	depends on !BR2_x86_64
 config BR2_x86_nocona
 	bool "nocona"
 	select BR2_X86_CPU_HAS_MMX
@@ -140,21 +140,21 @@ config BR2_x86_silvermont
 	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_k6
 	bool "k6"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_k6_2
 	bool "k6-2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon
 	bool "athlon"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_athlon_4
 	bool "athlon-4"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_opteron
 	bool "opteron"
 	select BR2_X86_CPU_HAS_MMX
@@ -198,21 +198,21 @@ config BR2_x86_geode
 	depends on !BR2_x86_64
 config BR2_x86_c3
 	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_c32
 	bool "Via C3-2 (Nehemiah cores)"
+	depends on !BR2_x86_64
 	select BR2_X86_CPU_HAS_MMX
 	select BR2_X86_CPU_HAS_SSE
-	depends on !BR2_x86_64
 config BR2_x86_winchip_c6
 	bool "IDT Winchip C6"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 config BR2_x86_winchip2
 	bool "IDT Winchip 2"
-	select BR2_X86_CPU_HAS_MMX
 	depends on !BR2_x86_64
+	select BR2_X86_CPU_HAS_MMX
 endchoice
 
 config BR2_ARCH
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 5d5bcb48f9..49e93a4774 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -1,15 +1,15 @@
 choice
 	prompt "Target Architecture Variant"
-	depends on BR2_xtensa
 	default BR2_xtensa_fsf
+	depends on BR2_xtensa
 
 config BR2_XTENSA_CUSTOM
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 	bool "Custom Xtensa processor configuration"
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 config BR2_xtensa_fsf
-	select BR2_ARCH_HAS_MMU_MANDATORY
 	bool "fsf - Default configuration"
+	select BR2_ARCH_HAS_MMU_MANDATORY
 
 endchoice
 
@@ -30,8 +30,8 @@ config BR2_XTENSA_OVERLAY_FILE
 
 choice
 	prompt "Target Architecture Endianness"
-	depends on BR2_XTENSA_CUSTOM
 	default BR2_XTENSA_LITTLE_ENDIAN
+	depends on BR2_XTENSA_CUSTOM
 
 config BR2_XTENSA_LITTLE_ENDIAN
 	bool "Little endian"
-- 
2.14.1

[Buildroot] [PATCH v2 22/37] boot/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 boot/at91bootstrap/Config.in     |  2 +-
 boot/at91bootstrap3/Config.in    |  2 +-
 boot/at91dataflashboot/Config.in |  2 +-
 boot/lpc32xxcdl/Config.in        |  2 +-
 boot/mxs-bootlets/Config.in      |  8 ++++----
 boot/uboot/Config.in             | 12 ++++++------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 57fdeda946..96cfdbc7e9 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_AT91BOOTSTRAP
-	depends on BR2_arm926t
 	bool "AT91 Bootstrap"
+	depends on BR2_arm926t
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index 237deb929c..bdc1e775a8 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_AT91BOOTSTRAP3
-	depends on BR2_arm926t || BR2_cortex_a5
 	bool "AT91 Bootstrap 3"
+	depends on BR2_arm926t || BR2_cortex_a5
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in
index 80b57a4ad0..4055f96410 100644
--- a/boot/at91dataflashboot/Config.in
+++ b/boot/at91dataflashboot/Config.in
@@ -1,3 +1,3 @@
 config BR2_TARGET_AT91DATAFLASHBOOT
-	depends on BR2_arm926t
 	bool "AT91 DataFlashBoot"
+	depends on BR2_arm926t
diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in
index ce7589c35c..97137aa7d4 100644
--- a/boot/lpc32xxcdl/Config.in
+++ b/boot/lpc32xxcdl/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_LPC32XXCDL
-	depends on BR2_arm926t
 	bool "LPC32XX CDL (kickstart and S1L)"
+	depends on BR2_arm926t
 
 if BR2_TARGET_LPC32XXCDL
 
diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in
index 4bb07a06f5..b3e392afa8 100644
--- a/boot/mxs-bootlets/Config.in
+++ b/boot/mxs-bootlets/Config.in
@@ -24,8 +24,8 @@ config BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT
 endchoice
 
 config BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL
-	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL
 	string "URL of custom bootlets tarball"
+	depends on BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL
 
 if BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT
 
@@ -43,16 +43,16 @@ choice
 	  Select which bootstream to generate
 
 config BR2_TARGET_MXS_BOOTLETS_BAREBOX
-	depends on BR2_TARGET_BAREBOX
 	bool "Barebox Bootloader"
+	depends on BR2_TARGET_BAREBOX
 
 config BR2_TARGET_MXS_BOOTLETS_LINUX
-	depends on BR2_LINUX_KERNEL
 	bool "Linux Kernel"
+	depends on BR2_LINUX_KERNEL
 
 config BR2_TARGET_MXS_BOOTLETS_UBOOT
-	depends on BR2_TARGET_UBOOT
 	bool "U-boot bootloader"
+	depends on BR2_TARGET_UBOOT
 
 endchoice
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 264f343767..d96e7f687f 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -199,23 +199,23 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
 	bool "u-boot-nand.bin"
 
 config BR2_TARGET_UBOOT_FORMAT_KWB
-	depends on BR2_arm
 	bool "u-boot.kwb (Marvell)"
+	depends on BR2_arm
 
 config BR2_TARGET_UBOOT_FORMAT_LDR
-	depends on BR2_bfin
 	bool "u-boot.ldr"
+	depends on BR2_bfin
 
 config BR2_TARGET_UBOOT_FORMAT_ELF
 	bool "u-boot.elf"
 
 config BR2_TARGET_UBOOT_FORMAT_SB
-	depends on BR2_arm
 	bool "u-boot.sb (Freescale i.MX28)"
+	depends on BR2_arm
 
 config BR2_TARGET_UBOOT_FORMAT_SD
-	depends on BR2_arm
 	bool "u-boot.sd (Freescale i.MX28)"
+	depends on BR2_arm
 	help
 	  This is Freescale i.MX28 SB format, with a header for booting
 	  from an SD card.
@@ -226,8 +226,8 @@ config BR2_TARGET_UBOOT_FORMAT_SD
 	  See doc/README.mxs (or doc/README.mx28_common before 2013.07)
 
 config BR2_TARGET_UBOOT_FORMAT_NAND
-	depends on BR2_arm
 	bool "u-boot.nand (Freescale i.MX28)"
+	depends on BR2_arm
 	help
 	  This is Freescale i.MX28 BootStream format (.sb), with a header
 	  for booting from a NAND flash.
@@ -303,10 +303,10 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
 endmenu
 
 config BR2_TARGET_UBOOT_OMAP_IFT
+	bool "produce a .ift signed image (OMAP)"
 	depends on BR2_TARGET_UBOOT_FORMAT_BIN
 	depends on BR2_arm || BR2_armeb
 	select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
-	bool "produce a .ift signed image (OMAP)"
 	help
 	  Use gpsign to produce an image of u-boot.bin signed with
 	  a Configuration Header for booting on OMAP processors.
-- 
2.14.1

[Buildroot] [PATCH v2 23/37] fs/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 fs/jffs2/Config.in | 6 +++---
 fs/tar/Config.in   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index f1703f4edd..208cabaa52 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -38,8 +38,8 @@ endchoice
 
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE
 	hex "Erase block size"
-	depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 	default 0x20000
+	depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM
 	help
 	  Set to erase size of memory
 
@@ -68,8 +68,8 @@ config BR2_TARGET_ROOTFS_JFFS2_PAD
 
 config BR2_TARGET_ROOTFS_JFFS2_PADSIZE
 	hex "Pad output size (0x0 = to end of EB)"
-	depends on BR2_TARGET_ROOTFS_JFFS2_PAD
 	default 0x0
+	depends on BR2_TARGET_ROOTFS_JFFS2_PAD
 	help
 	  Set to 0x0 to pad to end of erase block.
 
@@ -100,8 +100,8 @@ config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
 	hex "Virtual memory page size"
-	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	default 0x1000
+	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	help
 	  Set to virtual memory page size of target system (in bytes).  This value
 	  should match the virtual page size in Linux (i.e. this should have the
diff --git a/fs/tar/Config.in b/fs/tar/Config.in
index 2116edf143..a4e375c68b 100644
--- a/fs/tar/Config.in
+++ b/fs/tar/Config.in
@@ -50,8 +50,8 @@ endchoice
 
 config BR2_TARGET_ROOTFS_TAR_OPTIONS
 	string "other random options to pass to tar"
-	depends on BR2_TARGET_ROOTFS_TAR
 	default ""
+	depends on BR2_TARGET_ROOTFS_TAR
 	help
 	  Any other flags you want to pass to tar
 	  Refer to tar --help for details
-- 
2.14.1

[Buildroot] [PATCH v2 24/37] package/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 package/mono/Config.in    | 2 +-
 package/php/Config.in     | 8 ++++----
 package/systemd/Config.in | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/mono/Config.in b/package/mono/Config.in
index d162237086..63208fef49 100644
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -5,9 +5,9 @@ config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	bool
-	depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 	default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
 		      BR2_mipsel || BR2_powerpc || BR2_x86_64)
+	depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MONO
 	bool "mono"
diff --git a/package/php/Config.in b/package/php/Config.in
index 11514e04b1..2469573541 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_PHP
 	bool "php"
+	# PHP uses -export-dynamic, which breaks with elf2flt with a
+	# message like "ld.real: section .junk LMA [...,...] overlaps
+	# section .text LMA [...,...]"
+	depends on !BR2_BINFMT_FLAT
 	select BR2_PACKAGE_PHP_SAPI_CGI if \
 	       !BR2_PACKAGE_PHP_SAPI_APACHE && \
 	       !BR2_PACKAGE_PHP_SAPI_CLI && \
 	       !BR2_PACKAGE_PHP_SAPI_FPM &&  \
 	       BR2_USE_MMU
 	select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU
-	# PHP uses -export-dynamic, which breaks with elf2flt with a
-	# message like "ld.real: section .junk LMA [...,...] overlaps
-	# section .text LMA [...,...]"
-	depends on !BR2_BINFMT_FLAT
 	help
 	  PHP  is a widely-used general-purpose scripting
 	  language that is especially suited for Web development
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 420c78493d..c5a109675c 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -191,8 +191,8 @@ config BR2_PACKAGE_SYSTEMD_MACHINED
 
 config BR2_PACKAGE_SYSTEMD_MYHOSTNAME
 	bool "enable myhostname NSS plugin"
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	default y
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	help
 	  nss-myhostname is a plug-in module for the GNU Name Service
 	  Switch (NSS) functionality of the GNU C Library (glibc),
@@ -247,8 +247,8 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED
 
 config BR2_PACKAGE_SYSTEMD_RESOLVED
 	bool "enable resolve daemon"
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	default y
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs nss.h
 	help
 	  systemd-resolved is a system service that provides network
 	  name resolution to local applications. It implements a
-- 
2.14.1

[Buildroot] [PATCH v2 25/37] toolchain/*/Config.in: fix attributes order

[Ricardo Martincoski]

... to follow the convention: type, default, depends on, select, help.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 toolchain/Config.in                                          |  2 +-
 toolchain/toolchain-buildroot/Config.in                      |  2 +-
 .../toolchain-external-custom/Config.in.options              | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 91035c71d7..212fbbd300 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -42,8 +42,8 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
-	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 	depends on BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
+	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 9668f8d41a..0ab7e8db97 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -27,13 +27,13 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	bool "uClibc-ng"
-	select BR2_TOOLCHAIN_USES_UCLIBC
 	depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle   || BR2_arceb  || \
 		   BR2_arm     || BR2_armeb    || \
 		   BR2_bfin    || BR2_i386   || BR2_m68k   || BR2_microblaze || \
 		   BR2_mips    || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
 		   BR2_or1k    || BR2_powerpc || BR2_sh2a   || BR2_sh4	   || \
 		   BR2_sh4eb   || BR2_sparc   || BR2_xtensa || BR2_x86_64
+	select BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  This option selects uClibc-ng as the C library for the
 	  cross-compilation toolchain.
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 70c7d8e3c3..6c12b1619c 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -320,8 +320,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LOCALE
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 	bool "Toolchain has threads support?"
-	select BR2_TOOLCHAIN_HAS_THREADS
 	default y
+	select BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Select this option if your external toolchain has thread
 	  support. If you don't know, leave the default value,
@@ -331,8 +331,8 @@ if BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
 	bool "Toolchain has threads debugging support?"
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	default y
+	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	help
 	  Select this option if your external toolchain has thread
 	  debugging support. If you don't know, leave the default
@@ -340,8 +340,8 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL
 	bool "Toolchain has NPTL threads support?"
-	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	default y
+	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	help
 	  Select this option if your external toolchain uses the NPTL
 	  (Native Posix Thread Library) implementation of Posix
@@ -354,9 +354,9 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP
 	bool "Toolchain has SSP support?"
-	select BR2_TOOLCHAIN_HAS_SSP
 	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	default y if BR2_TOOLCHAIN_EXTERNAL_MUSL
+	select BR2_TOOLCHAIN_HAS_SSP
 	help
 	  Selection this option if your external toolchain has Stack
 	  Smashing Protection support enabled. If you don't know,
@@ -365,9 +365,9 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
 	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
+	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Select this option if your external toolchain supports
 	  RPC. If you don't know, leave the default value, Buildroot
-- 
2.14.1

[Buildroot] [PATCH v2 26/37] Config.in*: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 Config.in        |  27 +++---
 Config.in.legacy | 289 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 176 insertions(+), 140 deletions(-)

diff --git a/Config.in b/Config.in
index ca6010fd30..71b9f60e5b 100644
--- a/Config.in
+++ b/Config.in
@@ -175,8 +175,8 @@ config BR2_TAR_OPTIONS
 	default ""
 	help
 	  Options to pass to tar when extracting the sources.
-	  E.g. " -v --exclude='*.svn*'" to exclude all .svn internal files
-	  and to be verbose.
+	  E.g. " -v --exclude='*.svn*'" to exclude all .svn internal
+	  files and to be verbose.
 
 endmenu
 
@@ -667,7 +667,8 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH
 
 	  Note that this mechanism is available for both the internal
 	  toolchain (through the toolchain wrapper and binutils patches)
-	  and external toolchain backends (through the toolchain wrapper).
+	  and external toolchain backends (through the toolchain
+	  wrapper).
 
 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
@@ -751,9 +752,9 @@ choice
 	bool "RELRO Protection"
 	depends on BR2_SHARED_LIBS
 	help
-	  Enable a link-time protection know as RELRO (RELocation Read Only)
-	  which helps to protect from certain type of exploitation techniques
-	  altering the content of some ELF sections.
+	  Enable a link-time protection know as RELRO (RELocation Read
+	  Only) which helps to protect from certain type of exploitation
+	  techniques altering the content of some ELF sections.
 
 config BR2_RELRO_NONE
 	bool "None"
@@ -769,9 +770,9 @@ config BR2_RELRO_PARTIAL
 config BR2_RELRO_FULL
 	bool "Full"
 	help
-	  This option includes the partial configuration, but also
-	  marks the GOT as read-only at the cost of initialization time
-	  during program loading, i.e every time an executable is started.
+	  This option includes the partial configuration, but also marks
+	  the GOT as read-only at the cost of initialization time during
+	  program loading, i.e every time an executable is started.
 
 endchoice
 
@@ -784,10 +785,10 @@ choice
 	depends on !BR2_OPTIMIZE_0
 	help
 	  Enable the _FORTIFY_SOURCE macro which introduces additional
-	  checks to detect buffer-overflows in the following standard library
-	  functions: memcpy, mempcpy, memmove, memset, strcpy, stpcpy,
-	  strncpy, strcat, strncat, sprintf, vsprintf, snprintf, vsnprintf,
-	  gets.
+	  checks to detect buffer-overflows in the following standard
+	  library functions: memcpy, mempcpy, memmove, memset, strcpy,
+	  stpcpy, strncpy, strcat, strncat, sprintf, vsprintf, snprintf,
+	  vsnprintf, gets.
 
 	  NOTE: This feature requires an optimization level of s/1/2/3/g
 
diff --git a/Config.in.legacy b/Config.in.legacy
index 08a129106c..fa083eaf79 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -99,11 +99,11 @@ if !BR2_SKIP_LEGACY
 config BR2_LEGACY
 	bool
 	help
-	  This option is selected automatically when your old .config uses an
-	  option that no longer exists in current buildroot. In that case, the
-	  build will fail. Look for config options which are selected in the
-	  menu below: they no longer exist and should be replaced by something
-	  else.
+	  This option is selected automatically when your old .config
+	  uses an option that no longer exists in current buildroot. In
+	  that case, the build will fail. Look for config options which
+	  are selected in the menu below: they no longer exist and
+	  should be replaced by something else.
 
 # This comment fits exactly in a 80-column display
 comment "Legacy detected: check the content of the menu below"
@@ -566,18 +566,18 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
 	select BR2_LEGACY
 	help
 	  The Sourcery CodeBench toolchain for the sh architecture has
-	  been removed, since it uses glibc older than 2.17 that requires
-	  -lrt to link executables using clock_* system calls. This makes
-	  this toolchain difficult to maintain over time.
+	  been removed, since it uses glibc older than 2.17 that
+	  requires -lrt to link executables using clock_* system calls.
+	  This makes this toolchain difficult to maintain over time.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86
 	bool "x86 Sourcery toolchain has been removed"
 	select BR2_LEGACY
 	help
 	  The Sourcery CodeBench toolchain for the x86 architecture has
-	  been removed, since it uses glibc older than 2.17 that requires
-	  -lrt to link executables using clock_* system calls. This makes
-	  this toolchain difficult to maintain over time.
+	  been removed, since it uses glibc older than 2.17 that
+	  requires -lrt to link executables using clock_* system calls.
+	  This makes this toolchain difficult to maintain over time.
 
 config BR2_GCC_VERSION_4_8_X
 	bool "gcc 4.8.x support removed"
@@ -672,10 +672,10 @@ config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS
 	int "extra size in blocks has been removed"
 	default 0
 	help
-	  Since the support for auto calculation of the filesystem size has been
-	  removed, this option is now useless and must be 0.
-	  You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS matchs
-	  your needs.
+	  Since the support for auto calculation of the filesystem size
+	  has been removed, this option is now useless and must be 0.
+	  You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS
+	  matchs your needs.
 
 config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS_WRAP
 	bool
@@ -703,14 +703,16 @@ config BR2_NBD_CLIENT
 	select BR2_LEGACY
 	select BR2_PACKAGE_NBD_CLIENT
 	help
-	  The nbd client option has been renamed to BR2_PACKAGE_NBD_CLIENT.
+	  The nbd client option has been renamed to
+	  BR2_PACKAGE_NBD_CLIENT.
 
 config BR2_NBD_SERVER
 	bool "nbd server option was renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_NBD_SERVER
 	help
-	  The nbd server option has been renamed to BR2_PACKAGE_NBD_SERVER.
+	  The nbd server option has been renamed to
+	  BR2_PACKAGE_NBD_SERVER.
 
 config BR2_PACKAGE_GMOCK
 	bool "gmock merged into gtest package"
@@ -805,8 +807,8 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
 	help
 	  The support for the prebuilt toolchain based on the Musl C
 	  library provided by the musl-cross project has been removed.
-	  Upstream doesn't provide any prebuilt toolchain anymore, use the
-	  Buildroot toolchain instead.
+	  Upstream doesn't provide any prebuilt toolchain anymore, use
+	  the Buildroot toolchain instead.
 
 config BR2_UCLIBC_INSTALL_TEST_SUITE
 	bool "uClibc tests now in uclibc-ng-test"
@@ -957,8 +959,8 @@ config BR2_PACKAGE_IPKG
 	select BR2_LEGACY
 	help
 	  ipkg dates back to the early 2000s when Compaq started the
-	  handhelds.org project and it hasn't seen development since 2006.
-	  Use opkg as a replacement.
+	  handhelds.org project and it hasn't seen development since
+	  2006. Use opkg as a replacement.
 
 config BR2_GCC_VERSION_4_7_X
 	bool "gcc 4.7.x support removed"
@@ -1030,8 +1032,9 @@ config BR2_KERNEL_HEADERS_3_19
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.19.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.19.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1040,8 +1043,8 @@ config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
 	select BR2_LEGACY
 	select BR2_PACKAGE_EFL
 	help
-	  With EFL 1.18, libevas-generic-loaders is now provided by the efl
-	  package.
+	  With EFL 1.18, libevas-generic-loaders is now provided by the
+	  efl package.
 
 config BR2_PACKAGE_ELEMENTARY
 	bool "elementary package removed"
@@ -1053,8 +1056,9 @@ config BR2_PACKAGE_ELEMENTARY
 config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 	bool "Linux kernel local directory option removed"
 	help
-	  The option to select a local directory as the source of the Linux
-	  kernel has been removed. It hurts reproducibility of builds.
+	  The option to select a local directory as the source of the
+	  Linux kernel has been removed. It hurts reproducibility of
+	  builds.
 
 	  In case you were using this option during development of your
 	  Linux kernel, use the override mechanism instead.
@@ -1092,14 +1096,16 @@ config BR2_PACKAGE_LIBFSLVPUWRAP
 	select BR2_LEGACY
 	select BR2_PACKAGE_IMX_VPUWRAP
 	help
-	  The libfslvpuwrap has been renamed to match the renamed package.
+	  The libfslvpuwrap has been renamed to match the renamed
+	  package.
 
 config BR2_PACKAGE_LIBFSLPARSER
 	bool "libfslparser has been renamed to imx-parser"
 	select BR2_LEGACY
 	select BR2_PACKAGE_IMX_PARSER
 	help
-	  The libfslparser has been renamed to match the renamed package.
+	  The libfslparser has been renamed to match the renamed
+	  package.
 
 config BR2_PACKAGE_LIBFSLCODEC
 	bool "libfslcodec has been renamed to imx-codec"
@@ -1246,8 +1252,9 @@ config BR2_KERNEL_HEADERS_3_17
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.17.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.17.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1350,8 +1357,8 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
 	bool "openpowerlink debug option has been removed"
 	select BR2_LEGACY
 	help
-	  This option depends on BR2_ENABLE_DEBUG which should not be used
-	  by packages anymore.
+	  This option depends on BR2_ENABLE_DEBUG which should not be
+	  used by packages anymore.
 
 config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
 	bool "openpowerlink package has been updated"
@@ -1393,10 +1400,11 @@ config BR2_KERNEL_HEADERS_3_16
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	Version 3.16.x of the Linux kernel headers have been deprecated
-	for more than four buildroot releases and are now removed.
-	As an alternative, version 3.12.x of the headers have been
-	automatically selected in your configuration.
+	  Version 3.16.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
+	  As an alternative, version 3.12.x of the headers have been
+	  automatically selected in your configuration.
 
 config BR2_PACKAGE_PYTHON_PYXML
 	bool "python-pyxml package has been removed"
@@ -1409,9 +1417,9 @@ config BR2_PACKAGE_PYTHON_PYXML
 config BR2_ENABLE_SSP
 	bool "Stack Smashing protection now has different levels"
 	help
-	  The protection offered by SSP can now be selected from different
-	  protection levels. Be sure to review the SSP level in the build
-	  options menu.
+	  The protection offered by SSP can now be selected from
+	  different protection levels. Be sure to review the SSP level
+	  in the build options menu.
 
 config BR2_PACKAGE_DIRECTFB_CLE266
 	bool "cle266 driver for directfb removed"
@@ -1434,8 +1442,8 @@ config BR2_PACKAGE_LIBELEMENTARY
 	select BR2_LEGACY
 	select BR2_PACKAGE_ELEMENTARY
 	help
-	  The libelementary package has been renamed to match the upstream
-	  name.
+	  The libelementary package has been renamed to match the
+	  upstream name.
 
 config BR2_PACKAGE_LIBEINA
 	bool "libeina package has been removed"
@@ -1513,8 +1521,8 @@ config BR2_PACKAGE_INFOZIP
 	select BR2_PACKAGE_ZIP
 	help
 	  Info-Zip's Zip package has been renamed from infozip to zip,
-	  to avoid ambiguities with Info-Zip's UnZip which has been added
-	  in the unzip package.
+	  to avoid ambiguities with Info-Zip's UnZip which has been
+	  added in the unzip package.
 
 config BR2_BR2_PACKAGE_NODEJS_0_10_X
 	bool "nodejs 0.10.x option removed"
@@ -1522,9 +1530,10 @@ config BR2_BR2_PACKAGE_NODEJS_0_10_X
 	select BR2_PACKAGE_NODEJS
 	help
 	  nodejs 0.10.x option has been removed.  0.10.x is now
-	  automatically chosen for ARMv5 architectures only and the latest
-	  nodejs for all other supported architectures. The correct nodejs
-	  version has been automatically selected in your configuration.
+	  automatically chosen for ARMv5 architectures only and the
+	  latest nodejs for all other supported architectures. The
+	  correct nodejs version has been automatically selected in your
+	  configuration.
 
 config BR2_BR2_PACKAGE_NODEJS_0_12_X
 	bool "nodejs version 0.12.x has been removed"
@@ -1560,24 +1569,24 @@ config BR2_PACKAGE_MEDIA_CTL
 	select BR2_PACKAGE_LIBV4L
 	select BR2_PACKAGE_LIBV4L_UTILS
 	help
-	  media-ctl source and developement have been moved to
-	  v4l-utils since June 2014. For an up-to-date media-ctl
-	  version select BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS.
+	  media-ctl source and developement have been moved to v4l-utils
+	  since June 2014. For an up-to-date media-ctl version select
+	  BR2_PACKAGE_LIBV4L and BR2_PACKAGE_LIBV4L_UTILS.
 
 config BR2_PACKAGE_SCHIFRA
 	bool "schifra package has been removed"
 	select BR2_LEGACY
 	help
-	  Schifra package has been maked broken since 2014.11 release and
-	  haven't been fixed since then.
+	  Schifra package has been maked broken since 2014.11 release
+	  and haven't been fixed since then.
 
 config BR2_PACKAGE_ZXING
 	bool "zxing option has been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_ZXING_CPP
 	help
-	  ZXing no longer provides the cpp bindings, it has been renamed to
-	  BR2_PACKAGE_ZXING_CPP which uses a new upstream.
+	  ZXing no longer provides the cpp bindings, it has been renamed
+	  to BR2_PACKAGE_ZXING_CPP which uses a new upstream.
 
 # Since FreeRDP has new dependencies, protect this legacy to avoid the
 # infamous "unmet direct dependencies" kconfig error.
@@ -1609,8 +1618,9 @@ config BR2_KERNEL_HEADERS_3_11
 	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
-	  Version 3.11.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.11.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.10.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1619,8 +1629,9 @@ config BR2_KERNEL_HEADERS_3_13
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.13.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.13.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -1629,8 +1640,9 @@ config BR2_KERNEL_HEADERS_3_15
 	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
-	  Version 3.15.x of the Linux kernel headers have been deprecated
-	  for more than four buildroot releases and are now removed.
+	  Version 3.15.x of the Linux kernel headers have been
+	  deprecated for more than four buildroot releases and are now
+	  removed.
 	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
@@ -2058,8 +2070,9 @@ config BR2_TARGET_GENERIC_PASSWD_DES
 	bool "Encoding passwords with DES has been removed"
 	select BR2_LEGACY
 	help
-	  Paswords can now only be encoded with either of md5, sha256 or sha512.
-	  The default is md5, which is stronger that DES (but still pretty weak).
+	  Paswords can now only be encoded with either of md5, sha256 or
+	  sha512. The default is md5, which is stronger that DES (but
+	  still pretty weak).
 
 config BR2_PACKAGE_GTK2_THEME_HICOLOR
 	bool "hicolor (default theme) is a duplicate"
@@ -2083,16 +2096,17 @@ config BR2_PACKAGE_LIBGC
 	select BR2_LEGACY
 	select BR2_PACKAGE_BDWGC
 	help
-	  libgc has been removed because we have the same package under a
-	  different name, bdwgc.
+	  libgc has been removed because we have the same package under
+	  a different name, bdwgc.
 
 config BR2_PACKAGE_WDCTL
 	bool "util-linux' wdctl option has been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_UTIL_LINUX_WDCTL
 	help
-	  util-linux' wdctl option has been renamed to BR2_PACKAGE_UTIL_LINUX_WDCTL
-	  to be aligned with how the other options are named.
+	  util-linux' wdctl option has been renamed to
+	  BR2_PACKAGE_UTIL_LINUX_WDCTL to be aligned with how the other
+	  options are named.
 
 config BR2_PACKAGE_UTIL_LINUX_ARCH
 	bool "util-linux' arch option has been removed"
@@ -2112,16 +2126,17 @@ config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
 	select BR2_LEGACY
 	select BR2_PACKAGE_BZIP2
 	help
-	  The bzip2 payloads option rely entirely on the dependant package bzip2.
-	  So, you need to select it to enable this feature.
+	  The bzip2 payloads option rely entirely on the dependant
+	  package bzip2. So, you need to select it to enable this
+	  feature.
 
 config BR2_PACKAGE_RPM_XZ_PAYLOADS
 	bool "rpm's xz payloads option has been removed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_XZ
 	help
-	  The xz payloads option rely entirely on the dependant package xz.
-	  So, you need to select it to enable this feature.
+	  The xz payloads option rely entirely on the dependant package
+	  xz. So, you need to select it to enable this feature.
 
 config BR2_PACKAGE_M4
 	bool "m4 target package removed"
@@ -2176,9 +2191,9 @@ config BR2_PACKAGE_STRONGSWAN_TOOLS
 	select BR2_PACKAGE_STRONGSWAN_PKI
 	select BR2_PACKAGE_STRONGSWAN_SCEP
 	help
-	  The tools option has been removed upstream and the different tools
-	  have been split between the pki and scep options, with others
-	  deprecated.
+	  The tools option has been removed upstream and the different
+	  tools have been split between the pki and scep options, with
+	  others deprecated.
 
 config BR2_PACKAGE_XBMC_ADDON_XVDR
 	bool "xbmc-addon-xvdr removed"
@@ -2193,126 +2208,144 @@ config BR2_PACKAGE_XBMC_PVR_ADDONS
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_PVR_ADDONS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_ALSA_LIB
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_ALSA_LIB
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_AVAHI
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_AVAHI
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_DBUS
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_DBUS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBBLURAY
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBBLURAY
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_GOOM
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_GOOM
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_RSXS
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_RSXS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBCEC
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBCEC
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBMICROHTTPD
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBMICROHTTPD
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBNFS
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBNFS
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_RTMPDUMP
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_RTMPDUMP
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBSHAIRPLAY
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBSHAIRPLAY
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBSMBCLIENT
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBSMBCLIENT
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBTHEORA
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBTHEORA
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBUSB
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBUSB
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_LIBVA
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_LIBVA
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PACKAGE_XBMC_WAVPACK
 	bool "xbmc options have been renamed"
 	select BR2_LEGACY
 	select BR2_PACKAGE_KODI_WAVPACK
 	help
-	  The XBMC media center project was renamed to Kodi entertainment center
+	  The XBMC media center project was renamed to Kodi
+	  entertainment center
 
 config BR2_PREFER_STATIC_LIB
 	bool "static library option renamed"
@@ -2390,8 +2423,8 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XC5000
 	select BR2_PACKAGE_LINUX_FIRMWARE_XCx000
 	help
 	  The Xceive xc5000 option now also handles older firmwares from
-	  Xceive (the xc4000 series), as well as new firmwares (the xc5000c)
-	  from Cresta, who bought Xceive.
+	  Xceive (the xc4000 series), as well as new firmwares (the
+	  xc5000c) from Cresta, who bought Xceive.
 
 config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4
 	bool "Chelsio T4 option has been renamed"
@@ -2432,9 +2465,9 @@ config BR2_PACKAGE_LIBELF
 	select BR2_PACKAGE_ELFUTILS
 	select BR2_LEGACY
 	help
-	  The libelf package provided an old version of the libelf library
-	  and is deprecated. The libelf library is now provided by the
-	  elfutils package.
+	  The libelf package provided an old version of the libelf
+	  library and is deprecated. The libelf library is now provided
+	  by the elfutils package.
 
 config BR2_KERNEL_HEADERS_3_8
 	bool "kernel headers version 3.8.x are no longer supported"
@@ -2461,7 +2494,8 @@ config BR2_PACKAGE_PROCPS
 	select BR2_PACKAGE_PROCPS_NG
 	select BR2_LEGACY
 	help
-	  The procps package has been replaced by the equivalent procps-ng.
+	  The procps package has been replaced by the equivalent
+	  procps-ng.
 
 config BR2_BINUTILS_VERSION_2_20_1
 	bool "binutils 2.20.1 has been removed"
@@ -2548,40 +2582,40 @@ config BR2_PACKAGE_LIBV4L_DECODE_TM6000
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_IR_KEYTABLE
 	bool "ir-keytable"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE
 	bool "v4l2-compliance"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_V4L2_CTL
 	bool "v4l2-ctl"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 config BR2_PACKAGE_LIBV4L_V4L2_DBG
 	bool "v4l2-dbg"
 	select BR2_PACKAGE_LIBV4L_UTILS
 	select BR2_LEGACY
 	help
-	  This libv4l option has been deprecated and replaced by a single
-	  option to build all the libv4l utilities.
+	  This libv4l option has been deprecated and replaced by a
+	  single option to build all the libv4l utilities.
 
 ###############################################################################
 comment "Legacy options removed in 2014.05"
@@ -2629,8 +2663,8 @@ config BR2_PACKAGE_TZDATA_ZONELIST
 	string "tzdata: the timezone list option has been renamed"
 	help
 	  The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to
-	  BR2_TARGET_TZ_ZONELIST, and moved to the "System configuration"
-	  menu. You'll need to select BR2_TARGET_TZ_INFO.
+	  BR2_TARGET_TZ_ZONELIST, and moved to the "System
+	  configuration" menu. You'll need to select BR2_TARGET_TZ_INFO.
 
 config BR2_PACKAGE_TZDATA_ZONELIST_WRAP
 	bool
@@ -2642,8 +2676,8 @@ config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
 	select BR2_LEGACY
 	help
 	  The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been
-	  renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to select
-	  it in the corresponding choice.
+	  renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to
+	  select it in the corresponding choice.
 
 config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	bool "Lua command-line editing using readline has been renamed"
@@ -2707,8 +2741,8 @@ config BR2_PACKAGE_UDEV
 	  'systemd' as init system, 'eudev' should be selected, which is
 	  the case if '/dev management' is set to 'Dynamic using eudev'.
 
-	  If you are using 'systemd', its internal implementation of 'udev'
-	  is used.
+	  If you are using 'systemd', its internal implementation of
+	  'udev' is used.
 
 config BR2_PACKAGE_UDEV_RULES_GEN
 	bool "udev rules generation handled by provider"
@@ -2724,8 +2758,8 @@ config BR2_PACKAGE_UDEV_RULES_GEN
 	  '/dev management' is set to 'Dynamic using eudev' to get
 	  the same behaviour as in your old configuration.
 
-	  If you are using 'systemd', it internal implementation of 'udev'
-	  will generate the rules.
+	  If you are using 'systemd', it internal implementation of
+	  'udev' will generate the rules.
 
 config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "udev extras removed"
@@ -2832,23 +2866,23 @@ config BR2_HAVE_DOCUMENTATION
 	bool "support for documentation on target has been removed"
 	select BR2_LEGACY
 	help
-	  Support for documentation on target has been removed since it has
-	  been deprecated for more than four buildroot releases.
+	  Support for documentation on target has been removed since it
+	  has been deprecated for more than four buildroot releases.
 
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake target package has been removed"
 	select BR2_LEGACY
 	help
-	  The 'automake' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
+	  The 'automake' target package has been removed since it has
+	  been deprecated for more than four buildroot releases.
 	  Note: the host automake still exists.
 
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf target package has been removed"
 	select BR2_LEGACY
 	help
-	  The 'autoconf' target package has been removed since it has been
-	  deprecated for more than four buildroot releases.
+	  The 'autoconf' target package has been removed since it has
+	  been deprecated for more than four buildroot releases.
 	  Note: the host autoconf still exists.
 
 config BR2_PACKAGE_XSTROKE
@@ -2864,7 +2898,8 @@ config BR2_PACKAGE_LZMA
 	help
 	  The 'lzma' target package has been removed since it has been
 	  deprecated for more than four buildroot releases.
-	  Note: generating lzma-compressed rootfs images is still supported.
+	  Note: generating lzma-compressed rootfs images is still
+	  supported.
 
 config BR2_PACKAGE_TTCP
 	bool "ttcp has been removed"
@@ -2878,9 +2913,9 @@ config BR2_PACKAGE_LIBNFC_LLCP
 	select BR2_LEGACY
 	select BR2_PACKAGE_LIBLLCP
 	help
-	  The 'libnfc-llcp' package has been removed since upstream renamed
-	  to 'libllcp'. We have added a new package for 'libllcp' and bumped
-	  the version at the same time.
+	  The 'libnfc-llcp' package has been removed since upstream
+	  renamed to 'libllcp'. We have added a new package for
+	  'libllcp' and bumped the version at the same time.
 
 config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL client renamed to MySQL"
@@ -2946,8 +2981,8 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY
 	help
 	  The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which
 	  led to problems with other packages that need the full lvm2
-	  suite. Therefore, the option has been replaced with the positive
-	  BR2_PACKAGE_LVM2_STANDARD_INSTALL option.
+	  suite. Therefore, the option has been replaced with the
+	  positive BR2_PACKAGE_LVM2_STANDARD_INSTALL option.
 
 # Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in
 # in order to automatically propagate old configs
-- 
2.14.1

[Buildroot] [PATCH v2 27/37] arch/Config.in*: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 arch/Config.in        | 97 ++++++++++++++++++++++++++++-----------------------
 arch/Config.in.mips   |  4 +--
 arch/Config.in.xtensa | 12 +++----
 3 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/arch/Config.in b/arch/Config.in
index dd972bc0ee..65448e9339 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -28,24 +28,25 @@ config BR2_arcle
 	bool "ARC (little endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs
-	  that can be used from deeply embedded to high performance host
-	  applications. Little endian.
+	  Synopsys' DesignWare ARC Processor Cores are a family of
+	  32-bit CPUs that can be used from deeply embedded to high
+	  performance host applications. Little endian.
 
 config BR2_arceb
 	bool "ARC (big endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs
-	  that can be used from deeply embedded to high performance host
-	  applications. Big endian.
+	  Synopsys' DesignWare ARC Processor Cores are a family of
+	  32-bit CPUs that can be used from deeply embedded to high
+	  performance host applications. Big endian.
 
 config BR2_arm
 	bool "ARM (little endian)"
 	# MMU support is set by the subarchitecture file, arch/Config.in.arm
 	help
-	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
-	  set architecture (ISA) developed by ARM Holdings. Little endian.
+	  ARM is a 32-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by ARM Holdings.
+	  Little endian.
 	  http://www.arm.com/
 	  http://en.wikipedia.org/wiki/ARM
 
@@ -53,8 +54,9 @@ config BR2_armeb
 	bool "ARM (big endian)"
 	# MMU support is set by the subarchitecture file, arch/Config.in.arm
 	help
-	  ARM is a 32-bit reduced instruction set computer (RISC) instruction
-	  set architecture (ISA) developed by ARM Holdings. Big endian.
+	  ARM is a 32-bit reduced instruction set computer (RISC)
+	  instruction set architecture (ISA) developed by ARM Holdings.
+	  Big endian.
 	  http://www.arm.com/
 	  http://en.wikipedia.org/wiki/ARM
 
@@ -81,8 +83,8 @@ config BR2_bfin
 	select BR2_ARCH_HAS_FDPIC_SUPPORT
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	help
-	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
-	  manufactured and marketed by Analog Devices.
+	  The Blackfin is a family of 16 or 32-bit microprocessors
+	  developed, manufactured and marketed by Analog Devices.
 	  http://www.analog.com/
 	  http://en.wikipedia.org/wiki/Blackfin
 
@@ -113,8 +115,8 @@ config BR2_microblazeel
 	bool "Microblaze AXI (little endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus
-	  based architecture (little endian)
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI
+	  bus based architecture (little endian)
 	  http://www.xilinx.com
 	  http://en.wikipedia.org/wiki/Microblaze
 
@@ -122,8 +124,8 @@ config BR2_microblazebe
 	bool "Microblaze non-AXI (big endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus
-	  based architecture (non-AXI, big endian)
+	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB
+	  bus based architecture (non-AXI, big endian)
 	  http://www.xilinx.com
 	  http://en.wikipedia.org/wiki/Microblaze
 
@@ -131,7 +133,8 @@ config BR2_mips
 	bool "MIPS (big endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -139,7 +142,8 @@ config BR2_mipsel
 	bool "MIPS (little endian)"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -148,7 +152,8 @@ config BR2_mips64
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Big endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Big
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -157,7 +162,8 @@ config BR2_mips64el
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  MIPS is a RISC microprocessor from MIPS Technologies. Little endian.
+	  MIPS is a RISC microprocessor from MIPS Technologies. Little
+	  endian.
 	  http://www.mips.com/
 	  http://en.wikipedia.org/wiki/MIPS_Technologies
 
@@ -180,8 +186,8 @@ config BR2_powerpc
 	bool "PowerPC"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  Big endian.
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
+	  alliance. Big endian.
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
@@ -190,8 +196,8 @@ config BR2_powerpc64
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  Big endian.
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
+	  alliance. Big endian.
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
@@ -200,8 +206,8 @@ config BR2_powerpc64le
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.
-	  Little endian.
+	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
+	  alliance. Little endian.
 	  http://www.power.org/
 	  http://en.wikipedia.org/wiki/Powerpc
 
@@ -209,8 +215,9 @@ config BR2_sh
 	bool "SuperH"
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	help
-	  SuperH (or SH) is a 32-bit reduced instruction set computer (RISC)
-	  instruction set architecture (ISA) developed by Hitachi.
+	  SuperH (or SH) is a 32-bit reduced instruction set computer
+	  (RISC) instruction set architecture (ISA) developed by
+	  Hitachi.
 	  http://www.hitachi.com/
 	  http://en.wikipedia.org/wiki/SuperH
 
@@ -218,8 +225,9 @@ config BR2_sparc
 	bool "SPARC"
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  SPARC (from Scalable Processor Architecture) is a RISC instruction
-	  set architecture (ISA) developed by Sun Microsystems.
+	  SPARC (from Scalable Processor Architecture) is a RISC
+	  instruction set architecture (ISA) developed by Sun
+	  Microsystems.
 	  http://www.oracle.com/sun
 	  http://en.wikipedia.org/wiki/Sparc
 
@@ -228,8 +236,9 @@ config BR2_sparc64
 	select BR2_ARCH_IS_64
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
-	  SPARC (from Scalable Processor Architecture) is a RISC instruction
-	  set architecture (ISA) developed by Sun Microsystems.
+	  SPARC (from Scalable Processor Architecture) is a RISC
+	  instruction set architecture (ISA) developed by Sun
+	  Microsystems.
 	  http://www.oracle.com/sun
 	  http://en.wikipedia.org/wiki/Sparc
 
@@ -349,27 +358,27 @@ config BR2_BINFMT_ELF
 	depends on BR2_USE_MMU
 	select BR2_BINFMT_SUPPORTS_SHARED
 	help
-	  ELF (Executable and Linkable Format) is a format for libraries and
-	  executables used across different architectures and operating
-	  systems.
+	  ELF (Executable and Linkable Format) is a format for libraries
+	  and executables used across different architectures and
+	  operating systems.
 
 config BR2_BINFMT_FDPIC
 	bool "FDPIC"
 	depends on BR2_ARCH_HAS_FDPIC_SUPPORT
 	select BR2_BINFMT_SUPPORTS_SHARED
 	help
-	  ELF FDPIC binaries are based on ELF, but allow the individual load
-	  segments of a binary to be located in memory independently of each
-	  other. This makes this format ideal for use in environments where no
-	  MMU is available.
+	  ELF FDPIC binaries are based on ELF, but allow the individual
+	  load segments of a binary to be located in memory
+	  independently of each other. This makes this format ideal for
+	  use in environments where no MMU is available.
 
 config BR2_BINFMT_FLAT
 	bool "FLAT"
 	depends on !BR2_USE_MMU
 	help
-	  FLAT binary is a relatively simple and lightweight executable format
-	  based on the original a.out format. It is widely used in environment
-	  where no MMU is available.
+	  FLAT binary is a relatively simple and lightweight executable
+	  format based on the original a.out format. It is widely used
+	  in environment where no MMU is available.
 
 endchoice
 
@@ -393,8 +402,8 @@ config BR2_BINFMT_FLAT_SEP_DATA
 	# absolute jump" or "error: value -yyyyy out of range".
 	depends on BR2_bfin
 	help
-	  Allow for the data and text segments to be separated and placed in
-	  different regions of memory.
+	  Allow for the data and text segments to be separated and
+	  placed in different regions of memory.
 
 config BR2_BINFMT_FLAT_SHARED
 	bool "Shared binary"
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index cc11744f04..e45299f818 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -147,8 +147,8 @@ choice
 	default BR2_MIPS_FP32_MODE_XX
 	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
 	help
-	  MIPS32 supports different FP modes (32,xx,64). Information about FP
-	  modes can be found here:
+	  MIPS32 supports different FP modes (32,xx,64). Information
+	  about FP modes can be found here:
 	  https://sourceware.org/binutils/docs/as/MIPS-Options.html
 	  https://dmz-portal.imgtec.com/wiki/MIPS_O32_ABI_-_FR0_and_FR1_Interlinking#5._Generating_modeless_code
 
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 49e93a4774..14049480ec 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -20,13 +20,13 @@ config BR2_XTENSA_OVERLAY_FILE
 	  Enter the path to the overlay tarball for a custom processor
 	  configuration.
 
-	  These overlay files are tar packages with updated configuration
-	  files for various toolchain packages and Xtensa processor
-	  configurations. They are provided by the processor vendor or
-	  directly from Tensilica.
+	  These overlay files are tar packages with updated
+	  configuration files for various toolchain packages and Xtensa
+	  processor configurations. They are provided by the processor
+	  vendor or directly from Tensilica.
 
-	  The path can be either absolute, or relative to the top directory
-	  of buildroot.
+	  The path can be either absolute, or relative to the top
+	  directory of buildroot.
 
 choice
 	prompt "Target Architecture Endianness"
-- 
2.14.1

[Buildroot] [PATCH v2 28/37] boot/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 boot/at91bootstrap/Config.in  |  6 ++++--
 boot/at91bootstrap3/Config.in | 10 ++++++----
 boot/uboot/Config.in          | 43 ++++++++++++++++++++++---------------------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 96cfdbc7e9..0f6430fd8d 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -4,9 +4,11 @@ config BR2_TARGET_AT91BOOTSTRAP
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
-	  - Device initialization such as clock configuration, PIO settings...
+	  - Device initialization such as clock configuration, PIO
+	    settings...
 	  - Peripheral drivers such as PIO, PMC or SDRAMC...
-	  - Physical media algorithm such as DataFlash, NandFlash, NOR Flash...
+	  - Physical media algorithm such as DataFlash, NandFlash, NOR
+	    Flash...
 
 if	BR2_TARGET_AT91BOOTSTRAP
 
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index bdc1e775a8..614363c9a6 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -4,9 +4,11 @@ config BR2_TARGET_AT91BOOTSTRAP3
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
 	  devices. It integrates algorithms for:
-	  - Device initialization such as clock configuration, PIO settings...
+	  - Device initialization such as clock configuration, PIO
+	    settings...
 	  - Peripheral drivers such as PIO, PMC or SDRAMC...
-	  - Physical media algorithm such as DataFlash, NandFlash, NOR Flash...
+	  - Physical media algorithm such as DataFlash, NandFlash, NOR
+	    Flash...
 
 if BR2_TARGET_AT91BOOTSTRAP3
 
@@ -20,8 +22,8 @@ config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
 config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
 	bool "Custom Git repository"
 	help
-	  This option allows Buildroot to get the AT91 Bootstrap 3 source
-	  code from a Git repository.
+	  This option allows Buildroot to get the AT91 Bootstrap 3
+	  source code from a Git repository.
 
 endchoice
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index d96e7f687f..19cf12a073 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -11,14 +11,14 @@ choice
 config BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
 	bool "Legacy"
 	help
-	  Select this option if you use an old U-Boot (older than 2015.04),
-	  so that we use the old build system.
+	  Select this option if you use an old U-Boot (older than
+	  2015.04), so that we use the old build system.
 
 config BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
 	bool "Kconfig"
 	help
-	  Select this option if you use a recent U-Boot version (2015.04 or
-	  newer), so that we use the Kconfig build system.
+	  Select this option if you use a recent U-Boot version (2015.04
+	  or newer), so that we use the Kconfig build system.
 
 endchoice
 
@@ -27,9 +27,9 @@ config BR2_TARGET_UBOOT_BOARDNAME
 	string "U-Boot board name"
 	help
 	  One of U-Boot supported boards to be built.
-	  This will be suffixed with _config to meet U-Boot standard naming.
-	  See boards.cfg in U-Boot source code for the list of available
-	  configurations.
+	  This will be suffixed with _config to meet U-Boot standard
+	  naming. See boards.cfg in U-Boot source code for the list of
+	  available configurations.
 endif
 
 choice
@@ -79,8 +79,8 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
 		if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""  # legacy
 	help
-	  Revision to use in the typical format used by Git/Mercurial/Subversion
-	  E.G. a sha id, a tag, branch, ..
+	  Revision to use in the typical format used by
+	  Git/Mercurial/Subversion E.G. a sha id, a tag, branch, ..
 
 endif
 
@@ -229,25 +229,25 @@ config BR2_TARGET_UBOOT_FORMAT_NAND
 	bool "u-boot.nand (Freescale i.MX28)"
 	depends on BR2_arm
 	help
-	  This is Freescale i.MX28 BootStream format (.sb), with a header
-	  for booting from a NAND flash.
+	  This is Freescale i.MX28 BootStream format (.sb), with a
+	  header for booting from a NAND flash.
 
 	  U-boot includes an mxsboot tool to generate this format,
 	  starting from 2011.12.
 
-	  There are two possibilities when preparing an image writable to
-	  NAND flash:
-	  1) The NAND was not written at all yet or the BCB (Boot Control
-	  Blocks) is broken. In this case, the NAND image 'u-boot.nand'
-	  needs to written.
+	  There are two possibilities when preparing an image writable
+	  to NAND flash:
+	  1) The NAND was not written at all yet or the BCB (Boot
+	  Control Blocks) is broken. In this case, the NAND image
+	  'u-boot.nand' needs to written.
 	  2) The NAND flash was already written with a good BCB. This
 	  applies after 'u-boot.nand' was correctly written. There is no
-	  need to write the BCB again. In this case, the bootloader can be
-	  upgraded by writing 'u-boot.sb'.
+	  need to write the BCB again. In this case, the bootloader can
+	  be upgraded by writing 'u-boot.sb'.
 
 	  To satisfy both cases, the 'u-boot.nand' image obtained from
-	  mxsboot as well as the U-Boot make target 'u-boot.sb' are copied
-	  to the binaries directory.
+	  mxsboot as well as the U-Boot make target 'u-boot.sb' are
+	  copied to the binaries directory.
 
 	  See doc/README.mxs (or doc/README.mx28_common before 2013.07)
 
@@ -295,7 +295,8 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
 	depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
 	help
 	  In case the U-Boot binary for the target platform is not among
-	  the default names, one or more custom names can be listed here.
+	  the default names, one or more custom names can be listed
+	  here.
 	  Use space to separate multiple names.
 	  Example:
 	  u-boot_magic.bin
-- 
2.14.1

[Buildroot] [PATCH v2 29/37] fs/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 fs/cpio/Config.in      |  6 +++---
 fs/ext2/Config.in      | 22 ++++++++++++----------
 fs/initramfs/Config.in |  3 ++-
 fs/jffs2/Config.in     | 16 +++++++++-------
 fs/ubi/Config.in       | 11 ++++++-----
 5 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in
index 679959d222..83a7fa5824 100644
--- a/fs/cpio/Config.in
+++ b/fs/cpio/Config.in
@@ -1,9 +1,9 @@
 config BR2_TARGET_ROOTFS_CPIO
 	bool "cpio the root filesystem (for use as an initial RAM filesystem)"
 	help
-	  Build a cpio archive of the root filesystem.  This is typically
-	  used for an initial RAM filesystem that is passed to the kernel
-	  by the bootloader.
+	  Build a cpio archive of the root filesystem. This is typically
+	  used for an initial RAM filesystem that is passed to the
+	  kernel by the bootloader.
 
 if BR2_TARGET_ROOTFS_CPIO
 
diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index 27ad69fde9..74bacc1141 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -49,11 +49,11 @@ config BR2_TARGET_ROOTFS_EXT2_SIZE
 	default BR2_TARGET_ROOTFS_EXT2_BLOCKS if BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP # legacy 2017.08
 	default "60M"
 	help
-	  The size of the filesystem image. If it does not have a suffix,
-	  it is interpreted as power-of-two kilobytes. If it is suffixed
-	  by 'k', 'm', 'g', 't' (either upper-case or lower-case), then
-	  it is interpreted in power-of-two kilobytes, megabytes,
-	  gigabytes, terabytes, etc.
+	  The size of the filesystem image. If it does not have a
+	  suffix, it is interpreted as power-of-two kilobytes. If it is
+	  suffixed by 'k', 'm', 'g', 't' (either upper-case or
+	  lower-case), then it is interpreted in power-of-two kilobytes,
+	  megabytes, gigabytes, terabytes, etc.
 
 config BR2_TARGET_ROOTFS_EXT2_INODES
 	int "exact number of inodes (leave at 0 for auto calculation)"
@@ -65,15 +65,16 @@ config BR2_TARGET_ROOTFS_EXT2_RESBLKS
 	help
 	  The number of blocks on the filesystem (as a percentage of the
 	  total number of blocks), that are reserved for use by root.
-	  Traditionally, this has been 5%, and all ext-related tools still
-	  default to reserving 5% when creating a new ext filesystem.
+	  Traditionally, this has been 5%, and all ext-related tools
+	  still default to reserving 5% when creating a new ext
+	  filesystem.
 
 config BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS
 	string "additional mke2fs options"
 	default "-O ^64bit"
 	help
-	  Specify a space-separated list of mke2fs options, including any
-	  ext2/3/4 filesystem features.
+	  Specify a space-separated list of mke2fs options, including
+	  any ext2/3/4 filesystem features.
 
 	  For more information about the mke2fs options, see the manual
 	  page mke2fs(8).
@@ -91,7 +92,8 @@ choice
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_EXT2_NONE
 	help
-	  Select compressor for ext2/3/4 filesystem of the root filesystem
+	  Select compressor for ext2/3/4 filesystem of the root
+	  filesystem
 
 config BR2_TARGET_ROOTFS_EXT2_NONE
 	bool "no compression"
diff --git a/fs/initramfs/Config.in b/fs/initramfs/Config.in
index 8ed9f7ebb5..9d5a3f92e6 100644
--- a/fs/initramfs/Config.in
+++ b/fs/initramfs/Config.in
@@ -10,7 +10,8 @@ config BR2_TARGET_ROOTFS_INITRAMFS
 	  A rootfs.cpio file will be generated in the images/ directory.
 	  This is the archive that will be included in the kernel image.
 	  The default rootfs compression set in the kernel configuration
-	  is used, regardless of how buildroot's cpio archive is configured.
+	  is used, regardless of how buildroot's cpio archive is
+	  configured.
 
 	  Note that enabling initramfs together with another filesystem
 	  formats doesn't make sense: you would end up having two
diff --git a/fs/jffs2/Config.in b/fs/jffs2/Config.in
index 208cabaa52..44c0b10446 100644
--- a/fs/jffs2/Config.in
+++ b/fs/jffs2/Config.in
@@ -94,18 +94,20 @@ config BR2_TARGET_ROOTFS_JFFS2_SUMMARY
 config BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	bool "Select custom virtual memory page size"
 	help
-	  Use a custom virtual memory page size.  Note that this is not related to
-	  the flash memory page size.  Using this option is only needed if Linux is
-	  configured to use a page size different than 4kB.
+	  Use a custom virtual memory page size. Note that this is not
+	  related to the flash memory page size. Using this option is
+	  only needed if Linux is configured to use a page size
+	  different than 4kB.
 
 config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
 	hex "Virtual memory page size"
 	default 0x1000
 	depends on BR2_TARGET_ROOTFS_JFFS2_USE_CUSTOM_PAGESIZE
 	help
-	  Set to virtual memory page size of target system (in bytes).  This value
-	  should match the virtual page size in Linux (i.e. this should have the
-	  same value as the value of the PAGE_SIZE macro in Linux).  It is not
-	  related to the flash memory page size.
+	  Set to virtual memory page size of target system (in bytes).
+	  This value should match the virtual page size in Linux (i.e.
+	  this should have the same value as the value of the PAGE_SIZE
+	  macro in Linux). It is not related to the flash memory page
+	  size.
 
 endif
diff --git a/fs/ubi/Config.in b/fs/ubi/Config.in
index 5fa2f1f61d..85b1c56bb0 100644
--- a/fs/ubi/Config.in
+++ b/fs/ubi/Config.in
@@ -18,8 +18,9 @@ config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 	int "sub-page size"
 	default 512
 	help
-	  Tells ubinize that the flash supports sub-pages and the sub-page
-	  size. Use 0 if sub-pages are not supported on flash chip.
+	  Tells ubinize that the flash supports sub-pages and the
+	  sub-page size. Use 0 if sub-pages are not supported on flash
+	  chip.
 	  The value provided here is passed to the -s/--sub-page-size
 	  option of ubinize.
 
@@ -28,9 +29,9 @@ config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
 	help
 	  Select this option to use a custom ubinize configuration file,
 	  rather than the default configuration used by Buildroot (which
-	  defines a single dynamic volume marked as auto-resize).  Passing
-	  a custom ubinize configuration file allows you to create several
-	  volumes, specify volume types, etc.
+	  defines a single dynamic volume marked as auto-resize).
+	  Passing a custom ubinize configuration file allows you to
+	  create several volumes, specify volume types, etc.
 
 	  As a convenience, buildroot replaces the string
 	  "BR2_ROOTFS_UBIFS_PATH" with the path to the built ubifs file.
-- 
2.14.1

[Buildroot] [PATCH v2 30/37] linux/Config.*: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 linux/Config.ext.in | 15 +++++++++------
 linux/Config.in     | 43 +++++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 011dffb0b1..acc8a04742 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -117,14 +117,17 @@ config BR2_LINUX_KERNEL_EXT_AUFS_VERSION
 	string "aufs-standalone version"
 	default ""
 	help
-	  The version you choose must match that of your kernel. Usually,
-	  the sha1 of the cset you want to use; avoid using a branch name
-	  as this yields non-reproducible builds.
+	  The version you choose must match that of your kernel.
+	  Usually, the sha1 of the cset you want to use; avoid using a
+	  branch name as this yields non-reproducible builds.
 
-	  See the following resources to see what versions are available:
+	  See the following resources to see what versions are
+	  available:
 
-	  For aufs3.x: https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/
-	  For aufs4.x: https://github.com/sfjro/aufs4-standalone/branches/all
+	  For aufs3.x:
+	  https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/
+	  For aufs4.x:
+	  https://github.com/sfjro/aufs4-standalone/branches/all
 
 endif # aufs
 
diff --git a/linux/Config.in b/linux/Config.in
index 934142c535..d9c5b62863 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -61,13 +61,13 @@ config BR2_LINUX_KERNEL_CUSTOM_VERSION
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL
 	bool "Custom tarball"
 	help
-	  This option allows to specify a URL pointing to a kernel source
-	  tarball. This URL can use any protocol recognized by Buildroot,
-	  like http://, ftp://, file:// or scp://.
+	  This option allows to specify a URL pointing to a kernel
+	  source tarball. This URL can use any protocol recognized by
+	  Buildroot, like http://, ftp://, file:// or scp://.
 
-	  When pointing to a local tarball using file://, you may want to
-	  use a make variable like $(TOPDIR) to reference the root of the
-	  Buildroot tree.
+	  When pointing to a local tarball using file://, you may want
+	  to use a make variable like $(TOPDIR) to reference the root of
+	  the Buildroot tree.
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT
 	bool "Custom Git repository"
@@ -109,8 +109,8 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION \
 		if BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION != ""  # legacy
 	help
-	  Revision to use in the typical format used by Git/Mercurial/Subversion
-	  E.G. a sha id, a tag, branch, ..
+	  Revision to use in the typical format used by
+	  Git/Mercurial/Subversion E.G. a sha id, a tag, branch, ..
 
 endif
 
@@ -175,7 +175,8 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
 	  Path to the kernel configuration file
 
 	  Note: this can be a defconfig file or a complete .config file,
-	  which can later be saved back with make linux-update-(def)config.
+	  which can later be saved back with make
+	  linux-update-(def)config.
 
 config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES
 	string "Additional configuration fragment files"
@@ -284,9 +285,9 @@ endchoice
 choice
 	prompt "Kernel compression format"
 	help
-	  This selection will just ensure that the correct host tools are built.
-	  The actual compression for the kernel should be selected in the
-	  kernel configuration menu.
+	  This selection will just ensure that the correct host tools
+	  are built. The actual compression for the kernel should be
+	  selected in the kernel configuration menu.
 
 config BR2_LINUX_KERNEL_GZIP
 	bool "gzip compression"
@@ -317,8 +318,9 @@ config BR2_LINUX_KERNEL_IMAGE_NAME
 	depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
 	help
 	  The filename of the kernel image, if it is different from the
-	  make target (above). Only Xtensa uses a filename different from
-	  the make target. Defaults to BR2_LINUX_KERNEL_IMAGE_TARGET_NAME.
+	  make target (above). Only Xtensa uses a filename different
+	  from the make target. Defaults to
+	  BR2_LINUX_KERNEL_IMAGE_TARGET_NAME.
 
 	  If unsure, leave it empty.
 
@@ -327,18 +329,19 @@ config BR2_LINUX_KERNEL_UIMAGE_LOADADDR
 	depends on BR2_arm || BR2_armeb
 	depends on BR2_LINUX_KERNEL_UIMAGE || BR2_LINUX_KERNEL_APPENDED_UIMAGE
 	help
-	  If your ARM system's Linux kernel is configured with the new (3.7+)
-	  multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y in your
-	  kernel config), then it is necessary to specify a kernel load address
-	  when building the uImage. This should be a hexadecimal string
-	  beginning with 0x, for example: 0x00008000.
+	  If your ARM system's Linux kernel is configured with the new
+	  (3.7+) multi-architecture support (CONFIG_ARCH_MULTIPLATFORM=y
+	  in your kernel config), then it is necessary to specify a
+	  kernel load address when building the uImage. This should be a
+	  hexadecimal string beginning with 0x, for example: 0x00008000.
 
 	  If unsure, let this option empty.
 
 config BR2_LINUX_KERNEL_DTS_SUPPORT
 	bool "Build a Device Tree Blob (DTB)"
 	help
-	  Compile one or more device tree sources into device tree blobs.
+	  Compile one or more device tree sources into device tree
+	  blobs.
 	  Select the dts files to compile in the options below.
 
 if BR2_LINUX_KERNEL_DTS_SUPPORT
-- 
2.14.1

[Buildroot] [PATCH v2 31/37] system/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 system/Config.in | 122 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 58 deletions(-)

diff --git a/system/Config.in b/system/Config.in
index 7b36516cc7..d14a864ca5 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -92,9 +92,9 @@ config BR2_TARGET_GENERIC_PASSWD_SHA512
 	help
 	  Use SHA512 to encode passwords.
 
-	  Extremely strong, but not ubiquitous, although available in glibc
-	  for some time now. Choose only if you are sure your C library
-	  understands SHA512 passwords.
+	  Extremely strong, but not ubiquitous, although available in
+	  glibc for some time now. Choose only if you are sure your C
+	  library understands SHA512 passwords.
 
 endchoice # Passwd encoding
 
@@ -219,9 +219,9 @@ config BR2_ROOTFS_MERGED_USR
 	  is the historical UNIX way. In this case, /usr can be a
 	  filesystem on a partition separate from / .
 
-	  If you say 'y' here, then /bin, /sbin and /lib will be symlinks
-	  to their counterparts in /usr. In this case, /usr can not be a
-	  separate filesystem.
+	  If you say 'y' here, then /bin, /sbin and /lib will be
+	  symlinks to their counterparts in /usr. In this case, /usr can
+	  not be a separate filesystem.
 
 config BR2_TARGET_ENABLE_ROOT_LOGIN
 	bool "Enable root login with password"
@@ -230,10 +230,10 @@ config BR2_TARGET_ENABLE_ROOT_LOGIN
 	help
 	  Allow root to log in with a password.
 
-	  If not enabled, root will not be able to log in with a password.
-	  However, if you have an ssh server and you add an ssh key, you
-	  can still allow root to log in. Alternatively, you can use sudo
-	  to become root.
+	  If not enabled, root will not be able to log in with a
+	  password. However, if you have an ssh server and you add an
+	  ssh key, you can still allow root to log in. Alternatively,
+	  you can use sudo to become root.
 
 config BR2_TARGET_GENERIC_ROOT_PASSWD
 	string "Root password"
@@ -242,25 +242,28 @@ config BR2_TARGET_GENERIC_ROOT_PASSWD
 	help
 	  Set the initial root password.
 
-	  If set to empty (the default), then no root password will be set,
-	  and root will need no password to log in.
+	  If set to empty (the default), then no root password will be
+	  set, and root will need no password to log in.
 
-	  If the password starts with any of $1$, $5$ or $6$, it is considered
-	  to be already crypt-encoded with respectively md5, sha256 or sha512.
-	  Any other value is taken to be a clear-text value, and is crypt-encoded
-	  as per the "Passwords encoding" scheme, above.
+	  If the password starts with any of $1$, $5$ or $6$, it is
+	  considered to be already crypt-encoded with respectively md5,
+	  sha256 or sha512.  Any other value is taken to be a clear-text
+	  value, and is crypt-encoded as per the "Passwords encoding"
+	  scheme, above.
 
-	  Note: "$" signs in the hashed password must be doubled. For example,
-	  if the hashed password is "$1$longsalt$v35DIIeMo4yUfI23yditq0",
-	  then you must enter it as "$$1$$longsalt$$v35DIIeMo4yUfI23yditq0"
-	  (this is necessary otherwise make would attempt to interpret the $
-	  as a variable expansion).
+	  Note: "$" signs in the hashed password must be doubled. For
+	  example, if the hashed password is
+	  "$1$longsalt$v35DIIeMo4yUfI23yditq0", then you must enter it
+	  as "$$1$$longsalt$$v35DIIeMo4yUfI23yditq0" (this is necessary
+	  otherwise make would attempt to interpret the $ as a variable
+	  expansion).
 
 	  WARNING! WARNING!
 	  The password appears as-is in the .config file, and may appear
-	  in the build log! Avoid using a valuable password if either the
-	  .config file or the build log may be distributed, or at the
-	  very least use a strong cryptographic hash for your password!
+	  in the build log! Avoid using a valuable password if either
+	  the .config file or the build log may be distributed, or at
+	  the very least use a strong cryptographic hash for your
+	  password!
 
 choice
 	bool "/bin/sh"
@@ -375,10 +378,10 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
 	default y
 	help
 	  The root filesystem is typically mounted read-only at boot.
-	  By default, buildroot remounts it in read-write mode early during the
-	  boot process.
-	  Say no here if you would rather like your root filesystem to remain
-	  read-only.
+	  By default, buildroot remounts it in read-write mode early
+	  during the boot process.
+	  Say no here if you would rather like your root filesystem to
+	  remain read-only.
 	  If unsure, say Y.
 
 config BR2_SYSTEM_DHCP
@@ -391,8 +394,9 @@ config BR2_SYSTEM_DHCP
 
 	  If left empty, no automatic DHCP requests will take place.
 
-	  For more complicated network setups use an overlay to overwrite
-	  /etc/network/interfaces or add a networkd configuration file.
+	  For more complicated network setups use an overlay to
+	  overwrite /etc/network/interfaces or add a networkd
+	  configuration file.
 
 comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd"
 	depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || BR2_PACKAGE_SYSTEMD_NETWORKD)
@@ -468,18 +472,19 @@ config BR2_TARGET_TZ_ZONELIST
 	help
 	  Space-separated list of time zones to compile.
 
-	  The value "default" includes all commonly used time zones. Note
-	  that this set consumes around 5.5M for glibc and 2.1M for uClibc.
+	  The value "default" includes all commonly used time zones.
+	  Note that this set consumes around 5.5M for glibc and 2.1M for
+	  uClibc.
 
-	  The full list is the list of files in the time zone database source,
-	  not including the build and .tab files.
+	  The full list is the list of files in the time zone database
+	  source, not including the build and .tab files.
 
 config BR2_TARGET_LOCALTIME
 	string "default local time"
 	default "Etc/UTC"
 	help
-	  The time zone to install as the default local time, expressed as a
-	  tzdata location, such as:
+	  The time zone to install as the default local time, expressed
+	  as a tzdata location, such as:
 	    Etc/UTC             (the default)
 	    GMT
 	    Europe/Paris
@@ -506,24 +511,24 @@ config BR2_ROOTFS_OVERLAY
 	  root filesystem after the build has finished and before it is
 	  packed into the selected filesystem images.
 
-	  They are copied as-is into the rootfs, excluding files ending with
-	  ~ and .git, .svn and .hg directories.
+	  They are copied as-is into the rootfs, excluding files ending
+	  with ~ and .git, .svn and .hg directories.
 
 config BR2_ROOTFS_POST_BUILD_SCRIPT
 	string "Custom scripts to run before creating filesystem images"
 	default ""
 	help
-	  Specify a space-separated list of scripts to be run after the build
-	  has finished and before Buildroot starts packing the files into
-	  selected filesystem images.
+	  Specify a space-separated list of scripts to be run after the
+	  build has finished and before Buildroot starts packing the
+	  files into selected filesystem images.
 
-	  This gives users the opportunity to do board-specific cleanups,
-	  add-ons and the like, so the generated files can be used directly
-	  without further processing.
+	  This gives users the opportunity to do board-specific
+	  cleanups, add-ons and the like, so the generated files can be
+	  used directly without further processing.
 
-	  These scripts are called with the target directory name as first
-	  argument. Make sure the exit code of those scripts are 0, otherwise
-	  make will stop after calling them.
+	  These scripts are called with the target directory name as
+	  first argument. Make sure the exit code of those scripts are
+	  0, otherwise make will stop after calling them.
 
 config BR2_ROOTFS_POST_FAKEROOT_SCRIPT
 	string "Custom scripts to run inside the fakeroot environment"
@@ -548,8 +553,9 @@ config BR2_ROOTFS_POST_FAKEROOT_SCRIPT
 	        to create arbitrary entries statically in /dev
 
 	    - BR2_ROOTFS_DEVICE_TABLE
-	        to set arbitrary permissions as well as extended attributes
-	        (such as capabilities) on files and directories,
+	        to set arbitrary permissions as well as extended
+	        attributes (such as capabilities) on files and
+	        directories,
 
 	    - BR2_ROOTFS_USERS_TABLES:
 	        to create arbitrary users and their home directories
@@ -581,16 +587,16 @@ config BR2_ROOTFS_POST_SCRIPT_ARGS
 		|| BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" \
 		|| BR2_ROOTFS_POST_IMAGE_SCRIPT != ""
 	help
-	  Pass these additional arguments to each post-build or post-image
-	  scripts.
+	  Pass these additional arguments to each post-build or
+	  post-image scripts.
 
-	  Note that all the post-build and post-image scripts will be passed
-	  the same set of arguments, you can not pass different arguments to
-	  each script.
+	  Note that all the post-build and post-image scripts will be
+	  passed the same set of arguments, you can not pass different
+	  arguments to each script.
 
-	  Note also, as stated in their respective help text, that the first
-	  argument to each post-build or post-image script is the target
-	  directory / images directory. The arguments in this option will be
-	  passed *after* those.
+	  Note also, as stated in their respective help text, that the
+	  first argument to each post-build or post-image script is the
+	  target directory / images directory. The arguments in this
+	  option will be passed *after* those.
 
 endmenu
-- 
2.14.1

[Buildroot] [PATCH v2 32/37] toolchain/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
Changes v1 -> v2:
  - rebase after toolchain-common.in was merged to Config.in
---
 toolchain/Config.in                                           | 10 ++++++----
 toolchain/toolchain-external/Config.in                        | 11 ++++++-----
 .../toolchain-external-codescape-img-mips/Config.in           |  6 ++++--
 .../toolchain-external-codescape-mti-mips/Config.in           |  6 ++++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 212fbbd300..b33eaffd52 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -124,7 +124,8 @@ config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
 	  The gconv libraries are used to convert between different
 	  character sets (charsets).
 
-	  Say 'y' if you need to store and/or display different charsets.
+	  Say 'y' if you need to store and/or display different
+	  charsets.
 
 config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST
 	string "Gconv libraries to copy"
@@ -162,10 +163,11 @@ config BR2_TARGET_OPTIMIZATION
 config BR2_TARGET_LDFLAGS
 	string "Target linker options"
 	help
-	  Extra options to pass to the linker when building for the target.
+	  Extra options to pass to the linker when building for the
+	  target.
 
-	  Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib')
-	  are not supported.
+	  Note that options with a '$' sign (eg.
+	  -Wl,-rpath='$ORIGIN/../lib') are not supported.
 
 config BR2_ECLIPSE_REGISTER
 	bool "Register toolchain within Eclipse Buildroot plug-in"
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c4063b177b..6759e5cefa 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -53,15 +53,16 @@ choice
 config BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD
 	bool "Toolchain to be downloaded and installed"
 	help
-	  Select this option if you want Buildroot to download and install the
-	  toolchain. If you have selected a custom toolchain, specify the URL
-	  in BR2_TOOLCHAIN_EXTERNAL_URL.
+	  Select this option if you want Buildroot to download and
+	  install the toolchain. If you have selected a custom
+	  toolchain, specify the URL in BR2_TOOLCHAIN_EXTERNAL_URL.
 
 config BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED
 	bool "Pre-installed toolchain"
 	help
-	  Select this option if you want to use a pre-installed toolchain.
-	  Specify the path to this toolchain in BR2_TOOLCHAIN_EXTERNAL_PATH.
+	  Select this option if you want to use a pre-installed
+	  toolchain. Specify the path to this toolchain in
+	  BR2_TOOLCHAIN_EXTERNAL_PATH.
 
 endchoice
 
diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
index 8b2eab0ad2..2bfa567672 100644
--- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
+++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
@@ -30,12 +30,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r6' Target Architecture Variant
 	      Enable 'Use soft-float'
-	    - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS
+	    - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r6' Target Architecture Variant
 	      Disable 'Use soft-float'
 	      Set BR2_TARGET_OPTIMIZATION to '-mmicromips'
-	    - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, microMIPS
+	    - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r6' Target Architecture Variant
 	      Enable 'Use soft-float'
diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
index db191fd1be..5d466a58f4 100644
--- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
+++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
@@ -41,12 +41,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r2' Target Architecture Variant
 	      Enable 'Use soft-float'
-	    - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS
+	    - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r2' Target Architecture Variant
 	      Enable 'Use soft-float'
 	      Set BR2_TARGET_OPTIMIZATION to '-mmicromips'
-	    - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, microMIPS
+	    - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI,
+	      microMIPS
 	      Select 'MIPS (little endian)' Target Architecture
 	      Select 'mips 32r2' Target Architecture Variant
 	      Disable 'Use soft-float'
-- 
2.14.1

[Buildroot] [PATCH v2 33/37] qemu/Config.in.host: fix overindented depends on

[Ricardo Martincoski]

Do the same as used in all other Config.in files and use only one tab.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Adam Duskett <aduskett@gmail.com>
---
Changes v1 -> v2:
  - no changes
---
 package/qemu/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
index bbc2aa27c5..0ef4c700b0 100644
--- a/package/qemu/Config.in.host
+++ b/package/qemu/Config.in.host
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
 		BR2_mips64       || BR2_mips64el    || BR2_powerpc      || \
 		BR2_powerpc64    || BR2_powerpc64le || BR2_sh           || \
 		BR2_sparc        || BR2_x86_64
-		depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970
+	depends on !BR2_powerpc_620 && !BR2_powerpc_630 && !BR2_powerpc_970
 
 config BR2_PACKAGE_HOST_QEMU
 	bool "host qemu"
-- 
2.14.1

[Buildroot] [PATCH v2 34/37] package/*/Config.in: re-wrap help text

[Ricardo Martincoski]

... to follow the convention <tab><2 spaces><62 chars>.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
These packages were generated by scanpypi, so let's fix the tool in the
next patch.

Changes v1 -> v2:
  - no changes
---
 package/python-functools32/Config.in | 4 ++--
 package/python-jsonmodels/Config.in  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/python-functools32/Config.in b/package/python-functools32/Config.in
index cc12557edc..606341d828 100644
--- a/package/python-functools32/Config.in
+++ b/package/python-functools32/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_PYTHON_FUNCTOOLS32
 	bool "python-functools32"
 	depends on BR2_PACKAGE_PYTHON
 	help
-	  Backport of the functools module from Python 3.2.3 for use on 2.7
-	  and PyPy.
+	  Backport of the functools module from Python 3.2.3 for use on
+	  2.7 and PyPy.
 
 	  https://github.com/MiCHiLU/python-functools32
diff --git a/package/python-jsonmodels/Config.in b/package/python-jsonmodels/Config.in
index d840e2acfe..f66982874a 100644
--- a/package/python-jsonmodels/Config.in
+++ b/package/python-jsonmodels/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_JSONMODELS
 	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
-	  Models to make easier to deal with structures that are converted
-	  to, or read from JSON.
+	  Models to make easier to deal with structures that are
+	  converted to, or read from JSON.
 
 	  https://github.com/beregond/jsonmodels
-- 
2.14.1

[Buildroot] [PATCH v2 35/37] scanpypi: generate help text compliant to check-package

[Ricardo Martincoski]

Each line must fit in <tab><2 spaces><62 chars>.
The default width for textwrap.wrap() is 70, so explicit set it to 62.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
Changes v1 -> v2:
  - no changes
---
 utils/scanpypi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/scanpypi b/utils/scanpypi
index 505ba0a246..6a3cdcc666 100755
--- a/utils/scanpypi
+++ b/utils/scanpypi
@@ -583,7 +583,7 @@ class BuildrootPackage():
 
         lines.append('\thelp\n')
 
-        help_lines = textwrap.wrap(self.metadata['info']['summary'],
+        help_lines = textwrap.wrap(self.metadata['info']['summary'], 62,
                                    initial_indent='\t  ',
                                    subsequent_indent='\t  ')
 
-- 
2.14.1

[Buildroot] [PATCH v2 36/37] utils/checkpackagelib: exclude four files from Config.in indentation check

[Ricardo Martincoski]

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

package/Config.in, package/Config.in.host, package/x11r7/Config.in and
package/kodi/Config.in do not comply with the normal Config.in
indentation rules. However, this violation of the rule is legitimate, so
let's skip them in check-package for this specific indentation check.

This removes the last 2197 remaining warnings on Config.in files.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Ricardo: rebase patch to use relative paths passed by the main script,
          fix flake8 warnings, add package/Config.* to the list]
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
NOTE: this patch depends on the first one that introduces the use of
relative paths by the main script when testing intree files.

original patch: http://patchwork.ozlabs.org/patch/849882/

Changes v1 -> v2:
  - no changes
---
 utils/checkpackagelib/lib_config.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 11d885f8c7..1d273f1c5f 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -132,6 +132,12 @@ class Indent(_CheckFunction):
                         text]
         elif entry in entries_that_should_not_be_indented:
             if not text.startswith(entry):
+                # four Config.in files have a special but legitimate indentation rule
+                if self.filename in ["package/Config.in",
+                                     "package/Config.in.host",
+                                     "package/kodi/Config.in",
+                                     "package/x11r7/Config.in"]:
+                    return
                 return ["{}:{}: should not be indented"
                         .format(self.filename, lineno),
                         text]
-- 
2.14.1

[Buildroot] [PATCH v2 37/37] .gitlab-ci.yml: extend check-package test to Config.* files

[Ricardo Martincoski]

Now that all issues in Config.in files have been fixed, let's try to
make sure we don't introduce new ones by checking regularly these files
issues in Gitlab CI.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v1 -> v2:
  - rebase after toolchain-common.in was merged to Config.in
---
 .gitlab-ci.yml    | 3 ++-
 .gitlab-ci.yml.in | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd1aeb3408..fcb53d6451 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,8 @@ check-flake8:
 
 check-package:
     script:
-        - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} +
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
+            -exec ./utils/check-package {} +
 
 .defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to
diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in
index bffcb02be1..fb2650c5ce 100644
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -43,7 +43,8 @@ check-flake8:
 
 check-package:
     script:
-        - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} +
+        - find . -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \)
+            -exec ./utils/check-package {} +
 
 .defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to
-- 
2.14.1

[Buildroot] [PATCH v2 03/37] boot/*/*.mk: fix code style

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:16 -0300, Ricardo Martincoski wrote:
> Use only one space before backslash.
> Indent with tabs.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  boot/lpc32xxcdl/lpc32xxcdl.mk |  8 ++++----
>  boot/syslinux/syslinux.mk     |  2 +-
>  boot/uboot/uboot.mk           | 14 +++++++-------
>  3 files changed, 12 insertions(+), 12 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 05/37] fs/yaffs2: fix code style

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:18 -0300, Ricardo Martincoski wrote:
> Rename the .mk to follow the convention. The variables inside it already
> use the correct name.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  fs/yaffs2/{yaffs.mk => yaffs2.mk} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 21/37] arch/Config.in*: fix attributes order

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:34 -0300, Ricardo Martincoski wrote:
> ... to follow the convention: type, default, depends on, select, help.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  arch/Config.in         |  2 +-
>  arch/Config.in.arc     |  2 +-
>  arch/Config.in.arm     |  4 ++--
>  arch/Config.in.bfin    |  2 +-
>  arch/Config.in.m68k    |  2 +-
>  arch/Config.in.mips    |  8 ++++----
>  arch/Config.in.powerpc |  4 ++--
>  arch/Config.in.sh      |  2 +-
>  arch/Config.in.sparc   |  2 +-
>  arch/Config.in.x86     | 30 +++++++++++++++---------------
>  arch/Config.in.xtensa  |  8 ++++----
>  11 files changed, 33 insertions(+), 33 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 27/37] arch/Config.in*: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:40 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  arch/Config.in        | 97 ++++++++++++++++++++++++++++-----------------------
>  arch/Config.in.mips   |  4 +--
>  arch/Config.in.xtensa | 12 +++----
>  3 files changed, 61 insertions(+), 52 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 31/37] system/Config.in: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:44 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  system/Config.in | 122 +++++++++++++++++++++++++++++--------------------------
>  1 file changed, 64 insertions(+), 58 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 01/37] check-package: prepare to extend to other directories

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:14 -0300, Ricardo Martincoski wrote:
> Currently the script only checks files inside the package/ directory.
> Upcoming patches will enable it for other directories.
> 
> In order to reliably test for file names, i.e. the Config.in in the base
> directory, normalize the path of files to check to a relative path to
> the base directory.
> 
> Rename the variable that holds the compiled regexp to better represent
> its content and rearrange how it is declared to make easy to later add
> new directories to check. As a consequence the files that declare
> package infra types would not be ignored anymore, so create a new
> variable to list the files intree to be ignored during the check. The
> same variable will be used by upcoming patches to ignore other files.
> Ignore pkg-*.mk and doc-asciidoc.mk since they are package infra files.
> 
> In order to not produce weird results when used for files outside the
> tree (i.e. in a private br2-external) add an explicit command line
> option (-b) that bypasses any checks that would make a file be ignored
> by the path that contains it.
> When in this out-of-tree mode, the user is responsible for providing a
> list of files to check that do not contain files the script does not
> understand, e.g. package infra files.
> 
> As a result of this patch, besides the known use:
> $ ./utils/check-package package/new-package/*
> someone with the utils/ directory in the path can now also run:
> $ cd package/new-package/
> $ check-package *
> or
> $ check-package -b /path/to/br2-ext-tree/package/staging-package/*
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  utils/check-package | 32 +++++++++++++++++++++++++++-----
>  1 file changed, 27 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 02/37] check-package: enable for arch/ and system/

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:15 -0300, Ricardo Martincoski wrote:
> These directories can benefit from this script to prevent common
> mistakes when submitting patches.
> 
> In order to accomplish this:
> Do not ignore anymore files from these directories.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  utils/check-package | 2 ++
>  1 file changed, 2 insertions(+)

Applied to master, thanks. I've actually applied this commit *after*
the commits that fix the coding style issues in arch/ and system/, so
the order of commits is not the same as the order of the patches in
your patch series.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 22/37] boot/*/Config.in: fix attributes order

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:35 -0300, Ricardo Martincoski wrote:
> ... to follow the convention: type, default, depends on, select, help.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  boot/at91bootstrap/Config.in     |  2 +-
>  boot/at91bootstrap3/Config.in    |  2 +-
>  boot/at91dataflashboot/Config.in |  2 +-
>  boot/lpc32xxcdl/Config.in        |  2 +-
>  boot/mxs-bootlets/Config.in      |  8 ++++----
>  boot/uboot/Config.in             | 12 ++++++------
>  6 files changed, 14 insertions(+), 14 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 28/37] boot/*/Config.in: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:41 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  boot/at91bootstrap/Config.in  |  6 ++++--
>  boot/at91bootstrap3/Config.in | 10 ++++++----
>  boot/uboot/Config.in          | 43 ++++++++++++++++++++++---------------------
>  3 files changed, 32 insertions(+), 27 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 06/37] fs/ubi: use namespace for internal variable

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:19 -0300, Ricardo Martincoski wrote:
> UBINIZE_CONFIG_FILE_PATH is only used inside this file, so rename it to
> start with UBI_, following the namespace convention already used by
> common packages.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  fs/ubi/ubi.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 07/37] fs/*/*.mk: fix code style

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:20 -0300, Ricardo Martincoski wrote:
> The header of the initramfs.mk file fits in one line, so rearrange it.
> Remove consecutive empty line.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  fs/initramfs/initramfs.mk | 3 +--
>  fs/iso9660/iso9660.mk     | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 09/37] linux/linux-ext-*.mk: fit file header into one line

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:22 -0300, Ricardo Martincoski wrote:
> Make it follow the package coding style by removing redundant info.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Christian Stewart <christian@paral.in>
> Cc: David Lechner <david@lechnology.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  linux/linux-ext-aufs.mk                 | 2 +-
>  linux/linux-ext-ev3dev-linux-drivers.mk | 2 +-
>  linux/linux-ext-fbtft.mk                | 2 +-
>  linux/linux-ext-rtai.mk                 | 2 +-
>  linux/linux-ext-xenomai.mk              | 4 ++--
>  5 files changed, 6 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 10/37] linux/linux*.mk: fix code style

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:23 -0300, Ricardo Martincoski wrote:
> Use only one space before backslash.
> Remove consecutive empty line.
> Indent with tabs.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - rebased
> ---
>  linux/linux-ext-rtai.mk |  4 ++--
>  linux/linux.mk          | 25 ++++++++++++-------------
>  2 files changed, 14 insertions(+), 15 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 11/37] linux/linux.mk: use namespace for internal variables

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:24 -0300, Ricardo Martincoski wrote:
> These three symbols:
> KERNEL_ARCH_PATH
> KERNEL_DTBS
> KERNEL_DTS_NAME
> are defined and used only inside this file, so use the LINUX_ namespace
> for them instead of KERNEL_.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - use prefix LINUX_ instead of LINUX_KERNEL_  (suggested by Thomas
>     Petazzoni);
>   - rebased;
> ---
>  linux/linux.mk | 38 +++++++++++++++++++-------------------
>  1 file changed, 19 insertions(+), 19 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 13/37] toolchain: merge toolchain-common.in to Config.in

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:26 -0300, Ricardo Martincoski wrote:
> toolchain-common.in is a Config.in file with an uncommon name.
> It is just included by toolchain/Config.in, and toolchain/Config.in is
> not that long, so instead of renaming the file, merge it to
> toolchain/Config.in.
> 
> Move the raw contents from the file to the exact location it is
> currently included in order to not change the order in the menu.
> 
> Update the references in the manual as well.
> 
> Suggested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - new patch  (suggested by Thomas Petazzoni);
> ---
>  docs/manual/adding-packages-directory.txt |   4 +-
>  toolchain/Config.in                       | 471 +++++++++++++++++++++++++++++-
>  toolchain/toolchain-common.in             | 469 -----------------------------
>  3 files changed, 472 insertions(+), 472 deletions(-)
>  delete mode 100644 toolchain/toolchain-common.in

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 14/37] toolchain/wrapper: fix code style

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:27 -0300, Ricardo Martincoski wrote:
> The header of the .mk file fits in one line, so rearrange it to be
> similar to a header from a package.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  toolchain/toolchain-wrapper.mk | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 15/37] toolchain/toolchain.mk: fix code style

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:28 -0300, Ricardo Martincoski wrote:
> Rearrange the header of the .mk file so it becomes similar to a header
> from a package. It doesn't fit in one line, so split the details to a
> comment below the header.
> 
> GCONV_LIBS is only used inside this file, so rename it to start with
> TOOLCHAIN_, following the namespace convention already used by packages.
> 
> Rename the hook COPY_GCONV_LIBS to TOOLCHAIN_GLIBC_COPY_GCONV_LIBS
> following the convention used for hooks in packages.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - also COPY_GCONV_LIBS -> TOOLCHAIN_GLIBC_COPY_GCONV_LIBS  (suggested
>     by Thomas Petazzoni);
>   - fix commit log "it to be similar" -> "it becomes similar";
> ---
>  toolchain/toolchain.mk | 24 ++++++++++++++----------
>  1 file changed, 14 insertions(+), 10 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 19/37] */Config.in*: remove consecutive empty lines

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:32 -0300, Ricardo Martincoski wrote:
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  Config.in                      | 1 -
>  Config.in.legacy               | 1 -
>  arch/Config.in.mips            | 1 -
>  boot/barebox/barebox/Config.in | 1 -
>  boot/syslinux/Config.in        | 1 -
>  fs/jffs2/Config.in             | 1 -
>  6 files changed, 6 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 04/37] check-package: enable for boot/

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:17 -0300, Ricardo Martincoski wrote:
> This directory can benefit from this script to prevent common mistakes
> when submitting patches.
> 
> In order to accomplish this:
> Do not ignore anymore files from the boot/ directory.
> Ignore boot/barebox/barebox.mk as it declares a package infra and not a
> package itself.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  utils/check-package | 2 ++
>  1 file changed, 2 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 23/37] fs/*/Config.in: fix attributes order

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:36 -0300, Ricardo Martincoski wrote:
> ... to follow the convention: type, default, depends on, select, help.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  fs/jffs2/Config.in | 6 +++---
>  fs/tar/Config.in   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 29/37] fs/*/Config.in: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:42 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  fs/cpio/Config.in      |  6 +++---
>  fs/ext2/Config.in      | 22 ++++++++++++----------
>  fs/initramfs/Config.in |  3 ++-
>  fs/jffs2/Config.in     | 16 +++++++++-------
>  fs/ubi/Config.in       | 11 ++++++-----
>  5 files changed, 32 insertions(+), 26 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 08/37] check-package: enable for fs/

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:21 -0300, Ricardo Martincoski wrote:
> The filesystem types can benefit from this script to prevent common
> mistakes when submitting patches.
> 
> In order to accomplish this:
> Do not ignore anymore files from the fs/ directory.
> Ignore fs/common.mk as it declares a package infra and not a package itself.
> Register the ROOTFS_ as a valid prefix for variables.
> Ignore these symbols:
>  - PACKAGES_PERMISSIONS_TABLE: defined either by packages through
>    pkg-generic or by filesystem types, used by fs/common.mk;
>  - SUMTOOL: defined by package mtd, used by filesystem jffs2;
>  - TARGETS_ROOTFS: defined by filesystem types, used in the main
>    Makefile.
> 
> Keep using loose checks that warn about common mistakes while keep the
> code simple.
> As a consequence the check functions do not differentiate between
> packages and filesystems so the symbol PACKAGE_UBI would not generate a
> warning for the ubi filesystem neither the symbol ROOTFS_MTD would
> generate a warning for the mtd package. But those kind of mistakes are
> not common and are obvious in the code review, unlike typos i.e.
> ROOTFS_UBl or PACKAGE_MID that would be hard to see in the code review.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> Changes v1 -> v2:
>   - remove spurious info from commit log (I first created the series
>     changing the check-package and then fixing the package files; when I
>     rebased to allow partial apply of the series, the info "do not
>     ignore this symbol" became obsolete since it is fixed in a previous
>     patch);
> ---
>  utils/check-package             | 2 ++
>  utils/checkpackagelib/lib_mk.py | 5 ++++-
>  2 files changed, 6 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 30/37] linux/Config.*: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:43 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  linux/Config.ext.in | 15 +++++++++------
>  linux/Config.in     | 43 +++++++++++++++++++++++--------------------
>  2 files changed, 32 insertions(+), 26 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 12/37] check-package: enable for linux/

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:25 -0300, Ricardo Martincoski wrote:
> This directory can benefit from this script to prevent common mistakes
> when submitting patches.
> 
> In order to accomplish this:
> Do not ignore anymore files from the linux/ directory.
> Ignore missing LINUX_EXT_ prefix as the variables for linux extensions
> do not use it.
> Ignore this symbol:
>  - LINUX_EXTENSIONS: defined by each linux extension, used by
>    linux/linux.mk.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - remove spurious info from commit log (I first created the series
>     changing the check-package and then fixing the package files; when I
>     rebased to allow partial apply of the series, the info "do not
>     ignore this symbol" became obsolete since it is fixed in a previous
>     patch);
> ---
>  utils/check-package             | 1 +
>  utils/checkpackagelib/lib_mk.py | 3 +++
>  2 files changed, 4 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 25/37] toolchain/*/Config.in: fix attributes order

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:38 -0300, Ricardo Martincoski wrote:
> ... to follow the convention: type, default, depends on, select, help.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  toolchain/Config.in                                          |  2 +-
>  toolchain/toolchain-buildroot/Config.in                      |  2 +-
>  .../toolchain-external-custom/Config.in.options              | 12 ++++++------
>  3 files changed, 8 insertions(+), 8 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 32/37] toolchain/*/Config.in: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:45 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> ---
> Changes v1 -> v2:
>   - rebase after toolchain-common.in was merged to Config.in
> ---
>  toolchain/Config.in                                           | 10 ++++++----
>  toolchain/toolchain-external/Config.in                        | 11 ++++++-----
>  .../toolchain-external-codescape-img-mips/Config.in           |  6 ++++--
>  .../toolchain-external-codescape-mti-mips/Config.in           |  6 ++++--
>  4 files changed, 20 insertions(+), 13 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 16/37] check-package: enable for toolchain/

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:29 -0300, Ricardo Martincoski wrote:
> The toolchain directory can benefit from this script to prevent common
> mistakes when submitting patches.
> 
> In order to accomplish this:
> Do not ignore anymore files from the toolchain/ directory.
> Ignore this symbol:
>  - BR_LIBC: defined by the buildroot toolchain, used by gcc-final.mk.
> 
> Ignore toolchain/toolchain-external/pkg-toolchain-external.mk as it
> declares a package infra and not a package itself.
> Ignore toolchain/helpers.mk as it contains only helper functions.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Romain Naour <romain.naour@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - rebase after toolchain-common.in was merged to Config.in;
>   - remove spurious info from commit log (I first created the series
>     changing the check-package and then fixing the package files; when I
>     rebased to allow partial apply of the series, the info "do not
>     ignore this symbol" became obsolete since it is fixed in a previous
>     patch);
> ---
>  utils/check-package             | 3 +++
>  utils/checkpackagelib/lib_mk.py | 1 +
>  2 files changed, 4 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 33/37] qemu/Config.in.host: fix overindented depends on

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:46 -0300, Ricardo Martincoski wrote:
> Do the same as used in all other Config.in files and use only one tab.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Adam Duskett <aduskett@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  package/qemu/Config.in.host | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 20/37] Config.in*: fix attributes order

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:33 -0300, Ricardo Martincoski wrote:
> ... to follow the convention: type, default, depends on, select, help.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  Config.in        | 8 ++++----
>  Config.in.legacy | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 26/37] Config.in*: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:39 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  Config.in        |  27 +++---
>  Config.in.legacy | 289 +++++++++++++++++++++++++++++++------------------------
>  2 files changed, 176 insertions(+), 140 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 17/37] check-package: enable for Config.in* in base dir

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:30 -0300, Ricardo Martincoski wrote:
> These files can benefit from this script to prevent common mistakes when
> submitting patches.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> ---
> Changes v1 -> v2:
>   - rebase after toolchain-common.in was merged to Config.in
> ---
>  utils/check-package | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 18/37] docs/manual: add check-package to "Tips and tricks"

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:31 -0300, Ricardo Martincoski wrote:

> +[[check-package]]
> +==== How to check the coding style
> +
> +Buildroot provides a script in +utils/check-package+ that checks new or
> +changed files for coding style. It is not a complete language validator,
> +but it catches many common mistakes. It is meant to run in the actual
> +files you created or modified, before creating the patch for submission.
> +
> +This script can be used for packages and also for package-like files:
> +boot, fs, toolchain, ... ; but it does not check package infra types.

I'm not sure to understand what you mean by "does not check package
infra types". Do you mean that the code in package/pkg-*.mk is not
checked ? Or that it doesn't check the $(eval $(autotools-package))
line at the end of every package ?

> +The tool can also be used for proprietary packages in a br2-external:

I would say "external packages" or just "packages", because packages in
a br2-external are not necessarily proprietary.

> +
> +----
> +$ check-package -b /path/to/br2-ext-tree/package/my-package/*
> +----
> +
>  [[testing-package]]
>  ==== How to test your package
>  
> diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
> index c642146287..76fca6bf8c 100644
> --- a/docs/manual/adding-packages.txt
> +++ b/docs/manual/adding-packages.txt
> @@ -12,6 +12,8 @@ tuning their configuration.
>  When you add a new package, be sure to test it in various conditions;
>  see xref:testing-package[]
>  
> +Also check the new package for coding style; see xref:check-package[]

Final dot ?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 24/37] package/*/Config.in: fix attributes order

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:37 -0300, Ricardo Martincoski wrote:
> ... to follow the convention: type, default, depends on, select, help.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  package/mono/Config.in    | 2 +-
>  package/php/Config.in     | 8 ++++----
>  package/systemd/Config.in | 4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 34/37] package/*/Config.in: re-wrap help text

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:47 -0300, Ricardo Martincoski wrote:
> ... to follow the convention <tab><2 spaces><62 chars>.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
> These packages were generated by scanpypi, so let's fix the tool in the
> next patch.

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 35/37] scanpypi: generate help text compliant to check-package

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:48 -0300, Ricardo Martincoski wrote:
> Each line must fit in <tab><2 spaces><62 chars>.
> The default width for textwrap.wrap() is 70, so explicit set it to 62.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> Changes v1 -> v2:
>   - no changes
> ---
>  utils/scanpypi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 36/37] utils/checkpackagelib: exclude four files from Config.in indentation check

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:49 -0300, Ricardo Martincoski wrote:
> From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> package/Config.in, package/Config.in.host, package/x11r7/Config.in and
> package/kodi/Config.in do not comply with the normal Config.in
> indentation rules. However, this violation of the rule is legitimate, so
> let's skip them in check-package for this specific indentation check.
> 
> This removes the last 2197 remaining warnings on Config.in files.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> [Ricardo: rebase patch to use relative paths passed by the main script,
>           fix flake8 warnings, add package/Config.* to the list]
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> ---
> NOTE: this patch depends on the first one that introduces the use of
> relative paths by the main script when testing intree files.

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 37/37] .gitlab-ci.yml: extend check-package test to Config.* files

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 02:08:50 -0300, Ricardo Martincoski wrote:
> Now that all issues in Config.in files have been fixed, let's try to
> make sure we don't introduce new ones by checking regularly these files
> issues in Gitlab CI.
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> Changes v1 -> v2:
>   - rebase after toolchain-common.in was merged to Config.in
> ---
>  .gitlab-ci.yml    | 3 ++-
>  .gitlab-ci.yml.in | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 18/37] docs/manual: add check-package to "Tips and tricks"

[Ricardo Martincoski]

Hello,

Thank you for your review.

On Sun, Apr 01, 2018 at 04:16 AM, Thomas Petazzoni wrote:

> On Sun,  1 Apr 2018 02:08:31 -0300, Ricardo Martincoski wrote:
>> +This script can be used for packages and also for package-like files:
>> +boot, fs, toolchain, ... ; but it does not check package infra types.
> 
> I'm not sure to understand what you mean by "does not check package
> infra types". Do you mean that the code in package/pkg-*.mk is not
> checked ? Or that it doesn't check the $(eval $(autotools-package))
> line at the end of every package ?

I meant package/pkg-*.mk and similar files.
"and similar" because we have such files in bool/, fs/ and toolchain/ and the
user can also have such files inside a br2-external.

What I am trying to state is that the script does not validate the language of
any file in the tree or even any Makefile, it only checks for common mistakes in
the standardized naming and style we use for variables declared in package files
to be picked up by the package infra.

Maybe one of these?

"but it does not check package infra files."
"but it does not check +package/pkg-*.mk+."
"but it does not check +package/pkg-*.mk+ and similar files."
"but it does not check files that define a package infra."
"but it does not check files that define a package infra and not a
package itself."
"but it does not understand package infra files."
"but it does not understand +package/pkg-*.mk+."
"but it does not understand +package/pkg-*.mk+ and similar files."
"but it does not understand files that define a package infra."
"but it does not understand files that define a package infra and not a
package itself."

I have no preference.

>> +The tool can also be used for proprietary packages in a br2-external:
> 
> I would say "external packages" or just "packages", because packages in
> a br2-external are not necessarily proprietary.

You are right.
Just "packages" is more accurate.

>> +++ b/docs/manual/adding-packages.txt
>> @@ -12,6 +12,8 @@ tuning their configuration.
>>  When you add a new package, be sure to test it in various conditions;
>>  see xref:testing-package[]
>>  
>> +Also check the new package for coding style; see xref:check-package[]
> 
> Final dot ?

OK. Nit: should we also add a final dot to the paragraph above?

Or even join the two:

"
When you add a new package, be sure to test it in various conditions
(see xref:testing-package[]) and also check it for coding style
(see xref:check-package[]).
"

I kept test-pkg as first because it is more important to run this one.

But we could also rephrase to the order they are supposed to be used:

"
While you add a new package, check it for coding style; see
xref:check-package[].

Before you submit the new package, be sure to test it in various
conditions; see xref:testing-package[].
"

I have no preference.

Regards,
Ricardo

[Buildroot] [PATCH v2 18/37] docs/manual: add check-package to "Tips and tricks"

[Thomas Petazzoni]

Hello,

On Sun, 01 Apr 2018 17:53:05 -0300, Ricardo Martincoski wrote:

> > I'm not sure to understand what you mean by "does not check package
> > infra types". Do you mean that the code in package/pkg-*.mk is not
> > checked ? Or that it doesn't check the $(eval $(autotools-package))
> > line at the end of every package ?  
> 
> I meant package/pkg-*.mk and similar files.

OK, so "infra types" is not really the right word to express that.

> "and similar" because we have such files in bool/, fs/ and toolchain/ and the
> user can also have such files inside a br2-external.
> 
> What I am trying to state is that the script does not validate the language of
> any file in the tree or even any Makefile, it only checks for common mistakes in

I guess you wanted to say "does not validate the language of all files
in the tree". Your formulation means that the tool is not validating
any file!

> the standardized naming and style we use for variables declared in package files
> to be picked up by the package infra.
> 
> Maybe one of these?
> 
> "but it does not check package infra files."
> "but it does not check +package/pkg-*.mk+."
> "but it does not check +package/pkg-*.mk+ and similar files."
> "but it does not check files that define a package infra."
> "but it does not check files that define a package infra and not a
> package itself."
> "but it does not understand package infra files."
> "but it does not understand +package/pkg-*.mk+."
> "but it does not understand +package/pkg-*.mk+ and similar files."
> "but it does not understand files that define a package infra."
> "but it does not understand files that define a package infra and not a
> package itself."

Perhaps:

"""
It does not check the files defining the package infrastructures and
some other files containing similar common code.
"""

> >> +The tool can also be used for proprietary packages in a br2-external:  
> > 
> > I would say "external packages" or just "packages", because packages in
> > a br2-external are not necessarily proprietary.  
> 
> You are right.
> Just "packages" is more accurate.
> 
> >> +++ b/docs/manual/adding-packages.txt
> >> @@ -12,6 +12,8 @@ tuning their configuration.
> >>  When you add a new package, be sure to test it in various conditions;
> >>  see xref:testing-package[]
> >>  
> >> +Also check the new package for coding style; see xref:check-package[]  
> > 
> > Final dot ?  
> 
> OK. Nit: should we also add a final dot to the paragraph above?

Probably :)

> Or even join the two:
> 
> "
> When you add a new package, be sure to test it in various conditions
> (see xref:testing-package[]) and also check it for coding style
> (see xref:check-package[]).

I like this one.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2 18/37] docs/manual: add check-package to "Tips and tricks"

[Ricardo Martincoski]

Hello,

On Sun, Apr 01, 2018 at 06:03 PM, Thomas Petazzoni wrote:

> On Sun, 01 Apr 2018 17:53:05 -0300, Ricardo Martincoski wrote:
> 
>> > I'm not sure to understand what you mean by "does not check package
>> > infra types". Do you mean that the code in package/pkg-*.mk is not
>> > checked ? Or that it doesn't check the $(eval $(autotools-package))
>> > line at the end of every package ?  
>> 
>> I meant package/pkg-*.mk and similar files.
> 
> OK, so "infra types" is not really the right word to express that.

OK.

>> What I am trying to state is that the script does not validate the language of
>> any file in the tree or even any Makefile, it only checks for common mistakes in
> 
> I guess you wanted to say "does not validate the language of all files
> in the tree". Your formulation means that the tool is not validating
> any file!

Yes! I meant 'all files'.
Thank you for fixing while reading!

> """
> It does not check the files defining the package infrastructures and
> some other files containing similar common code.
> """

Much better. Thanks.

>> When you add a new package, be sure to test it in various conditions
>> (see xref:testing-package[]) and also check it for coding style
>> (see xref:check-package[]).
> 
> I like this one.

ACK.


Regards,
Ricardo

[Buildroot] [PATCH v3 1/1] docs/manual: add check-package to "Tips and tricks"

[Ricardo Martincoski]

And add two references to it: in "Submitting patches" and in "Adding new
packages to Buildroot" sections.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Changes v2 -> v3:  (after review from Thomas Petazzoni)
  - br2-external is not only for proprietary packages;
  - correctly express 'files defining the package infrastructures'
    (Thomas provided a better phrase, thanks);
  - join test-pkg and check-package paragraphs in 'Adding new packages
    to Buildroot'.

v2: http://patchwork.ozlabs.org/patch/893924/

Changes v1 -> v2:
  - no changes
---
 docs/manual/adding-packages-tips.txt | 33 +++++++++++++++++++++++++++++++++
 docs/manual/adding-packages.txt      |  5 +++--
 docs/manual/contribute.txt           |  4 ++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index f37f9874e7..99c656bef5 100644
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -32,6 +32,39 @@ using the following rules:
   with `.` and `-` characters substituted with `_` (e.g.:
   +FOO_BAR_BOO_VERSION+).
 
+[[check-package]]
+==== How to check the coding style
+
+Buildroot provides a script in +utils/check-package+ that checks new or
+changed files for coding style. It is not a complete language validator,
+but it catches many common mistakes. It is meant to run in the actual
+files you created or modified, before creating the patch for submission.
+
+This script can be used for packages and also for package-like files:
+boot, fs, toolchain, ... It does not check the files defining the
+package infrastructures and some other files containing similar common
+code.
+
+To use it, run the +check-package+ script, by telling which files you
+created or changed:
+
+----
+$ ./utils/check-package package/new-package/*
+----
+
+If you have the +utils+ directory in your path you can also run:
+
+----
+$ cd package/new-package/
+$ check-package *
+----
+
+The tool can also be used for packages in a br2-external:
+
+----
+$ check-package -b /path/to/br2-ext-tree/package/my-package/*
+----
+
 [[testing-package]]
 ==== How to test your package
 
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index c642146287..4a4a17e879 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -9,8 +9,9 @@ applications) can be integrated into Buildroot. It also shows how
 existing packages are integrated, which is needed for fixing issues or
 tuning their configuration.
 
-When you add a new package, be sure to test it in various conditions;
-see xref:testing-package[]
+When you add a new package, be sure to test it in various conditions
+(see xref:testing-package[]) and also check it for coding style (see
+xref:check-package[]).
 
 include::adding-packages-directory.txt[]
 
diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt
index 8bbc2b9eb7..b531ea987e 100644
--- a/docs/manual/contribute.txt
+++ b/docs/manual/contribute.txt
@@ -264,6 +264,10 @@ yourself to the DEVELOPERS file. This should be done in the same patch
 creating or modifying the package. See xref:DEVELOPERS[the DEVELOPERS file]
 for more information.
 
+Buildroot provides a handy tool to check for common coding style
+mistakes on files you created or modified, called +check-package+ (see
+xref:check-package[] for more information).
+
 ==== Preparing a patch series
 
 Starting from the changes committed in your local git view, _rebase_
-- 
2.14.1

[Buildroot] [PATCH v3 1/1] docs/manual: add check-package to "Tips and tricks"

[Thomas Petazzoni]

Hello,

On Sun,  1 Apr 2018 19:31:56 -0300, Ricardo Martincoski wrote:
> And add two references to it: in "Submitting patches" and in "Adding new

> +This script can be used for packages and also for package-like files:
> +boot, fs, toolchain, ...

boot and toolchain stuff are also packages, so I've reworded this a bit:

+This script can be used for packages, filesystem makefiles, Config.in
+files, etc. It does not check the files defining the package
+infrastructures and some other files containing similar common code.

And applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com