diff options
| author | Roman I Khimov <khimov@altell.ru> | 2009-06-17 23:22:57 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2009-06-19 00:15:08 +0400 |
| commit | 5f920c841a4d83fb903ccdf9127cb0fb5617eda1 (patch) | |
| tree | 4adc17a542fc6955efdfc6def65e9c9f48467b0c | |
| parent | 68a8be99518c624816d238ee2ebb5e602a4c62ac (diff) | |
Make package_update_index_ipk proper task with locking
Parallel image builds race in package_update_index_ipk, so locking is
needed and for a proper lock package_update_index_ipk needs to be a
proper task.
Acked-by: Tom Rini <trini@embeddedalley.com>
| -rw-r--r-- | classes/package_ipk.bbclass | 9 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 4 | ||||
| -rw-r--r-- | recipes/meta/canadian-sdk.bb | 3 | ||||
| -rw-r--r-- | recipes/meta/meta-toolchain.bb | 3 | ||||
| -rw-r--r-- | recipes/meta/package-index.bb | 6 |
5 files changed, 12 insertions, 13 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index d4cb3b62e2..1f1b5c9a79 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -67,10 +67,16 @@ python package_ipk_install () { raise bb.build.FuncFailed } +do_package_update_index_ipk[lockfiles] = "${DEPLOY_DIR_IPK}.lock" +do_package_update_index_ipk[nostamp] = "1" +do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk" +do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk" +do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_staging" + # # Update the Packages index files in ${DEPLOY_DIR_IPK} # -package_update_index_ipk () { +do_package_update_index_ipk () { set -x ipkgarchs="${PACKAGE_ARCHS}" @@ -322,3 +328,4 @@ python do_package_write_ipk () { } do_package_write_ipk[dirs] = "${D}" addtask package_write_ipk before do_package_write after do_package +addtask package_update_index_ipk before do_rootfs diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 99a8ed22c2..16dd511fcb 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -5,8 +5,7 @@ # See image.bbclass for a usage of this. # -do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" -do_rootfs[recrdeptask] += "do_package_write_ipk" +do_rootfs[depends] += "opkg-native:do_populate_staging" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" @@ -29,7 +28,6 @@ PACKAGE_INSTALL_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "non fakeroot rootfs_ipk_do_rootfs () { set -x - package_update_index_ipk package_generate_ipkg_conf mkdir -p ${T} diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 809173b42f..86b645bb7f 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -56,7 +56,6 @@ do_populate_sdk() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} - package_update_index_ipk package_generate_ipkg_conf for arch in ${PACKAGE_ARCHS}; do @@ -170,5 +169,5 @@ do_populate_sdk() { } do_populate_sdk[nostamp] = "1" -do_populate_sdk[recrdeptask] = "do_package_write" +addtask package_update_index_ipk before do_populate_sdk addtask populate_sdk before do_build after do_install diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index b641be1295..b8ed8013a9 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -56,7 +56,6 @@ do_populate_sdk() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} - package_update_index_ipk package_generate_ipkg_conf for arch in ${PACKAGE_ARCHS}; do @@ -170,5 +169,5 @@ do_populate_sdk() { } do_populate_sdk[nostamp] = "1" -do_populate_sdk[recrdeptask] = "do_package_write" +addtask package_update_index_ipk before do_populate_sdk addtask populate_sdk before do_build after do_install diff --git a/recipes/meta/package-index.bb b/recipes/meta/package-index.bb index f52fb6c72b..ce8b999e16 100644 --- a/recipes/meta/package-index.bb +++ b/recipes/meta/package-index.bb @@ -23,8 +23,4 @@ do_stage() { do_build[nostamp] = "1" do_build[dirs] = "${DEPLOY_DIR_IPK}" -do_build() { - set -ex - package_update_index_ipk - set +ex -} +addtask package_update_index_ipk before do_build |