From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6488313435861811200 X-Received: by 10.28.156.76 with SMTP id f73mr1372124wme.4.1511177504442; Mon, 20 Nov 2017 03:31:44 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.112.26 with SMTP id l26ls887848wmc.4.canary-gmail; Mon, 20 Nov 2017 03:31:44 -0800 (PST) X-Google-Smtp-Source: AGs4zMY/pUjMmFGhpGrtd7PiRjVJmZV+eUW5PtEM2mhcpEKGa3H1v6bDtF2hhUVR9pCo7cKOiZE1 X-Received: by 10.28.21.67 with SMTP id 64mr1068065wmv.8.1511177504078; Mon, 20 Nov 2017 03:31:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511177504; cv=none; d=google.com; s=arc-20160816; b=yeSprhuYIFk8U0ZJdn+uJIm4IXcwaO0CkHRjD4rubvB/sWIhzntajegin6V3xQ6naz aND/4XzCG/18H5jcD1IUENTqhrY5mUo4ObegADrqdf5vxdWvQaNQHUluCagC5JQK2lxX VIFrFBBlawly1SA6/O4MIQ9+JjAbRHxyhf2ETs9mrzXdJUsfci39+ShJCjIPDWfnLV06 eMFKKTkf0/r/EzM057gPDkCZDwQXxkYP9bqIYabCe4fcTf8M0dPopi5oRqZbeLqhGHk0 ALRqprFkaJ4bKcXPdJ4IUfWnq69blMDNHBu11PZiImkDvy9gaqjciQjBsJWFmW4Tds9k lfFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=cJiTuO8Tl6htEIVOlcZGnjsps1xxt0p5llSWeNvDv1k=; b=JkKV3Qe/J3rPNaomKdXaaUdaD90SbK7/vEt2rcOF92maZCClDualcYvvvKOJWkUCEP NVCJWduR2JIaF4iR+KC4gI8PtK514vHwu1GorL9FzY/sKVnzEMDM0ZzNeCXB+AjwDyg2 40mxpmPcopTxgV8vNE2BYAIpJa2yi/vvQTifUCvOJ+7qUUO9zxASDV+cSAujp4WrLPsh YPIb65c/rxFvkpg3I4KnnPmRo/CS2KYNCFBNQwU4+TwfzCzA+WCHRF9yeYeT0T1ZJsJP B1tAI3+ic/u9DzvSGU60dwLMQN+RPPS8B+l9SDCMDhOOK4aOlMAu0yU0fTHa0rYaKlvA qDDA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id l9si857589wrf.4.2017.11.20.03.31.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 03:31:44 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@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 christian.storm@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=christian.storm@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id vAKBVhwg006808 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 20 Nov 2017 12:31:43 +0100 Received: from MD1KR9XC.ww002.siemens.net ([139.25.69.251]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id vAKBVhD7002997; Mon, 20 Nov 2017 12:31:43 +0100 From: Christian Storm To: isar-users@googlegroups.com Cc: Christian Storm Subject: [PATCH] dpkg-base: mount git source folder into buildchroot Date: Mon, 20 Nov 2017 12:30:28 +0100 Message-Id: <20171120113028.18897-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171120103728.08714150@md1em3qc> References: <20171120103728.08714150@md1em3qc> X-TUID: ksM+fuQOhToT When building a Debian source package with source/format "3.0 (git)", the git binary is used to bundle the source. For being able to do so, /tmp/downloads/git/ needs to be mounted into the buildchroot as .git/objects/info/alternates refers to it. Signed-off-by: Christian Storm --- meta/classes/dpkg-base.bbclass | 5 ++++- meta/recipes-devtools/buildchroot/buildchroot.bb | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 35af6d5..3235ebf 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -20,14 +20,17 @@ dpkg_runbuild() { # Wrap the function dpkg_runbuild with the bind mount for buildroot do_build() { mkdir -p ${BUILDROOT} - sudo mount --bind ${WORKDIR} ${BUILDROOT} _do_build_cleanup() { ret=$? sudo umount ${BUILDROOT} 2>/dev/null || true sudo rmdir ${BUILDROOT} 2>/dev/null || true + sudo umount ${BUILDCHROOT_DIR}/${GITDIR} 2>/dev/null || true + sudo rmdir ${BUILDCHROOT_DIR}/${GITDIR} 2>/dev/null || true (exit $ret) || bb_exit_handler } trap '_do_build_cleanup' EXIT + sudo mount --bind ${WORKDIR} ${BUILDROOT} + sudo mount --bind ${GITDIR} ${BUILDCHROOT_DIR}/${GITDIR} dpkg_runbuild _do_build_cleanup } diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 6a94733..8652cf1 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -32,6 +32,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_build[dirs] = "${WORKDIR}/hooks_multistrap" +do_build[dirs] = "${BUILDCHROOT_DIR}/${GITDIR}" do_build() { chmod +x "${WORKDIR}/setup.sh" chmod +x "${WORKDIR}/configscript.sh" -- 2.15.0