diff options
Diffstat (limited to 'classes/rootfs_deb.bbclass')
| -rw-r--r-- | classes/rootfs_deb.bbclass | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 935ef6e3f7..dc2b2cb02c 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -1,6 +1,8 @@ # # Copyright 2006-2007 Openedhand Ltd. # +ROOTFS_PKGMANAGE = "run-postinsts dpkg" +ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging" do_rootfs[recrdeptask] += "do_package_write_deb" @@ -14,7 +16,7 @@ fakeroot rootfs_deb_do_rootfs () { rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences > ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/available - # > ${STAGING_DIR}/var/dpkg/status + mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives priority=1 for arch in ${PACKAGE_ARCHS}; do @@ -22,10 +24,12 @@ fakeroot rootfs_deb_do_rootfs () { continue; fi cd ${DEPLOY_DIR_DEB}/$arch - # if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - rm -f Packages.gz Packages Packages.bz2 - # fi - apt-ftparchive packages . | bzip2 > Packages.bz2 + rm -f Packages.gz Packages Packages.bz2 + + # apt-native ignores Packages.bz2 unless /bin/bzip2 exists + # on the build host, so stick with gzip + dpkg-scanpackages . | gzip > Packages.gz + echo "Label: $arch" > Release echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev @@ -39,15 +43,16 @@ fakeroot rootfs_deb_do_rootfs () { tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ - | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ + | sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \ + | sed -e 's#status ".*";#status "${IMAGE_ROOTFS}/var/dpkg/status";#' \ + | sed -e 's#DPkg::Options {".*"};#DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"};#' \ > "${STAGING_ETCDIR_NATIVE}/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 + export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} apt-get update @@ -79,12 +84,20 @@ fakeroot rootfs_deb_do_rootfs () { if [ $? -ne 0 ]; then exit 1 fi - find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do - mv $i `echo $i | sed -e's,\.dpkg-new$,,'` - done done fi + rm ${WORKDIR}/temp/log.do_$target-attemptonly.${PID} + if [ ! -z "${PACKAGE_INSTALL_ATTEMPTONLY}" ]; then + for i in ${PACKAGE_INSTALL_ATTEMPTONLY}; do + apt-get install $i --force-yes --allow-unauthenticated >> ${WORKDIR}/temp/log.do_rootfs-attemptonly.${PID} || true + done + fi + + find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do + mv $i `echo $i | sed -e's,\.dpkg-new$,,'` + done + install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version @@ -109,22 +122,14 @@ fakeroot rootfs_deb_do_rootfs () { set -e - # Hacks to make dpkg/ipkg coexist for now - mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/ - if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then - rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives + # Hacks to allow opkg's update-alternatives and opkg to coexist for now + mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg + if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then + rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives fi - if [ ! -e ${IMAGE_ROOTFS}${libdir}/ipkg ] ; then - mkdir -p ${IMAGE_ROOTFS}${libdir}/ipkg - fi - - if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/ipkg ] ; then - mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ipkg - fi - - ln -sf ${libdir}/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives - ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}${libdir}/ipkg/info - ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}${libdir}/ipkg/status + ln -s ${libdir}/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives + ln -s /var/dpkg/info ${IMAGE_ROOTFS}${libdir}/opkg/info + ln -s /var/dpkg/status ${IMAGE_ROOTFS}${libdir}/opkg/status ${ROOTFS_POSTPROCESS_COMMAND} @@ -152,6 +157,6 @@ rootfs_deb_log_check() { } remove_packaging_data_files() { - rm -rf ${IMAGE_ROOTFS}${libdir}/ipkg/ + rm -rf ${IMAGE_ROOTFS}${libdir}/opkg/ rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ } |