From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6755821036247187456 X-Received: by 2002:a5d:6703:: with SMTP id o3mr4795424wru.235.1576696267551; Wed, 18 Dec 2019 11:11:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c452:: with SMTP id l18ls1024173wmi.1.canary-gmail; Wed, 18 Dec 2019 11:11:06 -0800 (PST) X-Google-Smtp-Source: APXvYqzamCZlV0AltsoBK5e9mRCO6S0PiTnSwcPvX/cHYnGG0l/c9AJ92GjxfQ1qdYvr/4ujDIPk X-Received: by 2002:a1c:1d16:: with SMTP id d22mr5247201wmd.158.1576696266621; Wed, 18 Dec 2019 11:11:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576696266; cv=none; d=google.com; s=arc-20160816; b=kQgjmjn/McC4X/7ZuPJ3oIY5SKwQOu65xhavm0k7iqsLvabzqkrDai8LP37AUDcBed YOpbgjSxlI7v+J0TGglz6XoN5mtA5bJzbe7vZEyBgHQANfgfT9orTWeX9KgvlZNtRU+2 jAdUVxASsIGISbyEj/xJ+ErGFWOPgxE7ELiHk08qbQGai54WOnnPkTWbKJFPLTpSmnHV 9IjHuCiqV/ddS9phM5rKCj3n0GDS6HfeJyQurozM8lbxxO25V5nSKHDgFN6bI68KjqgD ymwbZcV99Nzw0LjF/ZNTqJQMwEfBTO+my9cdbdaDc2YgMPIZbel4rmjQGNF2MJ4iBOX1 UOpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=f0Wa1YF/SgZEDZDU94BU5TQ++YYY6FUlsgksbkyHyb8=; b=yBcluXj47dZ/FLDsmupRU/n8dX9Qum/CgtbblF10eII3gQ+Yd6Sz7FWikSv37Uc3r2 4JzSKHYHIBkPPsOVT0jU3dHnqWDCG/ilNJr9dquiA4iHakXZY5zDNnBSykdvwgeNoPYd maDm4rQsnr361EwwWqTwZxarQXwv6IdJy2ZlL3KnYLiO2g3Hjl7kBBOGDDHTZOQAmndV NFhp9v+2rWD/xl/mcDTkGhFVPXDUovDht0+7z/o2B+Upkbln3728RxJJQ+G+NYliXTCK fLCHPo4VEIhF71EiW24/BbZ/rgg2nBZqi9a3xrI5FlfzvNaTAAzVsdJVLlZunDkN1V9w CHSg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s139si260970wme.2.2019.12.18.11.11.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 11:11:06 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id xBIJB6PL006657 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 18 Dec 2019 20:11:06 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.25.68.37]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xBIJB500012070 for ; Wed, 18 Dec 2019 20:11:06 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v6 2/5] linux-mainline: fix stripping of .0 from the kernel version Date: Wed, 18 Dec 2019 20:11:01 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: ds3GNjFQ8asf From: Cedric Hombourger 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 Signed-off-by: Jan Kiszka --- 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 e50e1490..127f6e24 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.16.4