From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6735105003214602240 X-Received: by 2002:a05:600c:a:: with SMTP id g10mr582035wmc.71.1568138832740; Tue, 10 Sep 2019 11:07:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fd91:: with SMTP id d17ls5683589wrr.9.gmail; Tue, 10 Sep 2019 11:07:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqx63D0wOaWHCu2TYKcHBiqJza/YJJrEPDUMXJp4ejKHHSDGjZlhKI2s++nSuF9bC8I6mrtV X-Received: by 2002:adf:dfc2:: with SMTP id q2mr29584322wrn.307.1568138832135; Tue, 10 Sep 2019 11:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568138832; cv=none; d=google.com; s=arc-20160816; b=w+V+ikwMcXRJEKF/w/P5yFRNNs4y19SuMRxiKRFGTS+2wG4lVB7X/sEWctB+ht0T9T R81NYfjDg6qn3Ih+sz/t7pdBjjsWENNL7MBfBxqxTHGWIZHs3pa4fvasXZ+feOWg1Y0X kJs/ECNpphGGi9ofdKamb9Ylt5zBlJw/23qvaHV1QkuOnMGIqMAf7qf4JteQDYKFAe4d WhHQZOXuyUdPxNrJMKQUhPAcPmmTD6pABMP2RcpCszj4iUBCzk8E+PBlPigNACJqba5T LmrjRrM2uesaKTAQXE0fYCfA/NupshD7y2wv7EoPWfB56bwVMdpTCt3YQQ28XFyM5Fgi nQLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=cP4RFkku5akJjsNQOtItWjjIzdHXabL2Fv/qRVPeG6Y=; b=pIhW68VOpzt1IBCP0Yih3cOy+kUDl1fljvS687HW8zwa0HWgnh4yRKJEqEnej0I3M0 /DsAnZnHZUc5vbGx9Bv8HKP4qqfh1L6qiH98G5jsChUQw+h6dTkH3OEnmUZKxriP7QyF 6Rj0ptPXe8RCTnYSUJQhlqP/oMWLSuGjN8DUdhp/L1m+WnGQ+NSSaySyy14h5evN4FJh y5m/6gTXCljDC3mLuuokLKHLrAeznkxAldw3/O1weACp9p+xc/h3MD4LydQ4QY8jQFBq IThKITbAxxsbPlOWhHkBQoSHKPy1WBAov8hVpVanm0fSuX/Qq7TanZFWsJXuL7pkm/BK Flpw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id a14si741251wru.1.2019.09.10.11.07.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2019 11:07:12 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x8AI7BKd020905 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Sep 2019 20:07:11 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8AI7BnP032242; Tue, 10 Sep 2019 20:07:11 +0200 From: Jan Kiszka Subject: [PATCH] linux-custom: Control linux-libc-dev deployment manually To: isar-users Cc: Henning Schild , Cedric Hombourger Message-ID: <0600904d-7f34-875f-6bcf-6fbbfe8b9933@siemens.com> Date: Tue, 10 Sep 2019 20:07:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: ZtKTEo///6Ox 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