diff options
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 54d6c613c8..b511afd374 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -379,7 +379,14 @@ package_install_internal_rpm () { | |||
| 379 | 379 | ||
| 380 | fi | 380 | fi |
| 381 | 381 | ||
| 382 | cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest | 382 | # If base-passwd or shadow are in the list of packages to install, |
| 383 | # ensure they are installed first to support later packages that | ||
| 384 | # may create custom users/groups (fixes Yocto bug #2127) | ||
| 385 | infile=${target_rootfs}/install/install_solution.manifest | ||
| 386 | outfile=${target_rootfs}/install/total_solution.manifest | ||
| 387 | cat $infile | grep /base-passwd-[0-9] > $outfile || true | ||
| 388 | cat $infile | grep /shadow-[0-9] >> $outfile || true | ||
| 389 | cat $infile | grep -v /shadow-[0-9] | grep -v /base-passwd-[0-9] >> $outfile | ||
| 383 | cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest | 390 | cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest |
| 384 | 391 | ||
| 385 | # Construct install scriptlet wrapper | 392 | # Construct install scriptlet wrapper |