From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6546509269267644416 X-Received: by 10.28.146.75 with SMTP id u72mr224345wmd.18.1524227966639; Fri, 20 Apr 2018 05:39:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.159.200 with SMTP id c66ls5208235edf.8.gmail; Fri, 20 Apr 2018 05:39:26 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/wK39mzREQWo5dzkyen4djexf64JyCZnTM0zkonzVfPmWGj6Ik4ilTqyQtP7C570d38Pov X-Received: by 10.80.190.71 with SMTP id b7mr3116735edi.7.1524227963720; Fri, 20 Apr 2018 05:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524227963; cv=none; d=google.com; s=arc-20160816; b=wUoGc9LWSDpeh4t1qFA/fq7Q005WuT5It03Z5jDpVDhPzuryOTm0de7FLvBlVj28BE y6/xI3fjiiehgunrjyT2k7Af2eT+GLLAou1aI1fSTPvjNBLy0clDGC/yndVLXRwR4fRf W3jDe4eHk4Lg9M/lodIrU/04oW9BGA3o8ysqK0VoC/BMOM+EVzcxTWHCoBlR/7jK+uxD 0kVo+Ii7pqdE4EksSH0rF2+78CVByUfOhWQFiRlqO+IE0AyJZovXVWkAU33PoabnB8Uo qy2haK5XqfmDNrt4aO8yMSQFokvoOM0zi+Op842OQ5RDUpb9k1uZ+n2ZR5IjPflkFMat C3Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=vIjWwXqB2FJr898yjf9cUG6eKEYWtjsmuqeCECR0fgs=; b=kzb0dCPUuPtEQ8BthaFJ4bUKNUgg/5B5hYKMLS5Tgnj731dQKI4R5xfuM4cFkArQ/2 EJe24NMofvmYGtCnVtyvjuB4C+wMpp3/1XQ24IstuztyUZTB9+8P/qI2YEQz8s5u0H9s uqcyuyX/Bum9clRXYBqa2CRRih8wZGOSL7JY+y6KYhjOr5IPQl8EFF81r5LNV3+C87fR ZHglPo/J/lOCmvS9dz3THoz42HdE3cKpmVUjFp55gLcDRdynlWL08C9mVBBL2oGNes9a bQYqaufUdyv99cH02AmhKUyf+C1cSTsG5rOpMcIrDWXzlhFQ3Fn9s1DAAMSEvEO7cuNW keLw== 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 t16si359192edi.0.2018.04.20.05.39.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 05:39:23 -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 mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w3KCdNM4002239 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 20 Apr 2018 14:39:23 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w3KCdNxC017496; Fri, 20 Apr 2018 14:39:23 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Henning Schild Subject: [PATCH] build-kernel.sh: handle kernel configs with CONFIG_LOCALVERSION Date: Fri, 20 Apr 2018 14:39:21 +0200 Message-Id: <20180420123921.1927-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 X-TUID: 56GuKZ0sDHdT Setting this option in your kernel config will result in filenames that build-kernel.sh does not expect. To not introduce confusion between recipe versions and debian package versions simply require the recipe to have a PV matching "make kernelrelease". Signed-off-by: Henning Schild --- meta/recipes-kernel/linux/files/build-kernel.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index 42c8ff6..1ec094e 100644 --- a/meta/recipes-kernel/linux/files/build-kernel.sh +++ b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -21,6 +21,13 @@ flock /dpkg.lock \ cd $1 make olddefconfig +KV=$( make -s kernelrelease ) +if [ "${KV}" != "${PV}" ]; then + echo "ERROR: Recipe PV is \"${PV}\" but should be \"${KV}\"" 1>&2 + echo "ERROR: Probably due to CONFIG_LOCALVERSION" 1>&2 + exit 1 +fi + rm -f .version make -j $(($(nproc) * 2)) deb-pkg -- 2.16.1