From: David Laight <David.Laight@ACULAB.COM>
To: 'Willy Tarreau' <w@1wt.eu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guenter Roeck <linux@roeck-us.net>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>,
"lwn@lwn.net" <lwn@lwn.net>, "jslaby@suse.cz" <jslaby@suse.cz>,
"shuah@kernel.org" <shuah@kernel.org>,
"patches@kernelci.org" <patches@kernelci.org>,
"lkft-triage@lists.linaro.org" <lkft-triage@lists.linaro.org>,
"pavel@denx.de" <pavel@denx.de>,
"jonathanh@nvidia.com" <jonathanh@nvidia.com>
Subject: RE: Linux 4.4.256
Date: Mon, 8 Feb 2021 09:09:32 +0000 [thread overview]
Message-ID: <54e88e8d1ba1487ba43eb36ddfec4e5a@AcuMS.aculab.com> (raw)
In-Reply-To: <20210206132239.GC7312@1wt.eu>
From: Willy Tarreau
> Sent: 06 February 2021 13:23
>
> On Sat, Feb 06, 2021 at 02:11:13PM +0100, Willy Tarreau wrote:
> > Something like this looks more robust to me, it will use SUBLEVEL for
> > values 0 to 255 and 255 for any larger value:
>
> diff --git a/Makefile b/Makefile
> index 7d86ad6ad36c..9b91b8815b40 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1252,7 +1252,7 @@ endef
>
> define filechk_version.h
> echo \#define LINUX_VERSION_CODE $(shell \
> - expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
> + expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255 \* \( 0$(SUBLEVEL) \> 255 \) +
> 0$(SUBLEVEL) \* \( 0$(SUBLEVEL) \<= 255 \) ); \
> echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
> endef
Why not:
$(shell echo $$(($(VERSION)<<16 + $(PATCHLEVEL)<<8 + ($(SUBVERSION) < 255 ? $(SUBVERSION) : 255))))
Untested, but I think only the one $ needs any kind of escape.
The extra leading zeros do have to go - $((...)) does octal :-(
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next prev parent reply other threads:[~2021-02-08 9:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 14:26 Linux 4.4.256 Greg Kroah-Hartman
2021-02-05 14:26 ` Greg Kroah-Hartman
2021-02-05 20:56 ` Guenter Roeck
2021-02-06 13:00 ` Greg Kroah-Hartman
2021-02-06 13:11 ` Willy Tarreau
2021-02-06 13:19 ` Greg Kroah-Hartman
2021-02-06 13:24 ` Willy Tarreau
2021-02-06 13:22 ` Willy Tarreau
2021-02-06 16:59 ` Guenter Roeck
2021-02-06 18:13 ` Greg Kroah-Hartman
2021-02-06 18:49 ` Guenter Roeck
2021-02-07 8:22 ` Greg Kroah-Hartman
2021-02-08 17:14 ` Guenter Roeck
2021-02-08 17:20 ` Greg Kroah-Hartman
2021-02-08 9:09 ` David Laight [this message]
2021-02-08 9:38 ` David Laight
2021-02-08 9:44 ` Greg Kroah-Hartman
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=54e88e8d1ba1487ba43eb36ddfec4e5a@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lkft-triage@lists.linaro.org \
--cc=lwn@lwn.net \
--cc=patches@kernelci.org \
--cc=pavel@denx.de \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=w@1wt.eu \
/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