aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ricardo Martincoski <ricardo.martincoski@gmail.com>2018-04-01 02:08:21 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-01 08:52:45 +0200
commit0c8367363821c2417443082f076198f02afcdb4e (patch)
treef8447d568583427616d914f3768d0123eec69f9d
parent4a417b75091ac3d6136bc942ab54003c5299671d (diff)
downloadbuildroot-0c8367363821c2417443082f076198f02afcdb4e.tar.gz
buildroot-0c8367363821c2417443082f076198f02afcdb4e.tar.bz2
check-package: enable for fs/
The filesystem types can benefit from this script to prevent common mistakes when submitting patches. In order to accomplish this: Do not ignore anymore files from the fs/ directory. Ignore fs/common.mk as it declares a package infra and not a package itself. Register the ROOTFS_ as a valid prefix for variables. Ignore these symbols: - PACKAGES_PERMISSIONS_TABLE: defined either by packages through pkg-generic or by filesystem types, used by fs/common.mk; - SUMTOOL: defined by package mtd, used by filesystem jffs2; - TARGETS_ROOTFS: defined by filesystem types, used in the main Makefile. Keep using loose checks that warn about common mistakes while keep the code simple. As a consequence the check functions do not differentiate between packages and filesystems so the symbol PACKAGE_UBI would not generate a warning for the ubi filesystem neither the symbol ROOTFS_MTD would generate a warning for the mtd package. But those kind of mistakes are not common and are obvious in the code review, unlike typos i.e. ROOTFS_UBl or PACKAGE_MID that would be hard to see in the code review. Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rwxr-xr-xutils/check-package2
-rw-r--r--utils/checkpackagelib/lib_mk.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/utils/check-package b/utils/check-package
index 48ce956443..4c9eea0534 100755
--- a/utils/check-package
+++ b/utils/check-package
@@ -48,11 +48,13 @@ CONFIG_IN_FILENAME = re.compile("/Config\.\S*$")
DO_CHECK_INTREE = re.compile("|".join([
"arch/",
"boot/",
+ "fs/",
"package/",
"system/",
]))
DO_NOT_CHECK_INTREE = re.compile("|".join([
"boot/barebox/barebox\.mk$",
+ "fs/common\.mk$",
"package/doc-asciidoc\.mk$",
"package/pkg-\S*\.mk$",
]))
diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py
index cfd4d05117..58de4fd3cb 100644
--- a/utils/checkpackagelib/lib_mk.py
+++ b/utils/checkpackagelib/lib_mk.py
@@ -165,8 +165,11 @@ class TypoInPackageVariable(_CheckFunction):
"LUA_RUN",
"MKFS_JFFS2",
"MKIMAGE_ARCH",
+ "PACKAGES_PERMISSIONS_TABLE",
"PKG_CONFIG_HOST_BINARY",
+ "SUMTOOL",
"TARGET_FINALIZE_HOOKS",
+ "TARGETS_ROOTFS",
"XTENSA_CORE_NAME"]))
PACKAGE_NAME = re.compile("/([^/]+)\.mk")
VARIABLE = re.compile("^([A-Z0-9_]+_[A-Z0-9_]+)\s*(\+|)=")
@@ -177,7 +180,7 @@ class TypoInPackageVariable(_CheckFunction):
# linux tools do not use LINUX_TOOL_ prefix for variables
package = package.replace("LINUX_TOOL_", "")
self.package = package
- self.REGEX = re.compile("^(HOST_)?({}_[A-Z0-9_]+)".format(package))
+ self.REGEX = re.compile("^(HOST_|ROOTFS_)?({}_[A-Z0-9_]+)".format(package))
self.FIND_VIRTUAL = re.compile(
"^{}_PROVIDES\s*(\+|)=\s*(.*)".format(package))
self.virtual = []