From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6751292434813026304 X-Received: by 2002:ac8:2225:: with SMTP id o34mr2983033qto.68.1571907843796; Thu, 24 Oct 2019 02:04:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a37:9c11:: with SMTP id f17ls1754863qke.9.gmail; Thu, 24 Oct 2019 02:04:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGb5T7ALpXIOyZzguDHzXuwo6y53yBSEVdIhCUCiLxFZviWsyR9ZmpDeVlgFV0hMgZ6iPj X-Received: by 2002:a37:9902:: with SMTP id b2mr464518qke.317.1571907843372; Thu, 24 Oct 2019 02:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571907843; cv=none; d=google.com; s=arc-20160816; b=v43UHbZh57FL1XtmO1H+WU/VCfwpOPWFGPck9UbfuDDJjZXkFjgILK2wt/bifBYwT8 Y+xP7fY3oMT5qYqqePhneItUMKHqSlNeeCONRpbjsB09ftXAxhWi0nFH40Z5Syr3mXKo h16/841uZ6PJNHnQOBTpvcAtgJdEvS06LyIOVi3PS7aRdZuck5g9FqnMR2irIGs5oqhf mAiT9XM6ZNtFijsgRM/KALK8/5oqfLFMfIKJBeUp0XioyDl163PKjHwNhN2rRqlPhvMg c57dSWgNEZkX09YVR4zWjPKBkh2wy6ZHwaq8WISfdAv87jDQb7MiTSMhLsh7QWPsz9Uw OdDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=lUoG51Kurb35q+/vxLRUTP+DlxOFR6hAmcLumQ9KS+E=; b=kEuAX3pgp2UfHQw5PZocvAK9B8swsd9B/UIx3FYbvzICHcH09fI5Ho9DXJrTYIZvlw 70snb3PiRk8VzqySWTbY0Gg8jpfCfogQUZ83xTk5lwhymIYu2tu9PypJboXSQDvpq0Ec aSbCICNDMEbEbcez7B/yh8kkcQ5Znqec6k20rvIlV/Hzrh7kBZjwHE9GdUWJn0JwaCAe 2ZHR/FR3Afho9McQjsES+Fg+VLUL+6ttKtYe/LIEuIU4FI3ouB3/wNyB6OVgaE1hYNyb H/43+sPA4CKE6IAHgbA860GgrxO9ylKSiowAbzI/d5BHeP+dtVWv3wY3fmAJtNHttlz6 85bg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id t187si1023165qkd.0.2019.10.24.02.04.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 02:04:03 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: h/enIJ0mptZqKBxAnBZGvfk4KIV3UpYyeRvsRMe1WykMqJjv0RNDWbnj6u8yQng9KSgFHvsSY/ lDJQG3ypSVu4IuCNEA+jHUBzWZtJoKjcG/Mt5xqzxf9anZ17yudinuvnGOIukQimUxjZJbozjk oGN0XTsew/FBTn+xuVF9nqmU3UHoC+EvMSxP2i/gZijHF+c2MzGG6zgDLqEpSo000JNGsWo32Q yGoPNYXNG+DJNyB+y1qPPB/xHG9TL/6WeSRHYjb+JAhTGr5DqCeN54i5tjb938OIq4BXcMH7W6 zLs= X-IronPort-AV: E=Sophos;i="5.68,224,1569312000"; d="scan'208";a="44388602" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 24 Oct 2019 01:04:01 -0800 IronPort-SDR: 6CL6X/IfZoWMvsNhUMzD2U2ohR8LozurPeWJS135vlhHoTk4ncVEEWclsutFvD+C9fcz3jj6At syPKP2DxEN2nNhnjCns/6OQPJHsL8FPqmaglZT1Eng50QfM62G2EPQbApLOUscLQEw0Far+EbA /2zL6CaWa3lToKwKxD4jm1otqkQhjmLh9iNE0xb1K9pEdBG2EB+6/Uw8nrE8q2EtXNun3qLJHi y0wr27hvnBp6klVL/aN7hMDjlHH3QQDuZW8cWu8SAtXHBqWNpd7dYPlHCkOxE5nAJLBOkp88Ld OMI= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 05/10] linux-mainline: fix stripping of .0 from the kernel version Date: Thu, 24 Oct 2019 11:02:19 +0200 Message-ID: <1571907744-1121-6-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571907744-1121-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Cedric_Hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: iZMzRwtd7OBb The strip() function was used to strip the trailing .0 from the kernel version since it is omitted in the upstream archive file names. That function is actually taking a character set as argument not a substring. This was causing ARCHIVE_VERSION to expand to "4.19.8" when the user provided version was "4.19.80". The inline python code was changed to check if the version ends with ".0" and only then remove the last two characters. Signed-off-by: Cedric Hombourger --- meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb index e50e149..127f6e2 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb @@ -7,7 +7,7 @@ require recipes-kernel/linux/linux-custom.inc -ARCHIVE_VERSION = "${@d.getVar('PV').strip('.0')}" +ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else d.getVar('PV') }" SRC_URI += " \ https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${ARCHIVE_VERSION}.tar.xz \ -- 2.20.1