From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7003689951757860864 X-Received: by 2002:a5d:4ed0:: with SMTP id s16mr3963352wrv.71.1630673639912; Fri, 03 Sep 2021 05:53:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ef0d:: with SMTP id e13ls3579356wro.3.gmail; Fri, 03 Sep 2021 05:53:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9Y6MkI3whMlCBIP0VCtHk4ZMZhjh9GGmph9nbxSVLoGVAuwE6rAq9Q+bnqtrnGstURPXm X-Received: by 2002:a05:6000:250:: with SMTP id m16mr3551148wrz.349.1630673638876; Fri, 03 Sep 2021 05:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630673638; cv=none; d=google.com; s=arc-20160816; b=if6imPIfYfXzdyGjiy56QuxgD2hXYUChcKND1ykb3Jm84ciJcdd8qE0/aB6EmDRFGl AUzP+uU1xMHtxHUNlWbdnu9nGne+TS6CQ6gTOVsUd0JKTAsQOGJb7IyUFWZ2vaIbwym/ peVgGhTsbHWMa/ICo/PieUv/DQ/San/T58TPpZOjip4XQfyVS0mhzFqpe1fMuGPw7J8+ SvjRp/sMIyW8Jftv2jFlKzPwOYk/YYOT4mvvuewoveQYPXtXlTdFvpoHdDTJ1T1MiGRe josbP3bWAFd+omvlMLcr4JfaQjohhOtEtFq+vm4IT6b04XbCEIGJDvfqBD66zv5Pc9fm rgtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=A6KQWqTPJTfe4Ks+/CZmgCR6bujumW3Kr//r4vPHhEQ=; b=EXEwSO5L0fG8PSxZ3lavQ/EWXdP+SQggAvzS6xTMoZqtdSYXz77FA1pe8sp1t9sj29 E0xUzxtJAHWdyN6cFRM1M86wyEq5xtoh0mHcLysSRnBlyg/Ab5cyVE6v20Dpv/A32kQm oQ5ua+O7EWSnR+G3gOJB9LxFybbBCqzI5FLtpAzRv6x7EyuIHNNZ2N8xR90xV8DxrL00 E4XwACGRTbns+6PexecHMcYtWIH33OcWlA+5Btfy5lkiY651M2hlCaXPgfjbMIkqDQAa iVPHNzck7Qk2GVPpchtVX1oCO0+UCJDomlbbB+CLa6PLcezVd8mmCUxZ5ig8VFMJnOVP eE1Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id i4si239985wrc.3.2021.09.03.05.53.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 05:53:58 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 183Crw57028917 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Sep 2021 14:53:58 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 183CrvAw029234; Fri, 3 Sep 2021 14:53:58 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Florian Bezdeka , Vijai Kumar K , jan.kiszka@siemens.com, Henning Schild Subject: [PATCH v2 0/7] re-fork wic pcbios and efi plugins Date: Fri, 3 Sep 2021 14:53:48 +0200 Message-Id: <20210903125355.12279-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: DxG18XqWboCq changes since v1: - efi plugin forked as well - systemd-boot support in efi plugin enabled - common functionality in utility library - test case for system-boot - "cp -a" moved to "find exec cp" because of ubuntu - changed wks files to exclude boot from root and mount it The forked plugins have gotten out of sync with the last wic version bumps. And the original fork was not exactly minimal or made for easy maintenance. This series does a re-fork of the two plugins with the aim to come up with something readable, minimal and maintainable. There used to be a special case for grub-efi where the actual kernel and initrd would remain in the root partition, which kind of allowed kernel updates with apt-get. Now all three bootloaders (systemd-boot now works as well) place bootloader, config and boot artifacts in a boot-partition. Kernel updates with apt-get are now consistantly "broken". That consistency very likely is not too bad. A generic solution for this feature (if wanted) will need to be found. Covering not just these three bootloaders but possibly also u-boot and efibootguard. Henning Schild (7): wic: reset our plugin forks to OE upstream for re-forking wic: add utility library for common bits of isar plugins wic: apply the actual fork changes to our pcbios plugin fork wic: clean up wic class in terms of isar variables wic: apply the actual fork changes to our efi plugin fork wic: mount /boot and exlude it from root for efi meta-isar: use "systemd-boot" for one test target RECIPE-API-CHANGELOG.md | 9 + meta-isar/conf/machine/qemuamd64.conf | 3 + .../scripts/lib/wic/canned-wks/hikey.wks | 4 +- .../lib/wic/canned-wks/sdimage-efi-sd.wks | 9 + .../lib/wic/canned-wks/sdimage-efi.wks | 4 +- meta/classes/wic-img.bbclass | 6 +- .../scripts/lib/wic/plugins/isarpluginbase.py | 39 ++++ .../wic/plugins/source/bootimg-efi-isar.py | 200 ++++++++++++++---- .../wic/plugins/source/bootimg-pcbios-isar.py | 139 ++++++------ 9 files changed, 290 insertions(+), 123 deletions(-) create mode 100644 meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks create mode 100644 meta/scripts/lib/wic/plugins/isarpluginbase.py -- 2.32.0