summaryrefslogtreecommitdiffstats
path: root/meta/packages/apt
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-19 13:42:11 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-19 13:42:11 +0000
commit24f0ecbb14e5b6e4ab21fdc5def50b8a1f3f9bc4 (patch)
tree0d679d85792205dcf7f8fe2c8b9bed4dbdf9a555 /meta/packages/apt
parentbb9a858c58eb6754b9f810c58cd2475982753ea5 (diff)
downloadpoky-24f0ecbb14e5b6e4ab21fdc5def50b8a1f3f9bc4.tar.gz
apt-native: Use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/apt')
-rw-r--r--meta/packages/apt/apt-native.inc66
1 files changed, 33 insertions, 33 deletions
diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc
index 81e9f9415f..554ae078fe 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/packages/apt/apt-native.inc
@@ -7,12 +7,12 @@ USE_NLS = "yes"
7 7
8SRC_URI += "file://db_linking_hack.patch;patch=1" 8SRC_URI += "file://db_linking_hack.patch;patch=1"
9 9
10python do_stage () { 10python do_install () {
11 bb.build.exec_func('do_stage_base', d) 11 bb.build.exec_func('do_install_base', d)
12 bb.build.exec_func('do_stage_config', d) 12 bb.build.exec_func('do_install_config', d)
13} 13}
14 14
15python do_stage_config () { 15python do_install_config () {
16 indir = os.path.dirname(bb.data.getVar('FILE',d,1)) 16 indir = os.path.dirname(bb.data.getVar('FILE',d,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()
@@ -20,7 +20,7 @@ python do_stage_config () {
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('sysconfdir', d, 1), 'apt') 23 outdir = os.path.join(bb.data.getVar('D', d, 1), bb.data.getVar('sysconfdir', d, 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')
@@ -30,34 +30,34 @@ python do_stage_config () {
30 outfile.close() 30 outfile.close()
31} 31}
32 32
33do_stage_base () { 33do_install_base () {
34 install -d ${bindir} 34 install -d ${D}${bindir}
35 install -m 0755 bin/apt-cdrom ${bindir}/ 35 install -m 0755 bin/apt-cdrom ${D}${bindir}/
36 install -m 0755 bin/apt-get ${bindir}/ 36 install -m 0755 bin/apt-get ${D}${bindir}/
37 install -m 0755 bin/apt-config ${bindir}/ 37 install -m 0755 bin/apt-config ${D}${bindir}/
38 install -m 0755 bin/apt-cache ${bindir}/ 38 install -m 0755 bin/apt-cache ${D}${bindir}/
39 install -m 0755 bin/apt-sortpkgs ${bindir}/ 39 install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
40 install -m 0755 bin/apt-extracttemplates ${bindir}/ 40 install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
41 41
42 eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` 42 eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
43 oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${libdir}/ 43 oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/
44 ln -sf libapt-pkg$GLIBC_VER-6.so ${libdir}/libapt-pkg.so 44 ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
45 oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${libdir}/ 45 oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/
46 ln -sf libapt-inst$GLIBC_VER-6.so ${libdir}/libapt-inst.so 46 ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
47 47
48 install -d ${libdir}/apt/methods 48 install -d ${D}${libdir}/apt/methods
49 install -m 0755 bin/methods/* ${libdir}/apt/methods/ 49 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
50 50
51 install -d ${libdir}/dpkg/methods/apt 51 install -d ${D}${libdir}/dpkg/methods/apt
52 install -m 0644 dselect/desc.apt ${libdir}/dpkg/methods/apt/ 52 install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
53 install -m 0644 dselect/names ${libdir}/dpkg/methods/apt/ 53 install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/
54 install -m 0755 dselect/install ${libdir}/dpkg/methods/apt/ 54 install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/
55 install -m 0755 dselect/setup ${libdir}/dpkg/methods/apt/ 55 install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/
56 install -m 0755 dselect/update ${libdir}/dpkg/methods/apt/ 56 install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/
57 57
58 install -d ${sysconfdir}/apt 58 install -d ${D}${sysconfdir}/apt
59 install -d ${localstatedir}/lib/apt/lists/partial 59 install -d ${D}${localstatedir}/lib/apt/lists/partial
60 install -d ${localstatedir}/cache/apt/archives/partial 60 install -d ${D}${localstatedir}/cache/apt/archives/partial
61 61
62 install -d ${localstatedir}/log/apt/ 62 install -d ${D}${localstatedir}/log/apt/
63} 63}