From 7221ce1bca413a4e650d5d5882b1e496476e4ebc Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Mon, 21 Nov 2016 17:31:28 +0800 Subject: archiver.bbclass: fix can't create diff tarball When enable: ARCHIVER_MODE[src] = "configured" ARCHIVER_MODE[diff] = "1" There is no "diff" tarball created, just "configured" tarball created, in log file: log.do_unpack_and_patch, it said that directory doesn't exist. This is because when enable "diff" and "configured", system use create_diff_gz and do_ar_configured function respectively. In do_ar_configured function, it use create_tarball function, and the create_tarball use the function: bb.utils.mkdirhier(ar_outdir) So when creating "configured" tarball, there was no "directory doesn't exist" problem and it was created successfully. In create_diff_gz function, it didn't create the directory "ar_outdir", so it can't create "diff" tarball, and throw the problem that directory doesn't exit. So we should add the bb.utils.mkdirhier(ar_outdir) to function create_diff_gz in archiver.bbclass. Signed-off-by: Dengke Du --- meta/classes/archiver.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 9239983e8f..abe6f2b3cf 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -290,6 +290,7 @@ def create_diff_gz(d, src_orig, src, ar_outdir): dirname = os.path.dirname(src) basename = os.path.basename(src) os.chdir(dirname) + bb.utils.mkdirhier(ar_outdir) out_file = os.path.join(ar_outdir, '%s-diff.gz' % d.getVar('PF', True)) diff_cmd = 'diff -Naur %s.orig %s.patched | gzip -c > %s' % (basename, basename, out_file) subprocess.call(diff_cmd, shell=True) -- cgit 1.2.3-korg