rootfs_deb.bbclass: Fix apt.conf handling (from poky)

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index c2c4a76..5237285 100644 (file)
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -10,12 +10,8 @@ fakeroot rootfs_deb_do_rootfs () {
        mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
        mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
 
-       mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
-
        rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
        rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
-       > ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
-       > ${STAGING_ETCDIR_NATIVE}/apt/preferences
        > ${IMAGE_ROOTFS}/var/dpkg/status
        > ${IMAGE_ROOTFS}/var/dpkg/available
        # > ${STAGING_DIR}/var/dpkg/status
@@ -40,9 +36,9 @@ fakeroot rootfs_deb_do_rootfs () {
                priority=$(expr $priority + 5)
        done
 
-       tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
+       tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
 
-       cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
+       cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
                | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
                > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 

diff --git a/packages/apt/apt-native_0.6.46.2.bb b/packages/apt/apt-native_0.6.46.2.bb
index 43f7388..3342618 100644 (file)
--- a/packages/apt/apt-native_0.6.46.2.bb
+++ b/packages/apt/apt-native_0.6.46.2.bb
@@ -1,4 +1,5 @@
 require apt-native.inc
+PR = "r1"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"

diff --git a/packages/apt/apt-native_0.7.2.bb b/packages/apt/apt-native_0.7.2.bb
index 3342618..6db567f 100644 (file)
--- a/packages/apt/apt-native_0.7.2.bb
+++ b/packages/apt/apt-native_0.7.2.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"

diff --git a/packages/apt/apt-native_0.7.3.bb b/packages/apt/apt-native_0.7.3.bb
index 6db567f..7bf69c0 100644 (file)
--- a/packages/apt/apt-native_0.7.3.bb
+++ b/packages/apt/apt-native_0.7.3.bb
@@ -1,5 +1,5 @@
 require apt-native.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"

diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf
index 9e90616..2bd9ddb 100644 (file)
--- a/packages/apt/files/apt.conf
+++ b/packages/apt/files/apt.conf
@@ -1,4 +1,4 @@
-Dir "${STAGING_DIR}/"
+Dir "${STAGING_DIR_NATIVE}/"
 {
    State "var/lib/apt/"
    {