check-package: allow to check other directories v1
Subsystems (5)
cover check-package: allow to check other directories v1
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%)Signature · 1 line
2.14.1
PATCH 1/36 check-package: prepare to extend to other directories
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/*
--- utils/check-package | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
utils/check-package +27 -5
@@ -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
Signature · 1 line
2.14.1
PATCH 2/36 check-package: enable for arch/ and system/
In reply to Ricardo MartincoskiThese 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.
--- utils/check-package | 2 ++ 1 file changed, 2 insertions(+)
utils/check-package +2 -0
@@ -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$",
Signature · 1 line
2.14.1
PATCH 3/36 boot/*/*.mk: fix code style
In reply to Ricardo MartincoskiUse only one space before backslash.
Indent with tabs.
--- boot/lpc32xxcdl/lpc32xxcdl.mk | 8 ++++---- boot/syslinux/syslinux.mk | 2 +- boot/uboot/uboot.mk | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-)
boot/lpc32xxcdl/lpc32xxcdl.mk +4 -4
@@ -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 = \
boot/syslinux/syslinux.mk +1 -1
@@ -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
boot/uboot/uboot.mk +7 -7
@@ -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
Signature · 1 line
2.14.1
PATCH 4/36 check-package: enable for boot/
In reply to Ricardo MartincoskiThis 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.
--- utils/check-package | 2 ++ 1 file changed, 2 insertions(+)
utils/check-package +2 -0
@@ -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$", ]))
Signature · 1 line
2.14.1
PATCH 5/36 fs/yaffs2: fix code style
In reply to Ricardo MartincoskiRename the .mk to follow the convention. The variables inside it already use the correct name.
---
fs/yaffs2/{yaffs.mk => yaffs2.mk} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename fs/yaffs2/{yaffs.mk => yaffs2.mk} (100%)fs/yaffs2/yaffs2.mk renamed from fs/yaffs2/yaffs.mk +0 -0
Signature · 1 line
2.14.1
PATCH 6/36 fs/ubi: use namespace for internal variable
In reply to Ricardo MartincoskiUBINIZE_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.
--- fs/ubi/ubi.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ubi/ubi.mk +3 -3
@@ -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
Signature · 1 line
2.14.1
PATCH 7/36 fs/*/*.mk: fix code style
In reply to Ricardo MartincoskiThe header of the initramfs.mk file fits in one line, so rearrange it. Remove consecutive empty line.
--- fs/initramfs/initramfs.mk | 3 +-- fs/iso9660/iso9660.mk | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
fs/initramfs/initramfs.mk +1 -2
@@ -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. # ################################################################################
fs/iso9660/iso9660.mk +0 -1
@@ -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 \
Signature · 1 line
2.14.1
PATCH 8/36 check-package: enable for fs/
In reply to Ricardo MartincoskiThe 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.
--- utils/check-package | 2 ++ utils/checkpackagelib/lib_mk.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
utils/check-package +2 -0
@@ -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$", ]))
utils/checkpackagelib/lib_mk.py +4 -1
@@ -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 = []
Signature · 1 line
2.14.1
PATCH 9/36 linux/linux-ext-*.mk: fit file header into one line
In reply to Ricardo MartincoskiMake it follow the package coding style by removing redundant info.
--- 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(-)
linux/linux-ext-aufs.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux Aufs extensions # # Patch the linux kernel with aufs extension +# ################################################################################ LINUX_EXTENSIONS += aufs
linux/linux-ext-ev3dev-linux-drivers.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux ev3dev extensions # # Patch the linux kernel with ev3dev extension +# ################################################################################ LINUX_EXTENSIONS += ev3dev-linux-drivers
linux/linux-ext-fbtft.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux fbtft extensions # # Patch the linux kernel with fbtft extension +# ################################################################################ LINUX_EXTENSIONS += fbtft
linux/linux-ext-rtai.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux RTAI extensions # # Patch the linux kernel with RTAI extension +# ################################################################################ LINUX_EXTENSIONS += rtai
linux/linux-ext-xenomai.mk +2 -2
@@ -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
Signature · 1 line
2.14.1
PATCH 10/36 linux/linux*.mk: fix code style
In reply to Ricardo MartincoskiUse only one space before backslash.
Remove consecutive empty line.
Indent with tabs.
--- linux/linux-ext-rtai.mk | 4 ++-- linux/linux.mk | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-)
linux/linux-ext-rtai.mk +2 -2
@@ -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" ; \
linux/linux.mk +11 -12
@@ -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
Signature · 1 line
2.14.1
PATCH 11/36 linux/linux.mk: use namespace for internal variables
In reply to Ricardo MartincoskiThese three symbols:KERNEL_ARCH_PATHKERNEL_DTBSKERNEL_DTS_NAME
are defined and used only inside this file, so use the LINUX_ namespace for them.
--- linux/linux.mk | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
linux/linux.mk +19 -19
@@ -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
Signature · 1 line
2.14.1
PATCH 11/36 linux/linux.mk: use namespace for internal variables
Hello,
Thanks for this great cleanup series!
Quoted 6 lines · Ricardo Martincoski
These three symbols:
KERNEL_ARCH_PATHKERNEL_DTBSKERNEL_DTS_NAME
are defined and used only inside this file, so use theLINUX_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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 11/36 linux/linux.mk: use namespace for internal variables
Hello,
Quoted 6 lines · Thomas Petazzoni
Should we name them just
LINUX_ARCH_PATH,LINUX_DTBSandLINUX_DTS_NAME, instead ofLINUX_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 notLINUX_KERNEL_.
Sure, I will do.
Regards,
Ricardo
PATCH 12/36 check-package: enable for linux/
In reply to Ricardo MartincoskiThis 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.
--- utils/check-package | 1 + utils/checkpackagelib/lib_mk.py | 3 +++ 2 files changed, 4 insertions(+)
utils/check-package +1 -0
@@ -49,6 +49,7 @@ DO_CHECK_INTREE = re.compile("|".join([ "arch/", "boot/", "fs/", + "linux/", "package/", "system/", ]))
utils/checkpackagelib/lib_mk.py +3 -0
@@ -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(
Signature · 1 line
2.14.1
PATCH 13/36 toolchain/wrapper: fix code style
In reply to Ricardo MartincoskiThe header of the .mk file fits in one line, so rearrange it to be similar to a header from a package.
--- toolchain/toolchain-wrapper.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
toolchain/toolchain-wrapper.mk +5 -1
@@ -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
Signature · 1 line
2.14.1
PATCH 14/36 toolchain/toolchain.mk: fix code style
In reply to Ricardo MartincoskiRearrange 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.
--- toolchain/toolchain.mk | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
toolchain/toolchain.mk +12 -8
@@ -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
Signature · 1 line
2.14.1
PATCH 14/36 toolchain/toolchain.mk: fix code style
Hello,
toolchain/toolchain.mk endif · line 23
Quoted 5 lines · Ricardo Martincoski
# Install the gconv modules
ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)toolchain/toolchain.mk +1
-1-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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 14/36 toolchain/toolchain.mk: fix code style
Hello,
Quoted 4 lines · Thomas Petazzoni
Quoted 1 line
define
COPY_GCONV_LIBSPerhaps the name of this variable should also be name-spaced:
TOOLCHAIN_GLIBC_COPY_GCONV_LIBSor 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
PATCH 15/36 check-package: enable for toolchain/
In reply to Ricardo MartincoskiThe 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.
--- utils/check-package | 5 ++++- utils/checkpackagelib/lib_mk.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
utils/check-package +4 -1
@@ -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$", ]))
utils/checkpackagelib/lib_mk.py +1 -0
@@ -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",
Signature · 1 line
2.14.1
PATCH 15/36 check-package: enable for toolchain/
Hello,
Quoted 10 lines · 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.
You're not actually ignoring this variable in this patch, and you instead fixed it in PATCH 14/36 to have a TOOLCHAIN_ prefix.
Quoted 16 lines
Ignore
toolchain/toolchain-external/pkg-toolchain-external.mkas it declares a package infra and not a package itself. Ignoretoolchain/helpers.mkas it contains only helper functions.Signed-off-by Ricardo Martincoski <[email protected]>Cc Romain Naour <[email protected]>--- utils/check-package | 5 ++++- utils/checkpackagelib/lib_mk.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)utils/check-package +0
-0
utils/check-package def parse_args(): · line 47
Quoted 5 lines
utils/check-package +1
-1@@ -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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 15/36 check-package: enable for toolchain/
Quoted 3 lines · Thomas Petazzoni
Hello,
On Fri, 30 Mar 2018 23:22:40 -0300, Ricardo Martincoski wrote:
[snip]
Quoted 8 lines
utils/check-package def parse_args(): · line 47
Quoted 2 lines
utils/check-package +1
-1-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
Signature · 6 lines
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
PATCH 15/36 check-package: enable for toolchain/
Hello,
Quoted 11 lines · Arnout Vandecappelle
Quoted 8 lines · Thomas Petazzoni
Quoted 1 line · Ricardo Martincoski
+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
Quoted 1 line
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
PATCH 15/36 check-package: enable for toolchain/
In reply to Thomas PetazzoniHello,
Quoted 5 lines · Thomas Petazzoni
Quoted 2 lines
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).
Quoted 8 lines
utils/check-package def parse_args(): · line 47
Quoted 2 lines
utils/check-package +1
-1-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
PATCH 16/36 check-package: enable for Config.in* in base dir
In reply to Ricardo MartincoskiThese files can benefit from this script to prevent common mistakes when submitting patches.
--- utils/check-package | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
utils/check-package +2 -1
@@ -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/",
Signature · 1 line
2.14.1
PATCH 17/36 docs/manual: add check-package to "Tips and tricks"
In reply to Ricardo MartincoskiAnd add two references to it: in "Submitting patches" and in "Adding new packages to Buildroot" sections.
--- docs/manual/adding-packages-tips.txt | 31 +++++++++++++++++++++++++++++++ docs/manual/adding-packages.txt | 2 ++ docs/manual/contribute.txt | 4 ++++ 3 files changed, 37 insertions(+)
docs/manual/adding-packages-tips.txt +31 -0
@@ -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
docs/manual/adding-packages.txt +2 -0
@@ -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[]
docs/manual/contribute.txt +4 -0
@@ -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_
Signature · 1 line
2.14.1
PATCH 18/36 */Config.in*: remove consecutive empty lines
In reply to Ricardo Martincoski--- 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(-)
Config.in +0 -1
@@ -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"
Config.in.legacy +0 -1
@@ -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
arch/Config.in.mips +0 -1
@@ -115,7 +115,6 @@ config BR2_mips_p6600 select BR2_MIPS_CPU_MIPS64R6 endchoice - choice prompt "Target ABI" depends on BR2_mips64 || BR2_mips64el
boot/barebox/barebox/Config.in +0 -1
@@ -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
boot/syslinux/Config.in +0 -1
@@ -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
fs/jffs2/Config.in +0 -1
@@ -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
Signature · 1 line
2.14.1
PATCH 19/36 Config.in*: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
--- Config.in | 8 ++++---- Config.in.legacy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Config.in +4 -4
@@ -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
Config.in.legacy +1 -1
@@ -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
Signature · 1 line
2.14.1
PATCH 20/36 arch/Config.in*: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
--- 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(-)
arch/Config.in +1 -1
@@ -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"
arch/Config.in.arc +1 -1
@@ -1,7 +1,7 @@ choice prompt "Target CPU" - depends on BR2_arc default BR2_arc770d + depends on BR2_arc help Specific CPU to use
arch/Config.in.arm +2 -2
@@ -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
arch/Config.in.bfin +1 -1
@@ -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
arch/Config.in.m68k +1 -1
@@ -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
arch/Config.in.mips +4 -4
@@ -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:
arch/Config.in.powerpc +2 -2
@@ -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
arch/Config.in.sh +1 -1
@@ -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
arch/Config.in.sparc +1 -1
@@ -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
arch/Config.in.x86 +15 -15
@@ -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
arch/Config.in.xtensa +4 -4
@@ -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"
Signature · 1 line
2.14.1
PATCH 21/36 boot/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
--- 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(-)
boot/at91bootstrap/Config.in +1 -1
@@ -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:
boot/at91bootstrap3/Config.in +1 -1
@@ -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:
boot/at91dataflashboot/Config.in +1 -1
@@ -1,3 +1,3 @@ config BR2_TARGET_AT91DATAFLASHBOOT - depends on BR2_arm926t bool "AT91 DataFlashBoot" + depends on BR2_arm926t
boot/lpc32xxcdl/Config.in +1 -1
@@ -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
boot/mxs-bootlets/Config.in +4 -4
@@ -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
boot/uboot/Config.in +6 -6
@@ -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.
Signature · 1 line
2.14.1
PATCH 22/36 fs/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
--- fs/jffs2/Config.in | 6 +++--- fs/tar/Config.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/jffs2/Config.in +3 -3
@@ -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
fs/tar/Config.in +1 -1
@@ -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
Signature · 1 line
2.14.1
PATCH 23/36 package/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
--- package/mono/Config.in | 2 +- package/php/Config.in | 8 ++++---- package/systemd/Config.in | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
package/mono/Config.in +1 -1
@@ -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"
package/php/Config.in +4 -4
@@ -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
package/systemd/Config.in +2 -2
@@ -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
Signature · 1 line
2.14.1
PATCH 24/36 toolchain/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
--- toolchain/Config.in | 2 +- toolchain/toolchain-buildroot/Config.in | 2 +- .../toolchain-external-custom/Config.in.options | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
toolchain/Config.in +1 -1
@@ -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"
toolchain/toolchain-buildroot/Config.in +1 -1
@@ -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.
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +6 -6
@@ -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
Signature · 1 line
2.14.1
PATCH 25/36 Config.in*: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- Config.in | 27 +++--- Config.in.legacy | 289 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 176 insertions(+), 140 deletions(-)
Config.in +14 -13
@@ -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
Config.in.legacy +162 -127
695 lines not on this page · raw message
Signature · 1 line
2.14.1
PATCH 26/36 arch/Config.in*: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- arch/Config.in | 97 ++++++++++++++++++++++++++++----------------------- arch/Config.in.mips | 4 +-- arch/Config.in.xtensa | 12 +++---- 3 files changed, 61 insertions(+), 52 deletions(-)
arch/Config.in +53 -44
@@ -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"
arch/Config.in.mips +2 -2
@@ -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
arch/Config.in.xtensa +6 -6
@@ -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"
Signature · 1 line
2.14.1
PATCH 27/36 boot/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- boot/at91bootstrap/Config.in | 6 ++++-- boot/at91bootstrap3/Config.in | 10 ++++++---- boot/uboot/Config.in | 43 ++++++++++++++++++++++--------------------- 3 files changed, 32 insertions(+), 27 deletions(-)
boot/at91bootstrap/Config.in +4 -2
@@ -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
boot/at91bootstrap3/Config.in +6 -4
@@ -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
boot/uboot/Config.in +22 -21
85 lines not on this page · raw message
Signature · 1 line
2.14.1
PATCH 28/36 fs/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- 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(-)
fs/cpio/Config.in +3 -3
@@ -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
fs/ext2/Config.in +12 -10
@@ -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"
fs/initramfs/Config.in +2 -1
@@ -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
fs/jffs2/Config.in +9 -7
@@ -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
fs/ubi/Config.in +6 -5
@@ -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.
Signature · 1 line
2.14.1
PATCH 29/36 linux/Config.*: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- linux/Config.ext.in | 15 +++++++++------ linux/Config.in | 43 +++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 26 deletions(-)
linux/Config.ext.in +9 -6
@@ -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
linux/Config.in +23 -20
86 lines not on this page · raw message
Signature · 1 line
2.14.1
PATCH 30/36 system/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- system/Config.in | 122 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 58 deletions(-)
system/Config.in +64 -58
@@ -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
Signature · 1 line
2.14.1
PATCH 31/36 toolchain/{*/Config.in, *.in}: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
--- 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(-)
toolchain/toolchain-common.in +6 -4
@@ -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"
toolchain/toolchain-external/Config.in +6 -5
@@ -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
toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +4 -2
@@ -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'
toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +4 -2
@@ -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'
Signature · 1 line
2.14.1
PATCH 33/36 package/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
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(-)
package/python-functools32/Config.in +2 -2
@@ -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
package/python-jsonmodels/Config.in +2 -2
@@ -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
Signature · 1 line
2.14.1
PATCH 34/36 scanpypi: generate help text compliant to check-package
In reply to Ricardo MartincoskiEach line must fit in <tab><2 spaces><62 chars>.
The default width for textwrap.wrap() is 70, so explicit set it to 62.
--- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
utils/scanpypi +1 -1
@@ -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 ')
Signature · 1 line
2.14.1
PATCH 35/36 utils/checkpackagelib: exclude four files from Config.in indentation check
In reply to Ricardo MartincoskiFrom: Thomas Petazzoni <[email protected]>
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.
[Ricardo: rebase patch to use relative paths passed by the main script,
fix flake8 warnings, add package/Config.* to the list]
---
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(+)
utils/checkpackagelib/lib_config.py +6 -0
@@ -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]
Signature · 1 line
2.14.1
PATCH 36/36 .gitlab-ci.yml: extend check-package test to Config.* files
In reply to Ricardo MartincoskiNow 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.
--- .gitlab-ci.yml | 3 ++- .gitlab-ci.yml.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
.gitlab-ci.yml +2 -1
@@ -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
.gitlab-ci.yml.in +2 -1
@@ -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
Signature · 1 line
2.14.1
v2 cover check-package: allow to check other directories v2
In reply to Ricardo MartincoskiHello,
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
Signature · 130 lines
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.1PATCH v2 1/37 check-package: prepare to extend to other directories
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/*
---
Changes v1 -> v2:
- no changes
--- utils/check-package | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
utils/check-package +27 -5
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 1/37 check-package: prepare to extend to other directories
Hello,
Quoted 31 lines · 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/*
Quoted 7 lines
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes--- utils/check-package | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 2/37 check-package: enable for arch/ and system/
In reply to Ricardo MartincoskiThese 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.
---
Changes v1 -> v2:
- no changes
--- utils/check-package | 2 ++ 1 file changed, 2 insertions(+)
utils/check-package +2 -0
@@ -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$",
Signature · 1 line
2.14.1
PATCH v2 2/37 check-package: enable for arch/ and system/
Hello,
Quoted 6 lines · 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.
Quoted 8 lines
Signed-off-by Ricardo Martincoski <[email protected]>Cc Yann E. MORIN <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 3/37 boot/*/*.mk: fix code style
In reply to Ricardo MartincoskiUse only one space before backslash.
Indent with tabs.
---
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(-)
boot/lpc32xxcdl/lpc32xxcdl.mk +4 -4
@@ -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 = \
boot/syslinux/syslinux.mk +1 -1
@@ -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
boot/uboot/uboot.mk +7 -7
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 3/37 boot/*/*.mk: fix code style
Hello,
Quoted 4 lines · Ricardo Martincoski
Use only one space before backslash.
Indent with tabs.Signed-off-by Ricardo Martincoski <[email protected]>
Quoted 8 lines
---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 4/37 check-package: enable for boot/
In reply to Ricardo MartincoskiThis 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.
---
Changes v1 -> v2:
- no changes
--- utils/check-package | 2 ++ 1 file changed, 2 insertions(+)
utils/check-package +2 -0
@@ -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$", ]))
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 4/37 check-package: enable for boot/
Hello,
Quoted 8 lines · 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.
Ignoreboot/barebox/barebox.mkas it declares a package infra and not a package itself.
Quoted 7 lines
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes--- utils/check-package | 2 ++ 1 file changed, 2 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 5/37 fs/yaffs2: fix code style
In reply to Ricardo MartincoskiRename the .mk to follow the convention. The variables inside it already use the correct name.
---
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%)fs/yaffs2/yaffs2.mk renamed from fs/yaffs2/yaffs.mk +0 -0
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 5/37 fs/yaffs2: fix code style
Hello,
Quoted 11 lines · Ricardo Martincoski
Rename the .mk to follow the convention. The variables inside it already use the correct name.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 6/37 fs/ubi: use namespace for internal variable
In reply to Ricardo MartincoskiUBINIZE_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.
---
Changes v1 -> v2:
- no changes
--- fs/ubi/ubi.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ubi/ubi.mk +3 -3
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 6/37 fs/ubi: use namespace for internal variable
Hello,
Quoted 11 lines · Ricardo Martincoski
UBINIZE_CONFIG_FILE_PATHis only used inside this file, so rename it to start withUBI_, following the namespace convention already used by common packages.Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes--- fs/ubi/ubi.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 7/37 fs/*/*.mk: fix code style
In reply to Ricardo MartincoskiThe header of the initramfs.mk file fits in one line, so rearrange it. Remove consecutive empty line.
---
Changes v1 -> v2:
- no changes
--- fs/initramfs/initramfs.mk | 3 +-- fs/iso9660/iso9660.mk | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
fs/initramfs/initramfs.mk +1 -2
@@ -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. # ################################################################################
fs/iso9660/iso9660.mk +0 -1
@@ -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 \
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 7/37 fs/*/*.mk: fix code style
Hello,
Quoted 11 lines · 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 <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 8/37 check-package: enable for fs/
In reply to Ricardo MartincoskiThe 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.
---
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(-)
utils/check-package +2 -0
@@ -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$", ]))
utils/checkpackagelib/lib_mk.py +4 -1
@@ -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 = []
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 8/37 check-package: enable for fs/
Hello,
Quoted 33 lines · 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 thefs/directory.
Ignorefs/common.mkas it declares a package infra and not a package itself. Register theROOTFS_as a valid prefix for variables.
Ignore these symbols:
-PACKAGES_PERMISSIONS_TABLE: defined either by packages through pkg-generic or by filesystem types, used byfs/common.mk;
- SUMTOOL: defined by package mtd, used by filesystem jffs2;
-TARGETS_ROOTFS: defined by filesystem types, used in the mainMakefile.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 symbolPACKAGE_UBIwould not generate a warning for the ubi filesystem neither the symbolROOTFS_MTDwould 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_UBlorPACKAGE_MIDthat would be hard to see in the code review.Signed-off-by Ricardo Martincoski <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Yann E. MORIN <[email protected]>---
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);
Quoted 4 lines
--- utils/check-package | 2 ++ utils/checkpackagelib/lib_mk.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 9/37 linux/linux-ext-*.mk: fit file header into one line
In reply to Ricardo MartincoskiMake it follow the package coding style by removing redundant info.
---
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(-)
linux/linux-ext-aufs.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux Aufs extensions # # Patch the linux kernel with aufs extension +# ################################################################################ LINUX_EXTENSIONS += aufs
linux/linux-ext-ev3dev-linux-drivers.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux ev3dev extensions # # Patch the linux kernel with ev3dev extension +# ################################################################################ LINUX_EXTENSIONS += ev3dev-linux-drivers
linux/linux-ext-fbtft.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux fbtft extensions # # Patch the linux kernel with fbtft extension +# ################################################################################ LINUX_EXTENSIONS += fbtft
linux/linux-ext-rtai.mk +1 -1
@@ -1,7 +1,7 @@ ################################################################################ -# Linux RTAI extensions # # Patch the linux kernel with RTAI extension +# ################################################################################ LINUX_EXTENSIONS += rtai
linux/linux-ext-xenomai.mk +2 -2
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 9/37 linux/linux-ext-*.mk: fit file header into one line
Hello,
Quoted 8 lines · Ricardo Martincoski
Make it follow the package coding style by removing redundant info.
Signed-off-by Ricardo Martincoski <[email protected]>Cc Christian Stewart <[email protected]>Cc David Lechner <[email protected]>---
Changes v1 -> v2:
- no changes
Quoted 7 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 10/37 linux/linux*.mk: fix code style
In reply to Ricardo MartincoskiUse only one space before backslash.
Remove consecutive empty line.
Indent with tabs.
---
Changes v1 -> v2:
- rebased
--- linux/linux-ext-rtai.mk | 4 ++-- linux/linux.mk | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-)
linux/linux-ext-rtai.mk +2 -2
@@ -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" ; \
linux/linux.mk +12 -13
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 10/37 linux/linux*.mk: fix code style
Hello,
Quoted 4 lines · Ricardo Martincoski
Use only one space before backslash.
Remove consecutive empty line.
Indent with tabs.
Quoted 8 lines
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 11/37 linux/linux.mk: use namespace for internal variables
In reply to Ricardo MartincoskiThese three symbols:KERNEL_ARCH_PATHKERNEL_DTBSKERNEL_DTS_NAME
are defined and used only inside this file, so use the LINUX_ namespace for them instead of KERNEL_.
---
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(-)
linux/linux.mk +19 -19
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 11/37 linux/linux.mk: use namespace for internal variables
Hello,
Quoted 9 lines · Ricardo Martincoski
These three symbols:
KERNEL_ARCH_PATHKERNEL_DTBSKERNEL_DTS_NAME
are defined and used only inside this file, so use theLINUX_namespace for them instead ofKERNEL_.Signed-off-by Ricardo Martincoski <[email protected]>Cc Thomas Petazzoni <[email protected]>
Quoted 8 lines
---
Changes v1 -> v2:
- use prefixLINUX_instead ofLINUX_KERNEL_(suggested by ThomasPetazzoni); - rebased; --- linux/linux.mk | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 12/37 check-package: enable for linux/
In reply to Ricardo MartincoskiThis 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.
---
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(+)
utils/check-package +1 -0
@@ -49,6 +49,7 @@ DO_CHECK_INTREE = re.compile("|".join([ "arch/", "boot/", "fs/", + "linux/", "package/", "system/", ]))
utils/checkpackagelib/lib_mk.py +3 -0
@@ -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(
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 12/37 check-package: enable for linux/
Hello,
Quoted 20 lines · 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 missingLINUX_EXT_prefix as the variables for linux extensions do not use it.
Ignore this symbol:
-LINUX_EXTENSIONS: defined by each linux extension, used bylinux/linux.mk.Signed-off-by Ricardo Martincoski <[email protected]>Cc Thomas Petazzoni <[email protected]>---
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);
Quoted 4 lines
--- utils/check-package | 1 + utils/checkpackagelib/lib_mk.py | 3 +++ 2 files changed, 4 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 13/37 toolchain: merge toolchain-common.in to Config.in
In reply to Ricardo Martincoskitoolchain-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.
---
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
docs/manual/adding-packages-directory.txt +2 -2
@@ -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)
toolchain/Config.in +470 -1
476 lines not on this page · raw message
toolchain/toolchain-common.in deleted +0 -469
469 lines not on this page · raw message
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 13/37 toolchain: merge toolchain-common.in to Config.in
Hello,
Quoted 17 lines · 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 <[email protected]>Signed-off-by Ricardo Martincoski <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Thomas Petazzoni <[email protected]>---
Changes v1 -> v2:
- new patch (suggested by Thomas Petazzoni);
Quoted 6 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 14/37 toolchain/wrapper: fix code style
In reply to Ricardo MartincoskiThe header of the .mk file fits in one line, so rearrange it to be similar to a header from a package.
---
Changes v1 -> v2:
- no changes
--- toolchain/toolchain-wrapper.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
toolchain/toolchain-wrapper.mk +5 -1
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 14/37 toolchain/wrapper: fix code style
Hello,
Quoted 6 lines · 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 <[email protected]>Cc Thomas De Schampheleire <[email protected]>Cc Thomas Petazzoni <[email protected]>
Quoted 6 lines
---
Changes v1 -> v2:
- no changes--- toolchain/toolchain-wrapper.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 15/37 toolchain/toolchain.mk: fix code style
In reply to Ricardo MartincoskiRearrange 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.
---
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(-)
toolchain/toolchain.mk +14 -10
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 15/37 toolchain/toolchain.mk: fix code style
Hello,
Quoted 13 lines · 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_LIBSis only used inside this file, so rename it to start withTOOLCHAIN_, following the namespace convention already used by packages.Rename the hook
COPY_GCONV_LIBStoTOOLCHAIN_GLIBC_COPY_GCONV_LIBSfollowing the convention used for hooks in packages.Signed-off-by Ricardo Martincoski <[email protected]>Cc Thomas De Schampheleire <[email protected]>Cc Thomas Petazzoni <[email protected]>
Quoted 8 lines
---
Changes v1 -> v2:
- alsoCOPY_GCONV_LIBS->TOOLCHAIN_GLIBC_COPY_GCONV_LIBS(suggestedby 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 16/37 check-package: enable for toolchain/
In reply to Ricardo MartincoskiThe 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.
---
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(+)
utils/check-package +3 -0
@@ -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$", ]))
utils/checkpackagelib/lib_mk.py +1 -0
@@ -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",
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 16/37 check-package: enable for toolchain/
Hello,
Quoted 24 lines · 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.mkas it declares a package infra and not a package itself. Ignoretoolchain/helpers.mkas it contains only helper functions.Signed-off-by Ricardo Martincoski <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Romain Naour <[email protected]>Cc Thomas Petazzoni <[email protected]>---
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);
Quoted 4 lines
--- utils/check-package | 3 +++ utils/checkpackagelib/lib_mk.py | 1 + 2 files changed, 4 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 17/37 check-package: enable for Config.in* in base dir
In reply to Ricardo MartincoskiThese files can benefit from this script to prevent common mistakes when submitting patches.
---
Changes v1 -> v2:
- rebase after toolchain-common.in was merged to Config.in
--- utils/check-package | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
utils/check-package +2 -1
@@ -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/",
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 17/37 check-package: enable for Config.in* in base dir
Hello,
Quoted 6 lines · Ricardo Martincoski
These files can benefit from this script to prevent common mistakes when submitting patches.
Signed-off-by Ricardo Martincoski <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Arnout Vandecappelle <[email protected]>
Quoted 6 lines
---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 18/37 docs/manual: add check-package to "Tips and tricks"
In reply to Ricardo MartincoskiAnd add two references to it: in "Submitting patches" and in "Adding new packages to Buildroot" sections.
---
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(+)
docs/manual/adding-packages-tips.txt +31 -0
@@ -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
docs/manual/adding-packages.txt +2 -0
@@ -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[]
docs/manual/contribute.txt +4 -0
@@ -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_
Signature · 1 line
2.14.1
PATCH v2 18/37 docs/manual: add check-package to "Tips and tricks"
Hello,
docs/manual/adding-packages-tips.txt using the following rules: · line 44
Quoted 10 lines · Ricardo Martincoski
+[[check-package]]
+==== How to check the coding styledocs/manual/adding-packages-tips.txt +8
-0+ +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 ?
Quoted 1 line
+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.
Quoted 13 lines
docs/manual/adding-packages-tips.txt +5
-0+ +---- +$ check-package -b /path/to/br2-ext-tree/package/my-package/* +---- + [[testing-package]] ==== How to test your packagedocs/manual/adding-packages.txt +0
-0
docs/manual/adding-packages.txt tuning their configuration. · line 15
Quoted 4 lines
docs/manual/adding-packages.txt +1
-0@@ -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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 18/37 docs/manual: add check-package to "Tips and tricks"
Hello,
Thank you for your review.
Quoted 8 lines · Thomas Petazzoni
docs/manual/adding-packages-tips.txt using the following rules: · line 44
Quoted 2 lines · Ricardo Martincoski
docs/manual/adding-packages-tips.txt +2
-0+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-*.mkis 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.
Quoted 4 lines
Quoted 1 line
+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.
Quoted 8 lines
docs/manual/adding-packages.txt tuning their configuration. · line 15
Quoted 6 lines
+++
b/docs/manual/adding-packages.txtdocs/manual/adding-packages.txt +1
-0@@ -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
PATCH v2 18/37 docs/manual: add check-package to "Tips and tricks"
Hello,
Quoted 6 lines · Ricardo Martincoski
Quoted 4 lines
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-*.mkis not checked ? Or that it doesn't check the $(eval $(autotools-package)) line at the end of every package ?I meant
package/pkg-*.mkand similar files.
OK, so "infra types" is not really the right word to express that.
Quoted 5 lines
"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!
Quoted 5 lines
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?
Quoted 12 lines
"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.
"""
Quoted 13 lines
Quoted 4 lines
Quoted 1 line
+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.Quoted 5 lines
Quoted 5 lines
+++
b/docs/manual/adding-packages.txtdocs/manual/adding-packages.txt +0
-0@@ -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[]
Quoted 5 lines
Quoted 3 lines
docs/manual/adding-packages.txt tuning their configuration. · line 15
Quoted 1 line
docs/manual/adding-packages.txt +1
-0+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 :)
Quoted 6 lines
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 18/37 docs/manual: add check-package to "Tips and tricks"
Hello,
Quoted 10 lines · Thomas Petazzoni
Quoted 6 lines · Ricardo Martincoski
Quoted 4 lines
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-*.mkis not checked ? Or that it doesn't check the $(eval $(autotools-package)) line at the end of every package ?I meant
package/pkg-*.mkand similar files.OK, so "infra types" is not really the right word to express that.
OK.
Quoted 6 lines
Quoted 2 lines
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 inI 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!
Quoted 4 lines
"""
It does not check the files defining the package infrastructures and some other files containing similar common code.
"""
Much better. Thanks.
Quoted 5 lines
Quoted 3 lines
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
PATCH v3 1/1 docs/manual: add check-package to "Tips and tricks"
In reply to Ricardo MartincoskiAnd add two references to it: in "Submitting patches" and in "Adding new packages to Buildroot" sections.
---
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(-)
docs/manual/adding-packages-tips.txt +33 -0
@@ -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
docs/manual/adding-packages.txt +3 -2
@@ -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[]
docs/manual/contribute.txt +4 -0
@@ -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_
Signature · 1 line
2.14.1
PATCH v3 1/1 docs/manual: add check-package to "Tips and tricks"
Hello,
Review
Quoted 4 lines · Ricardo Martincoski
And add two references to it: in "Submitting patches" and in "Adding new
(quoted diff) +2
-0+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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 19/37 */Config.in*: remove consecutive empty lines
In reply to Ricardo Martincoski---
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(-)
Config.in +0 -1
@@ -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"
Config.in.legacy +0 -1
@@ -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
arch/Config.in.mips +0 -1
@@ -115,7 +115,6 @@ config BR2_mips_p6600 select BR2_MIPS_CPU_MIPS64R6 endchoice - choice prompt "Target ABI" depends on BR2_mips64 || BR2_mips64el
boot/barebox/barebox/Config.in +0 -1
@@ -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
boot/syslinux/Config.in +0 -1
@@ -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
fs/jffs2/Config.in +0 -1
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 19/37 */Config.in*: remove consecutive empty lines
Hello,
Quoted 4 lines · Ricardo Martincoski
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes
Quoted 8 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 20/37 Config.in*: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
---
Changes v1 -> v2:
- no changes
--- Config.in | 8 ++++---- Config.in.legacy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Config.in +4 -4
@@ -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
Config.in.legacy +1 -1
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 20/37 Config.in*: fix attributes order
Hello,
Quoted 10 lines · Ricardo Martincoski
... to follow the convention: type, default, depends on, select, help.
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes--- Config.in | 8 ++++---- Config.in.legacy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 21/37 arch/Config.in*: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
---
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(-)
arch/Config.in +1 -1
@@ -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"
arch/Config.in.arc +1 -1
@@ -1,7 +1,7 @@ choice prompt "Target CPU" - depends on BR2_arc default BR2_arc770d + depends on BR2_arc help Specific CPU to use
arch/Config.in.arm +2 -2
@@ -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
arch/Config.in.bfin +1 -1
@@ -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
arch/Config.in.m68k +1 -1
@@ -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
arch/Config.in.mips +4 -4
@@ -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:
arch/Config.in.powerpc +2 -2
@@ -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
arch/Config.in.sh +1 -1
@@ -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
arch/Config.in.sparc +1 -1
@@ -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
arch/Config.in.x86 +15 -15
@@ -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
arch/Config.in.xtensa +4 -4
@@ -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"
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 21/37 arch/Config.in*: fix attributes order
Hello,
Quoted 6 lines · Ricardo Martincoski
... to follow the convention: type, default, depends on, select, help.
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes
Quoted 13 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 22/37 boot/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
---
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(-)
boot/at91bootstrap/Config.in +1 -1
@@ -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:
boot/at91bootstrap3/Config.in +1 -1
@@ -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:
boot/at91dataflashboot/Config.in +1 -1
@@ -1,3 +1,3 @@ config BR2_TARGET_AT91DATAFLASHBOOT - depends on BR2_arm926t bool "AT91 DataFlashBoot" + depends on BR2_arm926t
boot/lpc32xxcdl/Config.in +1 -1
@@ -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
boot/mxs-bootlets/Config.in +4 -4
@@ -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
boot/uboot/Config.in +6 -6
@@ -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.
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 22/37 boot/*/Config.in: fix attributes order
Hello,
Quoted 6 lines · Ricardo Martincoski
... to follow the convention: type, default, depends on, select, help.
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes
Quoted 8 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 23/37 fs/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
---
Changes v1 -> v2:
- no changes
--- fs/jffs2/Config.in | 6 +++--- fs/tar/Config.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/jffs2/Config.in +3 -3
@@ -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
fs/tar/Config.in +1 -1
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 23/37 fs/*/Config.in: fix attributes order
Hello,
Quoted 10 lines · Ricardo Martincoski
... to follow the convention: type, default, depends on, select, help.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 24/37 package/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
---
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(-)
package/mono/Config.in +1 -1
@@ -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"
package/php/Config.in +4 -4
@@ -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
package/systemd/Config.in +2 -2
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 24/37 package/*/Config.in: fix attributes order
Hello,
Quoted 11 lines · Ricardo Martincoski
... to follow the convention: type, default, depends on, select, help.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 25/37 toolchain/*/Config.in: fix attributes order
In reply to Ricardo Martincoski... to follow the convention: type, default, depends on, select, help.
---
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(-)
toolchain/Config.in +1 -1
@@ -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"
toolchain/toolchain-buildroot/Config.in +1 -1
@@ -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.
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +6 -6
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 25/37 toolchain/*/Config.in: fix attributes order
Hello,
Quoted 11 lines · Ricardo Martincoski
... to follow the convention: type, default, depends on, select, help.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 26/37 Config.in*: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
Changes v1 -> v2:
- no changes
--- Config.in | 27 +++--- Config.in.legacy | 289 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 176 insertions(+), 140 deletions(-)
Config.in +14 -13
@@ -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
Config.in.legacy +162 -127
695 lines not on this page · raw message
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 26/37 Config.in*: re-wrap help text
Hello,
Quoted 10 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes--- Config.in | 27 +++--- Config.in.legacy | 289 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 176 insertions(+), 140 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 27/37 arch/Config.in*: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
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(-)
arch/Config.in +53 -44
@@ -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"
arch/Config.in.mips +2 -2
@@ -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
arch/Config.in.xtensa +6 -6
@@ -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"
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 27/37 arch/Config.in*: re-wrap help text
Hello,
Quoted 11 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 28/37 boot/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
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(-)
boot/at91bootstrap/Config.in +4 -2
@@ -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
boot/at91bootstrap3/Config.in +6 -4
@@ -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
boot/uboot/Config.in +22 -21
85 lines not on this page · raw message
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 28/37 boot/*/Config.in: re-wrap help text
Hello,
Quoted 11 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 29/37 fs/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
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(-)
fs/cpio/Config.in +3 -3
@@ -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
fs/ext2/Config.in +12 -10
@@ -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"
fs/initramfs/Config.in +2 -1
@@ -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
fs/jffs2/Config.in +9 -7
@@ -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
fs/ubi/Config.in +6 -5
@@ -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.
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 29/37 fs/*/Config.in: re-wrap help text
Hello,
Quoted 6 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes
Quoted 7 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 30/37 linux/Config.*: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
Changes v1 -> v2:
- no changes
--- linux/Config.ext.in | 15 +++++++++------ linux/Config.in | 43 +++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 26 deletions(-)
linux/Config.ext.in +9 -6
@@ -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
linux/Config.in +23 -20
86 lines not on this page · raw message
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 30/37 linux/Config.*: re-wrap help text
Hello,
Quoted 10 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 31/37 system/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
Changes v1 -> v2:
- no changes
--- system/Config.in | 122 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 58 deletions(-)
system/Config.in +64 -58
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 31/37 system/Config.in: re-wrap help text
Hello,
Quoted 9 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
Changes v1 -> v2:
- no changes--- system/Config.in | 122 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 58 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 32/37 toolchain/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
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(-)
toolchain/Config.in +6 -4
@@ -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"
toolchain/toolchain-external/Config.in +6 -5
@@ -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
toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +4 -2
@@ -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'
toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +4 -2
@@ -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'
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 32/37 toolchain/*/Config.in: re-wrap help text
Hello,
Quoted 8 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Arnout Vandecappelle <[email protected]>---
Changes v1 -> v2:
- rebase after toolchain-common.in was merged to Config.in
Quoted 6 lines
--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 33/37 qemu/Config.in.host: fix overindented depends on
In reply to Ricardo MartincoskiDo the same as used in all other Config.in files and use only one tab.
---
Changes v1 -> v2:
- no changes
--- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/qemu/Config.in.host +1 -1
@@ -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"
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 33/37 qemu/Config.in.host: fix overindented depends on
Hello,
Quoted 10 lines · Ricardo Martincoski
Do the same as used in all other Config.in files and use only one tab.
Signed-off-by Ricardo Martincoski <[email protected]>Cc Adam Duskett <[email protected]>---
Changes v1 -> v2:
- no changes--- package/qemu/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 34/37 package/*/Config.in: re-wrap help text
In reply to Ricardo Martincoski... to follow the convention <tab><2 spaces><62 chars>.
---
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(-)
package/python-functools32/Config.in +2 -2
@@ -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
package/python-jsonmodels/Config.in +2 -2
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 34/37 package/*/Config.in: re-wrap help text
Hello,
Quoted 6 lines · Ricardo Martincoski
... to follow the convention <tab><2 spaces><62 chars>.
Signed-off-by Ricardo Martincoski <[email protected]>---
These packages were generated by scanpypi, so let's fix the tool in the next patch.
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 35/37 scanpypi: generate help text compliant to check-package
In reply to Ricardo MartincoskiEach line must fit in <tab><2 spaces><62 chars>.
The default width for textwrap.wrap() is 70, so explicit set it to 62.
---
Changes v1 -> v2:
- no changes
--- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
utils/scanpypi +1 -1
@@ -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 ')
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 35/37 scanpypi: generate help text compliant to check-package
Hello,
Quoted 11 lines · Ricardo Martincoski
Each line must fit in <tab><2 spaces><62 chars>.
The default width fortextwrap.wrap()is 70, so explicit set it to 62.Signed-off-by Ricardo Martincoski <[email protected]>Cc Yegor Yefremov <[email protected]>---
Changes v1 -> v2:
- no changes--- utils/scanpypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 36/37 utils/checkpackagelib: exclude four files from Config.in indentation check
In reply to Ricardo MartincoskiFrom: Thomas Petazzoni <[email protected]>
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.
[Ricardo: rebase patch to use relative paths passed by the main script,
fix flake8 warnings, add package/Config.* to the list]
---
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(+)
utils/checkpackagelib/lib_config.py +6 -0
@@ -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]
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 36/37 utils/checkpackagelib: exclude four files from Config.in indentation check
Hello,
Quoted 9 lines · Ricardo Martincoski
From: Thomas Petazzoni <[email protected]>
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.
Quoted 8 lines
Signed-off-by Thomas Petazzoni <[email protected]>[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 <[email protected]>Cc Yann E. MORIN <[email protected]>---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 37/37 .gitlab-ci.yml: extend check-package test to Config.* files
In reply to Ricardo MartincoskiNow 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.
---
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(-)
.gitlab-ci.yml +2 -1
@@ -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
.gitlab-ci.yml.in +2 -1
@@ -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
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH v2 37/37 .gitlab-ci.yml: extend check-package test to Config.* files
Hello,
Quoted 7 lines · 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 <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Thomas Petazzoni <[email protected]>
Quoted 7 lines
---
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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com