From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6735105003214602240 X-Received: by 2002:aa7:c71a:: with SMTP id i26mr2415773edq.68.1568622464899; Mon, 16 Sep 2019 01:27:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:42cf:: with SMTP id nz23ls1460518ejb.12.gmail; Mon, 16 Sep 2019 01:27:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqxxomHIjVK4V1y24jkktTJhq0QZnuyyP2dSsar0xBn+L91Mf0ZTfQXHguRHm09k8OinzPK8 X-Received: by 2002:a17:906:9414:: with SMTP id q20mr50654960ejx.139.1568622464478; Mon, 16 Sep 2019 01:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568622464; cv=none; d=google.com; s=arc-20160816; b=q8/XgyzyvC34IQYA2KUUKX3oV6PFrnJgxbn3E4AJljhAAqzIjqXJTKSETegW/Ol8cR /mZ3OIsD0atm8aTf4TmBClKmGCkEQXy+xaazTA02jSBmTa7XdTTP3emoYSoolSbbXLtR jockv8BRvKJd1nEYPLKwdc3tpAR4TBd5xA4hrtxVayDpzKGJoBk82fES5fCTO9B+h+HP zn/6wWHjbswf0OOm1euaPy50fE02EBK2q3Mj709mugt83EZOgWfBeh/LzKfaJqjc6tHd K/KPGLVXFcxtlDRmrEH7BgIEEMetJZENpEbClbePd0q+acvaJLFwkMdzaN3uxaTAbfRY LCAQ== 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:subject:cc:to:from:date; bh=cYGfX4eSKX8sqO8LNf2ycZ223Tq/aMDv4jK90+tpaiM=; b=s/8qzmxS9fZKt22gM/jbuSjTn//e3B6pKGKwQAT+GpI320qBqVeerHH5KiT6ikeK0J aOTlTJEEIxVNsoSN1zC76mdaGWGVfWG+6xP0/Cjx+m3cW3m2WsWTBna7UA3NWS2QA3HP VY9cLKQ1KX4Q2ugPPuoNK78Ja78PegMwVGF6DGAcv7i/jJYjZvsOQwTA4mFIjXsObV61 iyztSK/zg0cNfK+etdqEW7OQs/Rr4V1d0Y2rJ+tRs03h6TVS7QeJFOPXS1jUDammcqnJ r2Fy5MQi2uPMXvSVnGfDSjn/nbh3pXBZEAVHx5qWaXt0VwB3gJgNt77E8VpPFPi9drxA KzRw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id r3si609437eds.2.2019.09.16.01.27.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 01:27:44 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x8G8RirT011384 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Sep 2019 10:27:44 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.69.14]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x8G8Rhkd019404; Mon, 16 Sep 2019 10:27:43 +0200 Date: Mon, 16 Sep 2019 10:27:42 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users , Cedric Hombourger Subject: Re: [PATCH] linux-custom: Control linux-libc-dev deployment manually Message-ID: <20190916102742.284e1838@md1za8fc.ad001.siemens.net> In-Reply-To: <0600904d-7f34-875f-6bcf-6fbbfe8b9933@siemens.com> References: <0600904d-7f34-875f-6bcf-6fbbfe8b9933@siemens.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: KxONE9wR658H Am Tue, 10 Sep 2019 20:07:11 +0200 schrieb Jan Kiszka : > 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 Maybe keep that warning in an else ... "not deploying since KERNEL_LIBC_DEV_DEPLOY=0" And Claudius always suggest to stay away from such boolean variables and use arrays instead. That is easier to layer with "random" layer prios. Henning > fi > }