From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6517147827419742208 X-Received: by 10.46.77.87 with SMTP id a84mr72414ljb.18.1517400119859; Wed, 31 Jan 2018 04:01:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.65.133 with SMTP id d5ls531447ljf.11.gmail; Wed, 31 Jan 2018 04:01:59 -0800 (PST) X-Google-Smtp-Source: AH8x225Yu0zu9Ggw1q0Ryob5eAQ7Bjd0kQkqp1LOb4aJIVwsj1MF7QoVdSSi4eW6E6uCpChaTKBU X-Received: by 10.25.202.77 with SMTP id h13mr2337217lfj.21.1517400119345; Wed, 31 Jan 2018 04:01:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517400119; cv=none; d=google.com; s=arc-20160816; b=yuJRx8bsv//AnprH8+Qkad1X6WSGrzaLMEVVt+2Zt5unxnVysew6ZuQ98XDw25kFxw p3Rtg8VXebvjuzTCSzhTdm1vyG0eHZGTG7PlAOgHothEbrMMz5DmUu1OZPQODmHlkGXY bYn/KK+SJZL9/iosw7WJ/p11lH6V0KCxYKsgEnQeQz+QgdeUKtS80j6ZhsKmxpxjTWv5 h22Rb5tvfqO9KUW02fmzh0rbAWGtg3fKp4RwaSoiIojWeiw1fec+Dj0Qdtz7FbaNb9vs uLE1Dv+yVkW6afNKSVx3aUBl3Xrx8pPlaIKapQ1D5eY9x3euk0BTecCh0XeDng8was9F z0oA== 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:from:references:to:subject :arc-authentication-results; bh=RtwCTe/EdmAp6HWigSBibAtOR7xv/XuhFKH+VfSrOGg=; b=Iicwm1jYT9+OvJ1eor6O2kk055OAmKIE6g22pGbzgmkWPqNMWMEjF07mP9oFNmdF2h 09LNxjn9BKyEVcGOCBhpkau1RhgY7AgtzKVmH1x9EpAu8aRYCPMgdEtxDiIkeXbTgJiZ Y5SsgwCH073/gGs9j7rr1MVaVbf/ppTyCmMEmwtn+3Uf+V8Cv2C2n1bDv2TpkHZVfReD y73D0bsXgzYOMPTl7BmwqdNsAaINb/xY80T512Oomq7kcWufgr/J0oFfSUnxyzsLzJzh 68OXwNN0BpmCKXmjqKp+F73xPfm5IYjQhLh7e/s0F3MWW1ALruzlLxSev/FXuResEM92 rsPg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m2si81490lfj.2.2018.01.31.04.01.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 04:01:59 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w0VC1w5a025413 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 31 Jan 2018 13:01:58 +0100 Received: from [167.87.8.100] ([167.87.8.100]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w0VC1vA2019391 for ; Wed, 31 Jan 2018 13:01:58 +0100 Subject: Re: [PATCH 9/9] wic: now truly go for the wic version we claim to have To: isar-users@googlegroups.com References: <540bb04ce24f67c121c83801288a3aea6f4cedac.1517390790.git.henning.schild@siemens.com> <9882db52-7c2e-d135-2ca5-13c5b9a722a7@siemens.com> <943545ea-d6a4-8fb0-2c95-3d62b1375ad6@siemens.com> <20180131115324.GB6508@yssyq.radix50.net> From: Jan Kiszka Message-ID: Date: Wed, 31 Jan 2018 13:01:57 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20180131115324.GB6508@yssyq.radix50.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: UnnuHtGn2xXo On 2018-01-31 12:53, Baurzhan Ismagulov wrote: > On Wed, Jan 31, 2018 at 12:43:24PM +0100, Jan Kiszka wrote: >> Study patch 2 again, I think you misunderstood what it changed: all >> adaptations are consolidated in those 100 lines now. Now longer a fork >> of wic, only few external wrappings (without changing scripts or lib). > > We'll study the patches in more detail, but I'd still like to confirm I > understand the concept correctly. The issue is, we import script/wic and > scripts/lib/wic atomically, as a single whole. Now, patch 9/9 changes: > > scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- > scripts/lib/wic/filemap.py | 6 +- > scripts/lib/wic/help.py | 2 - > scripts/lib/wic/ksparser.py | 4 +- > scripts/lib/wic/partition.py | 114 ++++++++++++++-------- > scripts/lib/wic/plugins/imager/direct.py | 17 +++- > scripts/lib/wic/plugins/source/bootimg-pcbios.py | 48 ++++----- > scripts/lib/wic/plugins/source/fsimage.py | 56 +++++++++++ > scripts/lib/wic/utils/misc.py | 16 +-- > scripts/lib/wic/utils/runner.py | 74 ++++++++++++-- > > Do I understand correctly that the series reverts changes to bitbake core and > moves them to scripts/lib? To my reading, no changes are moved to lib. lib is restored to the OE hash the original isar commit only /claimed/ to have used. Maybe just a mistake in the log of that original commit. But then please enlighten us what hash was truly used and if that should stay in favor of this reset. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux