From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628101528005640192 X-Received: by 2002:a2e:8112:: with SMTP id d18-v6mr782803ljg.10.1543225144635; Mon, 26 Nov 2018 01:39:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8910:: with SMTP id d16-v6ls2321811lji.14.gmail; Mon, 26 Nov 2018 01:39:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/UeBFiozFCg7COLKFWSvfotgMQEQx830mVioS/QiT52B+mC3yudlpZPkRwEPbydoMg2LOGY X-Received: by 2002:a2e:8887:: with SMTP id k7-v6mr1960860lji.3.1543225144009; Mon, 26 Nov 2018 01:39:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543225143; cv=none; d=google.com; s=arc-20160816; b=P2vZ0gGmT/8Ajmo4hxiGb5Hp4bpYKl+6c7TMSyykGsRuauSO7KaeQrHKaleOjkTmw+ 1ENSjiY4XN9CvtbC8ubEbAQwS+4oS/+loJFtnRv5YTi3JmYKz/6d7Ddz2U/XYX+UOOd0 ewXwaAURM2+naVGV1HH+7VQecIv/SYm0btPBQT1wzZAMxRdFd2BPt1iFp8tUsOxJOdSP 9RFFhVw/Bu196YiOjePl7LtyJHozVcVQ2cxiEw8mVCs42PvVNQsRVBjHakJ+zaUKmwcE kRBBqGBPtmE/yH+N8T9S5sb52KOfKZqsznY9zylK8r1rB69EmMiAh2lSmF2Z1X7pFghi uFiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=nxbcWWgSdu5CVDexl3Dtd48KC/XslxuExTPnmztDjew=; b=f1pLJR5a7B9KwKfrfjZGGlN81ktS7rALaYgyhXt10M0mfr7KG92XeVKOsRt20iUzU1 kjcvepY3U6Nn85A83hXwVefpekH5ZHUQgnAEbO43LpWRqAQoxLRVwtQhzx3mcHKoci7r XqeFT7O3yzhqzB3kxkWFuaLPQYD6Gv5dBTHXEsnidiXp81SNDOFNbbF0Vt7mfzuNIs62 Z23SXuapjI4KT0D72laXLqHSPIdvm+PCfj7gjMUbvOdVGsHtQ4OCS53/RrddAP7XQuxn ZS2eOAgUOcmfgd50/pOm/TCY8+roQUDb8qaMhcqDnG0G1h4K3GxD0vATZ2pl9GqbUQ5t 83bA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q10-v6si1749397lji.4.2018.11.26.01.39.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 01:39:03 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wAQ9d2V0030142 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Nov 2018 10:39:03 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.23.79.230]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wAQ9d2us012310; Mon, 26 Nov 2018 10:39:02 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 0/7] u-boot-script rework, the Final One (tm) Date: Mon, 26 Nov 2018 10:38:55 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 X-TUID: TOjOwUzG3NFm Yes, another rework of the u-boo-script interface. I finally realized that the current approach of packaging the machine- or even image- specific configuration along with the script generator is broken: It cannot easily account for different targets requesting different configurations. This breakes in multiconfig scenarios with different targets of the same architecture. Rather than hacking further on the recipe and package, this now pushes the /etc/default/u-boot-script generation to wic. For that, a new plugin is introduced, rootfs-u-boot, which is inheriting the rootfs plugin. The reason to choose rootfs as hook, rather than some bootimg plugin, is that there are systems that do not have U-Boot in a regular partition but still want to use u-boot-script. Along this change come a few directly or indirectly related cleanups. Jan Jan Kiszka (7): wic: Move isar plugins out of example layer to core wic: Remove obsolete reference to msger logger meta-isar: Factor out bananapi machine config wic: Add rootfs-u-boot meta-isar: Switch bananapi and de0-nano-soc to rootfs-u-boot u-boot-script: Make truly generic meta: Fold wks-file class into wic-img .../bananapi.conf} | 5 +- meta-isar/conf/machine/de0-nano-soc.conf | 2 +- meta-isar/conf/multiconfig/bananapi-stretch.conf | 17 +--- meta-isar/scripts/lib/wic/canned-wks/bananapi.wks | 2 +- .../scripts/lib/wic/canned-wks/de0-nano-soc.wks | 2 +- meta/classes/wic-img.bbclass | 26 ++++++- meta/classes/wks-file.bbclass | 30 ------- .../recipes-bsp/u-boot-script/u-boot-script_1.0.bb | 81 ------------------- .../recipes-bsp/u-boot-script/u-boot-script_1.1.bb | 28 +++++++ .../lib/wic/plugins/source/bootimg-efi-isar.py | 0 .../lib/wic/plugins/source/bootimg-pcbios-isar.py | 0 .../lib/wic/plugins/source/rootfs-u-boot.py | 91 ++++++++++++++++++++++ scripts/lib/wic/plugins/source/rootfs.py | 7 +- 13 files changed, 152 insertions(+), 139 deletions(-) copy meta-isar/conf/{multiconfig/bananapi-stretch.conf => machine/bananapi.conf} (79%) delete mode 100644 meta/classes/wks-file.bbclass delete mode 100644 meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb create mode 100644 meta/recipes-bsp/u-boot-script/u-boot-script_1.1.bb rename {meta-isar => meta}/scripts/lib/wic/plugins/source/bootimg-efi-isar.py (100%) rename {meta-isar => meta}/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py (100%) create mode 100644 meta/scripts/lib/wic/plugins/source/rootfs-u-boot.py -- 2.16.4