From: Michal Marek <mmarek@suse.cz>
To: Arun Sharma <asharma@fb.com>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/6] kbuild: Append RPM release to $KERNELRELEASE
Date: Tue, 17 May 2011 22:13:55 +0200 [thread overview]
Message-ID: <4DD2D703.4030908@suse.cz> (raw)
In-Reply-To: <1305653779-3445-5-git-send-email-asharma@fb.com>
On 17.5.2011 19:36, Arun Sharma wrote:
> 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)
Please stop decorating the kernel release string for the sake of make
rpm, thanks. If you really want the kernel release string match rpm's
%{version}-%{release}, how about this: Let the user set
CONFIG_LOCALVERSION=-<number> and check in make rpm if $KERNELRELEASE
ends with -<number>. If so, use <number> in the Release: field and the
rest in Version:, otherwise use the same scheme as before. That way, you
won't force a new kernel release numbering scheme on anyone.
Michal
next prev parent reply other threads:[~2011-05-17 20:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-17 17:36 [PATCH 1/6] kbuild: Integrate with new-kernel-pkg Arun Sharma
2011-05-17 17:36 ` [PATCH 2/6] kbuild: Add a kernel-devel package Arun Sharma
2011-05-25 20:34 ` Arun Sharma
2011-05-17 17:36 ` [PATCH 3/6] kbuild: Create a kernel-headers RPM Arun Sharma
2011-05-24 16:38 ` Michal Marek
2011-05-17 17:36 ` [PATCH 4/6] kbuild: Move firmware images to a separate RPM Arun Sharma
2011-05-25 13:53 ` Michal Marek
2011-05-17 17:36 ` [PATCH 5/6] kbuild: Append RPM release to $KERNELRELEASE Arun Sharma
2011-05-17 17:46 ` Arun Sharma
2011-05-17 20:13 ` Michal Marek [this message]
2011-05-20 20:59 ` Arun Sharma
2011-05-25 20:46 ` Arun Sharma
2011-05-17 17:36 ` [PATCH 6/6] kbuild: cleanup the rpm buildroot Arun Sharma
2011-05-25 13:54 ` Michal Marek
2011-05-25 19:39 ` Arun Sharma
2011-05-17 19:46 ` [PATCH 1/6] kbuild: Integrate with new-kernel-pkg Michal Marek
2011-05-17 20:45 ` Arun Sharma
2011-05-17 21:34 ` Michal Marek
2011-05-17 21:48 ` Arun Sharma
2011-05-25 20:31 ` Arun Sharma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DD2D703.4030908@suse.cz \
--to=mmarek@suse.cz \
--cc=asharma@fb.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).