Commit 33eedb00 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

tools: ynl-gen: record extra args for regen 



ynl-regen needs to know the arguments used to generate a file.
Record excluded ops and, while at it, user headers.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 008bcd68

tools/net/ynl/ynl-gen-c.py

+5 −0
Original line number Diff line number Diff line
@@ -2281,6 +2281,11 @@ def main(): 
    cw.p("/* Do not edit directly, auto-generated from: */")

    cw.p(f"/*\t{spec_kernel} */")

    cw.p(f"/* YNL-GEN {args.mode} {'header' if args.header else 'source'} */")

    if args.exclude_op or args.user_header:

        line = ''

        line += ' --user-header '.join([''] + args.user_header)

        line += ' --exclude-op '.join([''] + args.exclude_op)

        cw.p(f'/* YNL-ARG{line} */')

    cw.nl()



    if args.mode == 'uapi':

tools/net/ynl/ynl-regen.sh

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ for f in $files; do 
    # params:     0       1      2     3

    #         $YAML YNL-GEN kernel $mode

    params=( $(git grep -B1 -h '/\* YNL-GEN' $f | sed 's@/\*\(.*\)\*/@\1@') )

    args=$(sed -n 's@/\* YNL-ARG \(.*\) \*/@\1@p' $f)



    if [ $f -nt ${params[0]} -a -z "$force" ]; then

	echo -e "\tSKIP $f"
@@ -26,5 +27,6 @@ for f in $files; do 
    fi



    echo -e "\tGEN ${params[2]}\t$f"

    $TOOL --mode ${params[2]} --${params[3]} --spec $KDIR/${params[0]} -o $f

    $TOOL --mode ${params[2]} --${params[3]} --spec $KDIR/${params[0]} \

	  $args -o $f

done