diff options
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r-- | meta/lib/oe/package_manager.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f5a22abca7..3632a7af94 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -108,6 +108,7 @@ class RpmIndexer(Indexer): archs = archs.union(set(sdk_pkg_archs)) rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo") + index_cmds = [] rpm_dirs_found = False for arch in archs: @@ -127,9 +128,16 @@ class RpmIndexer(Indexer): bb.note("There are no packages in %s" % self.deploy_dir) return + # Create repodata result = oe.utils.multiprocess_exec(index_cmds, create_index) if result: bb.fatal('%s' % ('\n'.join(result))) + # Copy pubkey to repo + distro_version = self.d.getVar('DISTRO_VERSION', True) or "oe.0" + if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1': + shutil.copy2(self.d.getVar('RPM_GPG_PUBKEY', True), + os.path.join(self.deploy_dir, + 'RPM-GPG-KEY-%s' % distro_version)) class OpkgIndexer(Indexer): @@ -352,6 +360,9 @@ class RpmPkgsList(PkgsList): pkg = line.split()[0] arch = line.split()[1] ver = line.split()[2] + # Skip GPG keys + if pkg == 'gpg-pubkey': + continue if self.rpm_version == 4: pkgorigin = "unknown" else: @@ -864,6 +875,12 @@ class RpmPM(PackageManager): except subprocess.CalledProcessError as e: bb.fatal("Create rpm database failed. Command '%s' " "returned %d:\n%s" % (cmd, e.returncode, e.output)) + # Import GPG key to RPM database of the target system + if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1': + pubkey_path = self.d.getVar('RPM_GPG_PUBKEY', True) + cmd = "%s --root %s --dbpath /var/lib/rpm --import %s > /dev/null" % ( + self.rpm_cmd, self.target_rootfs, pubkey_path) + subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) # Configure smart bb.note("configuring Smart settings") |