lkml.org 
[lkml]   [2005]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] "PREEMPT" in UTS_VERSION
    On Wed, Feb 09, 2005 at 10:40:11AM -0800, Matt Mackall wrote:
    > Add PREEMPT to UTS_VERSION where enabled as is done for SMP to make
    > preempt kernels easily identifiable.
    I have the following patch in my tree now. It has the advantage that
    compile.h gets updated when you change the PREEMPT setting.

    How many scripts parsing the output of `uname -v` will break because of
    this?

    Sam

    ===== init/Makefile 1.28 vs edited =====
    --- 1.28/init/Makefile 2005-01-05 03:48:07 +01:00
    +++ edited/init/Makefile 2005-03-14 21:30:13 +01:00
    @@ -25,4 +25,5 @@

    include/linux/compile.h: FORCE
    @echo ' CHK $@'
    - @$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
    + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
    + "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(CFLAGS)"
    ===== scripts/mkcompile_h 1.17 vs edited =====
    --- 1.17/scripts/mkcompile_h 2003-09-10 08:41:43 +02:00
    +++ edited/scripts/mkcompile_h 2005-03-14 21:43:50 +01:00
    @@ -1,7 +1,8 @@
    TARGET=$1
    ARCH=$2
    SMP=$3
    -CC=$4
    +PREEMPT=$4
    +CC=$5

    # If compile.h exists already and we don't own autoconf.h
    # (i.e. we're not the same user who did make *config), don't
    @@ -26,8 +27,10 @@


    UTS_VERSION="#$VERSION"
    -if [ -n "$SMP" ] ; then UTS_VERSION="$UTS_VERSION SMP"; fi
    -UTS_VERSION="$UTS_VERSION `LC_ALL=C LANG=C date`"
    +CONFIG_FLAGS=""
    +if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
    +if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
    +UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS `LC_ALL=C LANG=C date`"

    # Truncate to maximum length

    @@ -37,7 +40,8 @@
    # Generate a temporary compile.h

    ( echo /\* This file is auto generated, version $VERSION \*/
    -
    + if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi
    +
    echo \#define UTS_MACHINE \"$ARCH\"

    echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:11    [W:0.100 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site