From patchwork Tue Jan 14 08:56:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1222571 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xkpw2dPjz9s29 for ; Tue, 14 Jan 2020 19:56:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3767884FDD; Tue, 14 Jan 2020 08:56:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Se6mo_WGwkXp; Tue, 14 Jan 2020 08:56:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6DCD385008; Tue, 14 Jan 2020 08:56:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 204DA1BF2F2 for ; Tue, 14 Jan 2020 08:56:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C3F820460 for ; Tue, 14 Jan 2020 08:56:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YhmbeyGmr+Xf for ; Tue, 14 Jan 2020 08:56:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by silver.osuosl.org (Postfix) with ESMTPS id BC9492012D for ; Tue, 14 Jan 2020 08:56:44 +0000 (UTC) Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 00E8ugax013271 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Jan 2020 09:56:42 +0100 Received: from [139.23.75.63] ([139.23.75.63]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 00E8ugAG011372; Tue, 14 Jan 2020 09:56:42 +0100 From: Jan Kiszka To: buildroot@buildroot.org, "Yann E. MORIN" Message-ID: <7a471c0c-9f4d-b4e5-7bb3-8aaae6d8a885@siemens.com> Date: Tue, 14 Jan 2020 09:56:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 Content-Language: en-US Subject: [Buildroot] [PATCH v3] package/xenomai: allow to pull git revisions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Jan Kiszka Default remains the latest stable release, expressed by BR2_PACKAGE_XENOMAI_USE_RELEASE=y and an empty BR2_PACKAGE_XENOMAI_VERSION. Signed-off-by: Jan Kiszka --- Changes in v3: - Replaced BR2_PACKAGE_XENOMAI_REV with BR2_PACKAGE_XENOMAI_VERSION - Adopted logic suggested by Yann package/xenomai/Config.in | 25 +++++++++++++++++-------- package/xenomai/xenomai.mk | 11 +++++++++-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index 0cb0b343de..6ee773c98f 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -41,17 +41,26 @@ config BR2_PACKAGE_XENOMAI if BR2_PACKAGE_XENOMAI +choice + prompt "Xenomai origin" + default BR2_PACKAGE_XENOMAI_USE_RELEASE + +config BR2_PACKAGE_XENOMAI_USE_RELEASE + bool "Release" + +config BR2_PACKAGE_XENOMAI_USE_GIT + bool "Git" + +endchoice + config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" + string "Xenomai version" help - Manually select Xenomai version. If left empty, the default - version will be used. + If downloading a release, leave empty for the default version, + or specify a valid release version. - Make sure that the selected version has a patch for your - selected Linux kernel. If it does not, download and select - a patch manually with - BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux - Kernel -> Linux Kernel Extensions menu. + If downloading from git, this can be any commit-ish (e.g. + a tag, or a hash). choice prompt "Xenomai core" diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 5f389ac851..abc768fd9f 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -5,14 +5,21 @@ ################################################################################ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) +XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 + +ifeq ($(BR2_PACKAGE_XENOMAI_USE_RELEASE),y) ifeq ($(XENOMAI_VERSION),) XENOMAI_VERSION = 3.0.10 else BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif - XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable -XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 +else +XENOMAI_SITE = https://gitlab.denx.de/Xenomai/xenomai/-/archive/$(XENOMAI_VERSION) +BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) +XENOMAI_AUTORECONF = YES +endif + XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver) # GFDL is not included but refers to gnu.org XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \