From patchwork Wed Oct 23 21:10:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182495 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::540; helo=mail-ed1-x540.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="sNc+uftn"; dkim-atps=neutral Received: from mail-ed1-x540.google.com (mail-ed1-x540.google.com [IPv6:2a00:1450:4864:20::540]) (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 46z32Z4HV1z9sNw for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-ed1-x540.google.com with SMTP id k5sf14131896edx.13 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865071; cv=pass; d=google.com; s=arc-20160816; b=nOGkLMQK/++ZQ3a9FDe/pkjEHAwqRXx3Uc0URZy0yClounpKSXYfxCKtIjekezVLWs vrsixZt2L5KeMsyttMIGwWl4yjXgjl4teX0NG67/I5HGZwJAUh5wgLlX0aJhkbXQmkWj vSULPUB2j5Hq9m0TEgj62+LFNvhtp7hfJlFwxz98kI11eyAtQXSy9yM0xCz7fPoPIlEI IIldq0CgaQnzmo52EgsghYjkxaH7FSUMHEupbOHodIG3LKk/W0+I8kGFnvXpz9TfMpdq dPW55WOWTz2EXB/eNkW67jzWA7zz0Fp4mKRNaG/tUeEVAQqYpgHLnrzLfgOJhSqxwY2l rWlw== 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:cc:to:from:mime-version:sender:dkim-signature; bh=1JU1wM9i+wTd0iJ9EpBRfXLv6RnfFyJXK4gYyKFbvDA=; b=fSO9rxwN+6gTjORUMOZvCAT3R33nH/Do42ctXQSf4of7dnBsHWiEsPjavJ7oh3bQUt xLih5mhPeqPFpTq2+qYyJ7c+icDYXhs5tylnCpw/kGXTVEYpreuAsoCVQopXPqP3nh+v rqihkb4NSyO3ydPujby/8EuE7TTPUm9IQGwgSigk0jErI5J9HevmLllRMYO0PqM5vHQx rfqxP6DKn3PkMoW9gjerG5AypnBUoaX5iBPlTTAQ+gYp4kx0s1qwB5ozCxIzIBjawcCQ qTTnRqiG9L71pM4aG2mDJVdzm6JEHFabLFdvodbjuqsafiJLqFjItaSr0h5AaGrGGTz+ 3EEg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=1JU1wM9i+wTd0iJ9EpBRfXLv6RnfFyJXK4gYyKFbvDA=; b=sNc+uftnicQjsXv/MBsuonVDSn3An6xBrPP71JEzbNH+sIkDFXN9MLb1CF6MwQ5z+5 8fCd/hnqGZPso1AqcHVHPNcIuQIDpu2d/6e+QESyGu8anxBvMZNsvtiYbNeGAREC+tIS /mJAzHC/3BWvU1r+ogg1sMRk7W72PzlaiuPY1nxGgFwfJn0jkfq+ZeiFrZYbzmSb+JAA 1CzuWmy37F06ueAhtEgBJu2lNjCt4nxVasRIeQtVBdf1eCX71xR5DWZlybkaKEo2Vyyv 1UesxKzpBxMfd3Yo8uUgbFVxxOLbrHU/ds0YU/+dGOqwqwi/BcoAQezdZL7IHpQizwTq 1uPQ== 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:cc: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=1JU1wM9i+wTd0iJ9EpBRfXLv6RnfFyJXK4gYyKFbvDA=; b=Pl8vtXfjTzHxMaORHanFbqHLeb8xX1DD+MgoLZUBqm9s6PLiVDb/nMeta/RF/7FibN UADc50QFINADF5V/9Oxa9mL2mzvdJQabWSfzNSIy4tIAb2Y5o8SFfGt31ao69n/hu84g D5ZpcL+CilxtnGlgdldmvJlZ/qqpFEVU0E5Xgk7pIOyICeI9c83SUPi7ooNS4GabanB8 AWXYRg5fdUsF/UFd9Trl2A95CunSB0ZWhHXp9urfYFFsEFCdRnV3sbmYlI4ALrau5iEV sLbpdsiEBQsRq4ztta2RHszqkP6MYlZ0d5tZzrfDPS1lfdXxyzgUaPVwGTHk+R7AWvN3 2HTg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAWIrowpuspEZVhhA7ktPUkIMOZvlKuVLJQIiVjcfKsfCeLuhhpt 6fSHHJsMSXVclfyUVMVzIhk= X-Google-Smtp-Source: APXvYqzT/+5XWC6wReuIxrYjc9Bj+HVDOotiyoOoNrQFWRHsVts6ilQjlmt3NqJ/leB81nANQE+t7w== X-Received: by 2002:aa7:ca0b:: with SMTP id y11mr17317121eds.51.1571865071154; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6402:2d3:: with SMTP id b19ls759580edx.0.gmail; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) X-Received: by 2002:a50:e606:: with SMTP id y6mr39681093edm.261.1571865070751; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865070; cv=none; d=google.com; s=arc-20160816; b=B59WiGT7BGFuz4jkKWpaHAq0mhJ9BSmCHFJfFfL8bNE+yD/022nwLAoAq9dKmL9EHg +DcwtXKlEML3iCEGf/6lOWXwlpPbnweEirfDGgThihR8eWBu4V2ujdYYm3zjFrwzFux8 iZdNHFEGeGXjxOwL9Hgi9uFBDkOyz9JEOGWCzGtGnmyYMVq1NUoqplRUxFpBAy7oVTDx d4Kep51yonOiBx2C+723XRfMMGN92XrgJjsXv8Iud5PxMLfRBytQMfaFkhGp9iUG17cV x4LlFHHZQQSV6jbfPk2WpcHqviSDIMCrRW95Jp5RY8qRAVWCJ2zp1kA1gvkJ9YWyhS0U tvQQ== 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:cc:to:from; bh=8wCN/g93qVnZfEiIXAogWMkIzlPI89McS8z13qsfkTk=; b=xjBNT7vUwWuolWCTmWt4N7Tc1PJu62BpX0J6d4ui479OzbOA9r8OQFZZs9H6zx0eAq rDo4EHuLbalUJ0R+dO0Ja8tYcc6HQ5RV9CWFoQXT2jo8NDqa/TRbo2n9N2lMu8xhYwCy fmZ1ILzDscTeqo5AklzoOc1bgoCoMuLQVZR62lirFjbFwEY/DcHdA9xViPeki+OZLneT 4iXjWIl6LOLefVT1HrKzM2Xa3s0tksMzwUJtAXig+6FBxQSXtREeb7mnqGvq/szv/z7c OouZol17MKcexBgMClwDq7QF3YA6JWmjRH985tR0EuGIOIkfeGRAewlhS59Dt5W1lQwT bYrQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id c28si1093107eda.4.2019.10.23.14.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:10 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9NLBAIH030514 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB8Nd026691; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 16ECC2353A51; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 01/12] swupdate: simplify find images added to swu Date: Wed, 23 Oct 2019 23:10:50 +0200 Message-Id: <20191023211101.16591-2-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , Try to make the swupdate.bbclass a little bit smarter in finding the image files added to the swu archive. The implementation is also a bit more Yocto like. By default, files are searched automatically whereas MACHINE specific files get priority over files without the MACHINE in the filename. This makes the SWUPDATE_IMAGES_NOAPPEND_MACHINE VarFlag more optional. Most standard use cases are expected to "just work" without setting this flag. Add support for files in a sub-folder of DEPLOY_DIR_IMAGE. Add documentation to the header of the swupdate.bbclass file. Signed-off-by: Adrian Freihofer --- classes/swupdate.bbclass | 77 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 1d74eef..79c9aae 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -7,10 +7,30 @@ # in field. # See also http://sbabic.github.io/swupdate/ # +# To use this class, add swupdate to the inherit clause of the update image bb file. +# The generated output file is an swu archive ready to be uploaded to a device running +# swupdate. # -# To use, add swupdate to the inherit clause and set -# set the images (all of them must be found in deploy directory) -# that are part of the compound image. +# Files listed in the SRC_URI variable are added the the swu archive. +# +# For each entry in the SWUPDATE_IMAGES variable an image file is searched for in the +# ${DEPLOY_DIR_IMAGE} folder and added to the swu archive. Different types of entries +# are supported: +# * image name(s) and fstype(s): +# Example: +# SWUPDATE_IMAGES = "core-image-full-cmdline" +# SWUPDATE_IMAGES_FSTYPES[core-image-full-cmdline] = ".ext4.gz" +# For this example either a file core-image-full-cmdline-${MACHINE}.ext4.gz or a file +# core-image-full-cmdline.ext4.gz gets added the swu archive. Optionally the variable +# SWUPDATE_IMAGES_NOAPPEND_MACHINE allows to explicitley define if the MACHINE name +# must be part of the image file name or not. +# * image file name(s) +# Example: +# SWUPDATE_IMAGES = "core-image-full-cmdline.ext4.gz" +# If SWUPDATE_IMAGES_FSTYPES is not defined for an entry in SWUPDATE_IMAGES or the +# corresponding image files cannot be found in the ${DEPLOY_DIR_IMAGE} folder, an +# image file with exactly the name as specified in SWUPDATE_IMAGES is searched for. + inherit swupdate-common.bbclass S = "${WORKDIR}/${PN}" @@ -74,6 +94,7 @@ python do_swuimage () { if d.getVar('SWUPDATE_SIGNING', True): list_for_cpio.append('sw-description.sig') + # Add files listed in SRC_URI to the swu file for url in fetch.urls: local = fetch.localpath(url) filename = os.path.basename(local) @@ -81,30 +102,40 @@ python do_swuimage () { shutil.copyfile(local, os.path.join(s, "%s" % filename )) list_for_cpio.append(filename) -# SWUPDATE_IMAGES refers to images in the DEPLOY directory -# If they are not there, additional file can be added -# by fetching from URLs + def add_image_to_swu(deploydir, imagename, s): + src = os.path.join(deploydir, imagename) + if not os.path.isfile(src): + return False + target_imagename = os.path.basename(imagename) # allow images in subfolders of DEPLOY_DIR_IMAGE + dst = os.path.join(s, target_imagename) + shutil.copyfile(src, dst) + list_for_cpio.append(target_imagename) + return True + + # Search for images listed in SWUPDATE_IMAGES in the DEPLOY directory. deploydir = d.getVar('DEPLOY_DIR_IMAGE', True) imgdeploydir = d.getVar('IMGDEPLOYDIR', True) - for image in images: fstypes = (d.getVarFlag("SWUPDATE_IMAGES_FSTYPES", image, True) or "").split() - if not fstypes: - fstypes = [""] - - for fstype in fstypes: - - appendmachine = d.getVarFlag("SWUPDATE_IMAGES_NOAPPEND_MACHINE", image, True) - if appendmachine == None: - imagebase = image + '-' + d.getVar('MACHINE', True) - else: - imagebase = image - - imagename = imagebase + fstype - src = os.path.join(deploydir, "%s" % imagename) - dst = os.path.join(s, "%s" % imagename) - shutil.copyfile(src, dst) - list_for_cpio.append(imagename) + if fstypes: + noappend_machine = d.getVarFlag("SWUPDATE_IMAGES_NOAPPEND_MACHINE", image, True) + if noappend_machine == False: # Search for a file explicitely with MACHINE + imagebases = [ image + '-' + d.getVar('MACHINE', True) ] + elif noappend_machine == True: # Search for a file explicitely without MACHINE + imagebases = [ image ] + else: # None, means auto mode. Just try to find an image file with MACHINE or without MACHINE + imagebases = [ image + '-' + d.getVar('MACHINE', True), image ] + for fstype in fstypes: + image_found = False + for imagebase in imagebases: + image_found = add_image_to_swu(deploydir, imagebase + fstype, s) + if image_found: + break + if not image_found: + bb.fatal("swupdate cannot find image file: %s" % os.path.join(deploydir, imagebase + fstype)) + else: # Allow also complete entries like "image.ext4.gz" in SWUPDATE_IMAGES + if not add_image_to_swu(deploydir, image, s): + bb.fatal("swupdate cannot find %s image file" % image) prepare_sw_description(d, s, list_for_cpio) From patchwork Wed Oct 23 21:10:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182486 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::13f; helo=mail-lf1-x13f.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="dEmKe6GW"; dkim-atps=neutral Received: from mail-lf1-x13f.google.com (mail-lf1-x13f.google.com [IPv6:2a00:1450:4864:20::13f]) (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 46z32Z4wDFz9sPZ for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-lf1-x13f.google.com with SMTP id k30sf1429304lfj.5 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865071; cv=pass; d=google.com; s=arc-20160816; b=WiquJkZfh6+f9ZpzMawbr8fBaWPrjmWq+/kZTa12tpkm0uZszVAXfjJ498DhQ0nfFR US9tvG0woCFn3B0K1bRuhQzCL9KqrZ1zxociv+lTfOk+1hk3oAXS2M4JMDwsp5diIT7n OAPqQqr6m25QxPMiT9cKedlWT6zUCWNd2vNNvFf5Z46lBsAeOsCB8HFJpifTMn6N5KfH +hfBI21v6Wcq1M6cAIs5/5zyomjvXhh/ggbgP2u65JAquDZlm2HPE11zi51bqVZbVbJ1 TOo7Fskmvdjbg3Dlp0noneUok5KzJwvGx81Lq+2GuLWv03Ge4rMwiUZ57crwEQKqjylC l1jg== 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:cc:to:from:mime-version:sender:dkim-signature; bh=ISNBnCjMPPdrDKesl5XmPDvA9z1wPW8Jj9Xsq2GvQIg=; b=B34OftdwljnV62L91tl4NZycpC0qTCjih30Oj4z36OhitJya7QQf4WVAnJ/J83fFRv f/pjcXbiCPyYMUUvGU7vlDx6MxAfZFJ7wKvSXJdHvXQ3HxNVKbl+XUWpvh7jTYebbc0X 7saUlhmbWIzx1MTYbDAZGWKehapwLGknfkkI4y6y9Coo3gs04OYrei4mU2pxw0IAHLcs oTbQbCKaxTtMIJKDjgtIyyiQP/R+kSrIJaPD6JI6rjxJCT8RlrewfSUrJHGr5UMerBIl /IhYOh1ChmPbfegVW5K9a/J6bID3MoIt5SydMsqkDyM0gFL72/moRqFzzp2gdpdcmx5e POdw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=ISNBnCjMPPdrDKesl5XmPDvA9z1wPW8Jj9Xsq2GvQIg=; b=dEmKe6GWy0TgYh09favwfDO8Rm7/TAZ8+c9bOH/Xxwt76pEYbMMsV04Is2+GEeva68 /Jv3HZbGMFKE6Nd4DCArqAFNimzC06GvnxXDgzib2GAHuMpdld9jNDfghoLrY28wbydS dMITpwvY8VcBLb7vLV2zX9iH2gRTUmoXBZG32ltzrJBjtFsAB8n/fq1KtujNsJD9WoRs HHg45MwgEKo14/n8R6oGSfsrlNGSfp0oolrCzGhb5xNBypQd8jktTbzw/CB9O+6kJ3PA zzPS93ZbOmg7RNRjsYr5ZSKZihPN3w4I9ESZYMTCBGc4bry3i3/W+gFscpLR+8AiZNdz p9gQ== 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:cc: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=ISNBnCjMPPdrDKesl5XmPDvA9z1wPW8Jj9Xsq2GvQIg=; b=iCqxcb7bZ+t5OiD6XXzMc1RE9NDprgrNN315cJiE2baDMmTIjPelxgtOkBDZ1B1+rv Q0HSdKbHKAorl0pmmWpYqT/+8Kbljho0KYCH4K+1oU21kNdyaPwx/VFuM3xonTs7PrSP SLN2Fu+1JGJQxM0dg4ymtmYQ0T6QwdOOylq/bbyfw31t4PX67/rcTsNKTJX1lvx5lhuM bZ8lrghSJcgorQEAzO1yFqW/dRKdBUAItfE4A0DCbAHw5aYroGRaHcTYPZTawGD75vdG tb1qhGNnBlC1RrVGoKk9jNXvDfVLDAs3l8sTF6GF3xIx7TnfLcf49UHyBnrohTbTxHXq QiMg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAV7QxGzyUDCwSJ1orD4BpA2K8DvEGiNRmmaTdYRRV0jY1xMZquz yHfLa+88NLnt+DndvlzH9dU= X-Google-Smtp-Source: APXvYqx/dx/wGSZXCVPiIeFfqa4lCulErj625NjxIgm1V3zCjI6H51Wvpeo7Fkrivj6MzPfrLPMCeg== X-Received: by 2002:a2e:8310:: with SMTP id a16mr24247785ljh.48.1571865071299; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:93:: with SMTP id 141ls349301lfa.12.gmail; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) X-Received: by 2002:a05:6512:142:: with SMTP id m2mr16861430lfo.126.1571865070883; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865070; cv=none; d=google.com; s=arc-20160816; b=hPGkBimrIP0Ai0imalybtY3smrQAri/zv0x3mdRIcqHBT4FraPrREVSoEhSiVp1cdM W/XedGndZ8lgr8MxaSTwlnQU6FY/ZgZ0DWJMCCTMdoY62glHSAx0d64kh0l1DPGAP5/Q WbvLV7qOu/W0MgwL6zQCtgbzmqfHrnXvy56XQ5RlnLME8UsqTNlvzJto8YN3ZzNSPwLX XyXOwJbSiECe41voZkvrkveLtYGyygLYzCTb5zGogqWzOMLp8fIENbU3nKMvibkdGf3I 7ow8l5TnJn5rWvOGOQXzZ0Kjq1YCKCFxUN6q/comHuvSP2/3hYIv6BiKPALHBKG8vqi2 jc4Q== 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:cc:to:from; bh=rBRkaXlkI7idc5ty1rxDEsY9R+6q1WOcSp1UNz6tmL4=; b=A0dowrqrhC/KF1EhKwwg9CfXuHt5ioO7qDK3cCDHtG12rX7q0EXSHUBUm+2LUGDXIQ I1pHcdNGN/UrJW+KIboErMjL5A+6XpgDlkM4XtHIEPMhBOFfBuNuNi9XpFTUvJ1ZMTVU zRPoUlrmVnn6Ws94qSurJHnLFa8jE2EqkwYm8QcuEi34B6sVf3RKQb8iDKb075L1bpKk 42fPhe6TLJ9x3Y3wgHasReNwDUUSVsLKxdNXJXU6CZsKyGvVjWC8Y4K9dTjY7msdsMNL wKJmQhCaX0GyJ1+/0PRYNG+GrRgycSNlFXSbGcGXlMjx4rGsf7jkoadAWJD+exZQFx5g zJnw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q25si1279086ljg.5.2019.10.23.14.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:10 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NLBAVU007382 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB8Yj012709; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 24F782353A53; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 02/12] swupdate: ensure scripts are added before images Date: Wed, 23 Oct 2019 23:10:51 +0200 Message-Id: <20191023211101.16591-3-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , In case of streamed images, it is essential to add scripts before images to the swu archive. Otherwise the preinstall script function arrives after the image installation step. Signed-off-by: Adrian Freihofer --- classes/swupdate.bbclass | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass index 79c9aae..cb1122c 100644 --- a/classes/swupdate.bbclass +++ b/classes/swupdate.bbclass @@ -90,17 +90,31 @@ python do_swuimage () { shutil.copyfile(os.path.join(workdir, "sw-description"), os.path.join(s, "sw-description")) fetch = bb.fetch2.Fetch([], d) list_for_cpio = ["sw-description"] + list_for_cpio_scripts = [] # scripts: pre-scripts must arive before streamed images + list_for_cpio_images = [] if d.getVar('SWUPDATE_SIGNING', True): list_for_cpio.append('sw-description.sig') + def is_script(filename): + try: + with open(filename, 'r') as fh: + if fh.read(2) == '#!': + return True + except UnicodeDecodeError: + pass + return False + # Add files listed in SRC_URI to the swu file for url in fetch.urls: local = fetch.localpath(url) filename = os.path.basename(local) if (filename != 'sw-description'): shutil.copyfile(local, os.path.join(s, "%s" % filename )) - list_for_cpio.append(filename) + if is_script(local): + list_for_cpio_scripts.append(filename) + else: + list_for_cpio_images.append(filename) def add_image_to_swu(deploydir, imagename, s): src = os.path.join(deploydir, imagename) @@ -109,7 +123,10 @@ python do_swuimage () { target_imagename = os.path.basename(imagename) # allow images in subfolders of DEPLOY_DIR_IMAGE dst = os.path.join(s, target_imagename) shutil.copyfile(src, dst) - list_for_cpio.append(target_imagename) + if is_script(dst): + list_for_cpio_scripts.append(target_imagename) + else: + list_for_cpio_images.append(target_imagename) return True # Search for images listed in SWUPDATE_IMAGES in the DEPLOY directory. @@ -137,6 +154,8 @@ python do_swuimage () { if not add_image_to_swu(deploydir, image, s): bb.fatal("swupdate cannot find %s image file" % image) + list_for_cpio = list_for_cpio + list_for_cpio_scripts + list_for_cpio_images + prepare_sw_description(d, s, list_for_cpio) line = 'for i in ' + ' '.join(list_for_cpio) + '; do echo $i;done | cpio -ov -H crc >' + os.path.join(imgdeploydir,d.getVar('IMAGE_NAME', True) + '.swu') From patchwork Wed Oct 23 21:10:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182491 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::13d; helo=mail-lf1-x13d.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="YxWdAvRR"; dkim-atps=neutral Received: from mail-lf1-x13d.google.com (mail-lf1-x13d.google.com [IPv6:2a00:1450:4864:20::13d]) (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 46z32Z54BDz9sPp for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-lf1-x13d.google.com with SMTP id w22sf4485194lfe.2 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865071; cv=pass; d=google.com; s=arc-20160816; b=HfS354IvjwbTKr3s+4WSH+p2dNmzwWeagqPW95zWoKRo84H0YJtqNna8UhJuY7xPW5 xnXYKGSgF0/hL/aRnu/QX2eNP6xR4PN4ciwuiBO9qVdI9ZbGhC6HNNVw8MfXiPuY5K97 +nP6BneBygSr1IypNjvXTG19NJwnHpmFAgzpoDsZW7o+BsDs7KgRjdI4+beWwPVoSOyg +YV93KiV/QeReByJxEndGGBYBpgFLEG4+3bo4Deyh5rzwRRhHDntkdCcyZlT4Lkjri5J gtntIYGJrZ+nHijQg3Lfs9gCD96nQkJg+eaujtdl4L4dB7dZU+Z5Py5qwmhSKGhqpwCo m7hw== 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:cc:to:from:mime-version:sender:dkim-signature; bh=FQeFVRIb9+wseTjg/1N0E/R4JDJdnhSthIJXSecc/88=; b=Ib4e2+SVWS8OLU1NbM0O6O66o2FLHY2nHCbYXVExmDkuUsaWi2DE4pZufbtUnRDi5d J1wotC1wAmJTDQCgQFvtu+S4TlQesxyekLcBqDFFOq2D8kZ22nV4PsuRPYouoeMp0SUE 1cVMWAmANR7jCkx48Qcm9YAuU5/GYjfLtQK2NoFVCBySwa+Xi7N1i9LHuHK0XiMDZFzq U3/hVqW0qyFowAYO5M9FnpFQc6nNsAzTPtaYDGyg5uwA7R0q0sjhE6WHnGZJ3eayGDoy YE3VDrPwSroOPGxLCu2FCsPzihdgQ9J/suuKQ5+WbhtJqsJ6B9kFThkDKC7/wRxFjaIs BXdw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=FQeFVRIb9+wseTjg/1N0E/R4JDJdnhSthIJXSecc/88=; b=YxWdAvRRqsdtVOlb2Dmu5TLkrVJMR3b409RCT5f/VtgASACJRrwSLITNwku07EPYcn 1mbogxNVH3svmkfJTleiRMhs3j9/ad8LwNvrsQm1bcRPfkYCIPhtxUXUxdoBC87uWQG/ x/9N6oaymWVJjI9QKg5fJV3TRBiMAl4wjYX8EyegIWiFyYpvQ0xaQPHYEwHuc5Hb31ta 5FSwhrSEVx5LbFmVjcnUFyPXMBVC3YogFR1s7TOb4W2OTys+M/2e6+4NLzfuaeMN+HHa qSj6ePY4uPaEkEaQxEMbM2BjLNegU/hmO+juDQirpp+BmeW+0/XZSh8PVh9jZZjclUTe JexA== 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:cc: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=FQeFVRIb9+wseTjg/1N0E/R4JDJdnhSthIJXSecc/88=; b=Fy7GcXH80RnrNQiIoem0pHhy/crtmp8FVIR19rKVJZB+H1E8dyv149OCDPT/7QFwpH 5d5Eg9H10ldbHFqrZRgD4q/lkZ3wElh22CvfaoS663hCv0C61ixyIJq/tW1Pb/UPxF4M y0c/RK3inh+53lYUSLvi3f6mgKrVEfQSqb/meji/Dn1cKzSIOGpQzaVEGHajkCuSAvTM xnzjkkqt0i3BIrpmuH04/HjUOLiQOYAhs5XduxKkvbIaQqwgnthSAJZL5kNEdDXTzLpE aPcke5KPlbdFuSgebPYLroYT2o8a74GnYaYpSKIqSO3+HNMSolG1cE/8NX6Gz2cI04C1 StWg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAXddrRlWn7hDLHy6LynSvjkxrrlYchxtM0qu5+qj0I8evWWZJiP 1pn7TWWCuYmn5K0UGgdOwMg= X-Google-Smtp-Source: APXvYqz8Gz83587N8cYdZm2oi94ehhycE+p6NUbrTLLfDBGVpxzdGq7L80HCJTZ6D1G6H5a8tDeRCA== X-Received: by 2002:a05:6512:1de:: with SMTP id f30mr16984214lfp.176.1571865071493; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:7417:: with SMTP id v23ls349841lfe.14.gmail; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) X-Received: by 2002:ac2:410e:: with SMTP id b14mr23090679lfi.110.1571865071093; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865071; cv=none; d=google.com; s=arc-20160816; b=vbd5l87p2HstAoEmW61xYyQK2aQ4DNoP25TutzmBG13qpedpjLQ8mIickWh2cVON6v 89PP6b9MIkP+LE4KTDqFeE6OCArZ4e6wVYCiQN1sQgH7axw2J6mH2UwYvA4u8NsqNGlh MC1ZCpLchghvvmqf6Apuyz+ka0aHZAVlPgC40J9wtlRxfYJ8wBay/qQK4Ja6cJvoBDSP fy4o7RmmFEWAglNaOAinJM2r8kvnVkSt0l/iPjTZqXVsTcyCLpBojdxqkFq9iACtU8Vc JWnpt+IeU7P3jFaLelbCq1MttlFuK4w4XxGtI8VQub2hgvjE/YfWO84RXGFkEGaXvPCf IBVA== 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:cc:to:from; bh=C1qQYF30ixLFhbDYuVXryxNPk9hI1x+XrxvpxN/o4dk=; b=YNq+Sg2Oswsc5R4Qq193nOPUp3+X756klQmle6Sze7i6IN95id1TVDm7pywzSU98rp /XbFFjx5L1eMMyisd8MgTXdLs4EvmJU1144iOkkrkJnQLMEHyggeabnH9UPYwxTJCua7 ExQxQjthP4xXslmRB0zaoR5szIY70eBr1MOgUfOy06bAiAeZacEvM9IgHHaHuKKT1DHe HTMwwypb6V8Wi6lDRH7FrDVZTn6/yq9eIYJ7piYcAczcY4llvboP2jV5IdACz3UGqI5r V3rC7RlurPIPpPB9nwKVxScVAEJ3R+yLNKs655INPcxjQsxuiAvVh9y4yF5vUa91Rry2 09Ww== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id d3si1200001lfq.1.2019.10.23.14.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9NLBAJ6030503 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB8To021850; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 31F252353A54; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 03/12] swupdate: support signed image with variable name Date: Wed, 23 Oct 2019 23:10:52 +0200 Message-Id: <20191023211101.16591-4-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , Support the following in a sw-description: filename = "@@ROOTFS_IMAGE@@"; sha256 = "@@@ROOTFS_IMAGE@@"; First the @@ROOTFS_IMAGE@@ gets replaced e.g. by @my-image. Second @my-image gets replaced by the sha256 hash. Signed-off-by: Adrian Freihofer --- classes/swupdate-common.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index c0b302a..38f1906 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -37,22 +37,22 @@ def swupdate_expand_bitbake_variables(d, s): for line in f: found = False while True: - m = re.match(r"^(?P.+)@@(?P\w+)@@(?P.+)$", line) + m = re.match(r"^(?P.+)@@(?P@?)(?P\w+)@@(?P.+)$", line) if m: bitbake_variable_value = d.getVar(m.group('bitbake_variable_name'), True) if bitbake_variable_value is None: bitbake_variable_value = "" bb.warn("BitBake variable %s not set" % (m.group('bitbake_variable_name'))) - line = m.group('before_placeholder') + bitbake_variable_value + m.group('after_placeholder') + line = m.group('before_placeholder') + m.group('sign_at') + bitbake_variable_value + m.group('after_placeholder') found = True continue else: - m = re.match(r"^(?P.+)@@(?P.+)\[(?P.+)\]@@(?P.+)$", line) + m = re.match(r"^(?P.+)(?P@?)@@(?P.+)\[(?P.+)\]@@(?P.+)$", line) if m: bitbake_variable_value = (d.getVarFlag(m.group('bitbake_variable_name'), m.group('flag_var_name'), True) or "") if bitbake_variable_value is None: bitbake_variable_value = "" - line = m.group('before_placeholder') + bitbake_variable_value + m.group('after_placeholder') + line = m.group('before_placeholder') + m.group('sign_at') + bitbake_variable_value + m.group('after_placeholder') continue if found: From patchwork Wed Oct 23 21:10:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182489 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::540; helo=mail-ed1-x540.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="XfbwX5yQ"; dkim-atps=neutral Received: from mail-ed1-x540.google.com (mail-ed1-x540.google.com [IPv6:2a00:1450:4864:20::540]) (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 46z32Z4WXGz9sPF for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-ed1-x540.google.com with SMTP id p55sf14155138edc.5 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865071; cv=pass; d=google.com; s=arc-20160816; b=KHCdqrvmhzGGw0gU4CUwgQ6OTkt1445xLykX3DnipT3X72V5lOhBGCLSbPP1No3iRo tUxjMikRxdUOfjiUqiNnsOMoA6e7APTOd9XSX5t0R8+9YPm9sCX/ox5VNsA//cpDdVdu kIgDPBnM2tsgHGPxknVnweehnWhXLGwC66GjGqk7TmERMdhtdib9glNgOnha9rOpmXXG 9/jNR0x9FHnoHcT17KaYgl0FiNE/qx6fEO3E4/w2fOsHGybDuh2vvGzckkjgi62w+Avy 2Tqvp0VadEis1hMyO206ndtDDbnSkl2MKVOjjFBeyLZYS5bFY8cC39dGMw+xdbF4Mt92 r4rQ== 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:cc:to:from:mime-version:sender:dkim-signature; bh=2FDzhCnK5NhUVmV4qlGHjUXAxF0JgGzMbgvsqFe9ufE=; b=NNR1fy2/r6WS3W4kY0GJtQ2aLK4nDjzua4vBBAGHcXrX53pOTGIZDksGtFZfm0fcIR YYiHY1DUbeO1WtWrKXNX8FG5nFWGBudLyrWeCYM75LWEXnMMZ8dueb16AmErg2Rcr+/D CUOlv0849npWXYkeGPID+5dviAjk+xysxCvHNRY29uSu9ldBFr1fVA1h+r+EGA0fQO28 UCJyyEuEfHaH+Ko1uce2HsX19SZAuQBG9A+4FNV4Kn31Ns0JsewMhniJAiOtsyHFlP0S yn3/ZeLhps27L0YBR0eTyxWEgTV83I9jraOIrtKjJu94wk4fR0hmxYb12q4/oNFqWoxX KoOQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=2FDzhCnK5NhUVmV4qlGHjUXAxF0JgGzMbgvsqFe9ufE=; b=XfbwX5yQObyotXcFRLbpHLwoCD949nic9z30o+TVqhLzUeL6WOLXAkry6u85TiaHqE il3hSj51cGbZ0GeTRWHX1JmyZfMj5AtDR2ZNaEfQzW7BU7wPA3lrIkXeLDRvq7i3DeS5 yhI2wdjc3CHTirIY2K5s69i+qaEt5hjpv2jjDKJY5VPgj/rOujQqSTkZrivqg1FqKpCk yax80VqxVnGpw8/30vVHPhQByaQCaS65CnZ6vRwJjIkuOKxgkmyOm1SfK4Ecg6qdnlNn 90GOu9n3YxPTiW4V4YZJGgCO+84Yl+dHxzO/ScRWv+8MWFElqc7y07arYJctI2tV79IT DefQ== 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:cc: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=2FDzhCnK5NhUVmV4qlGHjUXAxF0JgGzMbgvsqFe9ufE=; b=EDjh0/RwGQP63jQIr4jotNwJrqvlXRktI+OAnsRBK2+Q5/zGGx/JHmozOXDp7pWyiE iScer6NNTqvz5UOtT9rS+f3TgB5V6x6Bs+IAPFMwrEU/O/+y1om22pQ/h48Fodf1baoO +9pw+UgF14+XLyedfNcg2mZS78DQYNNXOApKuu/zZDovS49yj0CNDO4zVGm85rM6Isw9 4G38DwMwibs6CjJPGVupxhi8/qQ9bzW+Isaqbng/dGrXS2jkKB5PD8Ta0Flo+JUE7h8n Llq/UQpl83K5UnO5Hyt2YskBr46j5G90d1ikksp4YzANaBq75yDvT/GHKKxpQC1dfDb8 dpnw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAX7KOGJje6ZycT0Ytzj4/SPCyvao3f6ip3waEPDmOTnHCkSPe3U IRoYaeV5VD1yh5jljwhYZ/4= X-Google-Smtp-Source: APXvYqz9InQxtWdqfPBl49yCqv/FZPkuSIJ5gG88KUCqCImM4QL1vH53cdH2bvU0ZaNbXyKyacM3vw== X-Received: by 2002:a17:906:6451:: with SMTP id l17mr34636666ejn.114.1571865071155; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:907:1114:: with SMTP id qu20ls810932ejb.7.gmail; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) X-Received: by 2002:a17:906:2584:: with SMTP id m4mr35531693ejb.287.1571865070753; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865070; cv=none; d=google.com; s=arc-20160816; b=S66PJuYgunMJWZHm9oy5WljEeFI+e0pmHN897p0L6nFWK3kiqvEEL8EJt8I03hzU/6 I0a0/yD2kkKs63jFyPGPOovVMByBAfXd4YcoWMJfhGlET42sDbf7TJF3pzfEaj2ZEbqX UV4WZEEdw12y83PkdQpZwfy0xbRGj03si8Jn8CqMI5B/KvvCjZhd+UUi2uRQaoyhqhxG bZMsPt3kN1dceIOWkLG1DDHi8re6/dnkL6T48kkjVdGhhtNucjt3tlQUP4dR0Xg108Uo qhWZRCchLr6TJ1GQqhy4K3Hcvalx9IuzcgCPn4c2VRgEuZSN1LNc20m5VOyQcZRTNRvn 3oUw== 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:cc:to:from; bh=gEzWyX76LSgjits1j5KXUykzFgtUUJhrHyloPZMpMFc=; b=gi9yJGRKP0DdJgDWVx+6g3WeQK5pk5Seq16Ju4uFeGEgWdB7YJD+MpYpYTDPUXIvHf GPhauRkZN/N+2t+IJr03f9kz6TcWgq1MZadTaml0PCZnxaKDp4I+A4SHJOZhkM9IV+3E F9yVP4hSs3BPeOeGsOwV/jSVas7nRamEWJBKTa5HdfZHvcDcrqQUoW5NMXp/kiNSh8jt xErZXIM9eBABkx8VHqkCVp3ziyiXdTYsy7HIAQ+U+CceiLA5LGJX6mXfpMoQNPukHePK xiwypT8JcXRYjLRCEy5zAwMcWzYZBfCXgCcSqkpxIZWXWnNGKbp/R0RaZgr6XAeKvzs0 rHEQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id c28si1093106eda.4.2019.10.23.14.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:10 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; 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 x9NLBAC1030504 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB89A012710; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 3EAA02353A55; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 04/12] libubootenv: bump git srcrev Date: Wed, 23 Oct 2019 23:10:53 +0200 Message-Id: <20191023211101.16591-5-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , This includes the following changes: 71b2a73 handle protected mmcblk_boot_ devices 16bd392 add missing includes 31cb03c add .editorconfig file 4d05047 Merge pull request #3 from lamby/reproducible-build d63e76f Make the build reproducible 9e121d4 uboot_env: fix print format of type size_t 6c623d1 uboot_env: add ubi volume support 8feae6a uboot_env: add a flag to manage device type 65ae5fe uboot_env: don't accept MTD_DATAFLASH and MTD_UBI_VOLUME 2c36d07 uboot_env: nand: fix return of devwrite a1744ab uboot_env: nand: fix return of devread Signed-off-by: Adrian Freihofer --- recipes-bsp/libubootenv/libubootenv_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/libubootenv/libubootenv_git.bb b/recipes-bsp/libubootenv/libubootenv_git.bb index 3c9388f..5dba3c3 100644 --- a/recipes-bsp/libubootenv/libubootenv_git.bb +++ b/recipes-bsp/libubootenv/libubootenv_git.bb @@ -1,5 +1,5 @@ require libubootenv.inc -SRCREV = "9e121d41113dc0313452b2c00627097c46802c10" +SRCREV = "92949816720d7af2ac722016e7a5b9a85ff141bc" PV_append = "+git${SRCPV}" DEFAULT_PREFERENCE = "-1" From patchwork Wed Oct 23 21:10:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182490 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::338; helo=mail-wm1-x338.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="Xve1nNaU"; dkim-atps=neutral Received: from mail-wm1-x338.google.com (mail-wm1-x338.google.com [IPv6:2a00:1450:4864:20::338]) (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 46z32Z5Djfz9sQr for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-wm1-x338.google.com with SMTP id m16sf167644wmg.8 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865072; cv=pass; d=google.com; s=arc-20160816; b=w5qN9ambzO9zGuz6299kSAhirOpBk8p7zpSG/zQVsBI9BzZ/joyMPym9JlflIb/dhN QAlKdOb7dwc0+LnGSYYf/gTutMwRiTRda9nym2pO8zEYTyxLCzgvV+v87XECpNEWaYyx JcBnnajb16vnyEq2DuB6QaHGM1qu/bJlNcCp3lwTGgFDQtfgrh+cxD/9Mg3iNQog9p6M MiKebLmo790LaS5V+/H3u2mzKSJ+OoGABCBYCKKWFEHVPidOUxhaMX7f/XOgYjh7615d hr/zFh1ELGVxcpgGIKkCkh7q7SYFaepxwybL+pJc0pk1ZimsIBng7pgZMKkkWhdENZJ0 JAlA== 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:cc:to:from:mime-version:sender:dkim-signature; bh=nuaxqMvRcgCAMLqHysMQtLXL7jBvvvRJYH/fnHm59Y0=; b=Aa/MdsB4hGEKwp+OLT3gugH8rm36PMUztMfSLPVmsDFHoCCCB0oppI7+C2Fm5R0XNP 6p8IF1d8KpMZSzTX9PChLKX8eIQPWdJ16JWnt1/ljJkW0C9HkelmqRWkwHWhm2HeNKlM 2uzwMTonIUAMj7PLFEy4nhqjUMhbHflQ0dEEBVU9bkVlVOzGRWR5SrH60AEtnzVj8HNZ ZqLK83xjRPWmJW+Q/RTxcV2JqKi7e0jD4VyT1eHqYJb0sOwef1i9ZyHOTujJxu2cEi8z ymjd80fGvprYlKcAAJiDbJHS+WkE/XkKNxMr9i1tm+25vP5uunncTYlmIBzIOXEddy1G u8jQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=nuaxqMvRcgCAMLqHysMQtLXL7jBvvvRJYH/fnHm59Y0=; b=Xve1nNaUria7jP2UjlLTsI2e8SJ2F1dkOntXdTybSszhsgjdeLcO3J0wpZ8qHrmw6J q5tTTiewo4DZnIBxN8mHIymaMUVhydx7q807DX/qfyQqoUxouoGXP5nHe6cfW9WY2JTo hY8RVGZui4wFl9bki5XkUUuElB4BistKPqWoD3BLYax/1mSQ8ncYRAUDVhC+LWe7sGbd +QRjt22Hz0haAmA46tItTU95wHmJ3/OFQpTBphxY/lf9bsApFXZYM6a9HIFSmNp45cSX 67HrpaYMVMJXgUrmADDjTTblqc2gjOeiSGTQU4T73ioYw22v0JjHiHazvknrOQ6Bmuwo Bvwg== 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:cc: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=nuaxqMvRcgCAMLqHysMQtLXL7jBvvvRJYH/fnHm59Y0=; b=OicIbzchfB4BJUaE56CFX8c6NHqGGgCoZGihz2t1zdTFCwd4ERMhGJTnjyYkbpFMsq iypNGOHTYOYQkk69JyNA7FBieTlBbmXM0JUFoyVwbwrhkfOjQuAVb7PAXrti9xOgByZc 9Ls8TcviE+s+F1OueZzoG+yqYIqeBnhH3IbADs47ov8tGEfAHEZvxmZBB+md065cJHf/ Hi4s1o+P1GhlFh0Ga1wi/IFIlv7bpKU3UJIxngbOm3QUi81uh684JUUvV2zro9qxHmWe WTBq3E2eAhh3R08LdwTjBiFDEC6MzYxSX+vr1Y9Uln95YmNS6At1AHsyl7LCYVZhb2/d ZDCg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAVL1LAIz+lZ6+saohacoOvmaDb6X3xQkwVvj1f1c2rS5dkhwdIY rPox0bstAogViRH46iIqdzs= X-Google-Smtp-Source: APXvYqx8oLLfcWIb1TFOFWbCEFtTHhEEhl96rRNx6RJD/5KNYaM3xXm4w6HS+CMd/u3kxkQKy4zEWg== X-Received: by 2002:a05:6000:4c:: with SMTP id k12mr697211wrx.100.1571865071924; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a7b:c5c4:: with SMTP id n4ls2904134wmk.3.canary-gmail; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) X-Received: by 2002:a1c:9990:: with SMTP id b138mr1754300wme.176.1571865071382; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865071; cv=none; d=google.com; s=arc-20160816; b=L3mLoqQCmzuiik+6AWx/mR00IXg/NUNd1l0t92aebJe6zTwPD1M2VrFhYUnfGsXfPC UtRokURXFKcj5rPqNYBooBsldaSS3hlnfd3q3WjumbowsrNCwrv70zUdn/6TI/hO1uvk 5iO1n5QyfN0yUk2D3CQZa9xF9pwUdGrYLILfhhIR4hjJrhkHOYZiF3HR8zespyZTPTBf o43rGTLD3G5HwE7LuHW2/03EIbtpq5G85mrsWkCycbjxXj/i3mG1vJQPBJMAGaef6mVa ANTiOhPJjvC+Q742LgXdGdF2qdH5JMuWgGk1PoXxvVUkBHycFsADIceTM9TTO4PBX4h2 faVQ== 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:cc:to:from; bh=6xvAweYizBXfQKx6u/f2nDZmim4zsuJbssvPz6zfSKA=; b=zr+8jhgcaaveQaFfXU10KZW0SkRLeebukF4ryDSzr7WcvIToz0NWx77oMmqC4SWlMy GOocGMA6KnsFYSPgS5fabM3YlWQEdzAiqanPk18vzFRt36KPvQyqCRo0cfq8RpTsJntD VomUvxqk7R/nxADbiyH3soktWGgPDlQ46c755DKlbwrepNt1mXa0fmM/AS+wFj5Ef2MJ 8b9ZySQMXJTaP4JUGxEP7lqXoLc3TuiXRmU7NFCC0xRBE3WRzB8+te3kWBmP+lYALu4y NqJseQvjHRy3Tvryc4pHgkmYdc90UGd1a8qeZJPEF/UsHPea5XZUatz9BMZJQYvz3s+c CaFQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id w2si1131760wrn.4.2019.10.23.14.11.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NLBBCN007417 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:11 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9Y1026769; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 4C8A22353A56; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 05/12] libubootenv: git define PV Date: Wed, 23 Oct 2019 23:10:54 +0200 Message-Id: <20191023211101.16591-6-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , The devtool workflow does not work without setting PV properly. To prefer the git version add the following line to the distro config: PREFERRED_VERSION_libubootenv = "0.1+git%" Signed-off-by: Adrian Freihofer --- recipes-bsp/libubootenv/libubootenv_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/libubootenv/libubootenv_git.bb b/recipes-bsp/libubootenv/libubootenv_git.bb index 5dba3c3..6f7c080 100644 --- a/recipes-bsp/libubootenv/libubootenv_git.bb +++ b/recipes-bsp/libubootenv/libubootenv_git.bb @@ -1,5 +1,5 @@ require libubootenv.inc SRCREV = "92949816720d7af2ac722016e7a5b9a85ff141bc" -PV_append = "+git${SRCPV}" +PV = "0.1+git${SRCPV}" DEFAULT_PREFERENCE = "-1" From patchwork Wed Oct 23 21:10:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182497 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::538; helo=mail-ed1-x538.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="D/Wx5k8B"; dkim-atps=neutral Received: from mail-ed1-x538.google.com (mail-ed1-x538.google.com [IPv6:2a00:1450:4864:20::538]) (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 46z32Z4yYPz9sPc for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-ed1-x538.google.com with SMTP id f22sf8432296edj.14 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865071; cv=pass; d=google.com; s=arc-20160816; b=flpZSxDKGYaI6lPwAO/BUoOy6TnvZfuHwODSzGC1VVbp6G5qOTutH3eWpB2CYhx//c uz1LUwPA9gAECBv5wlKVln9WCGljpVeogsWSrihgNXevva3agz/5b5MbrxTC3QbsfORq IPCANfeoRYMzcKlJ0VFUfvMBWLvrYK/GQ7M6H1xZ88Na/tGuW8CgBj1RFz4jl6WAvlbT mXFQEqj5oojfvxWiXBSMELJhbmhhXGCEHtHL16AxkJOddkJokNHmrl9Zr38tuX2f2VvC qYa/cpd5y/WaypUOzJztyW6T6/6PYPKr7wZLPoAj2xHKIT7Av8k26re38dkcZdxi5L3z eGDw== 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:cc:to:from:mime-version:sender:dkim-signature; bh=6TbuElMgKIuGq5i85CgSp+8MlD9lPVJa7QLX1EkZGVs=; b=V+Mr2bOPgN/JgzdaRkDYjfpFpYUVizD1iokB0r09g7KLNDGxj3AvmD6CEUzZwJel5e Uc5fpS/ft8jNABbfbiq65tTR7cz+5p0jm4ghwzBvgmdK5X3ZzldQqB4DROVOSnllZm09 VugrXgyU7/iTLoKPONll7t5pPhXbiD1H8r7gkRxg07yvG2ZCe2mcMbvO4ARI1ltcjMLz fdgXYpHrcGCgZHctxbNbK29Y9p6Lt5rDZ8DWkL/30GT7Z0dkvYNpYlHoSZI2ZoQkPUfL RsVpwQGFb9yCNjaY8qzDcGgy/wCfbll0jKB9DnWp/zsimV9bppL4NSeOd8DvGg3F/Ev4 kIcA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=6TbuElMgKIuGq5i85CgSp+8MlD9lPVJa7QLX1EkZGVs=; b=D/Wx5k8BrF0B+dr7BL4zzE4CKcylujD37+ZtF7dnqG6eV0vFmZJJNwfcEC4F584njX nqo11EE7Aomb8ZojR4bnJ91IgW0QXHXd/sdHWcwccfyf+vQxjoP9i/uPORi2fdE1sw+Z 7SIfC12ARTGb0Vy6YYjXTY4yUmZKDiXfgHoFjL6aWIGe/JaPMC+kJSfmkt0deFfRCDmy qEW/JJJo4z524ZCwnQVPKULlhu14ZSRFoQ8GMaUgrLdrjjoBuNVQIZTOM4XA6YWR+pBF zAMnp7/KiMkH+fSeot5wlGuMTTV4tTpq86Kxn/4kuYFy4K5EKMhq9B5ayklPx0soMBLF Ll3g== 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:cc: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=6TbuElMgKIuGq5i85CgSp+8MlD9lPVJa7QLX1EkZGVs=; b=HFOMQ3+9reqP0sVc1glxUIUGYX0s0oySrTMz7grc/BFAjLViCpoHEPTFLgqLm+XRsA UUcBkQ23ccP/n55k77c8PDvKiaNIX0B8kgQj4EIf0wYWs5DIc1DqL/wQvdzp3OV1tdC8 nYwUDkH+2wWiVYQBK8qudGqsT2HeUq2mfW/4lvK82L6P4S4wpVtpauFrle0xPPVts/V6 kCLSd4oMshqjD1V401RU8pHLvYnCc9LtCEVVPkXC8ZP0Oy+CZ9aDRmdaUrvWwi+tCgxY S0GYPwpP2efRM+dbhEix+iOHil80+lEyVtJVCI7oBz10eCUa1iddr7ELvWZLdZPYjIoA 1ebA== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAV8Fp+aYndsaq2TWgEf8SQmPGUpUw/oAbClh93lsPMEbe4bA4Xn O/ZIe39UL89lGv53BlV5B44= X-Google-Smtp-Source: APXvYqxhfEAinD4Hg0VxDpvzqjOk4OJIrSEEEMgicjGOZUOFKFyBWV8MTZJ4ScYpE7dedmHiK74Csw== X-Received: by 2002:a50:8871:: with SMTP id c46mr21375074edc.24.1571865071238; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:906:fc1a:: with SMTP id ov26ls804934ejb.13.gmail; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) X-Received: by 2002:a17:906:35cb:: with SMTP id p11mr35463597ejb.128.1571865070917; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865070; cv=none; d=google.com; s=arc-20160816; b=qN8xWvHMRgNiOuMoc1n1YgoBrE76HitmTrYeZHLr3ISazj5KxplLF9FBzx84B6LxT+ 65zfVBX0zn840+7IHdATybIx25fOSn122/RXYYGX7e15ayPJ8iD4KNjGCkhjiGJQUeDk Q4JkRAF6FOR/sHXAEp2/6Zq9qB4GOhtCaX/2O68lXiwnVqadGJWg556tLR8/G8I+Q4ax UUR9a9eEhtjZ16vvASvUJbJMes8fDBdrD8WvEEDBwZptbhkGlzYfkRPB15Hw2BGqKisd m4z1ckfaIiQSq8SxS6JR7klXKNUJlma/laGPKamuL+hDgRjOxnGeSloKTTv0DyM4r7gO aXbQ== 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:cc:to:from; bh=5gZPHTMZfXLwMefIq2eZSoPzq+nhkYmgIhRLe9bR2SI=; b=IjV931BjUKoX4nvMUxOjRiRH5cmypXOoNyfWEKSzca/U/QHFxMs22nozu938/J36Tj tcHMVcJN0NXmReSv/XnYKOBcMoHLQhYH+n96AyU/my0HJ3qMUWuhjUnOFoeJvyLfW6g/ 5nPXASk/Ieifm0/mzzyXaQFEt7IbNOFC/o3KeGPLD55m5XluTvYqHRLufyK208EmBrgW lI+N8OCc7U8bskxTLr4zwAH0iDWMNACrS2lZ/qR/mDR32H/GE+feGFsG2yIWZPJ6oMxV /CSI4WYEdeBiUIboo3V7wQCPsBWueIQfD4f+7SNnyJZTs2SAmqJrjhXOxTT+TiTLqLRa kqFA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z18si1013265edd.5.2019.10.23.14.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:10 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NLBArU007398 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9YE012760; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 5A7C22353A57; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 06/12] swupdate git define PV Date: Wed, 23 Oct 2019 23:10:55 +0200 Message-Id: <20191023211101.16591-7-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , The devtool workflow does not work without setting PV properly. To prefer the git version add the following line to the distro config: PREFERRED_VERSION_swupdate = "2019.04+git%" Signed-off-by: Adrian Freihofer --- recipes-support/swupdate/swupdate_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 95c57a8..3f69b87 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -4,3 +4,4 @@ require swupdate_tools.inc DEFAULT_PREFERENCE = "-1" SRCREV ?= "a8d45381253838b34e4e035c065a1cdf429b1f09" +PV = "2019.04+git${SRCPV}" From patchwork Wed Oct 23 21:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182492 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::537; helo=mail-ed1-x537.google.com; envelope-from=swupdate+bncbaabb4edypwqkgqefra5usa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="mg1wNpcp"; dkim-atps=neutral Received: from mail-ed1-x537.google.com (mail-ed1-x537.google.com [IPv6:2a00:1450:4864:20::537]) (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 46z32Z4t4vz9sPL for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-ed1-x537.google.com with SMTP id k5sf14131913edx.13 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865072; cv=pass; d=google.com; s=arc-20160816; b=yAoQ7G7hCefsY91F13OAN0XcutrRd/86qu7mxAiZ7ZvHVUinz+TFTIB3vXmDhM+qoJ 1hH4mpp2qaYHgYeEuPqLnji3/hBnLz4CVSKv5iFatEQE7hGIpEoahOacFNsLJH+oe/2T LVILIOOX+2R5z05gz3NlpC86WyT8UGufx+74G0/LrR6VT55J1KtpYxGEcnCmrhSVFyNJ qw8SnoKB2vMrJmSD8eTtMmyRtRjNBGWTGVZoeMiiFusD5I+MBtcvD2/iaUOR/Be4YMOm jpB9qmO9lYkpiacK6HYfyUi1vFLuJXgsWfJBQBAElw6CGkdoN1RerkKFnZKemFnkIANW CHOA== 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:cc:to:from:mime-version:sender:dkim-signature; bh=Zuj+gzymh3R9g/+agFDeQcRRDpJ0WDX+AQJifNSTY1g=; b=ETPOdsxi5MAeAR5YYuoNw4oGJRP/uAaeqlTVn+QYHbABNSqJuKi5uNurlocf83YfYQ Xd5NWaALKVvHzzxCPbZTc7WZ9QdziWrgaLgwwGSLt4dc7MMgzF3JdX5eydSqR7GTan7F TVS5418Mpv3TUzzux1f5RUwSLMLxv+aSodlfGuggPqb29WTMuaDBJxT9xvnF9C1areeE ynpIDOewZygVe81ARXUmQb3G6jHcfEw1lIiOLYpahifXnqqF0jaLEGLnZ60ihFMIBu97 5/CyoqnFEQQfHrRJWdPlfKFkkRMMJZehyf2FOWtcFCzWXG4zNasWvsHxUN99lrGqdjIX Cr4g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=Zuj+gzymh3R9g/+agFDeQcRRDpJ0WDX+AQJifNSTY1g=; b=mg1wNpcpsz0+pQnO9ifkHcsuYvEuixJFVQyf5VcK56fJiKuHhE6N/UMM9VefbCg4HS StmwL41QsF9TKY68ScxtnPXpO0+ptLWiWjDlsvKZtSJzjXz0qSnapFqbr1VA74t6hj1Y BBK835SIF9FNtd8Efj5hUeF0tw+laG+2ECJMmAay7RP9Wa6jJF/kpSPRZvwZnIVjSV13 239dokWisvR3R0IwjhFAXMyonxGOVAyzeEHrlgn+08eXLu4Rm2xvp16mA8+x9vkKFiZ5 9TzPQuCWkdcoGxG/fSf/kbK0yHk3PYSyTDpJabB7+7bj3aafKDs2oysaq20SL/3b0oOm YIqw== 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:cc: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=Zuj+gzymh3R9g/+agFDeQcRRDpJ0WDX+AQJifNSTY1g=; b=G7tGmEqF0vpV860ydBcoAoMvROEZx+EkoTCliEUYNHifqqHZ0wSsEfWen+k0wdQz2x F4ofek/Kl3C+7dDTSueUr0K37z5ffO5GRBy9IHxWYmkCbwYLJWwPqckRVSHfTMj/sJ8k 6Lf18Z4Vs+kzUZkbAqMxWRXvK2fntkLLxpYN9FDOQzc3/rDYm5IqMb8ZoZ7foOC1h5/p KJKn1Pel/XQyVIOPCZCjRnDXUtlIrCis5BZdyiljoifpCLI6Lj8xDWfi+fsS2I75At3X c2B2FDmC8RrfxDt5e2tZW1nF4gd+M4cxOxY0I7WXXQ8gBWb+10AUh/M74Bzfo8+Ewc6b eenw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAWB3kmZ/7hzCo46idAHZYgDUZbcSW1lSIPeWcnUdAVXZC5k/896 8MSZW8m93GXZcDLWTiLVfmo= X-Google-Smtp-Source: APXvYqwOMNfKXLKpjMaGAgBFB8yTtVdBHQkrYrVq/cvIWOfbgoQf/sVnyCp3LNRDD0D93G6OkScJQg== X-Received: by 2002:a05:6402:794:: with SMTP id d20mr40807931edy.240.1571865072137; Wed, 23 Oct 2019 14:11:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a50:af86:: with SMTP id h6ls856362edd.3.gmail; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) X-Received: by 2002:a50:91c4:: with SMTP id h4mr27333117eda.36.1571865071714; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865071; cv=none; d=google.com; s=arc-20160816; b=eiC+Nbg7h4PegtgHIB0ZAOnXyJaaYTm2X2AcknKdQ5sxaAfnJnPrgD7XuEICX7BSFT bA4T5xpwJomoVcB4WDSC+q6SYecC5cWUkJcIuAw4NLYlmRo+o9ufqgeDC2+1hFTfszak geSiV24adVRrJIdMUTfQSCBdcCzkUz4JUQY8GopxK9yJZ0wNOS4jrj1ldaGFbeXWJdMO j/RdryQTCDLA4nRC1OYq79rRYEf8jWXtbBBKcafsmqQjtFk+S8qxWLRai9BRuG0OEopi PVa2RQApqVcMkoPhxZkHTsMT7JzdwQeBX6vyG2hKV/O5XBy7fiqmbgBQYHZa7sCMuIwd UVzg== 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:cc:to:from; bh=8jhwh1LQrNtR5BixD2rKqpPTRHHGSzQNsJ7oc+2WcuY=; b=eu6sXrxSWnlRbswfd9/cJ51ILDlF902cq3/3NLpNvI4p33peM/pabtODKnLY9iamZ/ rwpfwHm4aRqyqS1yILX+L6CMvN3v6O4VyXJ2yrG8kKmvhpnWL/4salHwhN8tv8s56U23 Xq44LSSsqEI1a2DWh2k6YkpXFlwV/ppBjZKJvPqO3g+cXjtGACv/utdkd4zprphx901C gUJKn8OkrJzMi5OFxFFOtrwhAoCvHlViq+5GlEer6OalIGvwr94wre+ixo3ETIRov8/s 034soQgdHvc3iic0oGi4pewnG0n7fCmncbbvoDmtb0Zcz+mJKJMbxshe7bQFDP5qoEPU bk4w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id d11si1098273edh.3.2019.10.23.14.11.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9NLBBxu030537 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:11 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9No026770; Wed, 23 Oct 2019 23:11:09 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 65B402353A58; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 07/12] swupdate: bump git srcrev Date: Wed, 23 Oct 2019 23:10:56 +0200 Message-Id: <20191023211101.16591-8-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , This includes the following changes: 75985aa Add Kconfig option for new systemd files bdc1d3c systemd generic startup 16790d1 doc: fix broken link for talks 7c8926d ssbl_handler: fix age comparison f130541 travis: set libwebsockets version 9409e9a Prepare 2019.11-rc1 d8d9fd4 handler: add a copy handler 21594da Add SSBL Handler 34c55f1 handlers: sort the list of modules in Makefile ede66e7 doc: add scenarios how to use SWUpdate a5e82b9 doc: add links to single and double copy scenarios c744dfe Cosmetic: rename entry points in raw handler 864dedd raw handler: return error number instead of -1 e38ad73 handler: push progress status from bootloader handler cfaec8c u-boot handler: fix removing variable 27c40c4 doc: ELC video published on YouTube 07811c7 swupdate: add pre-update command hook da974cd doc: update list of talks with ELC 2019 Signed-off-by: Adrian Freihofer --- recipes-support/swupdate/swupdate_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 3f69b87..9fea83a 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -3,5 +3,5 @@ require swupdate_tools.inc DEFAULT_PREFERENCE = "-1" -SRCREV ?= "a8d45381253838b34e4e035c065a1cdf429b1f09" +SRCREV ?= "045a618a725d0a2fce64161f10101c0004ac5d85" PV = "2019.04+git${SRCPV}" From patchwork Wed Oct 23 21:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182488 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::13e; helo=mail-lf1-x13e.google.com; envelope-from=swupdate+bncbaabb4edypwqkgqefra5usa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="q0njwGhp"; dkim-atps=neutral Received: from mail-lf1-x13e.google.com (mail-lf1-x13e.google.com [IPv6:2a00:1450:4864:20::13e]) (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 46z32Z5GYYz9sQv for ; Thu, 24 Oct 2019 08:11:18 +1100 (AEDT) Received: by mail-lf1-x13e.google.com with SMTP id u14sf4484090lfi.10 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865072; cv=pass; d=google.com; s=arc-20160816; b=wjsVXiyjByEIEQtNNCCxWXWu2sgBpXZuBswlt4ZwEMbqzHlT/MczJm/J+3WAI47E8r cHAOg7Ji64SukpM0X3H93fOuJLDqbjGvnEbxiiAuSBa6RQGjSYUuHD0lCqRXBaK8d3b5 AaRvoUD9alwHBR3raWk8Y+1xQbnzVc2LiEYfMUuV7rQhyhFDM10u9/vTvHT83lb/A26v VxQ9mOAjdr4RG9yMTivrVNc5Eo1KcYSZkwxKmKfoDEbKYI+CLBwFHfNxoGsL5i7GS+qm rNY3OahbF1i0T0uFdP780ZkHSIYv196V8+Nslnhuof0ebxq2uJEJ95z7/51K2RWB+l/F OXaw== 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:cc:to:from:mime-version:sender:dkim-signature; bh=ZOxJeJIkuk3Xq9xKk8SYYm2Lm4LgtB68UUKDciHLs0U=; b=MilF+VCvGZ5MOK8WE/sOnTQsY9xU5oH7B+zEUKqz1Iy/va3CXgo73M7/z0EzpbwR/P HDOsOoJLyuoKS+Q8Tw+MoaFLEtFPzxqYSt0nPgcGM2UcvoILLvcIw12zVp5gdl0KJEP3 nVKd2XmP9dyIie3G63BIB2cwi/f2o+PF3Fn6DwDO8szUnwG86vnGj+MrkK3HV/7x4W7H 9AyBcX4APRx+KcKrde6tnbY/B/tYwFRgUa2jOCczDF/taKCH33dD6rIS+0rhRvqORN/z i7toETt8FJTo3PQYZuDgQSZbHCKoBHPFHKgbHntKjMMmQ61q+6fzN8zT6cGviPvQx21H 3ujA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=ZOxJeJIkuk3Xq9xKk8SYYm2Lm4LgtB68UUKDciHLs0U=; b=q0njwGhpt6dWvKHNB8+bwFMbxhMjuzSTJPxcbq14bY04He43kHujtcsCf+22nz6oSe +/swzKcOZNzzTJ4pybiVe4yjXm0FH36MHPA/N6XEMAY0FYJssbYctix1FMk0o5pINTtI 9QRmP9dfhJln/eKDARTluZeq9/ZOeg2W9YN0Gd9OoNs9smlDiCs8k+GX60ibSYZQ8LLt PD4VBujYL1ESnWzgEmk6VuoaS0yEmQiRdcfOZhZLdE/elvKWUVtT+63HEUp9vxGhi4VP DtIX896rtCWS+e6RFhLER89WKAzs1Cp4Jh8nrxMVC6AdpIMW7FyXZe8sG59NqY+AjJbz CNhg== 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:cc: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=ZOxJeJIkuk3Xq9xKk8SYYm2Lm4LgtB68UUKDciHLs0U=; b=DnUykYmj6Lc6aM2zIyIAJCLVihrcEVL8pckhUcN+mBV+HfL1eiH1RgkHhnaoNp3pCZ dcgC1PpiNBJE6URr24PANo5d44DHkvGjCaTSAubDisTAE0cb0SGWZfpLdM3xxTwx03El anCkArzzfcPWxb53fwXt3BuLLKIcy8uODcR6ThkgjyEWKvsCNfTgbASo01eCoErI6T9T wBGqvt/7W5d599cLKAqikvzbHCQZZvgM9D2QQof0zEBslnizdi/QVoglc1kfsVX2Pvgn osvYdNOv/4dAWqPrf5+GszdeTmIp5ht9qCDc/EWZwZZGnYIPzXoca2rixNJjMZ1VgYBH +3tQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAU5VHZ7ssjmJf204VyYEVtmAIguIUzNCY4aa+bn9QDDv5GC+Q72 LQUSYbSDGp8MMNISxfz29PM= X-Google-Smtp-Source: APXvYqyA69KqdiTbzdYHsnI20bPGRByNWGnmCo4rKjEg7liaheLB1Eu4YJtjVGH9HI2u+u1FUDElJA== X-Received: by 2002:a2e:700f:: with SMTP id l15mr6451589ljc.69.1571865072269; Wed, 23 Oct 2019 14:11:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9786:: with SMTP id y6ls485479lji.3.gmail; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) X-Received: by 2002:a2e:808f:: with SMTP id i15mr3397684ljg.24.1571865071870; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865071; cv=none; d=google.com; s=arc-20160816; b=Pqsu2+FLd4HxNS9bpN0tqzcHT27+H1xwKWVp7015P7QunI8chr/fHhe9FgQ84yfo0R Sz9ec+4GEf7TJX7flLZveZnw1nThUkRYsgXtAA9aLGqt9febNSAiAA8PqjFQHoXeu3vz 1ic63B6lOdlo49jHXiHnI5QsFol1q1hhgh3yBy2GxSPF6JH5g0nkGkyUWJeSemHm8nIl Pq0wcIx5rjZ4AJTsdoGLmNZqrGpu1vZIFY29B8Yuo+/x2rNJKTpQ7Ul+sjGwCzPgViH6 /x5LIWYBxfm2fidfSfd9LeGX9WrNNJl84+X/tOaYCtaXRVqT+gRCRe+Dtmo9fqWuPt2Y 2jVA== 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:cc:to:from; bh=WSd+0htSKh4Z4wsJ4Yg25n8kjNpgkQLKUzNHnSq7BiQ=; b=npe6Mi1wu01fCeM8ptEXtu6Ak8OGo0SY1OdYRqnKSJZy++iRHHlaEVOESJIV/k+fb8 TJPx/B2uqrsfKuuqXOB64ssr0WRAbFsQTrYME9MkBvMqHSMijCe1IehM1rBafi+IrNCi puqw9XjSEk4UKuIWhJHQbG2Q/5jqPtC+W0iG90Fkhr+S1LJNrRVw96BSiMs70335t7pD UOQH5enNtjnSxUoVbnFBa++j//SkQXjz7kGq4Q2Kt5gBVI5iKiidvpAn4Ub0KcNarf/E dBUeCCaxMcbIFmD53iYnhkmdfUc2ne02JVZ83CvIJ62iR8qTEb2Ogno052Wo/izUItDl hDjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id d3si1200004lfq.1.2019.10.23.14.11.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NLBB2j007421 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:11 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9Rr026771; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 71F5B2353A59; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 08/12] swupdate: add missing rdepends Date: Wed, 23 Oct 2019 23:10:57 +0200 Message-Id: <20191023211101.16591-9-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , swupdate-www requires the swupdate-progress service from swupdate-tools package. Signed-off-by: Adrian Freihofer --- recipes-support/swupdate/swupdate.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 392af31..1c863bb 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -24,6 +24,8 @@ FILES_${PN}-lua += "${libdir}/lua/" FILES_${PN}-www = "/www/*" FILES_${PN} += "${libdir}/tmpfiles.d" +RDEPENDS_${PN}-www += "${PN}-tools" + S = "${WORKDIR}/git/" EXTRA_OEMAKE += " HOSTCC="${BUILD_CC}" HOSTCXX="${BUILD_CXX}" LD="${CC}" DESTDIR="${D}" V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" From patchwork Wed Oct 23 21:10:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182493 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::440; helo=mail-wr1-x440.google.com; envelope-from=swupdate+bncbaabb4edypwqkgqefra5usa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="ncbXxj9Y"; dkim-atps=neutral Received: from mail-wr1-x440.google.com (mail-wr1-x440.google.com [IPv6:2a00:1450:4864:20::440]) (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 46z32Z58YWz9sPx for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-wr1-x440.google.com with SMTP id v8sf10762864wrt.16 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865072; cv=pass; d=google.com; s=arc-20160816; b=ZyOEN3onEyblnuwO1ocYkd2hYlKy4mz7/HdOjU50jw7PIYHMAekL/O1419XHTeCaVD PypPCwq5UA6BHM9an1IAUEUSTPvsVSrl7lTPeJmOvTmstNajEZQuXNnuWDFR0+d2MutC koCIl8kId/M5nqtKK6uf4BrUM32czb4VM+1Db/9f9sLX7VTmrr78IzstE3BM2/dJgtci 35CTAhA/UYXhSEQLo72q/ChhocCKdKFSew1MrWDBEOOd0teUt0bFeLJnHBwpwemK43ZG UZSNrESxGQJp++uuJMuPND0GnmWw6vFOSFHSk95kwzcMrcUIiVou+viA3/FlAH1QuLaQ vnsQ== 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:cc:to:from:mime-version:sender:dkim-signature; bh=EYsjIejnvij1Oy/bjBoat6k4jbFJE7j0JimmYTQZyGs=; b=bu1rlEHH7LSIAADLGTvt0VXIyvZuXbe0lMX9iWseTg2hNYzl6U1hDu3lLqpHUW2RFG umtbPs9mkGJp9yQQ5eDMcAwKzVzJklFkA5MlLl6mNTj0li5jrhMoMFKjbDfy9F2PRhDS GYc1qSYYXN37LKw6YW3aw76S1xSbr6IEEtG+H7RapuxrTPmC7uUzl5vZmE2eUWA/2Dcs cviabSQu0SxPpM/ysBKHiSWrO1pYSMklDRVD4cf5od5ZbTuqI4oJ+O8aiYbloFHH43iC 1JR1gc+DQh9Rww0Ex17p6m9SNL53Jee16WoNQjZ7E860gYb0kIQjuyc2ZhF8Og9On19b vv3g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=EYsjIejnvij1Oy/bjBoat6k4jbFJE7j0JimmYTQZyGs=; b=ncbXxj9Yi94qBDPCdklZQO70A7ciYGC8XvIYeGgfs9MrUXjDJkew5kikO6O64OkdNz DWK078K9aXKiztJvALi3uK1ByaLZwktn3CP/LTNzH6QZ051WXvsec/DmZbLvoUWbzT4D DKAYP8xuM/aXDV2JALcZeeAfuBAS78DWl831gRgx0Vf9b8rMIMABbZEUHH+KnY4LEhOo wZRYUo2Kpx+wbdmognjuuww5ksxfV8UcQDP0VeNNSFoLU/n33YbpGitA4JreAhn9UMTn DdxqKd1JBrBL4Ql5w1pfORlo19JkqsoNo0kfXK0YOTufTHaMpTocYxfDJQ6FFGaOEWq8 /WGQ== 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:cc: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=EYsjIejnvij1Oy/bjBoat6k4jbFJE7j0JimmYTQZyGs=; b=Pu2gX6IUs4bT8OeZ8h3uEwc0D42L2Jm0er7VL8bJU74FMInY2dfvIT/D1AM8iFbyP0 1NtYcEgcgFhR8XjVvwc79EBMKoFWN5AsOuCc0MJm/fZBjfR7+2GE6OwNC7l9xW6p4Ujo fi2QqB2rilhcFpV/fOjgJ1QxoDRUT1FYTnWi837nXWpyCC2+vyNJXCHLGt4LuAhiwQoG cp3kwC3kQyjm0JPz5bYiLQcHKhCnqkSyWXG32z5mRiSKOMYj2xEevfQtIoQEO9JHb4c/ BcXdSu1BnKYMOvnOYnItioKeMuo5CEX6u6Layej18H9tfBPcpYsOw74S8tkZ1Q1BCru3 t8LQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAVd/Kjpful3y50QF5I4X+kc4i/J6v7HR8s6l3GzxR7bNDEvkKvC CSU7yV116XHKhllyMjCy5RA= X-Google-Smtp-Source: APXvYqxEX47BHJm2ULYTwNe36MGe7yp4Zndx4C6Tz6/2XZP5khWM153OwMTKTpKSRyqsDYpK7eCK3w== X-Received: by 2002:a1c:1d7:: with SMTP id 206mr1616247wmb.33.1571865072268; Wed, 23 Oct 2019 14:11:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:a517:: with SMTP id i23ls2124717wrb.9.gmail; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) X-Received: by 2002:a5d:62c5:: with SMTP id o5mr688022wrv.388.1571865071778; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865071; cv=none; d=google.com; s=arc-20160816; b=FHt0GlU+lRCAhiQoLLJVcw1Jwhl21zSkLZbrCMIDcfsbfNNjIr+XRi7MWnaIFfHGih szgAUeex+yxgqxErtDXgr9Z6su8aQ/SXePbpA+qsMB9YJmMNQygeyoExqvmt++flPlKH HaCEBa8mKbL6rHb9o2JFDOOdMVNBblPRPQooC4/b4aehwM7D0Az5h8z+3fLELFJCPgRu 62naWdW+nvPl2AGQjl35ZT4r4N9ouOk2Wggq6gLaQ1kGwoF24hAVQW7ntfMYI3tdlwl1 PORFv0yHYAG9nQ07r38+G8veSn2rDcbyJZxPX9E2dvEnA6GGYcpFtDSdFWslaEbmb5JZ abkg== 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:cc:to:from; bh=EHOUTaJA1BQyC9WHaTeB5fi+CjYZspzwY6P0wfo39zs=; b=L08auXsb0tpcC0EF71YWHl/edEmzrBgQHo+LM5bQ5X8m8HB0lG+43/bGQCDkSzC0od KI1JcuQGIfE2quLgpqOeiv00P673z2E/L0Qwsjyz8wVfk6j2uPqyTRpFlbjUk4AxXhi5 mhwvKngJN5v5Wg1EM+0nHxe8eO2pxUFgj6cCi3ADnLvipTuu8FmPkiu+B+4aWslU391l 5xctL+PYaeeI5nczfk0+st231zjIipKysAEeIFV3XQY/ioD+bPgjo8j58s7Fh+3z6Gjj wPtN4GaB76lFfE9RJFQ/CwA3e5H2oVm40K6YmxH1n/AZrlKG9l5bHVErHS+3T5L0o0jX oGnQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id l3si43980wmg.0.2019.10.23.14.11.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x9NLBBpT003140 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:11 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9nS026775; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 7DC9E2353A5A; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 09/12] swupdate: improve systemd config Date: Wed, 23 Oct 2019 23:10:58 +0200 Message-Id: <20191023211101.16591-10-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , For most projects starting swupdate requires some logic implemented in shell scripts. Therefore swupdate is now started by a shell script also in case of systemd is anabled in DISTRO_FEATURES. The new swupdate startup script sources code snippets located in /usr/lib/swupdate/conf.d and in /etc/swupdate/conf.d. The snippets are executed in alphabetical order. The idea is that files in /usr are added at build time and files in /etc might be added or modified at run-time. If two scripts, one in /etc and one in /usr have the same file name, the script in /usr gets skipped completely. This allows to disable code in /usr, which is probably mounted ro, at runtime. Code snippets are automatically generated at build-time, depending on the configuration created by swupdate's menuconfig. But code snippets may be created manually and added via bbappend to the /usr/lib/swupdate/conf.d folder. All modes (file, webserver, webclient) of swupdate are supported. Different variables might be defined by the code snippets added to the named folders: - SWUPDATE_ARGS - SWUPDATE_WEBSERVER_ARGS - SWUPDATE_DOWNLOAD_ARGS Finally swupdate gets started by a line similar to: exec /usr/bin/swupdate $SWUPDATE_ARGS \ -w "$SWUPDATE_WEBSERVER_ARGS" \ -u "$SWUPDATE_DOWNLOAD_ARGS" The default set of configuraton and service files is now installed by the "make install" target of the swupdate Makefile. The service files which are not used for the latest git version of swupdate are moved to swupdate-2019.04 folder. Signed-off-by: Adrian Freihofer --- .../swupdate-progress.service | 0 .../swupdate-usb.rules | 0 .../swupdate-usb@.service | 0 .../swupdate.service | 0 .../systemd-tmpfiles-swupdate.conf | 0 recipes-support/swupdate/swupdate.inc | 40 +++++++++------------- recipes-support/swupdate/swupdate_2019.04.bb | 8 +++++ recipes-support/swupdate/swupdate_git.bb | 4 +++ 8 files changed, 29 insertions(+), 23 deletions(-) rename recipes-support/swupdate/{swupdate => swupdate-2019.04}/swupdate-progress.service (100%) rename recipes-support/swupdate/{swupdate => swupdate-2019.04}/swupdate-usb.rules (100%) rename recipes-support/swupdate/{swupdate => swupdate-2019.04}/swupdate-usb@.service (100%) rename recipes-support/swupdate/{swupdate => swupdate-2019.04}/swupdate.service (100%) rename recipes-support/swupdate/{swupdate => swupdate-2019.04}/systemd-tmpfiles-swupdate.conf (100%) diff --git a/recipes-support/swupdate/swupdate/swupdate-progress.service b/recipes-support/swupdate/swupdate-2019.04/swupdate-progress.service similarity index 100% rename from recipes-support/swupdate/swupdate/swupdate-progress.service rename to recipes-support/swupdate/swupdate-2019.04/swupdate-progress.service diff --git a/recipes-support/swupdate/swupdate/swupdate-usb.rules b/recipes-support/swupdate/swupdate-2019.04/swupdate-usb.rules similarity index 100% rename from recipes-support/swupdate/swupdate/swupdate-usb.rules rename to recipes-support/swupdate/swupdate-2019.04/swupdate-usb.rules diff --git a/recipes-support/swupdate/swupdate/swupdate-usb@.service b/recipes-support/swupdate/swupdate-2019.04/swupdate-usb@.service similarity index 100% rename from recipes-support/swupdate/swupdate/swupdate-usb@.service rename to recipes-support/swupdate/swupdate-2019.04/swupdate-usb@.service diff --git a/recipes-support/swupdate/swupdate/swupdate.service b/recipes-support/swupdate/swupdate-2019.04/swupdate.service similarity index 100% rename from recipes-support/swupdate/swupdate/swupdate.service rename to recipes-support/swupdate/swupdate-2019.04/swupdate.service diff --git a/recipes-support/swupdate/swupdate/systemd-tmpfiles-swupdate.conf b/recipes-support/swupdate/swupdate-2019.04/systemd-tmpfiles-swupdate.conf similarity index 100% rename from recipes-support/swupdate/swupdate/systemd-tmpfiles-swupdate.conf rename to recipes-support/swupdate/swupdate-2019.04/systemd-tmpfiles-swupdate.conf diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 1c863bb..19ccf4a 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -10,25 +10,30 @@ inherit cml1 update-rc.d systemd pkgconfig SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https \ file://defconfig \ file://swupdate \ - file://swupdate.service \ - file://swupdate-usb.rules \ - file://swupdate-usb@.service \ - file://swupdate-progress.service \ - file://systemd-tmpfiles-swupdate.conf \ " INSANE_SKIP_${PN} = "ldflags" PACKAGES =+ "${PN}-www ${PN}-lua" FILES_${PN}-lua += "${libdir}/lua/" -FILES_${PN}-www = "/www/*" -FILES_${PN} += "${libdir}/tmpfiles.d" +FILES_${PN}-www = " \ + ${libdir}/swupdate/conf.d/*mongoose* \ + /www/* \ +" +FILES_${PN} += " \ + ${libdir}/tmpfiles.d \ + ${libdir}/swupdate/* \ + ${systemd_system_unitdir}/swupdate.socket \ + ${systemd_system_unitdir}/swupdate.service \ + ${systemd_system_unitdir}/swupdate-usb@.service \ +" RDEPENDS_${PN}-www += "${PN}-tools" S = "${WORKDIR}/git/" -EXTRA_OEMAKE += " HOSTCC="${BUILD_CC}" HOSTCXX="${BUILD_CXX}" LD="${CC}" DESTDIR="${D}" V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" +EXTRA_OEMAKE += " HOSTCC="${BUILD_CC}" HOSTCXX="${BUILD_CXX}" LD="${CC}" DESTDIR="${D}" V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SYSTEM_UNITDIR=${systemd_system_unitdir}', '', d)}" DEPENDS += "kern-tools-native" @@ -144,23 +149,12 @@ do_install () { install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/swupdate ${D}${sysconfdir}/init.d - - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_unitdir}/system - - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${libdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/systemd-tmpfiles-swupdate.conf ${D}${libdir}/tmpfiles.d/swupdate.conf - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ - fi } INITSCRIPT_NAME = "swupdate" INITSCRIPT_PARAMS = "defaults 70" -SYSTEMD_SERVICE_${PN} = "swupdate.service" -SYSTEMD_SERVICE_${PN} += "swupdate-usb@.service swupdate-progress.service" +SYSTEMD_SERVICE_${PN} = " \ + swupdate.service \ + swupdate-usb@.service \ + " diff --git a/recipes-support/swupdate/swupdate_2019.04.bb b/recipes-support/swupdate/swupdate_2019.04.bb index e2eabbb..83785d7 100644 --- a/recipes-support/swupdate/swupdate_2019.04.bb +++ b/recipes-support/swupdate/swupdate_2019.04.bb @@ -1,4 +1,12 @@ require swupdate.inc require swupdate_tools.inc +SRC_URI += " \ + file://swupdate.service \ + file://swupdate-usb.rules \ + file://swupdate-usb@.service \ + file://swupdate-progress.service \ + file://systemd-tmpfiles-swupdate.conf \ + " + SRCREV = "d39f4b8e00ef1929545b66158e45b82ea922bf81" diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index 9fea83a..a4289f6 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -5,3 +5,7 @@ DEFAULT_PREFERENCE = "-1" SRCREV ?= "045a618a725d0a2fce64161f10101c0004ac5d85" PV = "2019.04+git${SRCPV}" + +SYSTEMD_SERVICE_${PN} += " \ + swupdate.socket \ +" From patchwork Wed Oct 23 21:10:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182496 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::43b; helo=mail-wr1-x43b.google.com; envelope-from=swupdate+bncbaabb34dypwqkgqeithh2gi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="Bj+Sl7f0"; dkim-atps=neutral Received: from mail-wr1-x43b.google.com (mail-wr1-x43b.google.com [IPv6:2a00:1450:4864:20::43b]) (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 46z32Z56BFz9sPv for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-wr1-x43b.google.com with SMTP id k10sf2631111wrl.22 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865071; cv=pass; d=google.com; s=arc-20160816; b=z/lbP6A12sXRPqS4P2as4x+iHG/4235IOHZwggPESHTzWlvIRQzXeNERQOgSAaMxA2 G6IjoP+4L7eEn3qd9RaWaOvxXmreJA14hT0/rWafhqzoSEaMwHWiWIdbTfErw+LW2z1+ E2byeUxHQgmQbXnrknCDb47ndAGxupdXiCobYw8WJ+5VyarcbSIRVEQ0BvMR38c3YXqu Hnev4L60GZWC+hpsPSLlUlJxRl9/ruM1aCN9Ux4ZcuWpOu/HVYbvSa7aphurEmuEpa7R j22GIoPT9sxeAYQtjkXe1MdD5EovgbaJ0Wev2AasaCL/cof2wFGNLUH4q9XaY6gI1C1z 2GJw== 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:cc:to:from:mime-version:sender:dkim-signature; bh=qhNs599KZpjSZsl/j9KcGmWCrIvXPOGFVxsCa/2e/o8=; b=ajBJMkeecJCFVMiwgGcUMhQjUC2mKqzCdmCQDzj06j1vDgGnRDGC1z2hIa7HjfBQMU 67U7xYb0HuF+MyFU+WcYG/DozCWvP9jaTvbvnD2au96DL1ay8zEDxut5RRxjmjH3UAnw pdSx8Z8sSycIh+UdSluz2TYHeOO+vCgGhnUkACd19TA2scAnDO4CZz59TJhAy0JiBtaP cOYZtQ/Q+1+Ho0c6jUcD/Bq1afdtGpBifL4ZArB/MtTq2jcQBLGrM3iA+gz/5nrW/wku Pj1dOUh3xGWdVvS2WD1LP3HdA80v2LbHxnQ7cYZbR5YSpekYHuXfYZFznpb3IyWhZkZ8 hvhw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=qhNs599KZpjSZsl/j9KcGmWCrIvXPOGFVxsCa/2e/o8=; b=Bj+Sl7f0ZGSFGjNAeD8PpSLP2zaj3vrqaVSsal1fBZwn1shCCCMylJ5ZBl59c+FPCQ TDUjSo5K0Hx/OI/n+MMlNXIqzfwpqUDiycrwIgY0u8zt3hK/Jei7d8u6uzZT5Sjb/CH+ TjfrKlzGJEAyONIE5+Fd7wvpqDOh8YnLQ6CfTnHjkbr/VueGpcuzIzMaVRCz3U7eR2JR PfBX9/0A8H535LU9k9FMZJLajLHJ6616dS3oHmLhgaw2k9Gcgc3mLrflVc16neJZsz97 hqJUA3vWbDnKYi2LLv4jPNnkQvlH51pDRHlA0RcndGU0h+r/9suiTl+JWukdtB+Rnqh6 79sQ== 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:cc: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=qhNs599KZpjSZsl/j9KcGmWCrIvXPOGFVxsCa/2e/o8=; b=Wh7NoBvQMJsF/3ms4ilug/EV6Jdr9wvrXkowKFAT3Rk0iXxnps2DdUOK5QhjLR1e/p 5VDgydtARWw6bjPWbKk7NjICF4Z8LO52LW6sF781QxC7nHbz8cteeuJxMIr63/hy328Q AE4rXR0Cj+nirNr2n79n0xQmepW+47/L5NuzNB2nS+fjwcwA7qkg41A3FeXcbiw6xlSq z72iw3v8PO91MZsfn1rw6cPpiPG/Ev0yFLHgtDP4m87brd6WdrxzPKUPxCna+VKyjk3F klU7jODvx7OTFQBPfTmLB30WsnkWHEpuGegsEzhqsLQHuCD7a4kZcXN8jMd3neI6ijnH bVwA== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAWwG9z3oijmX7RHyzMHjZgl8ysvgbC3MH16d6p+/zCCwp1rEXp8 DGCXDK58z1nONJO3caV0zu4= X-Google-Smtp-Source: APXvYqxaWstQlYOD34Y3vtS3zCEkbAJJtidX1XN1RpWmgEtxcZaKttz1Tbdc++zCYDbcQantBFu2EA== X-Received: by 2002:a1c:f709:: with SMTP id v9mr1829102wmh.42.1571865071456; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:c448:: with SMTP id a8ls2150031wrg.0.gmail; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) X-Received: by 2002:adf:d190:: with SMTP id v16mr689540wrc.64.1571865070949; Wed, 23 Oct 2019 14:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865070; cv=none; d=google.com; s=arc-20160816; b=Z05xAjUWoa1bcSICqpg5ud9WtDmxkptm2LeGwuwKNi1vIZEXVYo3RT78CQ6twefna8 vnXmKjYt56dww8qyb2PKlpuaNRPti8bN62gs9NRsG27/a0IpT01k7MXbRnaSHo7NtgLn wQ4mS30SQMlYXcL/3R2tKBEqqHuC/Nr2EwkAJpbKKphVx40sRJGO7gFEuysfM5qYRbsO X/Rt7wAKrZJxAy0b4FtMGGsyDOYg9yPIJEi4M5N4/6EmFAGGq/QXhSwB2ILs563KE6Su sf6Egvi7+DGJy4lsGl8DwnsiOK5vkUXgImqHm0311Afzxy0mGu3l18CwZQloA7EC5VNG AF8g== 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:cc:to:from; bh=7PUlKItbm3yPUayaOMVtPagFng0qE7fB8PqYGRDeDsw=; b=FNgfLXApdFh3Obq2k7RlvHlZXYu38IQ+6W69gbDQIvIyp33WfJSg0gAShq9RZ7amfG 1rRBm0hQCLffjpQ1lZMN2U8yQvU07EKXRjHgmYUdubq1tUQAxZuK3OhrKQ3xlo7w80yY clzUwhQGWNIhh0P7WD88DuZGM9wP2YU58QmCr0OEmhkkH8MHD4QxUJcyBQnoKURQuZS6 k4N+SLJJtR6OY3kOlZRzaJLxa2zullk+ALABAbz/HA60rM5n7JrBlCZsC+kl3+aLusHU 9Bt/PIkUhVh4H/ijJ+EpGrHspxfOFnGIjtgYkERGvKF0azeGHWdSbyREwi+AESIunT62 hgRQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id c12si1073566wrn.2.2019.10.23.14.11.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:10 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NLBAPl007404 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9wk026777; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 892482353A5B; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 10/12] swupdate: update, fixes in do_install Date: Wed, 23 Oct 2019 23:10:59 +0200 Message-Id: <20191023211101.16591-11-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , Update swupdate to latest git version. This changes the filenames of the tools binaries for several reasons: - Binaries should not be named "client" or "progress" (also not accepted by Debian upstream) - Inconsistent with names referred in the service files The swupdate_tools.inc file gets merged into swupdate.inc file. By removing the tools file some bugs are fixed: - The tools binaries were installed twice. - do_compile from swupdate.inc was over written resulting in wired behavior - swupdate-progress.service file was part of swupdate package were the corresponding swupdate-progress binary was part of the tools package. The tools are now installed by the "make install" target of swupdate's Makefile. The related code here in meta-swupdate gets removed. Signed-off-by: Adrian Freihofer --- recipes-support/swupdate/swupdate.inc | 18 +++++++++++++----- recipes-support/swupdate/swupdate_2019.04.bb | 20 +++++++++++++++++++- recipes-support/swupdate/swupdate_git.bb | 1 - recipes-support/swupdate/swupdate_tools.inc | 24 ------------------------ 4 files changed, 32 insertions(+), 31 deletions(-) delete mode 100644 recipes-support/swupdate/swupdate_tools.inc diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index 19ccf4a..ec7091f 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -12,14 +12,22 @@ SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https \ file://swupdate \ " +PACKAGES =+ "${PN}-www ${PN}-lua ${PN}-tools" INSANE_SKIP_${PN} = "ldflags" -PACKAGES =+ "${PN}-www ${PN}-lua" +INSANE_SKIP_${PN}-tools = "ldflags" FILES_${PN}-lua += "${libdir}/lua/" FILES_${PN}-www = " \ ${libdir}/swupdate/conf.d/*mongoose* \ /www/* \ " +FILES_${PN}-tools = " \ + ${bindir}/swupdate-client \ + ${bindir}/swupdate-progress \ + ${systemd_system_unitdir}/swupdate-progress.service \ + ${bindir}/swupdate-hawkbitcfg \ + ${bindir}/swupdate-sendtohawkbit \ +" FILES_${PN} += " \ ${libdir}/tmpfiles.d \ ${libdir}/swupdate/* \ @@ -130,10 +138,7 @@ do_configure () { do_compile() { unset LDFLAGS - oe_runmake swupdate_unstripped progress_unstripped - cp swupdate_unstripped swupdate - cp progress_unstripped progress - + oe_runmake } do_install () { @@ -158,3 +163,6 @@ SYSTEMD_SERVICE_${PN} = " \ swupdate.service \ swupdate-usb@.service \ " + +SYSTEMD_PACKAGES_append = " ${PN}-tools" +SYSTEMD_SERVICE_${PN}-tools = "swupdate-progress.service" diff --git a/recipes-support/swupdate/swupdate_2019.04.bb b/recipes-support/swupdate/swupdate_2019.04.bb index 83785d7..5b0fb78 100644 --- a/recipes-support/swupdate/swupdate_2019.04.bb +++ b/recipes-support/swupdate/swupdate_2019.04.bb @@ -1,5 +1,4 @@ require swupdate.inc -require swupdate_tools.inc SRC_URI += " \ file://swupdate.service \ @@ -10,3 +9,22 @@ SRC_URI += " \ " SRCREV = "d39f4b8e00ef1929545b66158e45b82ea922bf81" + +do_install_append () { + # Rename the binaries installed by make install + test -f ${D}${bindir}/progress && mv ${D}${bindir}/progress ${D}${bindir}/swupdate-progress + test -f ${D}${bindir}/client && mv ${D}${bindir}/client ${D}${bindir}/swupdate-client + test -f ${D}${bindir}/hawkbitcfg && mv ${D}${bindir}/hawkbitcfg ${D}${bindir}/swupdate-hawkbitcfg + test -f ${D}${bindir}/sendtohawkbit && mv ${D}${bindir}/sendtohawkbit ${D}${bindir}/swupdate-sendtohawkbit + + install -d ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/swupdate.service ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/swupdate-usb@.service ${D}${systemd_system_unitdir} + install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_system_unitdir} + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${libdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/systemd-tmpfiles-swupdate.conf ${D}${libdir}/tmpfiles.d/swupdate.conf + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ + fi +} diff --git a/recipes-support/swupdate/swupdate_git.bb b/recipes-support/swupdate/swupdate_git.bb index a4289f6..8eef04e 100644 --- a/recipes-support/swupdate/swupdate_git.bb +++ b/recipes-support/swupdate/swupdate_git.bb @@ -1,5 +1,4 @@ require swupdate.inc -require swupdate_tools.inc DEFAULT_PREFERENCE = "-1" diff --git a/recipes-support/swupdate/swupdate_tools.inc b/recipes-support/swupdate/swupdate_tools.inc deleted file mode 100644 index d270dd4..0000000 --- a/recipes-support/swupdate/swupdate_tools.inc +++ /dev/null @@ -1,24 +0,0 @@ -PACKAGES =+ "${PN}-tools" - -INSANE_SKIP_${PN}-tools = "ldflags" - -FILES_${PN}-tools = "${bindir}/swupdate-client \ - ${bindir}/swupdate-progress \ - ${bindir}/swupdate-hawkbitcfg \ - ${bindir}/swupdate-sendtohawkbit" - -do_compile() { - unset LDFLAGS - - oe_runmake - cp swupdate_unstripped swupdate -} - -do_install_append () { - - install -m 0755 tools/client_unstripped ${D}${bindir}/swupdate-client - install -m 0755 tools/progress_unstripped ${D}${bindir}/swupdate-progress - install -m 0755 tools/hawkbitcfg_unstripped ${D}${bindir}/swupdate-hawkbitcfg - install -m 0755 tools/sendtohawkbit_unstripped ${D}${bindir}/swupdate-sendtohawkbit - -} From patchwork Wed Oct 23 21:11:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1182487 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::43d; helo=mail-wr1-x43d.google.com; envelope-from=swupdate+bncbaabb4edypwqkgqefra5usa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="SVQy/P7Y"; dkim-atps=neutral Received: from mail-wr1-x43d.google.com (mail-wr1-x43d.google.com [IPv6:2a00:1450:4864:20::43d]) (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 46z32Z4JmXz9sP4 for ; Thu, 24 Oct 2019 08:11:17 +1100 (AEDT) Received: by mail-wr1-x43d.google.com with SMTP id s17sf6010915wrp.17 for ; Wed, 23 Oct 2019 14:11:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571865072; cv=pass; d=google.com; s=arc-20160816; b=pl3ce5yFQYaAG2efzqoCLuuV43T1TgdZybYwrVxDQl4IH5JozzvBls3ebfemT9/TLF Q1P0RENNIMYZ9Mg8fsPXmfHhAhZRqccfBqDvveeDhdHrEQKASmt3Yint28qbagXcSA6B 4+Sm27rrvIVtO6mXT33G0wtGxZkB5Mu1kx8Lb/NgO/1JHdWBWhG702mFOjU6oqhe+9qC 5zzVsn+9Z2cNHrWqYL+0o+/4xohAPMtLeI91Nn+GHENzzKJQh5EsNdxPoJ4eoLY3c/Pv nyKm9NfiSfwvBopJxydskq6wKzF4037cN7hkVN/rqe4pUJ9Sksl3axTS9JkkOVuMtrOz kNmA== 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:cc:to:from:mime-version:sender:dkim-signature; bh=ACqx0SWqK0QX2gJXRbpS2EAFzJTDmrYoDth8GoX6waA=; b=RwRG32XsxoBrfjYMn+3/ZeaPsBfrfE++MVQLuQFb29O1LoSdZxRdKF/946MnI9mvS6 NyoM1ng7ApYC7BTBWiVSm3mySjmJuVuttTn3GTZwbuANAu7vK08lpIYCqjfTMXRvxEVz UG8ekPr7FHddMgFoZMo0JwNdBBaibKQGgxoQbb1TZqTiBseO0IiT81PGlInjS8Kjd9sE f3132PJkqPbSYK0M0UbhrlxNCWH3EPsBfxqZSmXf6zzjh2Wky/J1laMFzA6IaHuD9DfA ffs7IyBRhhMk4NzyD0OV5rknSrv7ITUsTurlsfwceEO5uDHfFBeruWBL029Di73JodgL gqdw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc: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=ACqx0SWqK0QX2gJXRbpS2EAFzJTDmrYoDth8GoX6waA=; b=SVQy/P7YGZyje5+9QUmaZdCKEMot0v+07s2UQ64R0ofila33uKZA+t1IHBCkEEvr78 CM0FT/+rOwmHJWv4Q8y0SVpqOrjZT38p+g+2enWmDiH/6I8GU696yZz9pcMGJ3ln5ofV O0qRoSuLBaN0PABVF7oCYVQ2c2W7gnxTeTUAvJrS0pRscVAOT384IpdfJyuHY2FA5cjC 6gC3hm/gCEpwEXEmoYHNZidBL78TYOKeAVZ3aE9JN+McsoOa7FrhBVwCR3TmN+orVEB0 UdG/T0xDHvsMpzKXQq7G3gIbIzC7ngSmLxW85oPbHgEmN+qqpYydQVPqu/laZxHDGjyr fbIQ== 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:cc: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=ACqx0SWqK0QX2gJXRbpS2EAFzJTDmrYoDth8GoX6waA=; b=Vf/4c8PwK+OEPFWxFzZK4w/uJt0PpeBqnJuEACWsTQ7laTV7Qj2cPbPo0QfBWoBAd7 aS0uF/er44gYydFZNKASo/eDFI5FdCHYIJzuKYvcgYnR4rGmacI+yCeatF7hTV3LmxxY weEh4o2NmIL1z1uXdQ1k7RK2xE/hekeQjxuFwrgMqEEsw2SYK8lWVLsbyDeY8f6fKW/0 +PnnItPz4ioWF/GQur7lG4Zzwc3Qh/LRfEx2FHRuBKeR+EBlPsnHkvrlNI9yG1OCuEUs ht1Q6QXeR2gT/PbvgtACOVHdeCtNw5LX6FQZ1rULJiKz1wTTmQcQHw03NYu2WhHhPAkj 0dTw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAWdHaxdkedLNRaGECTvz/Fsk4HwmLEoG3Kz8GlQR9/xx4kIkIij AVyf34toK7slS8ISYZBzWYk= X-Google-Smtp-Source: APXvYqx3u58Iugc465e7vQI7KIQdcw+TKppro7KBGjkOdm0uJNeB841R4zF9CBdjXXxvB9I1feIGDA== X-Received: by 2002:a5d:4f89:: with SMTP id d9mr669979wru.286.1571865072428; Wed, 23 Oct 2019 14:11:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:fa0f:: with SMTP id m15ls2116981wrr.13.gmail; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) X-Received: by 2002:a5d:4ace:: with SMTP id y14mr636837wrs.131.1571865071818; Wed, 23 Oct 2019 14:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571865071; cv=none; d=google.com; s=arc-20160816; b=WCiOA/2imxob+Fyvb6QK+I0mURJgtsuZPDMK5Ug96tUBtUtG18h08IKJF8fSXTZXWj FiBjczTMp5T6/zIs32OgmPzAtYQbb5IJsixAc3UgIhbXCST+KdrbiJJ19cCRNTZzTw// aIQj3kOElz0UU7rhnF7TRl/PCPeo6cpTisTLF0LFXKhfqep1rz1mj2hhF+Jz1ZpoTy3I vva9oKadUiWIIgxnpvWp4gFy7HTq0W6d0O9vthEBerXXE9uuDaGtwGzwBf7qba9FeLwI dK9FNfJzMsgc/7KywwXltviL5KU9CjSXiWd6tQaeHolYyC0nTYzcVxZF3JKxOKPgevg0 h08w== 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:cc:to:from; bh=gVymJoPDQMivEx18unEXtsrztUI2YNAz3FV9Ad2yJ44=; b=bBQxOpEwyHrINBFoYDcbuNnid6OhYD3qAnT0kr0VbLJK+oCKkfNyOGMvtKu7AlQ0RJ K6B3/tnL06AKzDjs4Dy/3NUPnk6KeBQHmXtWvX6b1wtjCTwv8Dd0HvS8jmUKaL4/ESR1 ssajEBl8mlMKORTE0CqYRQIlGd3dkSMkG1sEvQq4y3O+W8QehpqxVjIbAcH2V4uaD7eB pMvqWv4vuFWj7JVGP7UoTQd2o2lDU9RuRXTeZXKEIQJtQazMhvU+0XpeUnodbXFN2201 U7RmVxpuDoGijUcUocGhTxb4qlsB6igXmScD8+fvGiBYOMfr2ZN5BFASJ8HDfnPsl9SK uJXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id a14si840390wrm.1.2019.10.23.14.11.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 14:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9NLBBcx030547 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 23:11:11 +0200 Received: from dev.vm6.ccp.siemens.com ([167.87.32.70]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9NLB9oM026781; Wed, 23 Oct 2019 23:11:10 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 94E562354320; Wed, 23 Oct 2019 23:11:08 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH 11/12] swupdate-enc: add missing $ Date: Wed, 23 Oct 2019 23:11:00 +0200 Message-Id: <20191023211101.16591-12-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023211101.16591-1-adrian.freihofer@siemens.com> References: <20191023211101.16591-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , Signed-off-by: Adrian Freihofer Acked-by: Stefano Babic --- classes/swupdate-enc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/swupdate-enc.bbclass b/classes/swupdate-enc.bbclass index 5e3fe79..198ae98 100644 --- a/classes/swupdate-enc.bbclass +++ b/classes/swupdate-enc.bbclass @@ -13,7 +13,7 @@ swu_encrypt_file() { key=`cat ${SWUPDATE_AES_FILE} | grep ^key | cut -d '=' -f 2` iv=`cat ${SWUPDATE_AES_FILE} | grep ^iv | cut -d '=' -f 2` salt=`cat ${SWUPDATE_AES_FILE} | grep ^salt | cut -d '=' -f 2` - if [ -z ${salt} ] || [ -z ${key} ] || [ -z {iv} ];then + if [ -z ${salt} ] || [ -z ${key} ] || [ -z ${iv} ];then bbfatal "SWUPDATE_AES_FILE=$SWUPDATE_AES_FILE does not contain valid keys" fi openssl enc -aes-256-cbc -in ${input} -out ${output} -K ${key} -iv ${iv} -S ${salt}