lkml.org 
[lkml]   [2011]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] kbuild: Append RPM release to $KERNELRELEASE
    Date
    Provide the same consistency as distributor kernels.
    uname -r matches RPM name (includes the release)

    Glossary:

    KERNELRELEASE = what users see
    ___KERNELRELEASE = KERNELRELEASE without RPM release
    __KERNELRELEASE = ___KERNELRELEASE with s/-/_/g

    Signed-off-by: Arun Sharma <asharma@fb.com>
    ---
    Makefile | 9 ++++++---
    scripts/package/Makefile | 2 +-
    scripts/package/mkspec | 2 +-
    3 files changed, 8 insertions(+), 5 deletions(-)

    diff --git a/Makefile b/Makefile
    index 28820f7..90d45f4 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -367,11 +367,14 @@ KBUILD_AFLAGS_MODULE := -DMODULE
    KBUILD_CFLAGS_MODULE := -DMODULE
    KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

    -# Read KERNELRELEASE from include/config/kernel.release (if it exists)
    -KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
    +# Read ___KERNELRELEASE from include/config/kernel.release (if it exists)
    +___KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
    +# Append the release version only once.
    +# Note: .version could change during the build.
    +KERNELRELEASE ?= $(___KERNELRELEASE)-$(shell /bin/sh scripts/mkversion)
    KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

    -export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
    +export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION ___KERNELRELEASE
    export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
    export CPP AR NM STRIP OBJCOPY OBJDUMP
    export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE
    diff --git a/scripts/package/Makefile b/scripts/package/Makefile
    index 1b7eaea..0ec687b 100644
    --- a/scripts/package/Makefile
    +++ b/scripts/package/Makefile
    @@ -26,7 +26,7 @@ RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
    else echo rpm; fi)

    # Remove hyphens since they have special meaning in RPM filenames
    -KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
    +KERNELPATH := kernel-$(subst -,_,$(___KERNELRELEASE))
    MKSPEC := $(srctree)/scripts/package/mkspec
    PREV := set -e; cd ..;

    diff --git a/scripts/package/mkspec b/scripts/package/mkspec
    index bf215c5..9a8c2fa 100755
    --- a/scripts/package/mkspec
    +++ b/scripts/package/mkspec
    @@ -22,7 +22,7 @@ if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
    fi

    PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
    -__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`
    +__KERNELRELEASE=`echo $___KERNELRELEASE | sed -e "s/-/_/g"`

    echo "Name: kernel"
    echo "Summary: The Linux Kernel"
    --
    1.7.4


    \
     
     \ /
      Last update: 2011-05-17 19:41    [W:0.024 / U:30.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site