Patchwork [1/5] apt-native:fix support configuring etc dir in apt.conf

login
register
mail settings
Submitter Hongxu Jia
Date Feb. 4, 2013, 9:34 a.m.
Message ID <4838354326532930d6e805844c79d0323b5e946b.1359968242.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/43967/
State New
Headers show

Comments

Hongxu Jia - Feb. 4, 2013, 9:34 a.m.
Add "#APT_CONF_DIR#" to support configuring etc dir in apt.conf. Configure it
by using sed to replace the string at deb do_rootfs time.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-devtools/apt/apt-native_0.7.14.bb |    2 +-
 meta/recipes-devtools/apt/files/apt.conf       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
index d4513ca..777b05c 100644
--- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
@@ -1,6 +1,6 @@ 
 require apt-native.inc
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI += "file://nodoc.patch \
             file://noconfigure.patch \
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 5c20ea4..9bd19c1 100644
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
@@ -21,7 +21,7 @@  Dir "${STAGING_DIR_NATIVE}/"
       apt-get "apt-get";
       apt-cache "apt-cache";
    };
-   Etc "etc/apt/"
+   Etc "#APT_CONF_DIR#"
    {
       Preferences "preferences";
    };