From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739560601010307072 X-Received: by 2002:a17:906:4c4c:: with SMTP id d12mr26970230ejw.174.1569176236630; Sun, 22 Sep 2019 11:17:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:4e85:: with SMTP id v5ls2359123eju.4.gmail; Sun, 22 Sep 2019 11:17:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqy21V/8nCE/3Ko8RQCZzACQmRtkkbfq7FZLJ7HtYNrZx/tnT7MfVo3vvYsZADVtfiQs4s4w X-Received: by 2002:a17:906:19d3:: with SMTP id h19mr27822051ejd.121.1569176236136; Sun, 22 Sep 2019 11:17:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569176236; cv=none; d=google.com; s=arc-20160816; b=C+MoC6c/tJZLPiMESpuIvtok6DGL0dZEMC9Cw7KX2tQH6a0S7AoZ6+0cNYGVlbgJrJ frVFyMUyQpzZpuxpTyJqMwxJWmVyj5snZpLG7VOM7NGxnBY2vwtodc7FLdGTr1iIRmxO aCk3HNF5v8JfJNDyuZ2whnBQYNP+eYxP4eWv2iy1pk/XG3u3NpMfLOfE0+NFJ50Eryqr zGFG+5ecpx6IijsMzPhEJpDVQimrxSDt1xmUqmy5OZQ9TLtDWHpdpp4ZyfN9MQmuVv8x HF5JeIdQfH2AittxengYLKDZ1zqXyJGJBit1QQ1vAEf3jDLWnyRmtZYo7V/Ntmx69aIl PbuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=E7RRKkzE5xfBW/hzH6pbv4YTEvZABrlqPqYKMdG+i/0=; b=sJXSwl+2M3Cqp5TgdH6+miUh0gUs4bjhri1SXTBG97qrNMCCIDRglXnar7nfJFzhCz etfPNjXog/eEIIKusuAK/oZkRolVnMDE0qRi+rr1lXmWevCQVXANvXy9sGzENLKDMmPQ oZMrLBY7QNrOsEX6Cx5na2t1tZW6Rgprg7Xs7QMIRuUVbpUn+6nyLWu/faRXqqsR4FHc qde7NVdQQpAD43T6tSbXjtSdARUZH68gfCnYgtDC4ysrvwIFBvVSJRjayo/ANcFO6PdH 3hIGQ6PTACDQbT1mGMbzR7fPp4Y/gxOLa0bIqxCGpvPI5tVXYkTFSZ6g5IR+bQpfjxxZ POjA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id d27si430723ejt.1.2019.09.22.11.17.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Sep 2019 11:17:16 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x8MIHFt0027442 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Sep 2019 20:17:15 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.37.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8MIHB96005761 for ; Sun, 22 Sep 2019 20:17:15 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v5 18/27] linux-custom: Control linux-libc-dev deployment manually Date: Sun, 22 Sep 2019 20:17:02 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: y7Y3uLbQeJKh From: Jan Kiszka Deploying a version of linux-libc-dev that is different from the one Debian uses easily causes problems. We already ran into those when doing a downgrade, but we can also create deadlocks when doing an update. The latter happens in common cross-build scenarios when pushing a new version for the target arch but not providing one for the builder. Avoid such troubles my making the package deployment opt-in. In most cases, we will not depend on such an update because we will rarely exploit new kernel API in userspace packages. We can revert this behavior once we support building packages for both target and host. Signed-off-by: Jan Kiszka --- meta/recipes-kernel/linux/files/build-kernel.sh | 7 ------- meta/recipes-kernel/linux/linux-custom.inc | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index 8b7b23b..7b651af 100644 --- a/meta/recipes-kernel/linux/files/build-kernel.sh +++ b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -127,10 +127,3 @@ 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-1; 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 c045b89..e75eed1 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -26,6 +26,8 @@ KBUILD_DEPENDS ?= "build-essential:native libssl-dev libelf-dev bc git kmod biso KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, kmod, linux-base (>= 4.3~)" KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, libssl1.1" +KERNEL_LIBC_DEV_DEPLOY ?= "0" + do_install_builddeps() { dpkg_do_mounts E="${@ bb.utils.export_proxies(d)}" @@ -61,7 +63,8 @@ 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" + + if [ "${KERNEL_LIBC_DEV_DEPLOY}" != "1" ]; then + rm -f ${WORKDIR}/linux-libc-dev_${PV}*.deb fi } -- 2.16.4