apt-native: use sed to prepare apt.conf.sample

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

diff --git a/meta/recipes-devtools/apt/apt-native_1.2.12.bb b/meta/recipes-devtools/apt/apt-native_1.2.12.bb
index fbf96db051d2359696be9fdf48510a709136be91..695e21d1887c07887ac4a1f101e70c2726ac4dda 100644 (file)
--- a/meta/recipes-devtools/apt/apt-native_1.2.12.bb
+++ b/meta/recipes-devtools/apt/apt-native_1.2.12.bb
@@ -11,33 +11,10 @@ SRC_URI += "file://db_linking_hack.patch \
             file://0001-fix-the-gcc-version-check.patch \
             file://noconfigure.patch \
             file://no-curl.patch \
+            file://apt.conf.in \
 "
 
-python do_install () {
-    bb.build.exec_func('do_install_base', d)
-    bb.build.exec_func('do_install_config', d)
-}
-
-python do_install_config () {
-    indir = os.path.dirname(d.getVar('FILE'))
-    infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r')
-    data = infile.read()
-    infile.close()
-
-    data = d.expand(data)
-
-    outdir = oe.path.join(d.getVar('D'), d.getVar('sysconfdir'), 'apt')
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)
-
-    outpath = oe.path.join(outdir, 'apt.conf.sample')
-    if not os.path.exists(outpath):
-        outfile = open(outpath, 'w')
-        outfile.write(data)
-        outfile.close()
-}
-
-do_install_base () {
+do_install() {
        install -d ${D}${bindir}
        install -m 0755 bin/apt-cdrom ${D}${bindir}/
        install -m 0755 bin/apt-get ${D}${bindir}/
@@ -69,4 +46,9 @@ do_install_base () {
        install -d ${D}${localstatedir}/cache/apt/archives/partial
 
        install -d ${D}${localstatedir}/log/apt/
+
+       sed -e "s,@STAGING_DIR_NATIVE@,${STAGING_DIR_NATIVE},g" \
+           -e "s,@STAGING_BINDIR_NATIVE@,${STAGING_BINDIR_NATIVE},g" \
+           -e "s,@STAGING_LIBDIR@,${STAGING_LIBDIR},g" \
+           < ${WORKDIR}/apt.conf.in > ${D}${sysconfdir}/apt/apt.conf.sample
 }

diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/apt/apt.conf.in
similarity index 87%
rename from meta/recipes-devtools/apt/files/apt.conf
rename to meta/recipes-devtools/apt/apt/apt.conf.in
index 9ad61cc943a8b7e3e6b8d1dc5f827bd1c2e32ca2..6fc1326ffb6030e321a4f3e0b4460c9c1a33e403 100644 (file)
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/apt/apt.conf.in
@@ -1,4 +1,4 @@
-Dir "${STAGING_DIR_NATIVE}/"
+Dir "@STAGING_DIR_NATIVE@/"
 {
    State "var/lib/apt/"
    {
@@ -11,9 +11,9 @@ Dir "${STAGING_DIR_NATIVE}/"
       pkgcache "";
       srcpkgcache "";
    };
-   Bin "${STAGING_BINDIR_NATIVE}/"
+   Bin "@STAGING_BINDIR_NATIVE@/"
    {
-      methods "${STAGING_LIBDIR}/apt/methods/";
+      methods "@STAGING_LIBDIR@/apt/methods/";
       gzip "/bin/gzip";
       dpkg "dpkg";
       dpkg-source "dpkg-source";