summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-29 10:53:23 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-29 10:53:23 +0000
commit85e27da51a24b2d55495ff512548eedec35ddaf4 (patch)
tree15e03f9af5d82cb17b478f22cd82cea6c7770fe9 /meta
parentb7880fab82a400ff098fbde643fe1b2913d83330 (diff)
downloadpoky-85e27da51a24b2d55495ff512548eedec35ddaf4.tar.gz
rootfs_deb.bbclass: Reverse sources.list file to correct repository priorities. Add Release file to sources giving a Label. Update preferences file to use source labels instead of paths
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@976 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/rootfs_deb.bbclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 87a2bd6424..461b8bc939 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -5,7 +5,7 @@ fakeroot rootfs_deb_do_rootfs () {
5 set +e 5 set +e
6 mkdir -p ${IMAGE_ROOTFS}/var/dpkg/{info,updates} 6 mkdir -p ${IMAGE_ROOTFS}/var/dpkg/{info,updates}
7 7
8 rm -f ${STAGING_DIR}/etc/apt/sources.list 8 rm -f ${STAGING_DIR}/etc/apt/sources.list.rev
9 rm -f ${STAGING_DIR}/etc/apt/preferences 9 rm -f ${STAGING_DIR}/etc/apt/preferences
10 > ${IMAGE_ROOTFS}/var/dpkg/status 10 > ${IMAGE_ROOTFS}/var/dpkg/status
11 > ${IMAGE_ROOTFS}/var/dpkg/available 11 > ${IMAGE_ROOTFS}/var/dpkg/available
@@ -21,14 +21,18 @@ fakeroot rootfs_deb_do_rootfs () {
21 rm -f Packages.gz Packages Packages.bz2 21 rm -f Packages.gz Packages Packages.bz2
22 # fi 22 # fi
23 apt-ftparchive packages . | bzip2 > Packages.bz2 23 apt-ftparchive packages . | bzip2 > Packages.bz2
24 echo "Label: $arch" > Release
24 25
25 echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}/etc/apt/sources.list 26 echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}/etc/apt/sources.list.rev
26 (echo "Package: *" 27 (echo "Package: *"
27 echo "Pin origin ${DEPLOY_DIR_DEB}/$arch" 28 echo "Pin: release l=$arch"
28 echo "Pin-Priority: $((800 + $priority))") >> ${STAGING_DIR}/etc/apt/preferences 29 echo "Pin-Priority: $((800 + $priority))"
30 echo) >> ${STAGING_DIR}/etc/apt/preferences
29 priority=$(expr $priority + 5) 31 priority=$(expr $priority + 5)
30 done 32 done
31 33
34 tac ${STAGING_DIR}/etc/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
35
32 cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \ 36 cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
33 | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ 37 | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
34 > "${STAGING_DIR}/etc/apt/apt-rootfs.conf" 38 > "${STAGING_DIR}/etc/apt/apt-rootfs.conf"