From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6477538949418975232 X-Received: by 10.80.230.12 with SMTP id y12mr1932818edm.6.1508256487038; Tue, 17 Oct 2017 09:08:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.241.28 with SMTP id w28ls880639edl.6.gmail; Tue, 17 Oct 2017 09:08:06 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBndN4CjnMTp3CT0ZCMG10IlV/ByPfDlMQMoqsbjLCpaqoDo4LYUHIdaDLCTWnCazjtYhXl X-Received: by 10.80.167.162 with SMTP id i31mr3466988edc.9.1508256486735; Tue, 17 Oct 2017 09:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508256486; cv=none; d=google.com; s=arc-20160816; b=ptcIOsVAVUt6MjZJq4xOoJexBXLzneKwIjpW4oSNtFpxDOVusOk9s8tDDJWd+gRvrn gKC3YZwafHlKa9v70ZfUf5gL7u8mQ6CTwVBu1T/RkoqLvJf9YvOLOAgAXhGu1xvKLhFh wnAGgduxkHRP0Jau9q+z+cG9CNM2ueq+8WJb/33mnfjz3mz8sO+Q50yqN/Hh2n8x1Wun EM2uO1dIEzMYku79BtJ2gsL1WX5MReM7M5W7zbHD4G1NmmGypcQWXIqlbrvTsMOlqqp5 FJ8mnN0tpn839APF+c2QJkRzOWpg9n5sGHPGck5KOa67zeGkEZKXImfYaw5C/VHIJCDA Twpw== 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:arc-authentication-results; bh=oYKm1O3JpXXMdeCWqFIG97aamM1+XHcMRus8CSH8xDk=; b=b5gJ4YdZU4lyiEUcLLQ45B5xl6UzWwrn3K6I+aOZvuiSoJvwF7DoRL6wAh/jnpQ0Sw goVe5jTK2z9MUo87NhbIUOs48tIruYbh/vf91lCFuV8oL5vC1KOi+Tsh44Ohs3dYQbpO XMKQCadxMC0f7rBdD64emCb2BleF1NV3ZVlkvylNfqADDe2ze+LDW2R9RutLm8JyDHpP 4vukd1dza5/jdxdld9T6NASsJHyP5hFqEmeS9zP6hUOQ11rgVh53tJ2hMpPNkMK7dcu+ rCrLlv0Qfc4c2Qud1FYmZaw9IV4U1SGUVeJ4tUCjM9c7GC8cBW/x2765WE/NZyV5XoDb SAQw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id w24si462248edl.5.2017.10.17.09.08.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 09:08:06 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id v9HG85o1003588 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Oct 2017 18:08:05 +0200 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v9HG85Ms014980; Tue, 17 Oct 2017 18:08:05 +0200 Date: Tue, 17 Oct 2017 18:08:04 +0200 From: Henning Schild To: Alexander Smirnov Cc: , Frank Lenormand Subject: Re: [PATCH 2/2] meta-isar: Rework boot files copying Message-ID: <20171017180804.5a265c9e@md1em3qc> In-Reply-To: <6dbeba83-84cc-c475-0120-ab38b76a9d03@ilbers.de> References: <20171016155901.1724-1-asmirnov@ilbers.de> <20171016155901.1724-3-asmirnov@ilbers.de> <20171016181158.693048ca@md1em3qc> <6dbeba83-84cc-c475-0120-ab38b76a9d03@ilbers.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: vUMM34pZV1Mo On Mon, 16 Oct 2017 19:30:21 +0300 Alexander Smirnov wrote: > On 10/16/2017 07:11 PM, Henning Schild wrote: > > On Mon, 16 Oct 2017 18:59:01 +0300 > > Alexander Smirnov wrote: > > > >> Currently there are two variables that contains hardcoded filenames > >> with versions for kernel and initrd images. Isar uses them to copy > >> these files to deploy directory. Moreover this is performed in ext4 > >> class, what is logically wrong. > >> > >> This patch implements a new way which doesn't rely on hardcoded > >> versioned filenames. Also it drops this copying from ext4 class. > >> > >> Signed-off-by: Frank Lenormand > >> Signed-off-by: Alexander Smirnov > >> --- > >> meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 3 --- > >> meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 3 --- > >> meta-isar/conf/multiconfig/qemuarm-jessie.conf | 3 --- > >> meta-isar/conf/multiconfig/qemuarm-stretch.conf | 3 --- > >> meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 3 --- > >> meta-isar/conf/multiconfig/qemui386-jessie.conf | 3 --- > >> meta-isar/conf/multiconfig/qemui386-stretch.conf | 3 --- > >> meta-isar/conf/multiconfig/rpi-jessie.conf | 3 --- > >> meta/classes/ext4-img.bbclass | 8 -------- > >> meta/classes/image.bbclass | 23 > >> ++++++++++++++++++++--- 10 files changed, 20 insertions(+), 35 > >> deletions(-) > >> > >> diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf > >> b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf index > >> d9473f3..51d39b6 100644 --- > >> a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf +++ > >> b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf @@ -8,9 +8,6 @@ > >> DISTRO_ARCH ?= "amd64" > >> IMAGE_PREINSTALL += "linux-image-amd64" > >> > >> -KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-amd64" > >> -INITRD_IMAGE ?= "initrd.img-3.16.0-4-amd64" > >> - > >> ROOTFS_DEV ?= "sda" > >> > >> QEMU_ARCH ?= "x86_64" > >> diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf > >> b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf index > >> 5ac25d9..c59876a 100644 --- > >> a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf +++ > >> b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf @@ -11,9 +11,6 > >> @@ IMAGE_PREINSTALL += " \ linux-image-amd64 \ > >> " > >> > >> -KERNEL_IMAGE ?= "vmlinuz-4.9.0-4-amd64" > >> -INITRD_IMAGE ?= "initrd.img-4.9.0-4-amd64" > >> - > >> ROOTFS_DEV ?= "sda" > >> > >> QEMU_ARCH ?= "x86_64" > >> diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf > >> b/meta-isar/conf/multiconfig/qemuarm-jessie.conf index > >> 3dd33f2..ed84c6c 100644 --- > >> a/meta-isar/conf/multiconfig/qemuarm-jessie.conf +++ > >> b/meta-isar/conf/multiconfig/qemuarm-jessie.conf @@ -15,9 +15,6 @@ > >> DISTRO_ARCH ?= "armhf" > >> IMAGE_PREINSTALL += "linux-image-armmp" > >> > >> -KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-armmp" > >> -INITRD_IMAGE ?= "initrd.img-3.16.0-4-armmp" > >> - > >> ROOTFS_DEV ?= "vda" > >> > >> QEMU_ARCH ?= "arm" > >> diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf > >> b/meta-isar/conf/multiconfig/qemuarm-stretch.conf index > >> f3636f6..1cce97a 100644 --- > >> a/meta-isar/conf/multiconfig/qemuarm-stretch.conf +++ > >> b/meta-isar/conf/multiconfig/qemuarm-stretch.conf @@ -11,9 +11,6 @@ > >> IMAGE_PREINSTALL += " \ linux-image-armmp \ > >> " > >> > >> -KERNEL_IMAGE ?= "vmlinuz-4.9.0-4-armmp" > >> -INITRD_IMAGE ?= "initrd.img-4.9.0-4-armmp" > >> - > >> ROOTFS_DEV ?= "vda" > >> > >> QEMU_ARCH ?= "arm" > >> diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf > >> b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf index > >> 3a23692..38ea191 100644 --- > >> a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf +++ > >> b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf @@ -15,9 +15,6 @@ > >> DISTRO_ARCH ?= "armhf" > >> IMAGE_PREINSTALL += "linux-image-vexpress" > >> > >> -KERNEL_IMAGE ?= "vmlinuz-3.2.0-4-vexpress" > >> -INITRD_IMAGE ?= "initrd.img-3.2.0-4-vexpress" > >> - > >> ROOTFS_DEV ?= "mmcblk0" > >> > >> QEMU_ARCH ?= "arm" > >> diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf > >> b/meta-isar/conf/multiconfig/qemui386-jessie.conf index > >> 55cb172..d589661 100644 --- > >> a/meta-isar/conf/multiconfig/qemui386-jessie.conf +++ > >> b/meta-isar/conf/multiconfig/qemui386-jessie.conf @@ -8,9 +8,6 @@ > >> DISTRO_ARCH ?= "i386" > >> IMAGE_PREINSTALL += "linux-image-686-pae" > >> > >> -KERNEL_IMAGE ?= "vmlinuz-3.16.0-4-686-pae" > >> -INITRD_IMAGE ?= "initrd.img-3.16.0-4-686-pae" > >> - > >> ROOTFS_DEV ?= "sda" > >> > >> QEMU_ARCH ?= "i386" > >> diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf > >> b/meta-isar/conf/multiconfig/qemui386-stretch.conf index > >> c0285b4..40239e4 100644 --- > >> a/meta-isar/conf/multiconfig/qemui386-stretch.conf +++ > >> b/meta-isar/conf/multiconfig/qemui386-stretch.conf @@ -11,9 +11,6 > >> @@ IMAGE_PREINSTALL += " \ linux-image-686-pae \ > >> " > >> > >> -KERNEL_IMAGE ?= "vmlinuz-4.9.0-4-686-pae" > >> -INITRD_IMAGE ?= "initrd.img-4.9.0-4-686-pae" > >> - > >> ROOTFS_DEV ?= "sda" > >> > >> QEMU_ARCH ?= "i386" > >> diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf > >> b/meta-isar/conf/multiconfig/rpi-jessie.conf index 82b38d2..d1dd9d9 > >> 100644 --- a/meta-isar/conf/multiconfig/rpi-jessie.conf > >> +++ b/meta-isar/conf/multiconfig/rpi-jessie.conf > >> @@ -31,7 +31,4 @@ IMAGE_PREINSTALL += " \ > >> vim \ > >> " > >> > >> -KERNEL_IMAGE ?= "vmlinuz-4.9.0-3-rpi" > >> -INITRD_IMAGE ?= "initrd.img-4.9.0-3-rpi" > >> - > >> ROOTFS_DEV ?= "mmcblk0p2" > >> diff --git a/meta/classes/ext4-img.bbclass > >> b/meta/classes/ext4-img.bbclass index 9fa9aa5..277f3f3 100644 > >> --- a/meta/classes/ext4-img.bbclass > >> +++ b/meta/classes/ext4-img.bbclass > >> @@ -24,14 +24,6 @@ do_ext4_image() { > >> sudo cp -r ${IMAGE_ROOTFS}/* ${WORKDIR}/mnt > >> sudo umount ${WORKDIR}/mnt > >> rm -r ${WORKDIR}/mnt > >> - > >> - if [ -n "${KERNEL_IMAGE}" ]; then > >> - cp ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} > >> ${DEPLOY_DIR_IMAGE} > >> - fi > >> - > >> - if [ -n "${INITRD_IMAGE}" ]; then > >> - cp ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} > >> ${DEPLOY_DIR_IMAGE} > >> - fi > >> } > >> > >> addtask ext4_image before do_build after do_rootfs > >> diff --git a/meta/classes/image.bbclass > >> b/meta/classes/image.bbclass index 9ef8bee..5d917622 100644 > >> --- a/meta/classes/image.bbclass > >> +++ b/meta/classes/image.bbclass > >> @@ -1,9 +1,6 @@ > >> # This software is a part of ISAR. > >> # Copyright (C) 2015-2017 ilbers GmbH > >> > >> -KERNEL_IMAGE ?= "" > >> -INITRD_IMAGE ?= "" > >> - > >> IMAGE_INSTALL ?= "" > >> IMAGE_TYPE ?= "ext4-img" > >> IMAGE_ROOTFS = "${WORKDIR}/rootfs" > >> @@ -76,3 +73,23 @@ do_populate() { > >> > >> addtask populate before do_build > >> do_populate[deptask] = "do_deploy_deb" > >> + > >> +do_copy_boot_files() { > >> + if [ -z "${KERNEL_IMAGE}" ]; then > >> + KERNEL_IMAGE=$(readlink ${IMAGE_ROOTFS}/vmlinuz) > > > > readlink -e in case it is no symlink or a chain of links, debian > > packages do not do that but custom kernels could behave differently > > > > For custom kernels, if you don't follow debian style, you could > define KERNEL_IMAGE and INITRD_IMAGE in your local config (like it > was before). This function doesn't touch these variables if they are > already defined. So I assume that if they aren't defined - the pure > debian is used. > > I'd suggest to rely on debian style for default cases, this will help > to avoid defining of custom policies without real use-cases. If > eventually we will find out, that for some specific case the default > policy doesn't work, then we could define new custom one. Sure, as long as you are absolutely sure that these files will always be symlinks and there will never be a symlink chain. I would not rely on that and just add the "-e" it does not do any harm. Henning > Alex > > > Henning > > > >> + fi > >> + > >> + if [ -n "${KERNEL_IMAGE}" ]; then > >> + cp ${IMAGE_ROOTFS}/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE} > >> + fi > >> + > >> + if [ -z "${INITRD_IMAGE}" ]; then > >> + INITRD_IMAGE=$(readlink ${IMAGE_ROOTFS}/initrd.img) > >> + fi > >> + > >> + if [ -n "${INITRD_IMAGE}" ]; then > >> + cp ${IMAGE_ROOTFS}/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE} > >> + fi > >> +} > >> + > >> +addtask copy_boot_files before do_build after do_rootfs > > >