From fe029775b7c2dc8c52a92076b1a11e3594de3b9a Mon Sep 17 00:00:00 2001
From: Jason Andryuk <jandryuk@gmail.com>
Date: Thu, 22 Jul 2021 14:30:39 -0400
Subject: [PATCH] bordel: Use tmp-glibc/deploy

bitbake expects deploy under tmp-glibc.  When you delete tmp-glibc, it
complains when it finds deploy already populated.  Put deploy back under
tmp-glibc.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
 bordel      | 2 +-
 cmds/config | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bordel b/bordel
index 0f28cc9..6085c85 100755
--- a/bordel
+++ b/bordel
@@ -81,7 +81,7 @@ else
 fi
 
 CONF_DIR="conf"
-DEPLOY_DIR="deploy"
+DEPLOY_DIR="tmp-glibc/deploy"
 STAGING_DIR="staging"
 REPO_PACKAGES_DIR="packages.main"
 # shellcheck disable=SC2034
diff --git a/cmds/config b/cmds/config
index fc7cb89..4c4fd02 100755
--- a/cmds/config
+++ b/cmds/config
@@ -54,9 +54,6 @@ DL_DIR ?= "\${TOPDIR}/downloads"
 
 SSTATE_DIR = "\${TOPDIR}/sstate-cache"
 
-# Set DEPLOY_DIR outside of TMPDIR
-DEPLOY_DIR = "\${TOPDIR}/${DEPLOY_DIR}"
-
 export CCACHE_DIR = "\${TOPDIR}/ccache"
 CCACHE_TARGET_DIR = "\${CACHE_DIR}"