From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6477538949418975232 X-Received: by 10.28.141.66 with SMTP id p63mr165110wmd.8.1508170321026; Mon, 16 Oct 2017 09:12:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.88.14 with SMTP id m14ls1533751wmb.11.canary-gmail; Mon, 16 Oct 2017 09:12:00 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RfnLpyKzdFNFAC2iW8F+qkfLHwp5FA21N3cAxFMlWT5TVGM6h4/FNaicOd/aOBXkB/N50I X-Received: by 10.28.15.72 with SMTP id 69mr177885wmp.3.1508170320659; Mon, 16 Oct 2017 09:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508170320; cv=none; d=google.com; s=arc-20160816; b=vNFmY5xGI8ZCbt2aZJyVSyxRCbN4YaHTwqaK/VtqPEEVteCyEbcea5RbgyfgCunaao t5/ID2SYLj/F1bQlulubVj8z8XYv/kB1NaGfL/U+B8H/N3dSFDBcRUwSHUIjlkf+eGxY YaaBgijrAHhORdDLennLSBUmS0yneY6xg3FzY2l5eBXNHAv7Pq/8LdWZMSkMhJZVGdRQ PzYlU8Gr/wedmsSW+S1hAo7neG+gv+IaM+cEyRiJZfyBp7zqFsL/jv3ZMDk1cMEeQWfZ ASkg1pWM7xCuL3sgvxLYMPEf6ew/jyegEbuel/YCOrwtsnlyvGfCo/cHWrmwv/dTYSTQ YEHw== 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=wLQt1EsVJYwQyNLlbwUWF7N0VlwGZuMTzksuyyZs5ws=; b=ovLgbOMAyIX9exLhXoFanmvkiWsCTn1D0D+w0LjS2z8Mw7bDy6jnYlWqfrsWZkg8Cx TTQV6SS58ip+QX6B4/1wPSZ94QpMlwcHxbQRW0/eG1LDv+U0EfCnLtDAiE0jhCiXduYO JtVAxqQ4vL6Sx/xYGlE2AVwAQbYbmGxy+XNvA9gblMpTA/Skh81k6sA6MVTDn+FRLWOY Phd1V3vOaZ+rVYVhzo0jFbXEw1qr2lDg6oLZy5Q3rMtOZ9W5JDzdX/0Uo9fiah/Ey/yw s+Wr7FF9HHGg31eEgYpmgVhumaDb5Vz3sQe93ECpE81134FwEDIQ82X4jCHGcsmviYOT vq6w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b8si265350wrf.5.2017.10.16.09.12.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 09:12:00 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by domain of henning.schild@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v9GGBx4o007300 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Oct 2017 18:11:59 +0200 Received: from md1em3qc ([139.25.68.40]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id v9GGBxxd022485; Mon, 16 Oct 2017 18:11:59 +0200 Date: Mon, 16 Oct 2017 18:11:58 +0200 From: Henning Schild To: Alexander Smirnov Cc: , Frank Lenormand Subject: Re: [PATCH 2/2] meta-isar: Rework boot files copying Message-ID: <20171016181158.693048ca@md1em3qc> In-Reply-To: <20171016155901.1724-3-asmirnov@ilbers.de> References: <20171016155901.1724-1-asmirnov@ilbers.de> <20171016155901.1724-3-asmirnov@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: 12aHsKYJ3Ztd 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 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