diff options
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index eeb2f3f4c4..43ea5cecd0 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -41,12 +41,13 @@ rootfs_create_combined_feed() { # Set DEPLOY_ENABLE_OEFEED=2 to rebuild Packages with ipkg-make-index (very slow) # Set DEPLOY_ENABLE_OEFEED=1 to use the Packages files from ipk/ARCH/ (fast) - mkdir -p "${DEPLOY_DIR}/oe-feed" - cd "${DEPLOY_DIR}/oe-feed" || exit 1 + OLD_PWD="$PWD" # To catch deleted / changed packages, we have to completly rebuild # the symlinks every time. test -d "${DEPLOY_DIR}/oe-feed" && rm -rf "${DEPLOY_DIR}/oe-feed/" + mkdir -p "${DEPLOY_DIR}/oe-feed" + cd "${DEPLOY_DIR}/oe-feed" || exit 1 case "${DEPLOY_ENABLE_OEFEED}" in 1) MAKE_INDEX_TYPE="fast" ;; @@ -74,6 +75,9 @@ rootfs_create_combined_feed() { touch ${DEPLOY_DIR}/oe-feed/Packages ipkg-make-index -r ${DEPLOY_DIR}/oe-feed/Packages -p ${DEPLOY_DIR}/oe-feed/Packages -l ${DEPLOY_DIR}/oe-feed/Packages.filelist -m ${DEPLOY_DIR}/oe-feed/ fi + + # Some *-image.bb's are kinda touchy-feely about a changing $PWD + cd "$OLD_PWD" } fakeroot rootfs_ipk_do_rootfs () { |