diff options
| author | Saul Wold <sgw@linux.intel.com> | 2015-03-16 11:21:30 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:03:15 +0000 |
| commit | 335effec42099666d0fb433b31981edcb0dae9a0 (patch) | |
| tree | 1c7484009257390d230072bd4fce70358144288f /meta/lib/oe/rootfs.py | |
| parent | d91ed126eead8b09a4ddfe5cc11db16dda71273f (diff) | |
| download | openembedded-core-335effec42099666d0fb433b31981edcb0dae9a0.tar.gz openembedded-core-335effec42099666d0fb433b31981edcb0dae9a0.tar.bz2 openembedded-core-335effec42099666d0fb433b31981edcb0dae9a0.zip | |
package_manager: Create variable for install_dir_name
This patch creates a variable for the install_dir name so it can be
something other than /install, also by doing this we can correctly
clean up the empty directories (/install/tmp) during the clean-up
phase. The new default is /oe_install so as to not conflict with other
possible packages that might use /install to place files.
[YOCTO #7353]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 7e8d5d15a2..a18472aeeb 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -409,7 +409,10 @@ class RpmRootfs(Rootfs): # __db.00* (Berkeley DB files that hold locks, rpm specific environment # settings, etc.), that should not get into the final rootfs self.pm.unlock_rpm_db() - bb.utils.remove(self.image_rootfs + "/install", True) + if os.path.isdir(self.pm.install_dir_path + "/tmp") and not os.listdir(self.pm.install_dir_path + "/tmp"): + bb.utils.remove(self.pm.install_dir_path + "/tmp", True) + if os.path.isdir(self.pm.install_dir_path) and not os.listdir(self.pm.install_dir_path): + bb.utils.remove(self.pm.install_dir_path, True) class DpkgRootfs(Rootfs): |