diff options
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r-- | meta/lib/oe/package_manager.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index b0660411ea..502dfbe3ed 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -403,7 +403,7 @@ class PackageManager(object, metaclass=ABCMeta): | |||
403 | bb.utils.remove(self.intercepts_dir, True) | 403 | bb.utils.remove(self.intercepts_dir, True) |
404 | bb.utils.mkdirhier(self.intercepts_dir) | 404 | bb.utils.mkdirhier(self.intercepts_dir) |
405 | for intercept in postinst_intercepts: | 405 | for intercept in postinst_intercepts: |
406 | bb.utils.copyfile(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept))) | 406 | shutil.copy(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept))) |
407 | 407 | ||
408 | @abstractmethod | 408 | @abstractmethod |
409 | def _handle_intercept_failure(self, failed_script): | 409 | def _handle_intercept_failure(self, failed_script): |
@@ -611,12 +611,13 @@ class PackageManager(object, metaclass=ABCMeta): | |||
611 | "'%s' returned %d:\n%s" % | 611 | "'%s' returned %d:\n%s" % |
612 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) | 612 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) |
613 | 613 | ||
614 | target_arch = self.d.getVar('TARGET_ARCH') | 614 | if self.d.getVar('IMAGE_LOCALES_ARCHIVE') == '1': |
615 | localedir = oe.path.join(self.target_rootfs, self.d.getVar("libdir"), "locale") | 615 | target_arch = self.d.getVar('TARGET_ARCH') |
616 | if os.path.exists(localedir) and os.listdir(localedir): | 616 | localedir = oe.path.join(self.target_rootfs, self.d.getVar("libdir"), "locale") |
617 | generate_locale_archive(self.d, self.target_rootfs, target_arch, localedir) | 617 | if os.path.exists(localedir) and os.listdir(localedir): |
618 | # And now delete the binary locales | 618 | generate_locale_archive(self.d, self.target_rootfs, target_arch, localedir) |
619 | self.remove(fnmatch.filter(self.list_installed(), "glibc-binary-localedata-*"), False) | 619 | # And now delete the binary locales |
620 | self.remove(fnmatch.filter(self.list_installed(), "glibc-binary-localedata-*"), False) | ||
620 | 621 | ||
621 | def deploy_dir_lock(self): | 622 | def deploy_dir_lock(self): |
622 | if self.deploy_dir is None: | 623 | if self.deploy_dir is None: |