Hi all. Kernel update/config changes synchronization sometimes becomes a headache due to non-appliet patches (which are context-dependent, but really kernel config isn't context-dependent) and so on. So I wrote tiny diff/patch utilities specially for kernel config files.
confdiff.py matches two kernel configs, and wrote diff to stdout (options are sorted by sections). confpatch.py applies generated diff to basic config file (options marked for removal are removed, options marked for change are replaced, and new options are added at the bottom of file), result is written to stdout, also it warns for missed source options/options with different value (but these options are replaced in any way). I added these utils to 4.1 branch, and it looks like they're working ok (at least - kernel configs after 'make oldconfig' becomes similar to source configs from which cdiff was created). As result, diff files size is decreased at least by twice (or even more). Resulting cdiff looks like that part - it's much easier to control options changing than for regular diff: # # PCI host controller drivers # -CONFIG_ISA=y +# CONFIG_ISA is not set -CONFIG_EISA=y -CONFIG_EISA_VLB_PRIMING=y -CONFIG_EISA_PCI_EISA=y -CONFIG_EISA_VIRTUAL_ROOT=y -CONFIG_EISA_NAMES=y -# CONFIG_ALIX is not set +CONFIG_ALIX=y -CONFIG_NET5501=y +# CONFIG_NET5501 is not set -CONFIG_GEOS=y +# CONFIG_GEOS is not set # # PC-card bridges # -CONFIG_I82365=m -CONFIG_TCIC=m -CONFIG_PCMCIA_PROBE=y -CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI is not set -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -CONFIG_HOTPLUG_PCI_ACPI=y -# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set -# CONFIG_HOTPLUG_PCI_CPCI is not set -# CONFIG_HOTPLUG_PCI_SHPC is not set -CONFIG_X86_SYSFB=y +# CONFIG_X86_SYSFB is not set # # Networking options # -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set ------------------------------------------------------------------------------ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
