lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[134/165] kbuild: Fix GNU make v3.80 compatibility
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    Content-Length: 1190
    Lines: 33

    From: Kevin Cernekee <cernekee@gmail.com>

    commit 43f67c98161c65f1b2e3af3a9ce6741850072c06 upstream.

    According to Documentation/Changes, the kernel should be buildable with
    GNU make 3.80+. Commit 88d7be031f9f975bb3f50a0b5ef3796a671e7edf (kbuild:
    Use a single clean rule for kernel and external modules) introduced the
    "$(or" construct, which requires make 3.81. This causes "make clean" to
    malfunction when it is used with external modules.

    Replace "$(or" with an equivalent "$(if" expression, to restore backward
    compatibility.

    Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -1374,7 +1374,7 @@ endif # KBUILD_EXTMOD
    clean: $(clean-dirs)
    $(call cmd,rmdirs)
    $(call cmd,rmfiles)
    - @find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
    + @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
    \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
    -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
    -o -name '*.symtypes' -o -name 'modules.order' \



    \
     
     \ /
      Last update: 2011-06-01 10:37    [W:0.030 / U:121.516 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site