kconfig: Restore missing custom changes + add patches
authorPetr Vorel <petr.vorel@gmail.com>
Sun, 28 Oct 2018 23:09:51 +0000 (00:09 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 30 Oct 2018 19:58:09 +0000 (20:58 +0100)
commita3366b270562f42723a3b8032f73bb03b541d113
tree07ca8db8c4982060f0e05438d7d929567b89e1d5
parent775087fab0da126ebd0c2c094d1cbb7274898af5
kconfig: Restore missing custom changes + add patches

Commit 6eacea5ae0 accidentally removed these changes in merge_config.sh:
0f56304521 ("merge_config.sh: create temporary files in /tmp")
28fac3973b ("merge_config.sh: add br2-external support")

Changes were lost because commits just changed files, but didn't add patches.
Therefore not only restore our changes, but also add (updated) patches.

Missing 0f56304521 caused breaking merge_config.sh when used in out of
tree build:
$ make -C buildroot O=$PWD/output defconfig
...
$ cd output
$ echo 'BR2_TARGET_GENERIC_HOSTNAME="test"' > test.frag
$ ../buildroot/support/kconfig/merge_config.sh .config test.frag
Using .config as base
Merging test.frag
umask 0022 && make -C /home/test/buildroot O=/home/test/output/. alldefconfig
  GEN     /home/test/output/Makefile
*** Can't read seed configuration "./.tmp.config.qIcpASpUyh"!
make[1]: *** [Makefile:925: alldefconfig] Error 1
make: *** [Makefile:16: _all] Error 2

Fixes: 6eacea5ae0 support/kconfig: bump to kconfig from Linux 4.17-rc2
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Reported-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
support/kconfig/merge_config.sh
support/kconfig/patches/18-merge-config.sh-create-temporary-files-in-tmp.patch [new file with mode: 0644]
support/kconfig/patches/19-merge_config.sh-add-br2-external-support.patch [new file with mode: 0644]
support/kconfig/patches/series