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 | |
| 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>
| -rw-r--r-- | meta/lib/oe/package_manager.py | 15 | ||||
| -rw-r--r-- | meta/lib/oe/rootfs.py | 5 |
2 files changed, 12 insertions, 8 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 69bef1dfbc..c9a8084bf2 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -578,7 +578,8 @@ class RpmPM(PackageManager): self.fullpkglist = list() self.deploy_dir = self.d.getVar('DEPLOY_DIR_RPM', True) self.etcrpm_dir = os.path.join(self.target_rootfs, "etc/rpm") - self.install_dir = os.path.join(self.target_rootfs, "install") + self.install_dir_name = "oe_install" + self.install_dir_path = os.path.join(self.target_rootfs, self.install_dir_name) self.rpm_cmd = bb.utils.which(os.getenv('PATH'), "rpm") self.smart_cmd = bb.utils.which(os.getenv('PATH'), "smart") self.smart_opt = "--quiet --data-dir=" + os.path.join(target_rootfs, @@ -749,9 +750,9 @@ class RpmPM(PackageManager): bb.utils.mkdirhier(self.etcrpm_dir) # Setup temporary directory -- install... - if os.path.exists(self.install_dir): - bb.utils.remove(self.install_dir, True) - bb.utils.mkdirhier(os.path.join(self.install_dir, 'tmp')) + if os.path.exists(self.install_dir_path): + bb.utils.remove(self.install_dir_path, True) + bb.utils.mkdirhier(os.path.join(self.install_dir_path, 'tmp')) channel_priority = 5 platform_dir = os.path.join(self.etcrpm_dir, "platform") @@ -838,7 +839,7 @@ class RpmPM(PackageManager): self._invoke_smart('config --set rpm-dbpath=/var/lib/rpm') self._invoke_smart('config --set rpm-extra-macros._var=%s' % self.d.getVar('localstatedir', True)) - cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp' + cmd = "config --set rpm-extra-macros._tmppath=/%s/tmp" % (self.install_dir_name) prefer_color = self.d.getVar('RPM_PREFER_ELF_ARCH', True) if prefer_color: @@ -992,7 +993,7 @@ class RpmPM(PackageManager): cmd += "--dbpath=/var/lib/rpm " cmd += "--define='_cross_scriptlet_wrapper %s' " % \ self.scriptlet_wrapper - cmd += "--define='_tmppath /install/tmp' %s" % ' '.join(pkgs) + cmd += "--define='_tmppath /%s/tmp' %s" % (self.install_dir_name, ' '.join(pkgs)) else: # for pkg in pkgs: # bb.note('Debug: What required: %s' % pkg) @@ -1027,7 +1028,7 @@ class RpmPM(PackageManager): bb.utils.remove(os.path.join(self.target_rootfs, 'var/lib/opkg'), True) # remove temp directory - bb.utils.remove(self.d.expand('${IMAGE_ROOTFS}/install'), True) + bb.utils.remove(self.install_dir_path, True) def backup_packaging_data(self): # Save the rpmlib for increment rpm image generation 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): |