From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6537145023015682048 X-Received: by 10.46.151.203 with SMTP id m11mr2562563ljj.2.1522169017550; Tue, 27 Mar 2018 09:43:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:e207:: with SMTP id z7-v6ls215745lfg.14.gmail; Tue, 27 Mar 2018 09:43:37 -0700 (PDT) X-Google-Smtp-Source: AG47ELubTyQVWYd1q4JC38BjxKxxYJT0pyxVU7o/b5kVmSMp6YZpkFP/M5L6b5yEiv2lhYXUYMWC X-Received: by 2002:a19:1ac5:: with SMTP id a188-v6mr2495529lfa.17.1522169017036; Tue, 27 Mar 2018 09:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522169017; cv=none; d=google.com; s=arc-20160816; b=rN1ekbDlo5rnBSUhKpfsJwvd9+kAZaQgli1SG/nwgZ8oruHNhZWXMpo84PERy1o/OZ KuVv2/H0AMBeXznZEMwjDztmcickdggHyEMU1NFUSeZdg/uBKMHc8H2SW6OvsBCGWogy N/BuKW+9VbJFyXGMC3FYGuudLc9fpiKlhSoN1b5GIgdUXUsg04P0GguE0VtvChGgW1r8 m2sFNb+pjDbpQOfl/nNWyr48bY5m8re1coVChuf41TAwh/Kd0aUhsyRccK/lBMlORJn0 k8xcsGyijULMoVDmHDx2g3TF9gRTZxQJivIi6ZYB4NeaqkRGEumrNifZbMyFgyVrrtoe ph1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:to:arc-authentication-results; bh=NWhjOO9ErXKdLxAWUXXzN3V93EM5dxPoe/mBu0/xLjY=; b=rssEGFxP0KADTdbdNLJRdBLgSAHB9/zcV4HXUdlrmGSRm/XiaIkcypqkVFI1TMDPkK cU5EC3LdljgTTrWQtMNNTsM7ZPm1KLpYxucNN4A36Oc5J+Nt9vgZLu0phkfP1MoUvouo y8emEe3nzu3A2R32hIGGg2mHTInMhv4X2s+NrvLOqJw7Srf0RsE/4XV0ZhFTK6/R04Ww 7cPMIFpYZtHGbWmCH716FifSC+fvbtKH9W0O6allY6qkdqFBxsMVRX+qbFtLMz0YyyZ2 BnakPmq1EYrsslWY+VhxUX7/vt7zJquf0V8UHrnnd+YAkSeMqquLrAtvQE8R+d5yaL7F IpHA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.15.3]) by gmr-mx.google.com with ESMTPS id j4si68842lja.1.2018.03.27.09.43.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 09:43:37 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) client-ip=212.227.15.3; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Received: from [192.168.1.10] ([95.157.57.47]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MTxxp-1f9pzV1W7t-00QmfK for ; Tue, 27 Mar 2018 18:43:36 +0200 To: isar-users From: Jan Kiszka Subject: [PATCH v2] Avoid name collisions of deployed kernels and initrds Message-ID: Date: Tue, 27 Mar 2018 18:43:34 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:RawnI1oeYIpS9adG1LGbTIg+acSzCc5FtFpne6JFE+7AkoDrIgR NODzb+n3xwlFMHYKvywQD0uuMm5kLziwtmBomDLoGjU3zfwIHWyYV0b64G+70NeDtVt9Nhl qd7ug9dUsPGlaLlmP3dNnUd4zCc1vZV/smDBv9IkVCpkTJeSyThjULg/YEOgSK8wHsy0WNB pU/91oJhtXnr6WlnfCZyw== X-UI-Out-Filterresults: notjunk:1;V01:K0:EuL0HQm73vk=:+3dvlxNwI/xhcUbRRmW7PL IT5s5GzrGnKIzjPqo7SANgWosD9cM3gqm+rkBi55eEa4fSyDCnXYiuDTrCn6dha89zeLcXXsw CbfwVrzyVGt/TJ5W7dRVRTIgQm9/B34PE2JCCzqzUbKGoKG0kFwWMVQiEkymgMsAR5S0RVKcD OBB2p/Q7U5fq2DsAhF42BKm3KbPKi5e5MSMkUrlTpEPVmP66VhQeywI4cMUzdnjmGmFz7Ys+d DYjnVOF3Xo5JFOMFKp7OhlLE3YO6KOI/yskQZBU32flcLb2R8vAe02s7GWOzM7mr6iskyZx7m rVF3HdWT4oSv+JaTTePtnxsBQ5LRz51oWwqh1dFhmcZP7OThNk1mo4pbztuvh/amEr3ILWfve lslgz1jR+4WvIEH4XwruTII4+ueKTj26Dwger9LMWUUs4uoZf/ZG91cHPa++icAy85VUJ8njF uqwnmnmpKe9EpuIwSHwmeAEanuMQdz6THwIvrxh4UIuzB2GWzJHwb1dYMKMOo4t8mSgAaVRDJ 5dSJM07kaBBdltyBodFsrj8J6BeWUv0XEsjH1irxWv1BKmIY7qRAJcfE2cy+B5OrQxXBlOD9Q wFEp1sUrwRZ9ylUSQEs7C47q5rZTArHvhOpsQ7Mc2warOyEoZH21das3yKpX4GPiINq91TMf8 +PVqZWl2xWCAoNxPxm87mFvk7tABsdBI4enmrF2zvsitOqPP7LUDLvBPuxjuP1m6xck7kWhuI c5Lyn/Ic1G2nLGwKDDMqdcQiOQfIP4MPIaC0XXsDFBFekbdatB2QxnRZ313BSIRllgpynPRed Nfurb5VLCfjSl4CJwzVzXQAu3qYNBuB+IdLjF+M4nmTG+TuMY0= X-TUID: 4nDvTER6mGPh From: Jan Kiszka While distro kernels tend to have individualizing version names, this need not be the case for custom kernels. If we deploy them as is into the common image folder, they can easily overwrite each other when building images for different distro-machine tuples. Avoid this by appending - to the deployed image names. Take this into account when using the images in the start_vm script. Signed-off-by: Jan Kiszka --- Changes in v2: - rebased over next meta/classes/image.bbclass | 4 ++-- scripts/start_vm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6a705fc..e1bb5f6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -34,12 +34,12 @@ do_rootfs[deptask] = "do_deploy_deb" do_copy_boot_files() { KERNEL_IMAGE=${@get_image_name(d, 'vmlinuz')} if [ -n "${KERNEL_IMAGE}" ]; then - cp -f ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE} + cp -f ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}_${DISTRO}-${MACHINE} fi INITRD_IMAGE=${@get_image_name(d, 'initrd.img')} if [ -n "${INITRD_IMAGE}" ]; then - sudo cp -f ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE} + sudo cp -f ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}_${DISTRO}-${MACHINE} fi } diff --git a/scripts/start_vm b/scripts/start_vm index f996ee4..4cb05ae 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -118,9 +118,9 @@ readonly ROOTFS_IMAGE=isar-image-base-debian-$DISTRO-qemu$ARCH.ext4.img eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e multiconfig:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") -QKERNEL=$IMAGE_DIR/$KERNEL_IMAGE +QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE}_debian-$DISTRO-qemu$ARCH QINITRD=/dev/null -[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/$INITRD_IMAGE +[ -n "$INITRD_IMAGE" ] && QINITRD=$IMAGE_DIR/${INITRD_IMAGE}_debian-$DISTRO-qemu$ARCH readonly ISARROOT="$(dirname "$0")"/.. -- 2.13.6