lkml.org 
[lkml]   [2018]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] kbuild: move include/config/ksym/* to include/ksym/*
    Date
    The idea of using fixdep was inspired by Kconfig, but autoksyms
    is unrelated to Kconfig. So, I want to get those touched files
    out of include/config/. The directory include/ksym/ is removed
    by "make clean". We do not need to keep it for external module
    building.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    ---

    .gitignore | 1 +
    Makefile | 2 +-
    scripts/Kbuild.include | 2 +-
    scripts/adjust_autoksyms.sh | 2 +-
    scripts/basic/fixdep.c | 8 ++++----
    5 files changed, 8 insertions(+), 7 deletions(-)

    diff --git a/.gitignore b/.gitignore
    index 1be78fd..85bcc26 100644
    --- a/.gitignore
    +++ b/.gitignore
    @@ -87,6 +87,7 @@ modules.builtin
    #
    include/config
    include/generated
    +include/ksym
    arch/*/include/generated

    # stgit generated dirs
    diff --git a/Makefile b/Makefile
    index e60b16f..1dab647 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -1327,7 +1327,7 @@ endif # CONFIG_MODULES
    # make distclean Remove editor backup files, patch leftover files and the like

    # Directories & files removed with 'make clean'
    -CLEAN_DIRS += $(MODVERDIR)
    +CLEAN_DIRS += $(MODVERDIR) include/ksym

    # Directories & files removed with 'make mrproper'
    MRPROPER_DIRS += include/config usr/include include/generated \
    diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
    index 065324a..045971e 100644
    --- a/scripts/Kbuild.include
    +++ b/scripts/Kbuild.include
    @@ -368,7 +368,7 @@ ksym_dep_filter = \
    $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \
    boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;; \
    *) echo "Don't know how to preprocess $(1)" >&2; false ;; \
    - esac | tr ";" "\n" | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p'
    + esac | tr ";" "\n" | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/\1/p'

    cmd_and_fixdep = \
    $(echo-cmd) $(cmd_$(1)); \
    diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh
    index a52210b..7bb3618 100755
    --- a/scripts/adjust_autoksyms.sh
    +++ b/scripts/adjust_autoksyms.sh
    @@ -81,7 +81,7 @@ sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u |
    sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' | tr "A-Z_" "a-z/" |
    while read sympath; do
    if [ -z "$sympath" ]; then continue; fi
    - depfile="include/config/ksym/${sympath}.h"
    + depfile="include/ksym/${sympath}.h"
    mkdir -p "$(dirname "$depfile")"
    touch "$depfile"
    echo $((count += 1))
    diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
    index 449b68c..f387538 100644
    --- a/scripts/basic/fixdep.c
    +++ b/scripts/basic/fixdep.c
    @@ -113,11 +113,11 @@ static void usage(void)
    /*
    * Print out a dependency path from a symbol name
    */
    -static void print_config(const char *m, int slen)
    +static void print_dep(const char *m, int slen, const char *dir)
    {
    int c, i;

    - printf(" $(wildcard include/config/");
    + printf(" $(wildcard %s/", dir);
    for (i = 0; i < slen; i++) {
    c = m[i];
    if (c == '_')
    @@ -140,7 +140,7 @@ static void do_extra_deps(void)
    fprintf(stderr, "fixdep: bad data on stdin\n");
    exit(1);
    }
    - print_config(buf, len - 1);
    + print_dep(buf, len - 1, "include/ksym");
    }
    }

    @@ -208,7 +208,7 @@ static void use_config(const char *m, int slen)
    return;

    define_config(m, slen, hash);
    - print_config(m, slen);
    + print_dep(m, slen, "include/config");
    }

    /* test if s ends in sub */
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-03-14 17:46    [W:2.598 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site