mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

package.bbclass: Move variable checks to one place making the code more readable

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-10-29 23:41:24 +00:00
parent 764f73a033
commit 4f4a3da843
1 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package.bbclass
+14 -38
View File
@@ -31,9 +31,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
import os, os.path, bb import os, os.path, bb
dvar = bb.data.getVar('D', d, True) dvar = bb.data.getVar('D', d, True)
if not dvar:
bb.error("D not defined")
return
packages = bb.data.getVar('PACKAGES', d, True).split() packages = bb.data.getVar('PACKAGES', d, True).split()
@@ -242,14 +239,7 @@ python package_do_split_locales() {
return return
dvar = bb.data.getVar('D', d, True) dvar = bb.data.getVar('D', d, True)
if not dvar:
bb.error("D not defined")
return
pn = bb.data.getVar('PN', d, True) pn = bb.data.getVar('PN', d, True)
if not pn:
bb.error("PN not defined")
return
if pn + '-locale' in packages: if pn + '-locale' in packages:
packages.remove(pn + '-locale') packages.remove(pn + '-locale')
@@ -293,32 +283,17 @@ python package_do_split_locales() {
} }
python populate_packages () { python populate_packages () {
import glob, stat, errno, re import os, glob, stat, errno, re
workdir = bb.data.getVar('WORKDIR', d, True) workdir = bb.data.getVar('WORKDIR', d, True)
if not workdir:
bb.error("WORKDIR not defined, unable to package")
return
import os # path manipulations
outdir = bb.data.getVar('DEPLOY_DIR', d, True) outdir = bb.data.getVar('DEPLOY_DIR', d, True)
if not outdir:
bb.error("DEPLOY_DIR not defined, unable to package")
return
bb.mkdirhier(outdir)
dvar = bb.data.getVar('D', d, True) dvar = bb.data.getVar('D', d, True)
if not dvar: packages = bb.data.getVar('PACKAGES', d, True)
bb.error("D not defined, unable to package") pn = bb.data.getVar('PN', d, True)
return
bb.mkdirhier(outdir)
bb.mkdirhier(dvar) bb.mkdirhier(dvar)
packages = bb.data.getVar('PACKAGES', d, True)
pn = bb.data.getVar('PN', d, True)
if not pn:
bb.error("PN not defined")
return
os.chdir(dvar) os.chdir(dvar)
@@ -557,9 +532,6 @@ python package_do_shlibs() {
targetos = bb.data.getVar('TARGET_OS', d, True) targetos = bb.data.getVar('TARGET_OS', d, True)
workdir = bb.data.getVar('WORKDIR', d, True) workdir = bb.data.getVar('WORKDIR', d, True)
if not workdir:
bb.error("WORKDIR not defined")
return
ver = bb.data.getVar('PV', d, True) ver = bb.data.getVar('PV', d, True)
if not ver: if not ver:
@@ -765,12 +737,7 @@ python package_do_pkgconfig () {
import re, os import re, os
packages = bb.data.getVar('PACKAGES', d, True) packages = bb.data.getVar('PACKAGES', d, True)
workdir = bb.data.getVar('WORKDIR', d, True) workdir = bb.data.getVar('WORKDIR', d, True)
if not workdir:
bb.error("WORKDIR not defined")
return
pkgdest = bb.data.getVar('PKGDEST', d, True) pkgdest = bb.data.getVar('PKGDEST', d, True)
shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True) shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True)
@@ -1009,6 +976,15 @@ python package_do_package () {
bb.debug(1, "No packages to build, skipping do_package") bb.debug(1, "No packages to build, skipping do_package")
return return
workdir = bb.data.getVar('WORKDIR', d, True)
outdir = bb.data.getVar('DEPLOY_DIR', d, True)
dvar = bb.data.getVar('D', d, True)
pn = bb.data.getVar('PN', d, True)
if not workdir or not outdir or not dvar or not pn or not packages:
bb.error("WORKDIR, DEPLOY_DIR, D, and PN all must be defined, unable to package")
return
for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split(): for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split():
bb.build.exec_func(f, d) bb.build.exec_func(f, d)
} }