From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6906006289225089024 X-Received: by 2002:ac2:48ad:: with SMTP id u13mr8988725lfg.416.1607949247636; Mon, 14 Dec 2020 04:34:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c886:: with SMTP id y128ls336520lff.0.gmail; Mon, 14 Dec 2020 04:34:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGb30YWP5rzpomgeq6xjhpxybFYX2P1zkCl87Afd5fDMIFB5AbZaORLB+3eMxCrqWs40UG X-Received: by 2002:a19:c6c2:: with SMTP id w185mr9774353lff.354.1607949246318; Mon, 14 Dec 2020 04:34:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607949246; cv=none; d=google.com; s=arc-20160816; b=Mvf+CiP9SLgLYkHX83Z1Lqwte9Xpr+8V0D7WAbVYJCL5ppkXm/0xK2cMEQLWNTZVJ5 piRmAQo7hDKyyzt78dy2m9btLDN+YY8E28OxwjBrHIiZQYoyyQjb3MR4jB7x/aNCSO6T Qzv94sbOSzbakqTUiSbRmZyY4g6KJSW7fqzH/LSe+ay1i63T0qe09XLnXz9SQyLTWjc2 eYQx5BCFBjsu3u+lk5NfDOamuGViZ3TumyG74XHc+ZOafHe0yxwmpk5THRqQDMsUHXs3 qdSoKGMxpZ8KXHqWKTrhyjaJA4yHZEyw7bbPsdYsmbN0wJ4hkmQL3zWoRPsKQwkOn6M6 diUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=45wrJ6xi2SEXGH1S0u8OVE4G+EncOt+0Z81Tkdbs0A0=; b=B9sjl1ER4yDBCZzUw2FZ1AfsnAORf1tZklDqiTPwBX1tfoGYMedIJBG6EXSu052MLJ ZYKVnhK9ihgOR2jl8kP+zX56WYqKz/y3iqJR8dggXowfmCRz23eJu04CUwXTZb8mC9nt osSqCBVYr+nKhXaeGtL+hcuSwTkH8yXzIQGOwTlyZmwkvuAwX2DuEWTw0zkd3iOFQVvR kmYBbqWL5fNAVUyqAy2PxMd6vYNdNNDiz0ItscmKG++6pWjNwZePhICV2t+bg89R1aCw 7EEhANDuozWoMAbcPbaOnqtdJ+fPdJt/5AzeKX1uHM1+E3BX/BXyu9pszXotO5PG/ZZJ SUcA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d3si221678lfk.7.2020.12.14.04.34.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 04:34:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 0BECGWKm009615 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Dec 2020 13:16:33 +0100 Received: from md1za8fc.ad001.siemens.net ([167.87.44.172]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 0BECGW5D025472; Mon, 14 Dec 2020 13:16:32 +0100 Date: Mon, 14 Dec 2020 13:16:30 +0100 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 1/6] meta: image: Account for Ubuntu differences in do_copy_boot_files Message-ID: <20201214131630.0dd0f131@md1za8fc.ad001.siemens.net> In-Reply-To: References: X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: XnMkYJ+VAmeJ Am Mon, 14 Dec 2020 08:11:22 +0100 schrieb Jan Kiszka : > From: Jan Kiszka > > Ubuntu places kernel and initrd links under /boot. Furthermore, it > makes the kernel unreadable for non-root users. Account for the > latter by cat'ing the kernel under sudo, redirecting the output to > the deployment artifact so that it is owned by the building user. > > Signed-off-by: Jan Kiszka > --- > meta/classes/image.bbclass | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 74fc8500..eddc4449 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -132,15 +132,18 @@ EOF > > do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" > do_copy_boot_files() { > - kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinuz')" > + kernel="$(realpath -q '${IMAGE_ROOTFS}'/vmlinu[xz])" > if [ ! -f "$kernel" ]; then > - kernel="$(realpath -q '${IMAGE_ROOTFS}/vmlinux')" > + kernel="$(realpath -q '${IMAGE_ROOTFS}'/boot/vmlinu[xz])" > fi > if [ -f "$kernel" ]; then > - cp -f "$kernel" '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}' > + sudo cat "$kernel" > "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}" Why "cat" instead of "cp"? I think the real trick is the sudo anyways. Henning > fi > > initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" > + if [ ! -f "$initrd" ]; then > + initrd="$(realpath -q '${IMAGE_ROOTFS}/boot/initrd.img')" > + fi > if [ -f "$initrd" ]; then > cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' > fi