[PATCH v2] dpkg: acquire lock when calling reprepro

[Cedric Hombourger <Cedric_Hombourger@mentor.com>]

As bitbake performs multi-threaded builds, packages may be built
while others get deployed. A lock was already acquired within
dpkg_runbuild but accesses to the isar-apt database were not
protected from do_deploy_deb. Move the lock from the buildchroot
to the isar-apt repository and acquire the (same) lock from
dpkg_runbuild, repo_clean and do_deploy_deb.

Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
---
 meta/classes/dpkg-base.bbclass                   | 9 ++++++---
 meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
 meta/recipes-devtools/isar-apt/isar-apt-host.bb  | 4 ++--
 meta/recipes-devtools/isar-apt/isar-apt.bb       | 4 ++--
 meta/recipes-kernel/linux/files/build-kernel.sh  | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index a41df2c..108d942 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -71,6 +71,8 @@ do_build() {
             mount -t proc none ${BUILDCHROOT_DIR}/proc
         fi'
 
+    # Create database lock file here so we own it (not root) and perform actual build
+    touch ${DEPLOY_DIR_APT}/${DISTRO}/db.lock
     dpkg_runbuild
 
     sudo umount ${BUILDROOT} 2>/dev/null || true
@@ -82,7 +84,8 @@ CLEANFUNCS += "repo_clean"
 repo_clean() {
     PACKAGES=$(cd ${S}/..; ls *.deb | sed 's/\([^_]*\).*/\1/')
     if [ -n "${PACKAGES}" ]; then
-        reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
+        flock ${DEPLOY_DIR_APT}/${DISTRO}/db.lock \
+            reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
                  --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
                  -C main -A ${DISTRO_ARCH} \
                  remove ${DEBDISTRONAME} \
@@ -93,7 +96,8 @@ repo_clean() {
 # Install package to Isar-apt
 do_deploy_deb() {
     repo_clean
-    reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
+    flock ${DEPLOY_DIR_APT}/${DISTRO}/db.lock \
+        reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
              --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
              -C main \
              includedeb ${DEBDISTRONAME} \
@@ -102,6 +106,5 @@ do_deploy_deb() {
 
 addtask deploy_deb after do_build
 do_deploy_deb[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
-do_deploy_deb[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock"
 do_deploy_deb[depends] = "isar-apt:do_cache_config"
 do_deploy_deb[dirs] = "${S}"
diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh
index e2dabab..e8a9c17 100644
--- a/meta/recipes-devtools/buildchroot/files/build.sh
+++ b/meta/recipes-devtools/buildchroot/files/build.sh
@@ -50,7 +50,7 @@ install_cmd="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y
 
     # Install all build deps
     mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control
-) 42>/dpkg.lock
+) 42>/isar-apt/db.lock
 
 # If autotools files have been created, update their timestamp to
 # prevent them from being regenerated
diff --git a/meta/recipes-devtools/isar-apt/isar-apt-host.bb b/meta/recipes-devtools/isar-apt/isar-apt-host.bb
index 0cf5ce1..cab84a7 100644
--- a/meta/recipes-devtools/isar-apt/isar-apt-host.bb
+++ b/meta/recipes-devtools/isar-apt/isar-apt-host.bb
@@ -8,7 +8,6 @@ SRC_URI = "file://distributions.in"
 CACHE_CONF_DIR = "${DEPLOY_DIR_APT}/${HOST_DISTRO}/conf"
 do_cache_config[dirs] = "${CACHE_CONF_DIR}"
 do_cache_config[stamp-extra-info] = "${HOST_DISTRO}"
-do_cache_config[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock"
 
 # Generate reprepro config for current host distro if it doesn't exist. Once it's
 # generated, this task should do nothing.
@@ -22,7 +21,8 @@ do_cache_config() {
     path_databases="${DEPLOY_DIR_DB}/${HOST_DISTRO}"
 
     if [ ! -d "${path_databases}" ]; then
-        reprepro -b ${path_cache} \
+        flock ${DEPLOY_DIR_APT}/db.lock \
+            reprepro -b ${path_cache} \
                  --dbdir ${path_databases} \
                  export ${DEBDISTRONAME}
     fi
diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-devtools/isar-apt/isar-apt.bb
index 9c31d12..e9dfec1 100644
--- a/meta/recipes-devtools/isar-apt/isar-apt.bb
+++ b/meta/recipes-devtools/isar-apt/isar-apt.bb
@@ -6,7 +6,6 @@ SRC_URI = "file://distributions.in"
 CACHE_CONF_DIR = "${DEPLOY_DIR_APT}/${DISTRO}/conf"
 do_cache_config[dirs] = "${CACHE_CONF_DIR}"
 do_cache_config[stamp-extra-info] = "${DISTRO}"
-do_cache_config[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock"
 
 # Generate reprepro config for current distro if it doesn't exist. Once it's
 # generated, this task should do nothing.
@@ -20,7 +19,8 @@ do_cache_config() {
     path_databases="${DEPLOY_DIR_DB}/${DISTRO}"
 
     if [ ! -d "${path_databases}" ]; then
-        reprepro -b ${path_cache} \
+        flock ${DEPLOY_DIR_APT}/db.lock \
+            reprepro -b ${path_cache} \
                  --dbdir ${path_databases} \
                  export ${DEBDISTRONAME}
     fi
diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh
index 8b58e93..2ff5a1e 100644
--- a/meta/recipes-kernel/linux/files/build-kernel.sh
+++ b/meta/recipes-kernel/linux/files/build-kernel.sh
@@ -34,7 +34,7 @@ REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image"
 REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers"
 
 # Lock-protected because apt and dpkg do not wait in case of contention
-flock /dpkg.lock \
+flock /isar-apt/db.lock \
     apt-get install -y -o Debug::pkgProblemResolver=yes \
         --no-install-recommends ${KBUILD_DEPENDS}
 
-- 
2.11.0