From 78e5426a762b6f9b1b3b66fd8a65c67d6b94763c Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 10 Jan 2013 15:58:10 +0800 Subject: apt-native: fix the creation of apt.conf.sample 1.The file of "apt.conf.sample" is in the outdir, and outdir is assigned by "os.path.join" with the params of ${D}, ${sysconfdir} and "apt". But ${sysconfdir} is an absolute dir and that let ${D} be discarded. The following is the help on function os.path.join(a, *p): Join two or more pathname components, inserting '/' as needed. If any component is an absolute path, all previous path components will be discarded. Use oe.path.join instead which don't have this problem. 2. Create apt.conf.sample if it doesn't exist. [YOCTO #3677] (From OE-Core rev: 95a655a853b7cd43163362d72da0c134d4c0ec85) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt-native.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/apt') diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index ab89f71..c7e7e42 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc @@ -14,17 +14,18 @@ python do_install () { python do_install_config () { indir = os.path.dirname(d.getVar('FILE',1)) - infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r') + infile = file(oe.path.join(indir, 'files', 'apt.conf'), 'r') data = infile.read() infile.close() data = d.expand(data) - outdir = os.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt') + outdir = oe.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt') if not os.path.exists(outdir): os.makedirs(outdir) - outpath = os.path.join(outdir, 'apt.conf.sample') + outpath = oe.path.join(outdir, 'apt.conf.sample') + if not os.path.exists(outpath): outfile = file(outpath, 'w') outfile.write(data) outfile.close() -- cgit v1.1