summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-03-22 21:43:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:03:08 +0000
commit3d2d3cb379608301b17ce57787d324c2f06bf4f9 (patch)
treeb96ad424da9d0ccd0046469cee66b227596858b3 /meta
parentaff0373d8bfb7e9ea600fcc558433387818c520a (diff)
downloadopenembedded-core-3d2d3cb379608301b17ce57787d324c2f06bf4f9.tar.gz
openembedded-core-3d2d3cb379608301b17ce57787d324c2f06bf4f9.tar.bz2
openembedded-core-3d2d3cb379608301b17ce57787d324c2f06bf4f9.zip
package_rpm.bbclass: ensure base-passwd and shadow get installed first
When generating images, we need to make sure that base-passwd and shadow get installed before other packages, which might need to create custom user accounts. Thanks to Richard Purdie for the initial version of this fix. This fixes [YOCTO #2127] Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 80b16198d3..e83fc552c9 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -439,7 +439,14 @@ package_install_internal_rpm () {
fi
- cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
+ # If base-passwd or shadow are in the list of packages to install,
+ # ensure they are installed first to support later packages that
+ # may create custom users/groups (fixes Yocto bug #2127)
+ infile=${target_rootfs}/install/install_solution.manifest
+ outfile=${target_rootfs}/install/total_solution.manifest
+ cat $infile | grep /base-passwd-[0-9] > $outfile || true
+ cat $infile | grep /shadow-[0-9] >> $outfile || true
+ cat $infile | grep -v /shadow-[0-9] | grep -v /base-passwd-[0-9] >> $outfile
cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
# Construct install scriptlet wrapper