[oe-commits] org.oe.dev rootfs_deb.bbclass: Fix apt.conf handling (from poky)

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7389f2e99d76aac4eac93cb8bb1442c12e9d61bc
ViewMTN: http://monotone.openembedded.org/revision/info/7389f2e99d76aac4eac93cb8bb1442c12e9d61bc
Files:
1
classes/rootfs_deb.bbclass
packages/apt/apt-native_0.6.46.2.bb
packages/apt/apt-native_0.7.2.bb
packages/apt/apt-native_0.7.3.bb
packages/apt/files/apt.conf
Diffs:

#
# mt diff -rc7964e38f040b1e29b994ba2c8d3593596fb22d7 -r7389f2e99d76aac4eac93cb8bb1442c12e9d61bc
#
# 
# 
# patch "classes/rootfs_deb.bbclass"
#  from [e8db3994e43f6306e9aa0a2b2d8c58e06e87b803]
#    to [1c50f0fcce662bacf2c6333a068ce2d725a9a0fa]
# 
# patch "packages/apt/apt-native_0.6.46.2.bb"
#  from [4fff433a631dd3b390cedffba74b1a4f6e27c067]
#    to [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
# 
# patch "packages/apt/apt-native_0.7.2.bb"
#  from [df9f37be753866b1cc3ed597d51f32c1b95bfb30]
#    to [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
# 
# patch "packages/apt/apt-native_0.7.3.bb"
#  from [8dc4f447d98f36e642ab9f2f30fcdbee93e157fa]
#    to [b0989d5e0870cc4e217b461d8365a97faa3193c6]
# 
# patch "packages/apt/files/apt.conf"
#  from [efa1759f4e7e6b32306177bf4462c89759ca5466]
#    to [53637caf02a561e87535f655e947e10993c4bc70]
# 
============================================================
--- classes/rootfs_deb.bbclass	e8db3994e43f6306e9aa0a2b2d8c58e06e87b803
+++ classes/rootfs_deb.bbclass	1c50f0fcce662bacf2c6333a068ce2d725a9a0fa
@@ -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"
 
============================================================
--- packages/apt/apt-native_0.6.46.2.bb	4fff433a631dd3b390cedffba74b1a4f6e27c067
+++ packages/apt/apt-native_0.6.46.2.bb	df9f37be753866b1cc3ed597d51f32c1b95bfb30
@@ -1,4 +1,5 @@ require apt-native.inc
 require apt-native.inc
+PR = "r1"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-native_0.7.2.bb	df9f37be753866b1cc3ed597d51f32c1b95bfb30
+++ packages/apt/apt-native_0.7.2.bb	8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
@@ -1,5 +1,5 @@ require apt-native.inc
 require apt-native.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/apt-native_0.7.3.bb	8dc4f447d98f36e642ab9f2f30fcdbee93e157fa
+++ packages/apt/apt-native_0.7.3.bb	b0989d5e0870cc4e217b461d8365a97faa3193c6
@@ -1,5 +1,5 @@ require apt-native.inc
 require apt-native.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
============================================================
--- packages/apt/files/apt.conf	efa1759f4e7e6b32306177bf4462c89759ca5466
+++ packages/apt/files/apt.conf	53637caf02a561e87535f655e947e10993c4bc70
@@ -1,4 +1,4 @@
-Dir "${STAGING_DIR}/"
+Dir "${STAGING_DIR_NATIVE}/"
 {
    State "var/lib/apt/"
    {