classes/package_xxx.class: Use PKGE/PKGV/PKGR.
Use PKGE/PKGV/PKGR to build various package feed in tasks of pacakge_write_xxx. (From OE-Core rev: c2872315905fcdf6e4bf11fe96e5ca62af3475f8) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
66d27435be
commit
16f06f7135
|
@ -272,7 +272,7 @@ python do_package_deb () {
|
|||
except ValueError:
|
||||
pass
|
||||
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, True), bb.data.getVar('PR', localdata, True)))
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, True), bb.data.getVar('PKGR', localdata, True)))
|
||||
bb.utils.unlockfile(lf)
|
||||
continue
|
||||
|
||||
|
@ -288,11 +288,11 @@ python do_package_deb () {
|
|||
raise bb.build.FuncFailed("unable to open control file for writing.")
|
||||
|
||||
fields = []
|
||||
pe = bb.data.getVar('PE', d, True)
|
||||
pe = bb.data.getVar('PKGE', d, True)
|
||||
if pe and int(pe) > 0:
|
||||
fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
|
||||
fields.append(["Version: %s:%s-%s\n", ['PKGE', 'PKGV', 'PKGR']])
|
||||
else:
|
||||
fields.append(["Version: %s-%s\n", ['PV', 'PR']])
|
||||
fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']])
|
||||
fields.append(["Description: %s\n", ['DESCRIPTION']])
|
||||
fields.append(["Section: %s\n", ['SECTION']])
|
||||
fields.append(["Priority: %s\n", ['PRIORITY']])
|
||||
|
|
|
@ -241,7 +241,7 @@ python do_package_ipk () {
|
|||
except ValueError:
|
||||
pass
|
||||
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, 1), bb.data.getVar('PKGR', localdata, 1)))
|
||||
bb.utils.unlockfile(lf)
|
||||
continue
|
||||
|
||||
|
@ -254,11 +254,11 @@ python do_package_ipk () {
|
|||
raise bb.build.FuncFailed("unable to open control file for writing.")
|
||||
|
||||
fields = []
|
||||
pe = bb.data.getVar('PE', d, 1)
|
||||
pe = bb.data.getVar('PKGE', d, 1)
|
||||
if pe and int(pe) > 0:
|
||||
fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
|
||||
fields.append(["Version: %s:%s-%s\n", ['PKGE', 'PKGV', 'PKGR']])
|
||||
else:
|
||||
fields.append(["Version: %s-%s\n", ['PV', 'PR']])
|
||||
fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']])
|
||||
fields.append(["Description: %s\n", ['DESCRIPTION']])
|
||||
fields.append(["Section: %s\n", ['SECTION']])
|
||||
fields.append(["Priority: %s\n", ['PRIORITY']])
|
||||
|
|
|
@ -330,7 +330,7 @@ python write_specfile () {
|
|||
if dep and ver:
|
||||
if '-' in ver:
|
||||
subd = oe.packagedata.read_subpkgdata_dict(dep, d)
|
||||
pv = subd['PV']
|
||||
pv = subd['PKGV']
|
||||
reppv = pv.replace('-', '+')
|
||||
ver = ver.replace(pv, reppv)
|
||||
newdeps_dict[dep] = ver
|
||||
|
@ -383,9 +383,9 @@ python write_specfile () {
|
|||
# Construct the SPEC file...
|
||||
srcname = bb.data.getVar('PN', d, True)
|
||||
srcsummary = (bb.data.getVar('SUMMARY', d, True) or bb.data.getVar('DESCRIPTION', d, True) or ".")
|
||||
srcversion = bb.data.getVar('PV', d, True).replace('-', '+')
|
||||
srcrelease = bb.data.getVar('PR', d, True)
|
||||
srcepoch = (bb.data.getVar('PE', d, True) or "")
|
||||
srcversion = bb.data.getVar('PKGV', d, True).replace('-', '+')
|
||||
srcrelease = bb.data.getVar('PKGR', d, True)
|
||||
srcepoch = (bb.data.getVar('PKGE', d, True) or "")
|
||||
srclicense = bb.data.getVar('LICENSE', d, True)
|
||||
srcsection = bb.data.getVar('SECTION', d, True)
|
||||
srcmaintainer = bb.data.getVar('MAINTAINER', d, True)
|
||||
|
@ -438,9 +438,9 @@ python write_specfile () {
|
|||
splitname = pkgname
|
||||
|
||||
splitsummary = (bb.data.getVar('SUMMARY', localdata, True) or bb.data.getVar('DESCRIPTION', localdata, True) or ".")
|
||||
splitversion = (bb.data.getVar('PV', localdata, True) or "").replace('-', '+')
|
||||
splitrelease = (bb.data.getVar('PR', localdata, True) or "")
|
||||
splitepoch = (bb.data.getVar('PE', localdata, True) or "")
|
||||
splitversion = (bb.data.getVar('PKGV', localdata, True) or "").replace('-', '+')
|
||||
splitrelease = (bb.data.getVar('PKGR', localdata, True) or "")
|
||||
splitepoch = (bb.data.getVar('PKGE', localdata, True) or "")
|
||||
splitlicense = (bb.data.getVar('LICENSE', localdata, True) or "")
|
||||
splitsection = (bb.data.getVar('SECTION', localdata, True) or "")
|
||||
splitdescription = (bb.data.getVar('DESCRIPTION', localdata, True) or ".")
|
||||
|
|
|
@ -3,7 +3,7 @@ inherit package
|
|||
IMAGE_PKGTYPE ?= "tar"
|
||||
|
||||
python package_tar_fn () {
|
||||
fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PV', d), bb.data.getVar('PR', d)))
|
||||
fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PKGV', d), bb.data.getVar('PKGR', d)))
|
||||
fn = bb.data.expand(fn, d)
|
||||
bb.data.setVar('PKGFN', fn, d)
|
||||
}
|
||||
|
@ -83,7 +83,7 @@ python do_package_tar () {
|
|||
os.chdir(root)
|
||||
from glob import glob
|
||||
if not glob('*'):
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, 1), bb.data.getVar('PKGR', localdata, 1)))
|
||||
continue
|
||||
ret = os.system("tar -czf %s %s" % (tarfn, '.'))
|
||||
if ret != 0:
|
||||
|
|
Loading…
Reference in New Issue