aboutsummaryrefslogtreecommitdiffstats
path: root/meta/packages/apt/apt-native.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/apt/apt-native.inc')
-rw-r--r--meta/packages/apt/apt-native.inc56
1 files changed, 30 insertions, 26 deletions
diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc
index 4ace9e94bb..de9426bf70 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/packages/apt/apt-native.inc
@@ -19,39 +19,43 @@ python do_stage_config () {
data = bb.data.expand(data, d)
- outpath = bb.data.expand('${STAGING_DIR}/${sysconfdir}/apt.conf', d)
+ outdir = os.path.join(bb.data.getVar('sysconfdir', d, 1), 'apt')
+ if not os.path.exists(outdir):
+ os.makedirs(outdir)
+ outpath = os.path.join(outdir, 'apt.conf')
+
outfile = file(outpath, 'w')
outfile.write(data)
outfile.close()
}
do_stage_base () {
- install -d ${STAGING_BINDIR}
- install -m 0755 bin/apt-cdrom ${STAGING_BINDIR}/
- install -m 0755 bin/apt-get ${STAGING_BINDIR}/
- install -m 0755 bin/apt-config ${STAGING_BINDIR}/
- install -m 0755 bin/apt-cache ${STAGING_BINDIR}/
+ install -d ${bindir}
+ install -m 0755 bin/apt-cdrom ${bindir}/
+ install -m 0755 bin/apt-get ${bindir}/
+ install -m 0755 bin/apt-config ${bindir}/
+ install -m 0755 bin/apt-cache ${bindir}/
- install -m 0755 bin/apt-sortpkgs ${STAGING_BINDIR}/
- install -m 0755 bin/apt-extracttemplates ${STAGING_BINDIR}/
+ install -m 0755 bin/apt-sortpkgs ${bindir}/
+ install -m 0755 bin/apt-extracttemplates ${bindir}/
eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
- oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/
- ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so
- oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/
- ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so
-
- install -d ${STAGING_LIBDIR}/apt/methods
- install -m 0755 bin/methods/* ${STAGING_LIBDIR}/apt/methods/
-
- install -d ${STAGING_LIBDIR}/dpkg/methods/apt
- install -m 0644 dselect/desc.apt ${STAGING_LIBDIR}/dpkg/methods/apt/
- install -m 0644 dselect/names ${STAGING_LIBDIR}/dpkg/methods/apt/
- install -m 0755 dselect/install ${STAGING_LIBDIR}/dpkg/methods/apt/
- install -m 0755 dselect/setup ${STAGING_LIBDIR}/dpkg/methods/apt/
- install -m 0755 dselect/update ${STAGING_LIBDIR}/dpkg/methods/apt/
-
- install -d ${STAGING_DIR}${sysconfdir}/apt
- install -d ${STAGING_DIR}${localstatedir}/lib/apt/lists/partial
- install -d ${STAGING_DIR}${localstatedir}/cache/apt/archives/partial
+ oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${libdir}/
+ ln -sf libapt-pkg$GLIBC_VER-6.so ${libdir}/libapt-pkg.so
+ oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${libdir}/
+ ln -sf libapt-inst$GLIBC_VER-6.so ${libdir}/libapt-inst.so
+
+ install -d ${libdir}/apt/methods
+ install -m 0755 bin/methods/* ${libdir}/apt/methods/
+
+ install -d ${libdir}/dpkg/methods/apt
+ install -m 0644 dselect/desc.apt ${libdir}/dpkg/methods/apt/
+ install -m 0644 dselect/names ${libdir}/dpkg/methods/apt/
+ install -m 0755 dselect/install ${libdir}/dpkg/methods/apt/
+ install -m 0755 dselect/setup ${libdir}/dpkg/methods/apt/
+ install -m 0755 dselect/update ${libdir}/dpkg/methods/apt/
+
+ install -d ${sysconfdir}/apt
+ install -d ${localstatedir}/lib/apt/lists/partial
+ install -d ${localstatedir}/cache/apt/archives/partial
}