From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 6899390751905415168
X-Received: by 2002:a17:906:8415:: with SMTP id n21mr2106773ejx.399.1606389610181;
        Thu, 26 Nov 2020 03:20:10 -0800 (PST)
X-BeenThere: isar-users@googlegroups.com
Received: by 2002:a17:906:b5b:: with SMTP id v27ls772871ejg.7.gmail; Thu, 26
 Nov 2020 03:20:09 -0800 (PST)
X-Google-Smtp-Source: ABdhPJyI+LfKETDtQYvmj+ihYf8v7ALlLNgOULNVEeDztxLq4f7PISRCs069eiEs47DYLCovrKsQ
X-Received: by 2002:a17:906:4059:: with SMTP id y25mr2206181ejj.498.1606389609247;
        Thu, 26 Nov 2020 03:20:09 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1606389609; cv=none;
        d=google.com; s=arc-20160816;
        b=yGQ1sR1aQ+CHyiP3ugpkL3+2D6l2p4NznMQWPGNDcdXJ7BEfCVch/whewaUsU03Vi1
         zloz7ikYYYi1FwFw2xFdiHFvNk/MeTXzHxnypBaPPUDLGD7W+/g67nyOkxP1yB/YldHT
         lbC0CtH99xFVRkwQnAepOotDvL2TomzsQTw2tFVhS4QD9f/ahgW2HxNtlpn3L9iL01P+
         /RP+D5nOgHEIFG6sNSSJ7hTJBRurU0CTP3rKs3TI+zepG9W5qWLmvAbxVVJINx7OfSDq
         4fPViBJCf91m91jitcSEFh1RPx2lCZ0CgeJjeNfmmzhPO/k6z0xXISud3mruI6ZNUlTt
         aH5g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=mime-version:references:in-reply-to:message-id:date:subject:cc:to
         :from:ironport-sdr:ironport-sdr;
        bh=Pm6IAkSMDMZ8SW69PBUuWuZuVdTSuho2IhTBTP+44B0=;
        b=lYRPQaVo3FzH40YHFCAG54Q9BbD1tQ9ulT1lW4zu2MTghVCK2ORXfX460ivjq3fdMf
         XXpSkWuq+sewD1CCHtcnTqiaiMzSB+QyBHVh2QSZ4+SuwzIcNPWaWbTm9kB8DYRvtg02
         lI7uGm56KFIaQ1AKn1pPOkvgXPCXbgwXFJKMJId4pzK+Q5zn96YY7PktNOfaoqthas3t
         SP9r0pJyNRAvTo1ewVuHFkqJxzwaK20R/nhvMPL9Mivrn4smqkAsfHk7XOeKtnTwJvGE
         +FJWu5ixtsGyA8wjn25fidGeUutHygJrpQV6RfiOIQ74fT2vMnVRJbhmSZqIbvZiQCHk
         S8Qw==
ARC-Authentication-Results: i=1; gmr-mx.google.com;
       spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com
Return-Path: <Vijaikumar_Kanagarajan@mentor.com>
Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180])
        by gmr-mx.google.com with ESMTPS id v7si292239edj.5.2020.11.26.03.20.08
        for <isar-users@googlegroups.com>
        (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
        Thu, 26 Nov 2020 03:20:09 -0800 (PST)
Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180;
Authentication-Results: gmr-mx.google.com;
       spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com
IronPort-SDR: BlGVgXuS2nm30FDTa8fNtlrXs5oz9voHCS0wOaVAcwdSajTunDRQonWdMHzHEB35NuHgPhEi7T
 QcWWrgqeNPL/EjsKj3tf6+akWdqTI9BspxJgbxfRAnVDRs7FdJwt15nwWJJAy6XM35Z9Lsnp5E
 SHpeLsaBL/yEK9qymoJvOadLAZgxXwZd05poKU0+EPIZVE6qYJYBSaMY78qvGVFaQWQxsy4g4e
 AfnC62NpeM8nnDdQafdiRdDdOonjnaZou55CgtdM6QvUUDYvTue6i/YGWA+NmksJ1QydH/MIt6
 LIE=
X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; 
   d="scan'208";a="55500425"
Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165])
  by esa3.mentor.iphmx.com with ESMTP; 26 Nov 2020 03:20:08 -0800
IronPort-SDR: mgABqOYTLwXhdrmXfUdZ4IhUCRI+Ymgta8UVArat7czAGtwGHyORLYilqYyD+359k8Ef1n2kDq
 fmdXorGRBLWvExUa9cjwd1D7zlN35E5sK46GPFa3KOxNMOGWAxM8Rp+B8cVnmtLwFlIL3s5miX
 BZYwAvfwGy7kBrEtflVncd53uIqwlk34+VPdBoYGjul5HQ68F0z7cgS448+t6Rzg5gwZqm3cX+
 Nm4AhXWSp0cFB5qhiiomJtow/Y9IjhdT33HF3EwgSVXtzQ/+FNohiNvKH2Wrk5dw3O9H5rkg4W
 +yg=
From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
To: <isar-users@googlegroups.com>, <ibr@radix50.net>
CC: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Subject: [PATCH v9 06/14] deb-dl-dir: Factor out the mounting part
Date: Thu, 26 Nov 2020 16:49:04 +0530
Message-ID: <20201126111912.3037-7-Vijaikumar_Kanagarajan@mentor.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com>
References: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com>
MIME-Version: 1.0
Content-Type: text/plain
Return-Path: Vijaikumar_Kanagarajan@mentor.com
X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) To
 svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201)
X-TUID: rnzJFUyGrS/Y

Factor out the mount and unmount section to separate function for
easy readability. No functional change intended.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 meta/classes/deb-dl-dir.bbclass | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index 410befd..64d1823 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -14,15 +14,30 @@ is_not_part_of_current_build() {
     [ -z "${output}" ]
 }
 
+debsrc_do_mounts() {
+    sudo -s <<EOSUDO
+    mkdir -p "${1}/deb-src"
+    mountpoint -q "${1}/deb-src" || \
+    mount --bind "${DEBSRCDIR}" "${1}/deb-src"
+EOSUDO
+}
+
+debsrc_undo_mounts() {
+    sudo -s <<EOSUDO
+    mkdir -p "${1}/deb-src"
+    mountpoint -q "${1}/deb-src" && \
+    umount -l "${1}/deb-src"
+    rm -rf "${1}/deb-src"
+EOSUDO
+}
+
 debsrc_download() {
     export rootfs="$1"
     export rootfs_distro="$2"
     mkdir -p "${DEBSRCDIR}"/"${rootfs_distro}"
-    sudo -E -s <<'EOSUDO'
-    mkdir -p "${rootfs}/deb-src"
-    mountpoint -q "${rootfs}/deb-src" || \
-    mount --bind "${DEBSRCDIR}" "${rootfs}/deb-src"
-EOSUDO
+
+    debsrc_do_mounts "${rootfs}"
+
     ( flock 9
     set -e
     printenv | grep -q BB_VERBOSE_LOGS && set -x
@@ -37,11 +52,8 @@ EOSUDO
             sh -c ' mkdir -p "/deb-src/${1}/${2}" && cd "/deb-src/${1}/${2}" && apt-get -y --download-only --only-source source "$2"="$3" ' download-src "${rootfs_distro}" "${src}" "${version}"
     done
     ) 9>"${DEBSRCDIR}/${rootfs_distro}.lock"
-    sudo -E -s <<'EOSUDO'
-    mountpoint -q "${rootfs}/deb-src" && \
-    umount -l "${rootfs}/deb-src"
-    rm -rf "${rootfs}/deb-src"
-EOSUDO
+
+    debsrc_undo_mounts "${rootfs}"
 }
 
 deb_dl_dir_import() {
-- 
2.17.1