Hi, On 26/08/15 18:04, "Mark Hatle" <mark.ha...@windriver.com> wrote:
>On 8/26/15 6:18 AM, Markus Lehtonen wrote: >> This patch adds a new bbclass for generating rpm packages that are >> signed with a user defined key. The packages are signed as part of the >> "package_write_rpm" task. >> >> In order to enable the feature you need to >> 1. 'INHERIT += " sign_rpm"' in bitbake config (e.g. local or >> distro) >> 2. Create a file that contains the passphrase to your gpg secret key >> 3. 'RPM_GPG_PASSPHRASE_FILE = "<path_to_file>" in bitbake config, >> pointing to the passphrase file created in 2. >> 4. Define GPG key name to use by either defining >> 'RPM_GPG_NAME = "<key_id>" in bitbake config OR by defining >> %_gpg_name <key_id> in your ~/.oerpmmacros file >> 5. 'RPM_GPG_PUBKEY = "<path_to_pubkey>" in bitbake config pointing to >> the public key (in "armor" format) >> >> The sign_rpm.bbclass implements a simple scenario of locally signing the >> packages. It could be replaced by a more advanced class that would >> utilize a separate signing server for signing the packages, for example. >> >> [YOCTO #8134] >> >> Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com> >> --- >> meta/classes/package_rpm.bbclass | 5 ++++ >> meta/classes/sign_rpm.bbclass | 58 >>++++++++++++++++++++++++++++++++++++++++ >> meta/lib/oe/package_manager.py | 28 +++++++++++++++++++ >> 3 files changed, 91 insertions(+) >> create mode 100644 meta/classes/sign_rpm.bbclass >> >> diff --git a/meta/classes/package_rpm.bbclass >>b/meta/classes/package_rpm.bbclass >> index 8fd0685..3e933ef 100644 >> --- a/meta/classes/package_rpm.bbclass >> +++ b/meta/classes/package_rpm.bbclass >> @@ -695,6 +695,8 @@ python do_package_rpm () { >> else: >> d.setVar('PACKAGE_ARCH_EXTEND', package_arch) >> pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') >> + d.setVar('RPM_PKGWRITEDIR', pkgwritedir) >> + bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR', True)) >> pkgarch = >>d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') >> magicfile = >>d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc') >> bb.utils.mkdirhier(pkgwritedir) >> @@ -730,6 +732,9 @@ python do_package_rpm () { >> d.setVar('BUILDSPEC', cmd + "\n") >> d.setVarFlag('BUILDSPEC', 'func', '1') >> bb.build.exec_func('BUILDSPEC', d) >> + >> + if d.getVar('RPM_SIGN_PACKAGES', True) == '1': >> + bb.build.exec_func("sign_rpm", d) >> } >> >> python () { >> diff --git a/meta/classes/sign_rpm.bbclass >>b/meta/classes/sign_rpm.bbclass >> new file mode 100644 >> index 0000000..ddf6c3b >> --- /dev/null >> +++ b/meta/classes/sign_rpm.bbclass >> @@ -0,0 +1,58 @@ >> +inherit sanity >> + >> +RPM_SIGN_PACKAGES='1' >> + >> + >> +_check_gpg_name () { >> + macrodef=`rpm -E '%_gpg_name'` >> + [ "$macrodef" == "%_gpg_name" ] && return 1 || return 0 >> +} >> + >> + >> +def rpmsign_wrapper(d, files, passphrase, gpg_name=None): >> + import pexpect >> + >> + # Find the correct rpm binary >> + rpm_bin_path = d.getVar('STAGING_BINDIR_NATIVE', True) + '/rpm' >> + cmd = rpm_bin_path + " --addsign " >> + if gpg_name: >> + cmd += "--define '%%_gpg_name %s' " % gpg_name >> + else: >> + try: >> + bb.build.exec_func('_check_gpg_name', d) >> + except bb.build.FuncFailed: >> + raise_sanity_error("You need to define RPM_GPG_NAME in >>bitbake " >> + "config or the %_gpg_name RPM macro >>defined " >> + "(e.g. in ~/.oerpmmacros", d) >> + cmd += ' '.join(files) >> + >> + # Need to use pexpect for feeding the passphrase >> + proc = pexpect.spawn(cmd) >> + try: >> + proc.expect_exact('Enter pass phrase:', timeout=15) >> + proc.sendline(passphrase) >> + proc.expect(pexpect.EOF, timeout=900) >> + proc.close() >> + except pexpect.TIMEOUT as err: >> + bb.debug('rpmsign timeout: %s' % err) >> + proc.terminate() >> + return proc.exitstatus >> + >> + >> +python sign_rpm () { >> + import glob >> + >> + rpm_gpg_pass_file = (d.getVar("RPM_GPG_PASSPHRASE_FILE", True) or >>"") >> + if rpm_gpg_pass_file: >> + with open(rpm_gpg_pass_file) as fobj: >> + rpm_gpg_passphrase = fobj.readlines()[0].rstrip('\n') >> + else: >> + raise_sanity_error("You need to define RPM_GPG_PASSPHRASE_FILE >>in the config", d) >> + >> + rpm_gpg_name = (d.getVar("RPM_GPG_NAME", True) or "") >> + >> + rpms = glob.glob(d.getVar('RPM_PKGWRITEDIR', True) + '/*') >> + >> + if rpmsign_wrapper(d, rpms, rpm_gpg_passphrase, rpm_gpg_name) != 0: >> + raise bb.build.FuncFailed("RPM signing failed") >> +} >> diff --git a/meta/lib/oe/package_manager.py >>b/meta/lib/oe/package_manager.py >> index 2ab1d78..753b3eb 100644 >> --- a/meta/lib/oe/package_manager.py >> +++ b/meta/lib/oe/package_manager.py >> @@ -108,7 +108,14 @@ class RpmIndexer(Indexer): >> archs = archs.union(set(sdk_pkg_archs)) >> >> rpm_createrepo = bb.utils.which(os.getenv('PATH'), >>"createrepo") >> + rpm_bin = bb.utils.which(os.getenv('PATH'), "rpm") >> + if self.d.getVar('RPM_SIGN_PACKAGES', True) == '1': >> + rpm_pubkey = self.d.getVar('RPM_GPG_PUBKEY', True) >> + else: >> + rpm_pubkey = None >> + >> index_cmds = [] >> + key_import_cmds = [] >> rpm_dirs_found = False >> for arch in archs: >> dbpath = os.path.join(self.d.getVar('WORKDIR', True), >>'rpmdb', arch) >> @@ -118,6 +125,9 @@ class RpmIndexer(Indexer): >> if not os.path.isdir(arch_dir): >> continue >> >> + if rpm_pubkey: >> + key_import_cmds.append("%s --define '_dbpath %s' >>--import %s" % >> + (rpm_bin, dbpath, rpm_pubkey)) >> index_cmds.append("%s --dbpath %s --update -q %s" % \ >> (rpm_createrepo, dbpath, arch_dir)) >> >> @@ -127,9 +137,18 @@ class RpmIndexer(Indexer): >> bb.note("There are no packages in %s" % self.deploy_dir) >> return >> >> + # Import GPG key to all temporary RPMDBs >> + result = oe.utils.multiprocess_exec(key_import_cmds, >>create_index) >> + if result: >> + bb.fatal('%s' % ('\n'.join(result))) >> + # Create repodata >> result = oe.utils.multiprocess_exec(index_cmds, create_index) >> if result: >> bb.fatal('%s' % ('\n'.join(result))) >> + # Copy pubkey to repo >> + 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-oe')) > >Do you really need to do the above hunk? > >createrepo can very easily be modified to ignore the key in a signed >package >from being validated as the repository information is created. > >The only reason why I think you'd want to do the above is simply to have >createrepo verify the (externally signed) package has not been >modified/corrupted before createrepo runs. (Even if it has, the test >would fail >for people using the package feed... so I think it's unlikely to be an >issue.) Yes, I was thinking this as a verification step. But, you're right, the signature is checked in any case when the package is used (i.e. when creating an image or installing packages from the feed). Thus, I think you're suggestion is preferable. >Without pasting the whole patch: > >--- createrepo-0.4.11.orig/dumpMetadata.py >+++ createrepo-0.4.11/dumpMetadata.py >@@ -92,7 +92,7 @@ def returnHdr(ts, package): >- ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD)) >+ >ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD|rpm.RPMVSF_NODSA|rp >m.RPMVSF_NORSA|rpm.RPMVSF_NODSAHEADER|rpm.RPMVSF_NORSAHEADER)) > >I can send up this change if you think it's useful in this case (and would >eliminate these steps.) I can introduce a separate patch in the next version of this patchset. > >(The reason I question the steps is purely because we've seen in the past >these >temporary RPM databases seem to be fragile at times. So anything we can >do to >avoid that is probably good.) Yes. Thanks, Markus -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core