From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6647496723618856960 X-Received: by 2002:a1c:c789:: with SMTP id x131mr313673wmf.3.1548760450518; Tue, 29 Jan 2019 03:14:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:afca:: with SMTP id y10ls4213055wrd.4.gmail; Tue, 29 Jan 2019 03:14:10 -0800 (PST) X-Google-Smtp-Source: AHgI3IbLVKYKiHIIwoTpWsck1TI5gGY7rt4gNXmhAQaZSI+FvtEyeXZHyHF7HdMMFmHKqMxLrsKz X-Received: by 2002:a05:6000:114e:: with SMTP id d14mr264018wrx.5.1548760450125; Tue, 29 Jan 2019 03:14:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548760450; cv=none; d=google.com; s=arc-20160816; b=pCIy5d8texhilB4B4SLihpq/ED+2gH6AO3k19S273AJSHtmNn4Q4QYEZSS2hADgkGF fHV82ovKpXHZUWbEBPy21BrYIvXurYYfH4Ko3e5tpMgWjMBbYjRGQ6XEdSjKdEMyR+/5 Ox4bKlZQv4kwYSnUyy+1rwgQytSbZL6rRHBxCJqet0ruYGNBDUcYcFqrG9SEQWWpRA2x 4vT4v/DjbL2BiCOxL9FuOZCBFpJJjGxY/AFXsossuXriExqAWa4F5oKMWxJzVTtedB4G MqjdFfifmhUjrZqaQBeEv9VX0A6MsV00ORBt6y438nCrb30DgYKOlUYtf6hTbNYhNNjb OLbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:from:references:cc:to :subject; bh=EaZ62WLEIn2MZvLzQ3ktUNChXM9v2D0ipMY2WXXGJ/o=; b=buZzNf/JZKAnZkQYaMpP1pjhuJi5uODn0UsdzZJlcrB6PEODWTJ3sn/DhY3y0fLv4T 1KL4diIUptQV1tmv8u4cmRL8Y90K+uduXOyO7iG8FSefpbvsfq/dg5F4U5fALa/AEy/v pqSvRdx4hMZfckFniJc0fQiWw93Q/nzZhZuDNKekpFLuAK5V88HKXmmMgeuiQYNvg0Zc yXKNP+BMtENe0CtSMQNUV2+uSTTS9HijDURWTe8kVOxxtSygIxpWvWgGo4+L2rgBCe1x qHx0LGTGqQ3zHe2+fnRUMqr3HBwDoJJzT/TeNziu7gFXDzOcweNw+rNva8KnwS31kQGt L7tg== 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 y200si79401wmd.0.2019.01.29.03.14.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 03:14:10 -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 [192.168.50.163] (d51A48A80.access.telenet.be [81.164.138.128]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x0TBE7ng011327 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Tue, 29 Jan 2019 12:14:08 +0100 Subject: Re: [PATCH 6/7] local.conf: remove example-hello from the default build To: Jan Kiszka , "[ext] Henning Schild" , isar-users Cc: Cedric Hombourger References: <20190117160427.26556-1-henning.schild@siemens.com> <20190117160427.26556-7-henning.schild@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <43e559db-95a5-e378-98ff-9b51148628bd@ilbers.de> Date: Tue, 29 Jan 2019 12:14:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: 5ly7CTEX5viX On 1/28/19 6:08 PM, Jan Kiszka wrote: > On 17.01.19 17:04, [ext] Henning Schild wrote: >> From: Henning Schild >> >> 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 >> --- >>   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