From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514681807677423616 X-Received: by 10.28.23.197 with SMTP id 188mr422713wmx.20.1516817558654; Wed, 24 Jan 2018 10:12:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.170.1 with SMTP id t1ls2851749wme.7.gmail; Wed, 24 Jan 2018 10:12:38 -0800 (PST) X-Google-Smtp-Source: AH8x227E/CL8NGFn+RpYFg4fBFc998KRBAfKXtu03M//Zz7Vrz9FaDgxI//Dcp3DjTOgktBbo+Sl X-Received: by 10.28.153.194 with SMTP id b185mr696543wme.17.1516817558120; Wed, 24 Jan 2018 10:12:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516817558; cv=none; d=google.com; s=arc-20160816; b=g5cSZxWQ163bE3poU9On9zR8OZdDuptCcQ8Z0ifPJLwrwZS4L/cKQe6uaiyFWaWKwJ h4Pf/mVUM0xzscfLC9mh6m6w1GQU537xnjgDi/FhZToi3VRLYz5RTbvgipM7b9v55Mdl SuOMwsBriQLNx9uYvTGC9YqWMhzNr90ofSSgCPLBczNnqNZsO0mHNP550Njqn/WOs7ah nQtqtax5lh0PrteyIiYN6rZohi64glARFFimpWpsV5f21N5xTHfJCWP94rK6hVQEbeuS hlLt8ln7YQbVPS4xRnpbxHyfsnDEDR0i7mXAFxqw/Gnpi7PryfT64osBVEnvg0xocxP0 ww9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=JpztTl2O/zd2p8h3ohlV6Wd0P8tlF4IPm46X0YEiPtA=; b=ZdmS+2JtYAzQ0YA0K4eWEIjqNF6mQf8m8bzvGACxWi1AATYqhSCsgJs+R7RSV9X8s/ DxQNOJsDVQ+eLuWSLj1ywPpg7uQCUcDB/9Ct+5hvQ5uOJCgmiZEjXUKy8u8RsoE+9lN3 IlVOwhV0/9V3qsUuWKoqzkPh5Hs7zMMPzfoOGOrSIn7LfZNogTtHW7fH8XL6WGg/U7Tq tpDVRwsKozKcEhtzGgIzBLZWj9lNnhzpYFODp+PIu7d3KuTIK/6kFYpkjpqublA5wE3K kM2pgsctWm/MAHXQDkJr2A2wYeoQVWm0vt9E3cJ5KlkrP6g2Y95ec3D9QXX43KC49xy5 fgSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id m19si115809edd.4.2018.01.24.10.12.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:12:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w0OICNhv017826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2018 19:12:29 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH] hello: Rename to example-hello Date: Wed, 24 Jan 2018 21:12:16 +0300 Message-Id: <20180124181216.30169-1-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 X-TUID: eAApVVn7caoq Pure Debian contains already contains its 'hello' package. During image rootfs generation, multistrap fetches the upstream one, what is not correct. To avoid this collision and to keep cannonical names for Isar examples, rename 'hello' to 'example-hello'. Signed-off-by: Alexander Smirnov --- meta-isar/conf/local.conf.sample | 2 +- meta-isar/recipes-app/example-hello/example-hello.bb | 18 ++++++++++++++++++ meta-isar/recipes-app/hello/hello.bb | 18 ------------------ 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 meta-isar/recipes-app/example-hello/example-hello.bb delete mode 100644 meta-isar/recipes-app/hello/hello.bb diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 660958f..33d988e 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -153,7 +153,7 @@ CONF_VERSION = "1" # # The default list of extra packages to be installed. -IMAGE_INSTALL = "hello example-raw" +IMAGE_INSTALL = "example-hello example-raw" # # Default parallel jobs for bitbake: diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb b/meta-isar/recipes-app/example-hello/example-hello.bb new file mode 100644 index 0000000..114ee85 --- /dev/null +++ b/meta-isar/recipes-app/example-hello/example-hello.bb @@ -0,0 +1,18 @@ +# Sample application +# +# This software is a part of ISAR. +# Copyright (C) 2015-2018 ilbers GmbH + +DESCRIPTION = "Sample application for ISAR" + +LICENSE = "gpl-2.0" +LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" + +PV = "0.1+g7f35942-1" + +SRC_URI = "git://github.com/ilbers/hello.git;branch=devel;protocol=https" +SRCREV = "5c0ae73fdc97d80b6726e602a1fa0ef00c2c012a" + +SRC_DIR = "git" + +inherit dpkg diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb deleted file mode 100644 index 44b8bc3..0000000 --- a/meta-isar/recipes-app/hello/hello.bb +++ /dev/null @@ -1,18 +0,0 @@ -# Sample application -# -# This software is a part of ISAR. -# Copyright (C) 2015-2016 ilbers GmbH - -DESCRIPTION = "Sample application for ISAR" - -LICENSE = "gpl-2.0" -LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" - -PV = "0.1+g7f35942-1" - -SRC_URI = "git://github.com/ilbers/hello.git;protocol=https" -SRCREV = "ad7065ecc4840cc436bfcdac427386dbba4ea719" - -SRC_DIR = "git" - -inherit dpkg -- 2.1.4