diff options
Diffstat (limited to 'meta/recipes-devtools/apt')
-rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-package.inc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index b16f99e93c..d4b207b986 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc | |||
@@ -13,14 +13,14 @@ python do_install () { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | python do_install_config () { | 15 | python do_install_config () { |
16 | indir = os.path.dirname(bb.data.getVar('FILE',d,1)) | 16 | indir = os.path.dirname(d.getVar('FILE',1)) |
17 | infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r') | 17 | infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r') |
18 | data = infile.read() | 18 | data = infile.read() |
19 | infile.close() | 19 | infile.close() |
20 | 20 | ||
21 | data = bb.data.expand(data, d) | 21 | data = bb.data.expand(data, d) |
22 | 22 | ||
23 | outdir = os.path.join(bb.data.getVar('D', d, 1), bb.data.getVar('sysconfdir', d, 1), 'apt') | 23 | outdir = os.path.join(d.getVar('D', 1), d.getVar('sysconfdir', 1), 'apt') |
24 | if not os.path.exists(outdir): | 24 | if not os.path.exists(outdir): |
25 | os.makedirs(outdir) | 25 | os.makedirs(outdir) |
26 | outpath = os.path.join(outdir, 'apt.conf.sample') | 26 | outpath = os.path.join(outdir, 'apt.conf.sample') |
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc index 2e3be3885b..dde916e3da 100644 --- a/meta/recipes-devtools/apt/apt-package.inc +++ b/meta/recipes-devtools/apt/apt-package.inc | |||
@@ -59,15 +59,15 @@ FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \ | |||
59 | ${localstatedir} ${sysconfdir} \ | 59 | ${localstatedir} ${sysconfdir} \ |
60 | ${libdir}/dpkg" | 60 | ${libdir}/dpkg" |
61 | FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" | 61 | FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates" |
62 | FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \ | 62 | FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages', 1))} \ |
63 | ${docdir}/apt" | 63 | ${docdir}/apt" |
64 | FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}" | 64 | FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-utils-manpages', 1))}" |
65 | FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" | 65 | FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}" |
66 | 66 | ||
67 | do_install () { | 67 | do_install () { |
68 | set -x | 68 | set -x |
69 | ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} | 69 | ${@get_commands_apt_doc(d, bb, d.getVar('apt-manpages', 1))} |
70 | ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))} | 70 | ${@get_commands_apt_doc(d, bb, d.getVar('apt-utils-manpages', 1))} |
71 | install -d ${D}${bindir} | 71 | install -d ${D}${bindir} |
72 | install -m 0755 bin/apt-cdrom ${D}${bindir}/ | 72 | install -m 0755 bin/apt-cdrom ${D}${bindir}/ |
73 | install -m 0755 bin/apt-get ${D}${bindir}/ | 73 | install -m 0755 bin/apt-get ${D}${bindir}/ |