From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6647450695491387392 X-Received: by 2002:a5d:4811:: with SMTP id l17mr1448391wrq.29.1548676270555; Mon, 28 Jan 2019 03:51:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:ce8d:: with SMTP id q13ls1884463wmj.12.canary-gmail; Mon, 28 Jan 2019 03:51:10 -0800 (PST) X-Google-Smtp-Source: ALg8bN5BYAnA6x17qUK7NAD+wL7ptzBixM7Ag5W/035OZQ6WyhJT+jrO8LfAmZq0+wy8YqnGldKO X-Received: by 2002:a1c:1889:: with SMTP id 131mr1599882wmy.5.1548676270147; Mon, 28 Jan 2019 03:51:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548676270; cv=none; d=google.com; s=arc-20160816; b=QMJK9HAls2lW6vulQQ+VutCImuhV4kWnYrOu3SrL1CfGgQmuNvcfg6q9K1tTGWTapl jZrqMe09NZDohso0Sfr2Zaf8+ddPnuFuhOQCLaFVwQILTkDXlWwLq4sgpmOkoedQHUrm mr2tx3NfcL3+hzQy3AIG2JrkURGIFUU4mJtJDGRfLDIcxr4SNYreONA/DtUkvaKMGw/N 7d4hVq3c5H9jSnYbhsjBv3foQXHTYregSOx9YnZaH6Ro92fs8U96SLIR7RHCIGX1D6Rs LZxtymV+A3hseJQviPiqwW4BUU0PM3szrFNnWSJt8tsMfXb8Y7dJmrlKekp8a8GL/1Zv Oa/Q== 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:date:subject:cc:to:from; bh=Q/7J9ltthm9g43EysFaOaqdujXRQ1KtC0ltYjsv4Hzo=; b=L7gbV1aDDa8uK6SAVV5AgGNftbFAYJp9DFrGmxKDQYuBZ2pyASattYI7cAqZQr9A8f 12JjwqcifkB5h9cLTvm0gmh97MMv2tfnbkYkFBrnrIUUHk/CjevcKmi4SrDGjDqLRBnu AzH06R1Sidhe2uxJOPGioGLUIJkOfe/+AMLuzoXwqw+ZU78W2QICC06eh/qcyuCtfMvC l8minCjTn1XbO+A/uGHBE1MgLdtvLGR13otgAlC30/rOY+wqnfaAjNKo4aPZZ4QWUJHA sN1t4Zijq1sacQHVgNGKl89qopZWAYXbj2LRA/itwHYe+4vbiZx7SdO9R2CBYrlGzIQA 19Kw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) 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 y200si2413867wmd.0.2019.01.28.03.51.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 03:51:10 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0SBp9PQ019157 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Jan 2019 12:51:09 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.69]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0SBp9Mr005784; Mon, 28 Jan 2019 12:51:09 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv2] linux-custom: skip linux-libc-dev deployment on downgrade Date: Mon, 28 Jan 2019 12:51:08 +0100 Message-Id: <20190128115108.2386-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190117130342.15743-1-henning.schild@siemens.com> References: <20190117130342.15743-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: zT+DVgeiPOp7 From: Henning Schild A custom kernel usually deploys linux-libc-dev in the kernels version. But some packages in the distribution depend on >= expected upstream version of that package. If we deploy a linux-libc-dev in a lower version, installing packages like build-essential will not be possible anymore. That is especially problematic since incremental builds will pull that into our buildchroot and break package installation in there. If detecting a downgrade, do not deploy the package and issue a warning. Signed-off-by: Henning Schild --- meta/recipes-kernel/linux/files/build-kernel.sh | 7 +++++++ meta/recipes-kernel/linux/linux-custom.inc | 3 +++ 2 files changed, 10 insertions(+) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index dbd6162..745c89a 100644 --- a/meta/recipes-kernel/linux/files/build-kernel.sh +++ b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -122,3 +122,10 @@ rm -f linux-image-${PV}_${PV}-1_*.deb fakeroot dpkg-deb -b ${REPACK_LINUX_HEADERS_DIR} \ linux-headers-${KERNEL_NAME}_${PV}-1_${KERNEL_NAME}.deb rm -f linux-headers-${PV}_${PV}-1_*.deb + +# linux-libc-dev causes dependency problems if we downgrade +# remove it after the build so the downgraded version does not get deployed +LINUX_LIBC_DEV_V=$( dpkg-query --show --showformat '${Version}' linux-libc-dev ) +if dpkg --compare-versions $LINUX_LIBC_DEV_V gt $PV; then + rm -f linux-libc-dev_${PV}*.deb +fi diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index f33bb9d..ac37412 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -62,4 +62,7 @@ dpkg_runbuild() { export KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} ${PP}/build-kernel.sh ${PP}/${PPS} ${DISTRO_ARCH} + if [ ! -f ${WORKDIR}/linux-libc-dev_${PV}*.deb ]; then + bbwarn "Kernel downgrade detected, not deploying linux-libc-dev" + fi } -- 2.19.2