diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2007-11-17 23:21:03 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2007-11-17 23:21:03 +0000 |
commit | 4b751ba2557d2e3f448f92589ee0c9d5e30f6388 (patch) | |
tree | 1d6d10ef0f954314d31dba063faa454bf33d05f1 /classes/rootfs_deb.bbclass | |
parent | 702d82aa16bb05d638353677359846af2d125674 (diff) | |
download | openembedded-4b751ba2557d2e3f448f92589ee0c9d5e30f6388.tar.gz |
classes: Sync staging layout cleanups from Poky
Diffstat (limited to 'classes/rootfs_deb.bbclass')
-rw-r--r-- | classes/rootfs_deb.bbclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 5571f699e7..935ef6e3f7 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -10,8 +10,8 @@ fakeroot rootfs_deb_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates - rm -f ${STAGING_DIR}${sysconfdir}/apt/sources.list.rev - rm -f ${STAGING_DIR}${sysconfdir}/apt/preferences + rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev + rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences > ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/available # > ${STAGING_DIR}/var/dpkg/status @@ -28,25 +28,27 @@ fakeroot rootfs_deb_do_rootfs () { apt-ftparchive packages . | bzip2 > Packages.bz2 echo "Label: $arch" > Release - echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}${sysconfdir}/apt/sources.list.rev + echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev (echo "Package: *" echo "Pin: release l=$arch" echo "Pin-Priority: $((800 + $priority))" - echo) >> ${STAGING_DIR}${sysconfdir}/apt/preferences + echo) >> ${STAGING_ETCDIR_NATIVE}/apt/preferences priority=$(expr $priority + 5) done - tac ${STAGING_DIR}${sysconfdir}/apt/sources.list.rev > ${STAGING_DIR}${sysconfdir}/apt/sources.list + tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list - cat "${STAGING_DIR}${sysconfdir}/apt/apt.conf.sample" \ + cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ - > "${STAGING_DIR}${sysconfdir}/apt/apt-rootfs.conf" + > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" - export APT_CONFIG="${STAGING_DIR}${sysconfdir}/apt/apt-rootfs.conf" + export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" export D=${IMAGE_ROOTFS} export OFFLINE_ROOT=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} + mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives + apt-get update _flag () { |