From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6537145023015682048 X-Received: by 10.46.146.76 with SMTP id v12mr1666580ljg.29.1522047683832; Mon, 26 Mar 2018 00:01:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:7d8a:: with SMTP id y132-v6ls1574801lfc.6.gmail; Mon, 26 Mar 2018 00:01:23 -0700 (PDT) X-Google-Smtp-Source: AG47ELuwyO/lLfMNq8mVhLAqVoGsrM1kfxhUr8zixLz+tjLf1OUnlGsZ3v5orNHTXxrOVSTRDJG7 X-Received: by 2002:a19:e5c6:: with SMTP id i67-v6mr2379374lfk.4.1522047683280; Mon, 26 Mar 2018 00:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522047683; cv=none; d=google.com; s=arc-20160816; b=Ph96E/wBTiK5q9RoeOfk7PnBfWw9Il6eIInRrAsGZ0HtoSvhnfgP9VmwQfw/b8piGb C9ZJYPypRop2tExRVEA1t5yzgp4g65/1ojsizFrlQ4ULmFvy7iLM8iS2JG+YtBZG51tZ 4SUdmAKkn8ZnUEWjuqtY9JpH1lEa261ZG0/fdl75vI7zFOjZf+BotIdz/WP1HIxDcMgs jAVcokRTrC27avGoyntYc9eaLCJDS1lmZN6MMiAKh9Yfz8yoiTKTPQPY/xh6cPamF0rS Chk2H/iM6t9Y7bxGVyLpknZHLRiMIx4xxZ8gTIEZG2PnSuyKYsm6CiGm3/CJv6aN5q9S xKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:date:message-id:subject:from:to :arc-authentication-results; bh=/tbIa4YEQ7+fdhzOOc25qkSW8c3znyf26zu9KhVOnxM=; b=bAqLRQcDB/w2gSpjOvZzXxRGtJUM7mgBN+V4HvP1iwRTYpOsp2llMrzIu1GeKJH+Jc OLm0JIGTSDYREqLoEfYOERMUjPvR19PtjULPm0tR5p3jsMSnJ3MLAJ/ja8Nt1X53PaTt gXaFyFjHBMctpej+Gvm+LSWH4fBJ/MpM92NqLEYac31pTymvlCQ4GnMsHfgRjsV3YUj4 b/8rrosKDeqp8uMdjVbVwf7JVanpz/cxejzl4lKKRhT7bkYC7Nv7preTIUvkLtxxX18i UUq8CBejQ9o9S6tCL+miXXdhhCj7gwh27hl4BYZTMlq5zthcM+jxkr9HOQX4IewBmsJs 9CLQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.17.11 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.17.11]) by gmr-mx.google.com with ESMTPS id u25-v6si515391lfd.5.2018.03.26.00.01.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 00:01:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.17.11 as permitted sender) client-ip=212.227.17.11; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.17.11 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Received: from [192.168.1.10] ([95.157.57.47]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LtnvF-1ebIqF1tTB-011933 for ; Mon, 26 Mar 2018 09:01:22 +0200 To: isar-users From: Jan Kiszka Subject: [PATCH] Avoid name collisions of deployed kernels and initrds Message-ID: Date: Mon, 26 Mar 2018 09:01:21 +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: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CFvk2UPtfZ3BfgF9mhINj5TKvZ1aTo3Fl" X-Provags-ID: V03:K0:LQcb0A4nHGSiFZOfBVAq5E8Eo/NgwUmQMG2Dgnf7AUrRxUQuqBh IbsQ9Me6znJRPs6w9bKWnWO2MGemhrXcfJ9Equzii53YZPtQFFexjWUIQBgCd99ep+ax0cq BmY8keyTA15ltc/whzzhRtGSsrBvqeMtOe2t7n0z4ZQvWgo0PJZMrx3VL8SpltN1qiT+sS7 pszPWziVoln8VjigMyxmg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Utaf6ORKtHs=:9ekw06URl8VcMlE1Ecrf0V khJlhGv1ieerDRgCMk0YC3kSEyTbxX1PcHroC/l75Krn4eylNVKCxHydPyRWeQP1h+urPv2p4 lct9rxzmlnCZasIzJj1jh7JRI7N4WQtEVSF/9XPCMsW7TT6aOEesI5iqhj5cmwEiFVZQ7kLzN dcv5rGBZVPxcuWZr1DRmqueKIgB+FzuViWF9lUerkZ+p7ZJSxlnGLB31Z+kY8onMFw39Iqg0w tZJhuBFqEwR+tF626R+glkOquFDZxwDpqMdTtFCplSckwyiRfxfMOZ5MKdfMRJRkDNDyTzeHi 98Fi6lXM1LPNcesb1YpJYupvaLHzZ22eJGTtZfVbUHYUHlV9cQECSuFHBIpjidrrZPsu/3WSV tV6YUxxg+LNUHmCmXnL66Zxtlw7iBfcyFKYplIo8XaiZX7yC7pQKlwbwqzSYa+1ncSDFHpTCf D1pmZJrkIJxZJkqsHgW0FIXZoQ172HqOtye1pa7r8+BmRprycA1PXmEcnpfSjn3A3DpvqN46Q ImsFVfRmNVs2mhwRKVg3zjNq64K0RWUGjxKpPH5a9kaDhgKH6GrgcCtpgVrE5vZy6ZV7/I6Tk mPBHdsXyUXdlw5ecZmk6lxHyRTwAk4LEBokyvNl7xeSe2P+tCkWEZP+svHgnPrIqsWw9aLr6p zZotqe5D9tTFGuX0NL+vujNxpDoWBq4bAp0CA837sn36N8ZcHTna9gTifuLHbMR1T7idOWwKL K8xlNKX9F9GAnsZ/eJwk1hU0WJYsbxpv2Zj/Yv2CtOVjktj9SYZYQoJHaw3WzU68Lo9v+VoG3 70mbcKP9lH9gdycLzUeHdyBg4D61w== X-TUID: Soe6GNzKC5ZR This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --CFvk2UPtfZ3BfgF9mhINj5TKvZ1aTo3Fl Content-Type: multipart/mixed; boundary="px9fDSi3d1AsEyMe8Dbwpd4BL1YFlxnQ4"; protected-headers="v1" From: Jan Kiszka To: isar-users Message-ID: Subject: [PATCH] Avoid name collisions of deployed kernels and initrds --px9fDSi3d1AsEyMe8Dbwpd4BL1YFlxnQ4 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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 --- meta/classes/image.bbclass | 4 ++-- scripts/start_vm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2c255f4..3c73ae3 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -31,12 +31,12 @@ do_rootfs[deptask] =3D "do_deploy_deb" do_copy_boot_files() { KERNEL_IMAGE=3D${@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 =20 INITRD_IMAGE=3D${@get_image_name(d, 'initrd.img')} if [ -n "${INITRD_IMAGE}" ]; then - sudo cp -f ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMA= GE} + sudo cp -f ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMA= GE}/${INITRD_IMAGE}_${DISTRO}-${MACHINE} fi } =20 diff --git a/scripts/start_vm b/scripts/start_vm index 0717193..98fc463 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -25,8 +25,8 @@ qemu-system-$QEMU_ARCH \\\\\n\ -M $QEMU_MACHINE \\\\\n\ $QCPU\\\\\n\ -nographic \\\\\n\ - -kernel \$IMAGE_DIR/$KERNEL_IMAGE \\\\\n\ - -initrd \$IMAGE_DIR/$INITRD_IMAGE \\\\\n\ + -kernel \$IMAGE_DIR/${KERNEL_IMAGE}_debian-$DISTRO-qemu$ARCH \\\\\n\= + -initrd \$IMAGE_DIR/${INITRD_IMAGE}_debian-$DISTRO-qemu$ARCH \\\\\n\= -append \"console=3D$MACHINE_SERIAL root=3D/dev/$ROOTFS_DEV rw\" \\\= \\n\ $EXTRA_ARGS \\\\\n\ $root1" @@ -38,8 +38,8 @@ qemu-system-$QEMU_ARCH \\\\\n\ -M $QEMU_MACHINE \ $QCPU \ -nographic \ - -kernel $IMAGE_DIR/$KERNEL_IMAGE \ - -initrd $IMAGE_DIR/$INITRD_IMAGE \ + -kernel $IMAGE_DIR/${KERNEL_IMAGE}_debian-$DISTRO-qemu$ARCH \ + -initrd $IMAGE_DIR/${INITRD_IMAGE}_debian-$DISTRO-qemu$ARCH \ -append "console=3D$MACHINE_SERIAL root=3D/dev/$ROOTFS_DEV rw" \ $EXTRA_ARGS \ $root2 --=20 2.13.6 --px9fDSi3d1AsEyMe8Dbwpd4BL1YFlxnQ4-- --CFvk2UPtfZ3BfgF9mhINj5TKvZ1aTo3Fl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlq4msIACgkQitSsb3rl5xT5MACgtLnowdHm6lK+RRjlIYmexscW tYAAoOpknrEZHZV0/gDl6vzTicNfIKJC =EtSV -----END PGP SIGNATURE----- --CFvk2UPtfZ3BfgF9mhINj5TKvZ1aTo3Fl--