From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-f194.google.com (mail-yb1-f194.google.com [209.85.219.194]) by mail.openembedded.org (Postfix) with ESMTP id 43E4D605BF for ; Wed, 16 Jan 2019 12:00:56 +0000 (UTC) Received: by mail-yb1-f194.google.com with SMTP id j10so2394536ybj.8 for ; Wed, 16 Jan 2019 04:00:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=86jxYT/Dt33YelrfjYqkuBkcXSI0kfMMrm0pNxp5/vc=; b=JJfdjGEznGkinwJgWVW+HaCwUZ8pgpgQXlk3tj9kW7NcpSLRTwkalDMg/30aBm+wy6 zimIR9fwMlhLB7NiEvCa8zRag3vJiQR7kbG5pxcKt5mzM2Lhd3X+DcxgIEZ8qulC2swQ dNQkLpmT9iAUbrXcakfdLkpq/A6UAhc3kfdZkA06IOwcEW3jHF/HGfgS260y3OaBt8eL 4GAb7MhILgSxiBPsgzh9BVeEY1+uofMO9VQm5/QZzE+Zs7UIcohM30fB8+V95LPXXM2d nQvMrXEPdBtSZR3TEO2XHpluJBZMc4GjV2GxnOlgjX/iSQF2IMoQ3jfVVoiDnz4wVkmW Lx2Q== X-Gm-Message-State: AJcUukfEvxjTzMYDJaiwMN/Mw6P4Y84p+oBBySqc919MB7yflvg95YG8 oqqjXevHKK/mCl5g/HfJh4GLxqEw X-Google-Smtp-Source: ALg8bN6OBtF5Hgl93e5vb2GIAPxpcezsPPzjPRH6wNSnLCuoMj3eGXjnEqYl7i3nRnd41APsxoR5iQ== X-Received: by 2002:a25:ce94:: with SMTP id x142mr7305757ybe.292.1547640057016; Wed, 16 Jan 2019 04:00:57 -0800 (PST) Received: from tfsielt31850.garage.tyco.com ([77.107.218.170]) by smtp.gmail.com with ESMTPSA id o124sm2169655ywe.75.2019.01.16.04.00.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 04:00:56 -0800 (PST) From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: openembedded-core@lists.openembedded.org Date: Wed, 16 Jan 2019 12:00:37 +0000 Message-Id: <20190116120051.12182-2-git@andred.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190116120051.12182-1-git@andred.net> References: <20190114125632.4780-1-git@andred.net> <20190116120051.12182-1-git@andred.net> MIME-Version: 1.0 Subject: [PATCH v3 01/15] util-linux: simplify version upgrades (MAJOR_VERSION) X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 12:00:56 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: André Draszik There doesn't appear to be a need to manually and explicitly specificy the major version (for the download URL), it can be deduced easily from PV. Do so. Signed-off-by: André Draszik --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e514041a19..7bfec80508 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -24,7 +24,8 @@ DEPENDS = "zlib ncurses virtual/crypt" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ +MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ " PACKAGES =+ "util-linux-agetty util-linux-blkdiscard util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index c909836cbb..b0492afff3 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -1,4 +1,3 @@ -MAJOR_VERSION = "2.32" require util-linux.inc # To support older hosts, we need to patch and/or revert -- 2.20.1