[PATCH(sbuild) 0/1] Fix issues on rebuild with empty DL_DIR

[PATCH(sbuild) 0/1] Fix issues on rebuild with empty DL_DIR

[Felix Moessbauer]

Hi,

this is an addition to the sbuild-v8 patch series.
It fixes the discussed issue when re-building with sstate,
but without a persistent DL_DIR.

By that, the DL_DIR was empty, hence the deb_dl_dir_import function
did not find any files and also did not create the directories.

Note, that this is technically unrelated to sstate-cache,
but was only observed when using sstate, as the DL_DIR otherwise
always contained at least one package.

Best regards,
Felix

Felix Moessbauer (1):
  always create apt-cache dirs in deb_dl_dir_import

 meta/classes/deb-dl-dir.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.30.2

[PATCH(sbuild) 1/1] always create apt-cache dirs in deb_dl_dir_import

[Felix Moessbauer]

This patch ensures that the deb_dl_dir_import function
always creates the apt-cache directories under ${PP}/rootfs,
no matter if files are in the download cache or not.

By that, downstream tasks can safely assume that the apt-cache
is created and place files there.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/deb-dl-dir.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index 484fda69..8cf1b4d6 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -78,8 +78,8 @@ debsrc_download() {
 deb_dl_dir_import() {
     export pc="${DEBDIR}/${2}"
     export rootfs="${1}"
-    [ ! -d "${pc}" ] && return 0
     sudo mkdir -p "${rootfs}"/var/cache/apt/archives/
+    [ ! -d "${pc}" ] && return 0
     flock -s "${pc}".lock -c '
         set -e
         printenv | grep -q BB_VERBOSE_LOGS && set -x
-- 
2.30.2