Backport patch to fix CVE-2021-36770. And drop the section of code which
updates version.
CVE: CVE-2021-36770
(From OE-Core rev: 9a5e0f3ece45529358b6b712e3450a8594f531c6)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>