From patchwork Thu Feb 11 10:38:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 1439389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23d; helo=mail-lj1-x23d.google.com; envelope-from=swupdate+bncbda3zhwu2icrbeusssaqmgqebpglbui@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=a9XrY96i; dkim-atps=neutral Received: from mail-lj1-x23d.google.com (mail-lj1-x23d.google.com [IPv6:2a00:1450:4864:20::23d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DbtQ15DPHz9sS8 for ; Thu, 11 Feb 2021 21:38:15 +1100 (AEDT) Received: by mail-lj1-x23d.google.com with SMTP id c19sf3369978lji.11 for ; Thu, 11 Feb 2021 02:38:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1613039891; cv=pass; d=google.com; s=arc-20160816; b=XZIC1qdhK7b2lN/cGynESNHk0fXMs1t6jDQxV0gw3bnnIthcun+3h7rYURVrLi9vPt c6a3X0TqZ64/MXd5cZkbBaznuo4B2CMRnlQhAHfGihaiZ3vClniwV+dAdhJ2xP2oZgFe kRA1FXSfWGCEIOBH9R+9NHlAZXF7iBAOW9jlF+YxjY8IO213RrT+9CzThyYfe/V9NOBd H2vjFO1nsOCbfm3a+AGptmrBJCTHtf7IgCDvXTzxBfLkf9WG9vPUxiv8X60/JQOObEz6 5f92mfVGRA9szdJVatjHAbQ9lHSn324JOB0Y2mahOGk/sDyLDUXG0z6JcH9lPaFYbGen 2ZIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:to:from:mime-version:sender:dkim-signature; bh=tdwg4WHPcF58kqSbrZj2tfFrrCySbhLiYCSb7/3LOg4=; b=J+PdOFi5nI558ler88XCJvYr7ZbaQvp9Jui/ukh+Qk0eunAikUOgRsLpr4jve0yVwL zXZXKAp37vXeKWxL78pLFDlFkwEF3OvsWHE9jl/+kfyD0AeZ2G+FXQ+ZkUd0CQ5KKbAz 5VvCww8J9+cemR2tgq1jAttzh2D6LiqWKw6cfNWUufey9csS4EkvHq+FJTxQ4hr00WK9 2yhLdC4gh1sCREt6vR2D66+106W6RhoEJomPa1WMN6ha1lD3Tx6ANzWwFNWk6RmI2Y8s g1HnPhA2sq1REVZtfvsxTTXQgXSVoFLInSsYlp8GoFc+Fasa4y3KDc1Vio7tbnFTnGkW 7jqQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=tdwg4WHPcF58kqSbrZj2tfFrrCySbhLiYCSb7/3LOg4=; b=a9XrY96iiikdcvb/i582XGCbM99JSK3uJdztVnBhqOMSfWxeMoEY5hJSw3M92SKAPV K8RnPXOPIhIkJi6P3SS9ZKQwilWTOvTO0aXFI5YJpHuhbM0q4iYANWvQT3h48eWvnS5A 6Gc4MPXNebNSK2YKX7E6z4TLjY1IrTmtF9cKl0EH4/ZQ2ghQy4fxljL8DqyfHVCbVQKJ G93Tl/2WII+9fW+UX0mDj//p0qz0bqC3vR/kji6Tfhe90Ud9zbGraCH6SpdJ+PDKUwS1 +YsAKYAFz2XxQzL35NKm2RmmP9tQ7OHBDV2bQajai0xjWl8mWGyLU/Dzd4ox8bT8D7N5 wRww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=tdwg4WHPcF58kqSbrZj2tfFrrCySbhLiYCSb7/3LOg4=; b=h6Fyb7ALIpGeS9sMOHriP1QKft0MHZzMxBLZ2AuDLOq6G39SNND4fb/A+zIMuzLbW6 xh1y+dk27Dac5iugppvPVDGeS5XlZlAxS1gMZuslDwhucwWPFmR7LyDRQT149Zt+ctNk /15wk+nv7Rn3VH7iEdEPjcM4eJEV0sRGcBI7MmMMXboukVTHJdCHoAjFrveZWAzv3xGy FWYKBpYNyDKP7zKL5onv6lHvXOcH3/eipom9zqC+d1grY52DVUM44Ba4wTuOzv547JnI cE6E3+kqrIZylr59Tis2EmGPtjcBPzRZLOuhxChZ2kfZM3BRoe2s+/bdt6XBlyg2lOmf Nl/Q== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM53069CZtQ3K3LlbREI+oPbuoGHH1xT6ZMcjAaf6miM82+L+2ap3f zmcmiuij7FaLxIteUckWa/k= X-Google-Smtp-Source: ABdhPJx3/kRtVsfMrVUl5eZfr7HqCj0irNBuAPV9i5RJfRuIPmbKw3JkVRICiCeb0MSeE4bQ7jmVgA== X-Received: by 2002:a2e:99ca:: with SMTP id l10mr406110ljj.259.1613039891427; Thu, 11 Feb 2021 02:38:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:8952:: with SMTP id b18ls997821ljk.3.gmail; Thu, 11 Feb 2021 02:38:10 -0800 (PST) X-Received: by 2002:a05:651c:2112:: with SMTP id a18mr4665515ljq.341.1613039890202; Thu, 11 Feb 2021 02:38:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613039890; cv=none; d=google.com; s=arc-20160816; b=oGhbu+wNL287vLFoRYD+1wpd6XWqShyKLQv8HmvAr6SNrfi4sm7ORSejHvhrIKXP6d cENjsr53HFY3edddpojIp/e7K2KC+qpOgY4mkY1yXhuQApuVLKZwjc1x+euNz0rgNar8 3hHirr56U/HOTacDHZxEpmZgOI8ysSq4MZgGtQbFI/QlWv2OqU/uTdE6NN8+j0Bt5Tlm nteI5vJvD0pdfCZmFKDH4jkBV8B3qAJUz7RW2tZHh4kaCvfX/Sa1f7ZpgeUGgeRqTkmx 9Ysg7qTdzNIM78ElB3u6I14Pz7x9VYe1Om7NMcAupWvxc/PW/c2ongmJCa/52U5U3VeO kqmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=Ciu+a/0KQn0mPuUokRA5EEVz17IQTuby39EIzsSDxpg=; b=Yvv9ZxwShHsJiwS4SXWyQyyz/5GrtBlQG12z/dVnPQfWMuUb1mxEkJPUOkevCT2SM7 IES1KVW+LeALCdTN/khXuOmYpNV9PYEJdlBrfHARvaeoUq45gjDlQA6pUf9a35Xqy3l9 gLfk1/QUxsnAu13N/4zvGxE9eq9eWH15Mi6tYjfHn7tzKFZulTiLWEE9gYamhgwHZP+u LA/NueHL05hIha67drX/MvcMcyIPNSgwCwKRULkHPA1RhZ8XwHymosuXJQEEep9SmZ01 gTtSNh5iKiTqnMOo5sG++UAkh8qplgXgYbAidp0PJWu2bzhmvnXWVSYV7J2zP9apNAwD T0lQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id k21si257016lji.3.2021.02.11.02.38.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2021 02:38:10 -0800 (PST) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of agust@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DbtPs4DDxz1rtZW for ; Thu, 11 Feb 2021 11:38:09 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DbtPs46cXz1qqkk for ; Thu, 11 Feb 2021 11:38:09 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id COg9Bm_gjWkw for ; Thu, 11 Feb 2021 11:38:08 +0100 (CET) X-Auth-Info: JxSVnmsReXE0Me+Wsl7TC+8GkbdH52Uzo99nIcKW43o= Received: from crub.agik.hopto.org (p5483356f.dip0.t-ipconnect.de [84.131.53.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Thu, 11 Feb 2021 11:38:08 +0100 (CET) From: Anatolij Gustschin To: swupdate@googlegroups.com Subject: [swupdate] [meta-swupdate][PATCH 1/4] swupdate_class: prepare to use SRC_URI in image recipes Date: Thu, 11 Feb 2021 11:38:04 +0100 Message-Id: <20210211103807.9022-2-agust@denx.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210211103807.9022-1-agust@denx.de> References: <20210211103807.9022-1-agust@denx.de> X-Original-Sender: agust@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Enable swuimage task if building 'update-image' recipe of the meta-swupdate-boards layer or if building usual image recipes with appended SRC_URI and enabled 'swu' image fstype. Fetch SRC_URI files if 'swu' image fstype was selected. This is in preparation of support for 'swu' image type class (for building .swu images without meta-swupdate-boards layer). Signed-off-by: Anatolij Gustschin --- classes/swupdate.bbclass | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 2c2430b..774de01 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -76,14 +76,36 @@ do_package_write_ipk[noexec] = "1" do_package_write_deb[noexec] = "1" do_package_write_rpm[noexec] = "1" +USING_SWU = "${@bb.utils.contains('IMAGE_FSTYPES', 'swu', '1', '', d)}" + python () { deps = " " + swupdate_getdepends(d) d.appendVarFlag('do_swuimage', 'depends', deps) + + # add swuimage task if building with swu image type or if + # building via 'update-image' recipe in meta-swupdate-boards + if d.getVar('USING_SWU') or d.getVar('PN') == 'update-image': + bb.build.addtask('do_swuimage', 'do_build', 'do_image_complete', d) } python do_swuimage () { import shutil + if d.getVar('USING_SWU'): + src_uri = (d.getVar('SRC_URI') or "").split() + if len(src_uri) == 0: + bb.fatal("SRC_URI (sw-description) required with 'swu' in IMAGE_FSTYPES") + + try: + fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher.download() + except bb.fetch2.BBFetchException as e: + bb.fatal(str(e)) + try: + fetcher.unpack(d.getVar('WORKDIR')) + except bb.fetch2.BBFetchException as e: + bb.fatal(str(e)) + workdir = d.getVar('WORKDIR', True) images = (d.getVar('SWUPDATE_IMAGES', True) or "").split() s = d.getVar('S', True) @@ -168,5 +190,3 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" - -addtask do_swuimage after do_unpack do_prepare_recipe_sysroot before do_build From patchwork Thu Feb 11 10:38:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 1439387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::437; helo=mail-wr1-x437.google.com; envelope-from=swupdate+bncbda3zhwu2icrbe4sssaqmgqegav5jca@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=Qqd/S0HT; dkim-atps=neutral Received: from mail-wr1-x437.google.com (mail-wr1-x437.google.com [IPv6:2a00:1450:4864:20::437]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DbtQ14lXRz9sRf for ; Thu, 11 Feb 2021 21:38:16 +1100 (AEDT) Received: by mail-wr1-x437.google.com with SMTP id e11sf2243917wro.19 for ; Thu, 11 Feb 2021 02:38:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1613039891; cv=pass; d=google.com; s=arc-20160816; b=nX3qBx0BepDdQwc15z5QBlTmLh+k2CLXx7eJ7BZeaGykT0Y7FB0MteyURwrBPoq5Fu azp8Z3duBs9fBIUketlwlg+PW9yg7VRaMLYC8aneFvEf5KNzrf0eXkNBs9ip/YXKNyuQ NzEfafkd7uJ68/BTlg8s5z2naB/W3bSr3iBTBhUNr3IMB5vhBCf+l4JFHpKMdBAdj9DT tBLSiLtghwcZl8w6AAdWx/lVNqld6ZLtNsuvWUpCmYaL3PqaIXx5Ni39jE0AiVa73KbQ ABmKpEP6Y/sy/4TggJ6uYzEC49YOkhGU6T813yRo2XmqQZ31t8uSn0Bb6YKFjHgL37NJ swsg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:to:from:mime-version:sender:dkim-signature; bh=z5lCASE6Uv5hOCSyuPNUuK1wZEO4lT2WamigcbamHA8=; b=qds95rpasAMIz9XasICdwtRP1gU/9WVYH0UkYpnHogf1CuVYKPslmoZAHq92p1vrrX cHFhvNgfvl/93fj2mg9ykgpdcmna26hIShOZwKArAdH8bGKJ+8VLXQOcT/WLDw0jnoCW gPgmJGKRTE0V7ETO5X8h9A/GqrjHmtvOMqQfy2p1ASsEmRrNw/CoLNhCKY1xm2NPb8cq zjglocKNcWnTuaEOjMerpTDoaV6u4fmmiPS4aF8+sHd6qfpDQGuWv0/YhiPC5S7Ozpx4 F75FdmtRbCVTenzOw0xnGrwyRlvew2hzrCaUPrHXf9ivEyUiB4LbO0nnVLzlslyEmrLl u61A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=z5lCASE6Uv5hOCSyuPNUuK1wZEO4lT2WamigcbamHA8=; b=Qqd/S0HTDW7MJBw8BjkuTBo6sPWOMk7ZEziB/kVH4SveOxXk0p+FtGuF8QVjUP+7bu nTJmKJZ46O9WHgnM6MB2ErUxoQ9WjSeCGGXuC1hjA4U5DQaWrBWZ3yAq+vr4tGjUzl6O a1pqqpFeVLT6oSKd0BCCaEzGjSjzZadgky/Q7aHLnv4pWQBL+DVz0rKmbmQPmF1/GNY7 Ql2d2jdmVgW1oh2FvAd3EmG//2FQ2mfRdbJlm49kIRbiv4fYvpJdBr3J4JljvSM3PfVA vsv6ra5DmiHpHRg5bTsNjSJfz5AAeuOxoQqVH6Co4erw7k15KstV1JYWxrftYrW/ZPxu ODWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=z5lCASE6Uv5hOCSyuPNUuK1wZEO4lT2WamigcbamHA8=; b=gkhvC3ismood0hBkNo9SJhdbddzTZMClPc0K73yRL6V+/uHkzEUNvvxQWMtx7P1S6f G1chsNf7LsHWgewAQXbnNplGJUPeRZZsWVEtGwmr8yt/Qu4jLfhbxLME3r8zFLTQXl7x 32rDvqQPy4IrYfHfOLUNfp9K6yZnyVCJ0LJVUjDC7hjghT8UBCm6/9bhg+R6OSwyosBA Ios4b2WQwCkw5JyG7KWUyqjWxxkbJtoyXxXqNHrY8wfYnIRmYDFrDhM9ju3vD0DJmakf xHUnJYP/PslczUtLA2KQuRkVvw62yndrH8QusFztwKdY8OhZ0MHiu5wc1whIjdDgd5H1 Ho6Q== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530seGcGil8OuTtYHKWlaTmOYXAwDXZGia82FdUHzdlWjBZNTdam PoXAo4qoMhCQuBAfxHiT61c= X-Google-Smtp-Source: ABdhPJywazejiUGkoSnjhSFuxqd0c8kb722G54NC3FsjxqHrxaiOQcFr1nYwicPUNEtIl1uF0kN6Mg== X-Received: by 2002:adf:a1c4:: with SMTP id v4mr5074108wrv.104.1613039891634; Thu, 11 Feb 2021 02:38:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:385:: with SMTP id 127ls2733397wmd.0.canary-gmail; Thu, 11 Feb 2021 02:38:10 -0800 (PST) X-Received: by 2002:a1c:720b:: with SMTP id n11mr4609848wmc.154.1613039890528; Thu, 11 Feb 2021 02:38:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613039890; cv=none; d=google.com; s=arc-20160816; b=nk2EALwDptKR2kLm+VC4Ds3quALGX6140Yt02NoK9sHEuWcQgn+H0oc8hgwgPsJF4J UtYzz0nf3CPPOSnQvJ6RAK9JicIFc3yW5Q9IpJG8t4BVLB3pLScXt4mZT0+ot+GD/Dqm XPNbRn/4MD4CsRiolkN7jOk8a49Ihzv1DkwC8p2V+tKhmBDVGQurHKjxZxutIfrC2Vpr eLUvsBU2pDwrFS3QItr+xHzQaj8wH3gGv7rvVTxBWgCPhJfKX0gs1oWSQAENpRB+HCGP Vr5/Kdko+AFzrNpUawZ6YBlVwuoA0DN1tUdCvDVGoM7yw9kYcWWz1WNLd75FlsbYS3DY qZfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=wIbAn8CP/EppleRZh14koh6VIA6sMH5gKsj3rOqNJDk=; b=AFICumFM6dS3wBFqYW1OytbzTIkbxymSPCAWRLLPWD8sD1ryj1NdAmMv2ozkb4KgEB I81w5Enq0yEWPHVuRtvj5gQh7o+HdMHZyW/zh6zS6BYDnSndcoXIgVsBTyQvr1ZMrA5R 4RTLaoVSTdwCDPxUvjqCo6Yd0z/mqDAeOdPoIdtl4mpRDDrpANc9TUm3EZGzbxnB2Bi5 I3MturNSL6E7vBOfO180IWWQFoj+lbAE9q9jSF74I0iSG98Rq2dYmE27UTaMVk6jubR3 Ld+qyGYjf9fjJnWQBSejnCljo14OERmI7ieS9gB/GZTReudgBq11nUK5QkmcntssCuV4 qmXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id e11si152242wrd.3.2021.02.11.02.38.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2021 02:38:10 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) client-ip=212.18.0.9; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DbtPt23pRz1qtd7 for ; Thu, 11 Feb 2021 11:38:10 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DbtPt1zZDz1qqkj for ; Thu, 11 Feb 2021 11:38:10 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ui9MF0r2sSuP for ; Thu, 11 Feb 2021 11:38:09 +0100 (CET) X-Auth-Info: c5aXNWVUcTmXfyJo/F5/9mZUSv8gUaewNhYqccwTais= Received: from crub.agik.hopto.org (p5483356f.dip0.t-ipconnect.de [84.131.53.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Thu, 11 Feb 2021 11:38:09 +0100 (CET) From: Anatolij Gustschin To: swupdate@googlegroups.com Subject: [swupdate] [meta-swupdate][PATCH 2/4] swupdate_class: fix do_swuimage circular dependency Date: Thu, 11 Feb 2021 11:38:05 +0100 Message-Id: <20210211103807.9022-3-agust@denx.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210211103807.9022-1-agust@denx.de> References: <20210211103807.9022-1-agust@denx.de> X-Original-Sender: agust@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , When building with 'swu' image fstype enabled, there is an error: ... core-image-full-cmdline.bb:do_build has circular dependency on \ core-image-full-cmdline.bb:do_swuimage Depend on do_image_complete instead of do_build (do_build is an empty task here). Signed-off-by: Anatolij Gustschin --- classes/swupdate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 774de01..70b855f 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -51,7 +51,7 @@ def swupdate_getdepends(d): depstr = "" for dep in deps: - depstr += " " + dep + ":do_build" + depstr += " " + dep + ":do_image_complete" return depstr IMGDEPLOYDIR = "${WORKDIR}/deploy-${PN}-swuimage" From patchwork Thu Feb 11 10:38:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 1439390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23a; helo=mail-lj1-x23a.google.com; envelope-from=swupdate+bncbda3zhwu2icrbfesssaqmgqegdjmimy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=qHVv4hlS; dkim-atps=neutral Received: from mail-lj1-x23a.google.com (mail-lj1-x23a.google.com [IPv6:2a00:1450:4864:20::23a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DbtQ14VlKz9sBy for ; Thu, 11 Feb 2021 21:38:15 +1100 (AEDT) Received: by mail-lj1-x23a.google.com with SMTP id c1sf3368536ljj.8 for ; Thu, 11 Feb 2021 02:38:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1613039892; cv=pass; d=google.com; s=arc-20160816; b=FC2CFyHSPvn4kXieuPrMUbRz0t6mlhogH0mQkwIoYUfIt5YVZ82Nx2jU9ovBYWb/iB Uim5dZilHHGzVVNtxmmmByjs+LxBBkTypdKrMgmROsr9x0oTYjxMKkF27TkOzjG5iWXW y+IVyY1Gb131R6MauEfGdWbpexFzBi47uxM5YSbJ96lXfaxhD65U6fOnkT0XJbX7CMQ8 sGmyvFK3ZWlYqH814hxm+JvJdFIZsJLS83jLHMjcCGv6dx7fsMhP0WQ8GUsdfYlLCDSu f1YhUOptopzH45jzI1/1BFLBFm0G/2626CvXq83x7fCc1nVKRQDncx72Uu42DDr+TgUo Dv0Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:to:from:mime-version:sender:dkim-signature; bh=oq5giFn7iCusKzyHmkMW803egsRXsrBifcA7xx+2bHw=; b=D//w10btN8G7dCkpawOfRKtl4GH/TQsOtql6F+Rszv2vaSItTtTIU6kXQeHwILDBdf Uwd/625r+dNtovhkn8VKgbskM4say6FCi7ym0V6uqRPUNls22JWyjViBS7aYZbgIJN0v Tr3ZhsPinyBVvpd09agmLA3Oay435bU1lKMbUhUAK6MSZyGhD14mc2V6+TNbEKwMY+Do z8H2kVD5fAfRAvWFljl0Xpa5iG4l0Kk/mtwBe6yWtji2jzD2wzrniasBALqrl5q1grRj FBfwOi1pN70atogk5OR7M7QxqDq6Oz+HWWF6QrW9x5dIDxHeayzheP9lIarLOG8x1oBu XSaQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=oq5giFn7iCusKzyHmkMW803egsRXsrBifcA7xx+2bHw=; b=qHVv4hlSFechz7oP1DX/5brvRc+zYqk6p6Ae5wyoW65uz6o7xxljGO/OSm26H+ce0y UQD3rzR4kVGyQ67qLodrgIQmPuHOvMpOl2u53/EvCj/StVlYgfmK39LzVx7qUfTSRA/h zLd/z1tUkE34yi2IB7XMO6El5ywp4ym7wnz/G1634L2YPHy1zwc5TbRCDmZQilUpJS+r PN/V+r3z7j3Pi2rELoGHhq43uZNzquRlmK8F1tlaDac7RAHAqzn5rGqPYFOvMgu9nBGJ kWX4QXPun73GANpEBzXLnzusdx/BGIXlzBi2WuwPdGsvmZAOO9zZaHgbBHI6v7Ik/mHD 89cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=oq5giFn7iCusKzyHmkMW803egsRXsrBifcA7xx+2bHw=; b=kNhM4zvCAoDocT9opCmViHSSZlg4aUWpoW5tczrImS+tGldvkgzVsz83IYn+0SWoa5 YC41WdkaSd8Aa8uLkUcI9Wy0YsKBNTjoVxiwfzkpRPDSpADgKj37g30hrbHuoo7f6PtP O5ifzSRFUWebqFapk2DfadxgREorNnH58PMMye0CM6Jrqysq2wMn8yHQOAEDcV0TDPnc ca4b+C9P13yA3aj84tbr8MYCj/XeAmUmI5IrRlM0uT6FKYWbl6ILTZJJzpDZ6wHzZLMv QFWazh8tbStksiG0XzxdHTfnGzi1c8cK5p2R7rc2gWT7CtMqazktQ48pHbBQyJMfKyqE Vlug== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533ndKcIkd4XSsbiHZv6STqiyBlybhfJkH/1W/6pAXoR2RskvkZb Qjaa4CEcw8T8MUMtEHtLKLk= X-Google-Smtp-Source: ABdhPJwaoknbVyByWATddIj5hY4zG0+lsKXKL2777Mz4X5LX2Sp+Uc4t55n6caXnrYhX9tfnUxJkYw== X-Received: by 2002:a2e:a58f:: with SMTP id m15mr4731716ljp.214.1613039892430; Thu, 11 Feb 2021 02:38:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:b4d1:: with SMTP id r17ls993584ljm.10.gmail; Thu, 11 Feb 2021 02:38:11 -0800 (PST) X-Received: by 2002:a2e:4c11:: with SMTP id z17mr4650950lja.364.1613039891458; Thu, 11 Feb 2021 02:38:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613039891; cv=none; d=google.com; s=arc-20160816; b=jaFTn8YnZKG+Xpj6MSE2ZMhSs3E1Z+hDRoxW87TbmH9Er1zvueVxncQEr/oyJfxt4S 8kzvPo7BuR9PD3CQjDFGz4S61abrliy+OdZoHdwqJgzLvb4jDPX//Tpku5R2FS7UvePH LePwr6ll7w29eu+YUHyka6pVy0PrFiZhsdk6lXWafllUWY9AqtRyYtnZpTNnD0s9Ckx2 wMcGho0/xRVw+pCf+bnzmVUA6WIVZR/ERwRRc1iMH+5rvuhaE3vRcKLpFN1X90tZilul gVgQPQ5H18ui11h2oxYAoX/9FdHbpgpNcF+e4AMifLleA8P4pwCCoHAB6vzBNSyBggwh aUeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=Dkx55Kud2DyURUgIzM/7bwwPXgk2aw1bXRpe8lHOfIY=; b=Ss3/kXFO6BJOVufYiVwlEMOscsQ4NILMcTN++zYVYpYf1ZUCvpK8Kx1J8NeCL1u0JR jLbgNSim837SEv32vjsTKT1kwZTgfKcyT/zWWByNV4dv7ulAK7r5MpOhfcdwOf/h40NB aJhopB0Y17y6BJm3ClnYDdltk7a2UHdKARBNDZhin5/E3BMKgYx0rg5laiINxLtHROKR e7rZy02ZhgfYUxdtmQaDby/mGbyv1NvL1aFKfc3La8607ZHpRq6H4vspVATCR+3IrXby +hhsa+TCE72MgcwbBzl6ZFOnyFlgpScJPcfPEh1CgpXgjmE2ua7hT/3IKSW9cIpikp3W gGnw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id i190si228653lfi.8.2021.02.11.02.38.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2021 02:38:11 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) client-ip=212.18.0.9; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DbtPv08KLz1qtd7 for ; Thu, 11 Feb 2021 11:38:11 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DbtPv01Wkz1qqkj for ; Thu, 11 Feb 2021 11:38:10 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id NTpTvtSq1nDU for ; Thu, 11 Feb 2021 11:38:10 +0100 (CET) X-Auth-Info: gE/fa8JC5BRQB9Lnz4vaLWIYXUwgq/DtEK3H0y7V9M0= Received: from crub.agik.hopto.org (p5483356f.dip0.t-ipconnect.de [84.131.53.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Thu, 11 Feb 2021 11:38:10 +0100 (CET) From: Anatolij Gustschin To: swupdate@googlegroups.com Subject: [swupdate] [meta-swupdate][PATCH 3/4] swupdate_class: enable building .swu images via swu image fstype Date: Thu, 11 Feb 2021 11:38:06 +0100 Message-Id: <20210211103807.9022-4-agust@denx.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210211103807.9022-1-agust@denx.de> References: <20210211103807.9022-1-agust@denx.de> X-Original-Sender: agust@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Extend swupdate class to support swu image type. To use this in an image recipe following changes should be appended in it: - inherit swupdate class - add SRC_URI with sw-description (and more required files) - add IMAGE_FSTYPES, i.e. "ext4.gz swu" or "ext4.gz.enc swu" - SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = ".ext4.gz" - IMAGE_DEPENDS = "core-image-full-cmdline" - SWUPDATE_IMAGES = "core-image-full-cmdline" Signed-off-by: Anatolij Gustschin --- classes/swupdate.bbclass | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 70b855f..4112970 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -32,6 +32,8 @@ # image file with exactly the name as specified in SWUPDATE_IMAGES is searched for. inherit swupdate-common.bbclass +inherit swupdate-enc +inherit image_types S = "${WORKDIR}/${PN}" @@ -190,3 +192,21 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" + +IMAGE_CMD_swu () { + # We cannot use existing python swupdate class code here, + # so this is a dummy command to make image_types class work. + # The .swu image generation is in separate do_swuimage task. +} + +clean_swuimages () { + cd ${DEPLOY_DIR_IMAGE} + rm -rf ${IMAGE_LINK_NAME}*.swu +} + +do_clean_swuimage[doc] = "Removes .swu output files from image deploy dir" +do_clean_swuimage[nostamp] = "1" +python do_clean_swuimage () { + bb.build.exec_func('clean_swuimages', d) +} +addtask clean_swuimage after do_rootfs before do_image From patchwork Thu Feb 11 10:38:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 1439388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33c; helo=mail-wm1-x33c.google.com; envelope-from=swupdate+bncbda3zhwu2icrbfesssaqmgqegdjmimy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=ia7dlkXr; dkim-atps=neutral Received: from mail-wm1-x33c.google.com (mail-wm1-x33c.google.com [IPv6:2a00:1450:4864:20::33c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DbtQ15Vnmz9sSC for ; Thu, 11 Feb 2021 21:38:16 +1100 (AEDT) Received: by mail-wm1-x33c.google.com with SMTP id y9sf2325771wmj.7 for ; Thu, 11 Feb 2021 02:38:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1613039893; cv=pass; d=google.com; s=arc-20160816; b=r0l2VdIxBCV5Yf+4IGIbR/KgYZH7Tyo76zsueVRmWaF7iiQOBTV14U67l9CFomUHmf ELp/sDWTNWgQtoSwBRPC2qQV+frwi+d/rImqyh3LswkLPJKfa5A54LW+cyM1rCU0srum SJRR5MT6y2Qe96VIjmEBkUeum2KOiVPL6XlsphGeHaLW8i3fQjBiNraWQM+dGccbJi/h 7LnPrYowXtWKv1tMcaZUDz8M162WNODU6yoiLqJamxKg9gOS6DY7moD6hOZbJ3IA1Vpb f4jrVFK1LGhfc5HQJpmJLMXtl20Mz/v4SJ7AUThoZtFgw3Gt9T8MjhgbPWmjq5R9UkrS NLRg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:to:from:mime-version:sender:dkim-signature; bh=QeMTEEXkxNPAvYvhg7nk87p9FjtFSj2JqE/Nc214r+4=; b=uHV66Il4Gba+1UA0oTtH6waoGwArivTNr9n70KtXGrwAW0waduGCNGyomGvuR6m2Y/ GsLKIyGaFsQ7t1BuvrNUgRDumdEOPeZwOggnQnlQQtmes7VJ4ByzJZUJQ62lyJJ01i6c 6xuXgcaFLRVYGy0jYTQrqw9m3sBdhK95UBY5HTokSwM8W7TGPlUQxtRtLDanCutb+Xw2 2xhYAyCob7td1faD1Vlojpc9VSrUosQKwS+47X94Tm0YsWl/0lEdetadyqwrSEfJToVR 6MY83/dBG64EAd1HDCDvtoNiunrbegu49Z2y6q0R25grdZZ+Et8q13GD5Eo3OnNjY9yG 12cw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=QeMTEEXkxNPAvYvhg7nk87p9FjtFSj2JqE/Nc214r+4=; b=ia7dlkXrXohrPkbsHJvwyPN3HQq1haj5zuggHOX5WaxlShtGL9a+TA8kszNp2t+jrK BBIQcqbuydPU+1NSWBxCQumsLnAhRWOdsBNha98k67YXC+T+UZhEcvMJHD/MZbmOgfbG lDKWpoW+XKEE/X8G7LeJANzfitGQG96smjwYIFqbvAJNUi3Btk63Pa7necGyABVX3H+r 5RCxCOfjXor1Xo6PNpwTiv5FGjlwMWi0psxDU9b7QU9a/l1wHNg/guJqDEKb4t4kywSO wONFCGrLvIS7PS3Ys40shoNcMuAeqFQGWaRTkXDYnFlQzsUwa/9taX82zRa+uYjyWWdf M3kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=QeMTEEXkxNPAvYvhg7nk87p9FjtFSj2JqE/Nc214r+4=; b=Kmsl/Ay/SrKSwvPKDk5cIVeIVl2S/qgyJfTOVUG07rKTgYE8OvpabcXxOyPwwJ1X7q fPyKoxAIARFS1xE0ffIZP8weVM3T8NppfxdBIv0ZDayB+/RbJ1yS32QLwqYid9W2696H qiteuxht8SFTkM8+79eqFlUcsSoFVnK2xnDxI6XioN2aGtVryskN8eQpJ17hBb/b1xuZ NNi6++AqpTvSBeG8tdxbp03F50885+4OwVsJhyIq7y+XjUEPnqPS7qRb2DbMak0x/0AE wY0RyPJ/P/r3BBLNJ3cGfx2NaGbhRjjfBpKwF6H0h+BErgKya+J/LhkqFQkLWPO/pr1F F9Xw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533SFr7h6QgsqHJUpG3QBERa8jKY5uj8PVpY25Lv2JpgCF7RjKhZ vpiP4fm+QSl9IH+t2Zbt33k= X-Google-Smtp-Source: ABdhPJxuaNSQbq+BuAbhht9q2gE4WNmANHEVcOcuXk274TcndKGlrsjBweEYNvL9wdREVB/lt/ZWkg== X-Received: by 2002:a5d:58c2:: with SMTP id o2mr5058068wrf.141.1613039892962; Thu, 11 Feb 2021 02:38:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:640a:: with SMTP id z10ls3856579wru.0.gmail; Thu, 11 Feb 2021 02:38:12 -0800 (PST) X-Received: by 2002:adf:ec89:: with SMTP id z9mr46661wrn.410.1613039892097; Thu, 11 Feb 2021 02:38:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613039892; cv=none; d=google.com; s=arc-20160816; b=vOz44Myqa+nU6spc4myvOTmxAGVvzYd+2w9s0YF3YdLMsRf7cm+WBnQ87vOBUb2Ye5 rVApQX0jOhfZkGfRuRYoQPQ3cp2BX2m3p1Pf1tU1WjybFLm6eEvCVeJTsz9rfR97KrWj lXTO6txAUucBEj4Kx96KSFSPt/NOZaELhbJgjAk/1kzfGnyYJdoPPNxjqBZs01ou/2Us CRyad+UuavaIVUVJbjBbgu8FHD84jH11U2rbQElHiD+BGGtx16ay5EjvzEWSX9MLJJyZ jJLq/95/q7kyj72nv4/MSFmBZizpGLXkYNqu99QbFuJukkPY3mxEBYGFxlxf0mwT6zIF 79Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=/9DrE4rk9jng+YcGgr2sS7uP4JlRZorJ1gvl8YObtp0=; b=m9e5peF1CFMi1RbJew7vF5WiI5/ngZ09WqrAjeyxuZlqnmYzVqhObawjb49df1a/s7 xvopk8iC8BClx+6B462ES9XiPtwZquN8iytZC6gdYEvZIWT9q4aG1hnxWC+mfykeP4Fr Lf0Tr/sgZ7H748Jp1i/KKNwTrdNXBFGDVUZRn1OG+AGWvhOrhy6JPBrbdxY74H6K+uIF P3tRzlDh2akACoz9+A6LB4vzvHDZdhbnNm7istKrAa1RTMpy38Jqfe6Dh4rTkwHr3K1L oahGOa6otTZVJ5j3oHgrExb9HKgMMEeRzyzIk0rWRFbo++IIrBr2qcQWjmDZmu9PmcYT WYHg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id 201si450647wmb.2.2021.02.11.02.38.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2021 02:38:12 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of agust@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DbtPv6784z1rtMh for ; Thu, 11 Feb 2021 11:38:11 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DbtPv5tc7z1qqkn for ; Thu, 11 Feb 2021 11:38:11 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id QkJCe3WSOTU0 for ; Thu, 11 Feb 2021 11:38:11 +0100 (CET) X-Auth-Info: XaP4Dl3L99Yz+xRv/jlZAAp0NmyX1BFvcpCMB+MbIm4= Received: from crub.agik.hopto.org (p5483356f.dip0.t-ipconnect.de [84.131.53.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Thu, 11 Feb 2021 11:38:11 +0100 (CET) From: Anatolij Gustschin To: swupdate@googlegroups.com Subject: [swupdate] [meta-swupdate][PATCH 4/4] core-image: add example for .swu image generation Date: Thu, 11 Feb 2021 11:38:07 +0100 Message-Id: <20210211103807.9022-5-agust@denx.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210211103807.9022-1-agust@denx.de> References: <20210211103807.9022-1-agust@denx.de> X-Original-Sender: agust@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of agust@denx.de) smtp.mailfrom=agust@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Extend core-image-full-cmdline with options for building .swu images. Signed-off-by: Anatolij Gustschin --- .../images/core-image-full-cmdline.bbappend | 26 +++++++++++ .../wandboard/sw-description | 43 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 recipes-extended/images/core-image-full-cmdline.bbappend create mode 100644 recipes-extended/images/core-image-full-cmdline/wandboard/sw-description diff --git a/recipes-extended/images/core-image-full-cmdline.bbappend b/recipes-extended/images/core-image-full-cmdline.bbappend new file mode 100644 index 0000000..cbc59a6 --- /dev/null +++ b/recipes-extended/images/core-image-full-cmdline.bbappend @@ -0,0 +1,26 @@ +# Extensions for core-image-full-cmdline image recipe +# to generate .swu image using swupdate class + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +inherit swupdate + +SRC_URI = " \ + file://sw-description \ +" + +IMAGE_FSTYPES = "ext4.gz swu" + +# remove comment when configuring to generate ext4.gz.enc or +# ext4.gz.enc.swu images and add a key to the build directory +# as "conf/enc.key" +#SWUPDATE_AES_FILE = "${TOPDIR}/conf/enc.key" + +#SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = ".ext4.gz.enc" +SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = ".ext4.gz" + +# images to build before building swupdate image +IMAGE_DEPENDS = "core-image-full-cmdline" + +# images and files that will be included in the .swu image +SWUPDATE_IMAGES = "core-image-full-cmdline" diff --git a/recipes-extended/images/core-image-full-cmdline/wandboard/sw-description b/recipes-extended/images/core-image-full-cmdline/wandboard/sw-description new file mode 100644 index 0000000..3a372d9 --- /dev/null +++ b/recipes-extended/images/core-image-full-cmdline/wandboard/sw-description @@ -0,0 +1,43 @@ +software = +{ + version = "@@DISTRO_VERSION@@"; + + @@MACHINE@@ = { + hardware-compatibility: [ "revB", "revC", "revD"]; + stable : { + copy1 : { + images: ( + { + filename = "@@IMAGE_LINK_NAME@@.ext4.gz"; + type = "raw"; + compressed = true; + device = "/dev/mmcblk0p1"; + } + ); + uboot: ( + { + name = "rootpart"; + value = "1"; + } + ); + + }; + copy2 : { + images: ( + { + filename = "@@IMAGE_LINK_NAME@@.ext4.gz"; + type = "raw"; + compressed = true; + device = "/dev/mmcblk0p2"; + } + ); + uboot: ( + { + name = "rootpart"; + value = "2"; + } + ); + }; + }; + } +}