From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6647835775200133120 X-Received: by 2002:a50:86d3:: with SMTP id 19mr2675344edu.5.1547819882124; Fri, 18 Jan 2019 05:58:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:488b:: with SMTP id v11-v6ls2354650ejq.5.gmail; Fri, 18 Jan 2019 05:58:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN5PKqQ7VLzv2d8pCXofIHZTm5mgdH3qfQsC4ihbVoI3MfmoXjQJ9SJpRcEzbujT0Xer/swq X-Received: by 2002:a17:906:1c45:: with SMTP id l5-v6mr2411131ejg.3.1547819881695; Fri, 18 Jan 2019 05:58:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547819881; cv=none; d=google.com; s=arc-20160816; b=F1ujJXPozI0469nky7xN0BMRpIxVR1OZd0QOPs4fgBH88Fnyl1zaDRfxHrjOfvMHvp EUNQ3YOHp/luobAjpUJfCMFc2Ykyl6yDJ5+40rNxN7MqdRDxZqeEBnCQHr0ZcVWHJFqO A+yhBpczHfnUth5bLJM3DDV/aOroadbip4+hKcszVVaGv3EnUzy+ObgcaScfr183YcqZ cagzCOeZMVmWF4CVtNObIWI1PAMwHfcsU6ICzUbL3Hp4gdVy9GvkjQn5RRtN3VUL+W8I m9Jya6P6MRG6sUXwDi9TiBG3weWNuQ2efD6W6HdFWSZ60hyMK5j877NKESoxbFg7BlDm bk2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=J7qz1z11/yGJdyBHH3fAatXK+o2uEcDuaop7D4moC90=; b=kr+iYDz3yKOYMIPOU6xj08+Ybbx3veP0kLWiM08V47LIh+vfSnq/gWG1LXcP63Ql4p tb3+jN7UOLeA/lBJMnf/DET4x0bMhBqr+nhcup9z66jPgAS2llkjgVR5nh8YVYcYAnke RYsYvL35kqRVH0uKdvBdBQTV1PiQSpogIveyRP/WsmgxDo4ZOi6asCi41r3ysXOvrHMa huqDPFqcEnE8R+zBezoKH+vzlsOGwHfAYOlQKylJGwDBHbHyqMGA44fm9dfoVR6RX4v1 CB/vCYG9BYGGpW7k2e4OsZZ7bzNOld7pnv74QdVau7hnC6Uicq05PMRxRAl5rl0qOPuW pQVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id k25si1372706edd.1.2019.01.18.05.58.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 05:58:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@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 mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x0IDvpgV010935 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Fri, 18 Jan 2019 14:58:00 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH] recipes-app: Rename example-hello to hello-isar to avoid collisions with Debian Hello Date: Fri, 18 Jan 2019 14:57:51 +0100 Message-Id: <20190118135751.23060-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: 6psKOBrnpJmz Suggested-by: Henning Schild Signed-off-by: Maxim Yu. Osipov --- doc/technical_overview.md | 2 +- doc/user_manual.md | 4 ++-- meta-isar/conf/local.conf.sample | 2 +- .../{example-hello => hello-isar}/files/0001-Add-some-help.patch | 0 .../{example-hello => hello-isar}/files/yet-another-change.txt | 0 .../{example-hello/example-hello.bb => hello-isar/hello-isar.bb} | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename meta-isar/recipes-app/{example-hello => hello-isar}/files/0001-Add-some-help.patch (100%) rename meta-isar/recipes-app/{example-hello => hello-isar}/files/yet-another-change.txt (100%) rename meta-isar/recipes-app/{example-hello/example-hello.bb => hello-isar/hello-isar.bb} (89%) diff --git a/doc/technical_overview.md b/doc/technical_overview.md index 4f6d954..7efbeee 100644 --- a/doc/technical_overview.md +++ b/doc/technical_overview.md @@ -58,7 +58,7 @@ Typical example, when Isar builds the following configurations: - Debian Stretch, i386 In this case there will be 3 different build subtrees. So the standard -example-hello demo application will be processed 3 times for each +hello-isar demo application will be processed 3 times for each environment. Three different sets of stamps will be used to distinguish build progress between different bitbake configurations. diff --git a/doc/user_manual.md b/doc/user_manual.md index 2aa291d..3b28e3a 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -548,10 +548,10 @@ DESCRIPTION = "Sample application for ISAR" LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -PV = "1.0" +PV = "0.3-a18c14c" SRC_URI = "git://github.com/ilbers/hello.git" -SRCREV = "ad7065ecc4840cc436bfcdac427386dbba4ea719" +SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" S = "${WORKDIR}/git" diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index fe81f20..a671b20 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -161,7 +161,7 @@ CONF_VERSION = "1" # # The default list of extra packages to be installed. -IMAGE_INSTALL = "example-hello example-raw example-module-${KERNEL_NAME} enable-fsck" +IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck" # # Enable cross-compilation support diff --git a/meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch b/meta-isar/recipes-app/hello-isar/files/0001-Add-some-help.patch similarity index 100% rename from meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch rename to meta-isar/recipes-app/hello-isar/files/0001-Add-some-help.patch diff --git a/meta-isar/recipes-app/example-hello/files/yet-another-change.txt b/meta-isar/recipes-app/hello-isar/files/yet-another-change.txt similarity index 100% rename from meta-isar/recipes-app/example-hello/files/yet-another-change.txt rename to meta-isar/recipes-app/hello-isar/files/yet-another-change.txt diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb similarity index 89% rename from meta-isar/recipes-app/example-hello/example-hello.bb rename to meta-isar/recipes-app/hello-isar/hello-isar.bb index 9b35537..5806f9e 100644 --- a/meta-isar/recipes-app/example-hello/example-hello.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Sample application for ISAR" LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -PV = "0.2-86cc719" +PV = "0.3-a18c14c" # NOTE: the following line duplicates the content in 'debian/control', but # for now it's the only way to correctly build bitbake pipeline. @@ -18,6 +18,6 @@ SRC_URI = " \ git://github.com/ilbers/hello.git;protocol=https;destsuffix=${P} \ file://0001-Add-some-help.patch \ file://yet-another-change.txt;apply=yes;striplevel=0" -SRCREV = "86cc719b3359adc3c4e243387feba50360a860f3" +SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" inherit dpkg -- 2.11.0