* [Buildroot] [git commit branch/2018.02.x] utils/diffconfig: remove BR2_* prefix restriction
@ 2018-10-24 12:48 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2018-10-24 12:48 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=994ab8b2f5a8e7890559967306cbf86c1f5e9e53
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2018.02.x
The utils/diffconfig script works only on variables with the BR2_
prefix. This is OK for Buildroot [def]configs since this is the prefix
for all user-facing variables, but it prevents using the same script
to compare configs from kconfig-based packages.
Remove the BR2_ restriction, allowing usage such as:
./utils/diffconfig \
board/qemu/xtensa-lx60/linux.config \
board/qemu/xtensa-lx60/linux-nommu.config
Signed-off-by: Marcel Patzlaff <m.patzlaff@pilz.de>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bf9ccfc37b6594c41163eb235384abb4771a6a1c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
utils/diffconfig | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/utils/diffconfig b/utils/diffconfig
index 5862a62f25..f1af23cfce 100755
--- a/utils/diffconfig
+++ b/utils/diffconfig
@@ -28,14 +28,14 @@ If no config files are specified, .config and .config.old are used.
Example usage:
$ diffconfig .config config-with-some-changes
--LINUX_KERNEL_INTREE_DTS_NAME "vexpress-v2p-ca9"
- LINUX_KERNEL_DTS_SUPPORT y -> n
- LINUX_KERNEL_USE_INTREE_DTS y -> n
- PACKAGE_DFU_UTIL n -> y
- PACKAGE_LIBUSB n -> y
- TARGET_GENERIC_HOSTNAME "buildroot" -> "Tuxie"
- TARGET_GENERIC_ISSUE "Welcome to Buildroot" -> "Welcome to CustomBoard"
-+PACKAGE_LIBUSB_COMPAT n
+-BR2_LINUX_KERNEL_INTREE_DTS_NAME "vexpress-v2p-ca9"
+ BR2_LINUX_KERNEL_DTS_SUPPORT y -> n
+ BR2_LINUX_KERNEL_USE_INTREE_DTS y -> n
+ BR2_PACKAGE_DFU_UTIL n -> y
+ BR2_PACKAGE_LIBUSB n -> y
+ BR2_TARGET_GENERIC_HOSTNAME "buildroot" -> "Tuxie"
+ BR2_TARGET_GENERIC_ISSUE "Welcome to Buildroot" -> "Welcome to CustomBoard"
++BR2_PACKAGE_LIBUSB_COMPAT n
""")
sys.exit(0)
@@ -44,12 +44,14 @@ Example usage:
def readconfig(config_file):
d = {}
for line in config_file:
- line = line[:-1]
- if line[:4] == "BR2_":
- name, val = line[4:].split("=", 1)
- d[name] = val
+ line = line.strip()
+ if len(line) == 0:
+ continue
if line[-11:] == " is not set":
- d[line[6:-11]] = "n"
+ d[line[2:-11]] = "n"
+ elif line[0] != "#":
+ name, val = line.split("=", 1)
+ d[name] = val
return d
def print_config(op, config, value, new_value):
@@ -58,9 +60,9 @@ def print_config(op, config, value, new_value):
if merge_style:
if new_value:
if new_value=="n":
- print("# BR2_%s is not set" % config)
+ print("# %s is not set" % config)
else:
- print("BR2_%s=%s" % (config, new_value))
+ print("%s=%s" % (config, new_value))
else:
if op=="-":
print("-%s %s" % (config, value))
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-10-24 12:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-24 12:48 [Buildroot] [git commit branch/2018.02.x] utils/diffconfig: remove BR2_* prefix restriction Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.