On Mon, Jul 26, 2021 at 8:01 PM Lee Jones <lee.jones@xxxxxxxxxx> wrote: > > On Sat, 24 Jul 2021, 14:57 Masahiro Yamada, <masahiroy@xxxxxxxxxx> wrote: >> >> On Thu, Jul 22, 2021 at 7:13 PM Lee Jones <lee.jones@xxxxxxxxxx> wrote: >> > >> > Masahiro, >> > >> > On Fri, 21 May 2021 at 10:29, Lee Jones <lee.jones@xxxxxxxxxx> wrote: >> >> >> >> On Wed, 2 Dec 2020 at 15:13, Matthias Maennich <maennich@xxxxxxxxxx> wrote: >> >>> >> >>> When merging configuration fragments, it might be of interest to >> >>> identify mismatches (redefinitions) programmatically. Hence add the >> >>> option -s (strict mode) to instruct merge_config.sh to bail out in >> >>> case any redefinition has been detected. >> >>> >> >>> With strict mode, warnings are emitted as before, but the script >> >>> terminates with rc=1. If -y is set to define "builtin having >> >>> precedence over modules", fragments are still allowed to set =m (while >> >>> the base config has =y). Strict mode will tolerate that as demotions >> >>> from =y to =m are ignored when setting -y. >> >>> >> >>> Cc: Masahiro Yamada <masahiroy@xxxxxxxxxx> >> >>> Signed-off-by: Matthias Maennich <maennich@xxxxxxxxxx> >> >>> --- >> >>> scripts/kconfig/merge_config.sh | 15 +++++++++++++++ >> >>> 1 file changed, 15 insertions(+) >> >> >> >> >> >> Reviewed-by: Lee Jones <lee.jones@xxxxxxxxxx> >> > >> > >> > Any idea what's holding this up please? >> >> Simply because I hate this script. >> >> >> merge_config.sh itself is a bad hack. >> I do not like to extend it further. > > > Sorry you feel that way Masahiro. I do not know why merge_config was implemented as a separate shell script while all the other functions were contained in the kconfig binary. Anyway... >> Not only this one. >> I saw more people with >> "hey, I came up with a new option for merge_config.sh" >> to do whatever they like to do. >> >> However, it might be too late anyway. >> >> >> So, I can merge this patch if people believe >> it is useful. > > > I know of multiple entities who make good use of the script and this extension. > > My vote is to merge it, but ultimately this is your train set. OK, I decided to not care about it too much. Now applied to linux-kbuild. Thanks. -- Best Regards Masahiro Yamada
