diff options
author | Fredrik Gustafsson <fredrik.gustafsson@axis.com> | 2020-07-24 16:42:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-27 19:58:10 +0100 |
commit | a0416ca06e9150b19bc572f3ad6a49428312961e (patch) | |
tree | 4ff520839a5c7bb4a8919bfd882342328575111c /meta/lib/oe/rootfs.py | |
parent | 34dc8571d2d7c2bb9b5f92e157ab91e9d4f9e992 (diff) | |
download | poky-a0416ca06e9150b19bc572f3ad6a49428312961e.tar.gz |
rpm: Move manifest to its own subdir
This is a part of a refactor that will split the package manager
code so that it's possible to use other package managers in other
layers.
(From OE-Core rev: 87a1c8ee406f73e53888df3b682e8a5f0f610c2f)
Signed-off-by: Fredrik Gustafsson <fredrigu@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 0e05f1f75e..c674551764 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -11,7 +11,7 @@ import shutil | |||
11 | import os | 11 | import os |
12 | import subprocess | 12 | import subprocess |
13 | import re | 13 | import re |
14 | 14 | from oe.package_manager.rpm.manifest import RpmManifest | |
15 | 15 | ||
16 | class Rootfs(object, metaclass=ABCMeta): | 16 | class Rootfs(object, metaclass=ABCMeta): |
17 | """ | 17 | """ |
@@ -359,6 +359,7 @@ class RpmRootfs(Rootfs): | |||
359 | self.log_check_regex = r'(unpacking of archive failed|Cannot find package'\ | 359 | self.log_check_regex = r'(unpacking of archive failed|Cannot find package'\ |
360 | r'|exit 1|ERROR: |Error: |Error |ERROR '\ | 360 | r'|exit 1|ERROR: |Error: |Error |ERROR '\ |
361 | r'|Failed |Failed: |Failed$|Failed\(\d+\):)' | 361 | r'|Failed |Failed: |Failed$|Failed\(\d+\):)' |
362 | |||
362 | self.manifest = RpmManifest(d, manifest_dir) | 363 | self.manifest = RpmManifest(d, manifest_dir) |
363 | 364 | ||
364 | self.pm = RpmPM(d, | 365 | self.pm = RpmPM(d, |