From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: Jan Kiszka <jan.kiszka@siemens.com>,
"[ext] Henning Schild" <henning.schild@siemens.com>,
isar-users <isar-users@googlegroups.com>
Cc: Cedric Hombourger <Cedric_Hombourger@mentor.com>
Subject: Re: [PATCH 6/7] local.conf: remove example-hello from the default build
Date: Tue, 29 Jan 2019 12:14:09 +0100 [thread overview]
Message-ID: <43e559db-95a5-e378-98ff-9b51148628bd@ilbers.de> (raw)
In-Reply-To: <caa46e9f-7993-125b-875e-4b1a4a3e3b5e@siemens.com>
On 1/28/19 6:08 PM, Jan Kiszka wrote:
> On 17.01.19 17:04, [ext] Henning Schild wrote:
>> From: Henning Schild <henning.schild@siemens.com>
>>
>> As reported on the mailinglist, this recipe conflicts with "hello" from
>> upstream debian. This commit should be reverted once the conflict is
>> resolved.
>
> I think the resolution is merged already, no?
Yes, it is merged (example-hello was renamed to hello-isar).
Maxim.
> Jan
>
>>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> ---
>> meta-isar/conf/local.conf.sample | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-isar/conf/local.conf.sample
>> b/meta-isar/conf/local.conf.sample
>> index fe81f20..6ed4caa 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 = "example-raw example-module-${KERNEL_NAME} enable-fsck"
>> #
>> # Enable cross-compilation support
>>
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
next prev parent reply other threads:[~2019-01-29 11:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 16:04 [PATCH 0/7] "apt-get source" fetch/unpack support Henning Schild
2019-01-17 16:04 ` [PATCH 1/7] conf: add deb-src entries to all our distro configs Henning Schild
2019-01-17 16:04 ` [PATCH 2/7] dpkg-base: introduce an "apt-get source" fetch/unpack step Henning Schild
2019-01-28 17:06 ` Jan Kiszka
2019-01-28 17:12 ` Hombourger, Cedric
2019-01-28 17:13 ` Jan Kiszka
2019-01-30 13:57 ` [PATCHv2 " Henning Schild
2019-01-30 13:58 ` Henning Schild
2019-01-17 16:04 ` [PATCH 3/7] meta: move debianization code into a class and into dpkg-base Henning Schild
2019-01-17 16:04 ` [PATCH 4/7] debianize: allow changlog version change Henning Schild
2019-01-17 16:04 ` [PATCH 5/7] meta-isar/recipes-app: add upstream hello rebuild example Henning Schild
2019-01-30 13:06 ` [PATCHv2 " Henning Schild
2019-01-30 13:07 ` Henning Schild
2019-01-17 16:04 ` [PATCH 6/7] local.conf: remove example-hello from the default build Henning Schild
2019-01-28 17:08 ` Jan Kiszka
2019-01-29 11:14 ` Maxim Yu. Osipov [this message]
2019-01-17 16:04 ` [PATCH 7/7] local.conf: enable rebuilding "hello" for all distros Henning Schild
2019-01-29 11:20 ` Maxim Yu. Osipov
2019-01-30 13:04 ` Henning Schild
2019-01-17 16:38 ` [PATCH 0/7] "apt-get source" fetch/unpack support Henning Schild
2019-01-21 9:29 ` Claudius Heine
2019-01-28 17:17 ` Jan Kiszka
2019-01-28 16:57 ` Henning Schild
2019-01-30 6:43 ` Maxim Yu. Osipov
2019-01-30 9:15 ` Henning Schild
2019-01-30 12:24 ` Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43e559db-95a5-e378-98ff-9b51148628bd@ilbers.de \
--to=mosipov@ilbers.de \
--cc=Cedric_Hombourger@mentor.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox