From patchwork Wed Apr 1 08:03:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 1265063 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=2607:f8b0:4864:20::33b; helo=mail-ot1-x33b.google.com; envelope-from=swupdate+bncbctyrthe4edrbxevsh2akgqepsqmb3a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=NZbA0YOp; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=oFZHxQ9b; dkim-atps=neutral Received: from mail-ot1-x33b.google.com (mail-ot1-x33b.google.com [IPv6:2607:f8b0:4864:20::33b]) (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 48sdxX3Fczz9sSM for ; Wed, 1 Apr 2020 19:03:43 +1100 (AEDT) Received: by mail-ot1-x33b.google.com with SMTP id v11sf10334451ote.8 for ; Wed, 01 Apr 2020 01:03:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1585728220; cv=pass; d=google.com; s=arc-20160816; b=md5ajcr2uoKSNuIM+PHvAZBS85EtixQr2zPMxNbLkU83/4r7SVI5pKvuew748xYHKK 51xEKz23c6E6tDf9x2xpp1KkWnhB2NgMu4/8e4WdsLyWU0PdzyiEUFwaXp4ppIz76ScH 7VBJPIzzWyTKxKYUYtL3G9Kxrwv/LMvYH2AAzW41sr1D6JXjKwOpUSaVTMmxfI0myHuL wrZ5Np2gr9wrr6eSAHYZACMLB070U+9aC+Hsp1sgRSn+E8VcBypp/U7BZiN9+5CpElrX jNzopo8pIuwTyqnZJqQTG6eiXukqKnJS9c2ocy14O6i2+A1lXL9MdjErvFdQsG5i/WTJ VU+Q== 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:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=oI1UBLhcNqgcrCq0VDNIf0jrsbX4lwkVEZ1q2uni8b4=; b=gZNXVTLuQVP1nskP6yCsDL5HQhXzQJar37xAKpXgbXHOG452jk7j6payENu+Am4a5z fsgyHkSnzYDUJpEXKWawg32lrMu2eRnMrhSBy0qOysSfM20G8Gl8pun/xdFulx2M0d+x AMGURZd+IjGWEeK/ilTPoQvVCEZgf5ZpcaWB6ZUFwlVrXf8jiENBQojeY91iFix+lXhF 0j5zymzoJlHwvNO8ndLZErKPtDDn53Nt7WEIYYMbAYODv2c8XboqHmBe/fW2eZz2daZx uwu7qqv+d1VjHtv3Xd8TjIoOian8lMi7nTalWPXp7GeodFQI3/3ir96zXAKrLIZ1Edij lvFw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=O6ZUCC8w; spf=pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::433 as permitted sender) smtp.mailfrom=raj.khem@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=oI1UBLhcNqgcrCq0VDNIf0jrsbX4lwkVEZ1q2uni8b4=; b=NZbA0YOpWh7uF9QqQ38HGGWP04hUBWprJhEccweXz8lxoGV4TSA02mdkT4n0FECUu8 B/4b6YgrQeUcwxUAtj/beR2cLZ2+ISt5keZclM9bnmyt1f+vL/L5Fm3eTbYc1qT6ppcQ mM6nIrCgM5715igJgOCctVFD3veMXsXylsAG8+P+mqIjv/Ocq6Aimrl9pTdFNTgdvcaR MCbLfzGzVbJKLqH0PKqz3mO6ehUcv6Yz17vIIoj/yDo7aY/p1IXTPET+QnEIVD5iH15T mGHG3Z5PxM+uNuDyto24XDXww0BvDcRupOP2+8ZgpIeQCLBB3T1uLhuB915SB8JRnSzc JpBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=oI1UBLhcNqgcrCq0VDNIf0jrsbX4lwkVEZ1q2uni8b4=; b=oFZHxQ9bB0r6JF1TbDmxgZlzgWOZDLwNZTxey9n3JtTZL9aQGbNsm0Yaj4Fv2dBcb2 1vq59S3Ra2sGJuEwFVkmeD2d6u1liNAEFPD3ynNQxFpGE/ex/6xcRG5w68o9JzhAFTnn QfJQw7jKMCJRd/c5R9GJ9iMN4zh1syILExRePTH6tGL4qZCYWatvLNSyjY9/0xcF5nCn MBduC5Gd23BVuWi3mZUDLi0/TcVPP5UQZfg8koGvLhQTQK1P5Ixx93Y13ngz1r/7jJMJ 9ZQf/iYYFMn3R4JFltZNfKEjKZjZPfl7AN3Jv/lwl8a+Xdobl9HygL/Cw2lQb5Oa/uLc 49iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version: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=oI1UBLhcNqgcrCq0VDNIf0jrsbX4lwkVEZ1q2uni8b4=; b=PzXbMk57btp/uVlzY3J/oRZG7xQiO5pbJlF0AOVnXMhFkb0fBPrpom0sCnDQauov3M F3QuCK9GSK0gjrnxTSxvJnbPR+v6dDnEChg1XuMob6hOiAnsQ8NmiyG8K7xdByBFxUHA wZVfpJ6B61vxVLXNmbyHA7DRCtHLn4th0cjJ09ce4rdvGjf5Qbc8/RZ7QedyNRzm8g6v 9U9JlTGB8XjH7P1IBFbMzVF7qb7Qpd4DSW8x0hig0k5Q4ol0dDND558iRvih36nXLN0s YbWhuKOhjyvv1nN5Vesh3ePRLWHFKXYZrLEl2S5nuCyZs4s1zofF5Sp2QvB1oUQfdNjc GedA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AGi0PuaSP2rWeUi4qZKKZz6z5hALExOD8GnNArPIoklk5q82cZTpR9Zl yqlY/mwedQW2qeldoJxivNE= X-Google-Smtp-Source: APiQypKDJl2HH9rW0ioV+TG2CSIVp1vDfyHH3Ls+FCg0KbIwN+uN41b2Vnb28grAF60j5bkPqMDdpA== X-Received: by 2002:aca:c695:: with SMTP id w143mr1974010oif.98.1585728220543; Wed, 01 Apr 2020 01:03:40 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a9d:6750:: with SMTP id w16ls8793057otm.4.gmail; Wed, 01 Apr 2020 01:03:39 -0700 (PDT) X-Received: by 2002:a9d:1d67:: with SMTP id m94mr16190173otm.140.1585728219738; Wed, 01 Apr 2020 01:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585728219; cv=none; d=google.com; s=arc-20160816; b=nd7K0BM792ptl/8Hc56t/lwFLM2K/BuldCE7XnlrQeTyb7u1xDUGIe+5WcL8qkvp93 WgVfjgrfwYs802uEUijBy5GSOtqbaGcUoXT2ZsUxt6Kj0a0HGE12Szb3l0eB+i2vvhCr gz4gA5H7L6hVdTbzfubBjQlH7ZDMUr0+2Y1Owr3Geq2MLGyXr8pgIxeFsGoPcJObEOwp ahwwqRYA272hBEUGB2i+9ZzlO7j2ObWRVXjnkjXCRfHB7n2fWFHTnd9lSNDTli2P619N cys+Jlk0dn80Bvn5W0leokJl6lE3ATTobQT8+w0++9z2PXra4JxUceptqA6weV3LCJt6 4hHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=atlNnU4cipdrJLKOVetPecXofzk8fJZusNkaMfrj3bw=; b=RYLdgQRhDOBDflHJZEpAECj7MVKHv799hARskgPTc3eHM614sZgObxOYFPuc5tct+g VE1nPOrCPcYa46eZoFL+MzUPHzyR8eha2HkVDxXxkdX2Br8XFoexeGtWufi5gwhhmnkd ve8oO+htGkYIVHVi3VbjVYwXSJe+euYfjqugzowJ0uBuZAgUZdJQBns3WSWRXqOBM8pX ZWuhL2r1FeVo1xLRjy44s3dvoh3p3b4suNzJuK1Afrz0N2WALGMZU8XHRcGYlksBdsB/ BD6co/Nca9tMvttPBkstRU+ihc1ee4/ltnB+sKctZDNOw/hbiLC+zvRZInacjMzNPN4h 59uw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=O6ZUCC8w; spf=pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::433 as permitted sender) smtp.mailfrom=raj.khem@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com. [2607:f8b0:4864:20::433]) by gmr-mx.google.com with ESMTPS id t81si86600oie.5.2020.04.01.01.03.39 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Apr 2020 01:03:39 -0700 (PDT) Received-SPF: pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::433 as permitted sender) client-ip=2607:f8b0:4864:20::433; Received: by mail-pf1-x433.google.com with SMTP id 23so11755785pfj.1 for ; Wed, 01 Apr 2020 01:03:39 -0700 (PDT) X-Received: by 2002:a63:8e44:: with SMTP id k65mr20686579pge.452.1585728218252; Wed, 01 Apr 2020 01:03:38 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::3e84]) by smtp.gmail.com with ESMTPSA id l22sm994535pjq.15.2020.04.01.01.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2020 01:03:37 -0700 (PDT) From: Khem Raj To: swupdate@googlegroups.com Cc: Khem Raj Subject: [swupdate] [meta-swupdate-boards][PATCH] raspberrypi: Drop creating semi layer and simplify layer structure Date: Wed, 1 Apr 2020 01:03:51 -0700 Message-Id: <20200401080351.3059074-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-Original-Sender: raj.khem@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=O6ZUCC8w; spf=pass (google.com: domain of raj.khem@gmail.com designates 2607:f8b0:4864:20::433 as permitted sender) smtp.mailfrom=raj.khem@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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: , rpi-u-boot-scr is now marked properly with rpi overrides in meta-raspberrypi overlay recipe is quite common and is not rpi specific Drop contruct to add BBFILES which was added to support this structure Signed-off-by: Khem Raj --- conf/layer.conf | 5 +---- .../rpi-uboot-scr/files/boot.cmd.in | 0 .../rpi-uboot-scr/rpi-u-boot-scr.bbappend | 2 -- .../recipes-core => recipes-core}/overlayfs/etc-overlay.bb | 0 .../recipes-core => recipes-core}/overlayfs/files/etc.mount | 0 .../overlayfs/files/overlays-etc-dirs.service | 0 6 files changed, 1 insertion(+), 6 deletions(-) rename {raspberrypi/recipes-bsp => recipes-bsp}/rpi-uboot-scr/files/boot.cmd.in (100%) rename {raspberrypi/recipes-bsp => recipes-bsp}/rpi-uboot-scr/rpi-u-boot-scr.bbappend (61%) rename {raspberrypi/recipes-core => recipes-core}/overlayfs/etc-overlay.bb (100%) rename {raspberrypi/recipes-core => recipes-core}/overlayfs/files/etc.mount (100%) rename {raspberrypi/recipes-core => recipes-core}/overlayfs/files/overlays-etc-dirs.service (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 5c95d9d..ac60647 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -3,7 +3,7 @@ BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" + ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "swupdate-boards" BBFILE_PATTERN_swupdate-boards = "^${LAYERDIR}/" @@ -12,6 +12,3 @@ BBFILE_PRIORITY_swupdate-boards = "7" LAYERDEPENDS_swupdate-boards = "swupdate" LAYERSERIES_COMPAT_swupdate-boards = "warrior zeus dunfell" - -BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.%s' % (layer, ext) \ - for layer in '${BBFILE_COLLECTIONS}'.split() for ext in ['bb', 'bbappend'])}" diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in similarity index 100% rename from raspberrypi/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in rename to recipes-bsp/rpi-uboot-scr/files/boot.cmd.in diff --git a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend b/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend similarity index 61% rename from raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend rename to recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend index d3ad9bd..81fe7b7 100644 --- a/raspberrypi/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend +++ b/recipes-bsp/rpi-uboot-scr/rpi-u-boot-scr.bbappend @@ -1,3 +1 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -COMPATIBLE = "raspberrypi3" diff --git a/raspberrypi/recipes-core/overlayfs/etc-overlay.bb b/recipes-core/overlayfs/etc-overlay.bb similarity index 100% rename from raspberrypi/recipes-core/overlayfs/etc-overlay.bb rename to recipes-core/overlayfs/etc-overlay.bb diff --git a/raspberrypi/recipes-core/overlayfs/files/etc.mount b/recipes-core/overlayfs/files/etc.mount similarity index 100% rename from raspberrypi/recipes-core/overlayfs/files/etc.mount rename to recipes-core/overlayfs/files/etc.mount diff --git a/raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service b/recipes-core/overlayfs/files/overlays-etc-dirs.service similarity index 100% rename from raspberrypi/recipes-core/overlayfs/files/overlays-etc-dirs.service rename to recipes-core/overlayfs/files/overlays-etc-dirs.service