From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6626719792838475776 X-Received: by 2002:a2e:7402:: with SMTP id p2-v6mr1088673ljc.18.1542903434236; Thu, 22 Nov 2018 08:17:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:90ce:: with SMTP id o14-v6ls1298562ljg.11.gmail; Thu, 22 Nov 2018 08:17:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/V/jUACrafEHgoNea3tBu1jeHlxarcRyazxttViBijGwB+JjKboizK+stJpZogHLvcUJMBL X-Received: by 2002:a2e:86ce:: with SMTP id n14-v6mr1089894ljj.21.1542903433781; Thu, 22 Nov 2018 08:17:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542903433; cv=none; d=google.com; s=arc-20160816; b=IEVwx8Hcnsqj/ZRBj/Cqt/0RHm/ePJHItwSfksQqU4UmWpu12/Vs3wfxG07JCQkgd0 FHBm5IAmDUsnkUGuFrJoteRLI2H0V33zPR1bw4TZnMXtMFE1UKHDCT4Nk7I9oI4uj/Hl x3gye78z+Y+RBJJDsyGQpwpukCuOi/3JcyXvif9/zYUMCaN5KRVC/C0qghy1KNBsQ/OQ X5LJI42uAxU7oAa2rplg0eMM8YgsFJ9zr5De9ncy8gP59SVGjM/A5OTDIJsTtejz0oe+ M6uv9m/lbpmmYNs9A9YJDIDLDwkEgUPk69wtTC7yeR9lnYCD3U8ZZiDZXigYt63h9XK1 ovOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=ITJ4ThNzqtVWzEs43s96ut8PLP8gbTIuQiT89yxc2qo=; b=AGQansqZ0OmAgof3hx2vmS7Dqf2wR2DrF7zSQ2WzhKsQEG39g6P9L2bs9ceX6vI/hd OfAASmeafC204cbvXOgBdVwDzXrBu6aF96gKR3nUwqkJyFgRzvzMoUB5Xv51F9uEjxHx Gr+HDq4gZ4n1z7URhqgPmNuYJc0dXs7mXeKum7M6F1RcN6m5hq+UV45TNkWtFnbSBrA4 ueAsHMbChk2VIIgf2lI5tB2MbG52V4B+xC662Ndu41SZ5+01mDurXvQC1VmGDSdmybDX fuWKJx+i/DihICcBd3mgJ5uisYFkaMWYd7IIHetdPXj5+xiIeoqNgL3ux0wHWk9kUJNn Tn1g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id t5-v6si1843112lje.3.2018.11.22.08.17.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 08:17:13 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id wAMGHCgv000599 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 Nov 2018 17:17:13 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.187]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wAMGHCZ5026414; Thu, 22 Nov 2018 17:17:12 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH] linux-custom: Build as "builder:builder" and not as root Date: Thu, 22 Nov 2018 17:17:01 +0100 Message-Id: <20181122161701.2565-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: MTlvg4kRrHVz In line with previous patches, avoid "root" in buildchroot to avoid permission problems between the host and the chroot. Signed-off-by: Henning Schild --- meta/recipes-kernel/linux/files/build-kernel.sh | 10 ++++------ meta/recipes-kernel/linux/linux-custom.inc | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh index 32d62bf..dbd6162 100644 --- a/meta/recipes-kernel/linux/files/build-kernel.sh +++ b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Custom kernel build # @@ -7,10 +7,9 @@ # # SPDX-License-Identifier: MIT -set -e +source /isar/common.sh host_arch=$(dpkg --print-architecture) -target_arch=$2 if [ "$host_arch" != "$target_arch" ]; then case $target_arch in @@ -33,7 +32,6 @@ REPACK_DIR="$1/../repack" REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image" REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers" -cd $1 if [ -e .config ]; then make olddefconfig else @@ -118,9 +116,9 @@ dpkg-gencontrol -crepack/debian/control \ -DDepends="${KERNEL_HEADERS_DEBIAN_DEPENDS}" \ -DArchitecture=$target_arch -dpkg-deb -b ${REPACK_LINUX_IMAGE_DIR} \ +fakeroot dpkg-deb -b ${REPACK_LINUX_IMAGE_DIR} \ linux-image-${KERNEL_NAME}_${PV}-1_${KERNEL_NAME}.deb rm -f linux-image-${PV}_${PV}-1_*.deb -dpkg-deb -b ${REPACK_LINUX_HEADERS_DIR} \ +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 diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index d9b2935..f33bb9d 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -47,11 +47,9 @@ do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_builddeps[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" dpkg_runbuild() { - # Install package builder script - sudo install -m 755 ${WORKDIR}/build-kernel.sh ${BUILDCHROOT_DIR} - + chmod +x ${WORKDIR}/build-kernel.sh if [ -n "${KERNEL_DEFCONFIG}" ]; then - sudo cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config + cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config fi E="${@ bb.utils.export_proxies(d)}" @@ -63,5 +61,5 @@ dpkg_runbuild() { export KERNEL_DEBIAN_DEPENDS="${KERNEL_DEBIAN_DEPENDS}" export KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}" - sudo -E chroot ${BUILDCHROOT_DIR} /build-kernel.sh ${PP}/${PPS} ${DISTRO_ARCH} + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} ${PP}/build-kernel.sh ${PP}/${PPS} ${DISTRO_ARCH} } -- 2.19.1