diff options
| -rw-r--r-- | meta/classes/archive-configured-source.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/archive-original-source.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/archive-patched-source.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/deploy.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/license.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package_deb.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/sstate.bbclass | 26 | ||||
| -rw-r--r-- | meta/classes/staging.bbclass | 1 |
11 files changed, 6 insertions, 34 deletions
diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass index 54c234406a..961a53282a 100644 --- a/meta/classes/archive-configured-source.bbclass +++ b/meta/classes/archive-configured-source.bbclass @@ -45,7 +45,6 @@ ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/" ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/" SSTATETASKS += "do_archive_scripts_logs" -do_archive_scripts_logs[sstate-name] = "archive_scripts_logs" do_archive_scripts_logs[sstate-inputdirs] = "${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}" do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" @@ -56,7 +55,6 @@ python do_archive_scripts_logs_setscene () { addtask do_archive_scripts_logs_setscene SSTATETASKS += "do_dumpdata_create_diff_gz" -do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz" do_dumpdata_create_diff_gz[sstate-inputdirs] = "${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}" do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass index 7e9ed6d111..e271a08146 100644 --- a/meta/classes/archive-original-source.bbclass +++ b/meta/classes/archive-original-source.bbclass @@ -45,7 +45,6 @@ ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/" ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/" SSTATETASKS += "do_archive_scripts_logs" -do_archive_scripts_logs[sstate-name] = "archive_scripts_logs" do_archive_scripts_logs[sstate-inputdirs] = "${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}" do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" @@ -56,7 +55,6 @@ python do_archive_scripts_logs_setscene () { addtask do_archive_scripts_logs_setscene SSTATETASKS += "do_dumpdata_create_diff_gz" -do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz" do_dumpdata_create_diff_gz[sstate-inputdirs] = "${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}" do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass index d8d494a45d..c5f5cca382 100644 --- a/meta/classes/archive-patched-source.bbclass +++ b/meta/classes/archive-patched-source.bbclass @@ -45,7 +45,6 @@ ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR = "${WORKDIR}/script-logs/" ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR = "${WORKDIR}/diffgz-envdata/" SSTATETASKS += "do_archive_scripts_logs" -do_archive_scripts_logs[sstate-name] = "archive_scripts_logs" do_archive_scripts_logs[sstate-inputdirs] = "${ARCHIVE_SSTATE_SCRIPTS_LOGS_INDIR}" do_archive_scripts_logs[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" @@ -56,7 +55,6 @@ python do_archive_scripts_logs_setscene () { addtask do_archive_scripts_logs_setscene SSTATETASKS += "do_dumpdata_create_diff_gz" -do_dumpdata_create_diff_gz[sstate-name] = "dumpdata_create_diff_gz" do_dumpdata_create_diff_gz[sstate-inputdirs] = "${ARCHIVE_SSTATE_DIFFGZ_ENVDATA_INDIR}" do_dumpdata_create_diff_gz[sstate-outputdirs] = "${ARCHIVE_SSTATE_OUTDIR}" diff --git a/meta/classes/deploy.bbclass b/meta/classes/deploy.bbclass index c3371421d8..78f5e4a7ba 100644 --- a/meta/classes/deploy.bbclass +++ b/meta/classes/deploy.bbclass @@ -1,6 +1,5 @@ DEPLOYDIR = "${WORKDIR}/deploy-${PN}" SSTATETASKS += "do_deploy" -do_deploy[sstate-name] = "deploy" do_deploy[sstate-inputdirs] = "${DEPLOYDIR}" do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 8ad55f8031..f075f59340 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -351,7 +351,6 @@ def check_license_flags(d): return None SSTATETASKS += "do_populate_lic" -do_populate_lic[sstate-name] = "populate-lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 44a852f3f6..eb4cf44ef0 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1931,7 +1931,6 @@ addtask package before do_build after do_install PACKAGELOCK = "${STAGING_DIR}/package-output.lock" SSTATETASKS += "do_package" -do_package[sstate-name] = "package" do_package[cleandirs] = "${PKGDEST} ${PKGDESTWORK}" do_package[sstate-plaindirs] = "${PKGD} ${PKGDEST} ${PKGDESTWORK}" do_package[sstate-lockfile-shared] = "${PACKAGELOCK}" @@ -1949,7 +1948,6 @@ do_packagedata () { addtask packagedata before do_build after do_package SSTATETASKS += "do_packagedata" -do_packagedata[sstate-name] = "packagedata" do_packagedata[sstate-inputdirs] = "${PKGDESTWORK}" do_packagedata[sstate-outputdirs] = "${PKGDATA_DIR}" do_packagedata[sstate-lockfile-shared] = "${PACKAGELOCK}" diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index d18c250ecc..82ff432f71 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -412,7 +412,6 @@ python do_package_deb () { } SSTATETASKS += "do_package_write_deb" -do_package_write_deb[sstate-name] = "deploy-deb" do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}" do_package_write_deb[sstate-outputdirs] = "${DEPLOY_DIR_DEB}" diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index d0db9454d1..e7b275577a 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -415,7 +415,6 @@ python do_package_ipk () { } SSTATETASKS += "do_package_write_ipk" -do_package_write_ipk[sstate-name] = "deploy-ipk" do_package_write_ipk[sstate-inputdirs] = "${PKGWRITEDIRIPK}" do_package_write_ipk[sstate-outputdirs] = "${DEPLOY_DIR_IPK}" diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 346b7abd53..fcde73ebe9 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -1172,7 +1172,6 @@ python () { } SSTATETASKS += "do_package_write_rpm" -do_package_write_rpm[sstate-name] = "deploy-rpm" do_package_write_rpm[sstate-inputdirs] = "${PKGWRITEDIRRPM}" do_package_write_rpm[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" # Take a shared lock, we can write multiple packages at the same time... diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 9df9ac2429..199a5b3fc4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -69,12 +69,9 @@ python () { unique_tasks = set((d.getVar('SSTATETASKS', True) or "").split()) d.setVar('SSTATETASKS', " ".join(unique_tasks)) - namemap = [] for task in unique_tasks: - namemap.append(d.getVarFlag(task, 'sstate-name')) d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ") d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc") - d.setVar('SSTATETASKNAMES', " ".join(namemap)) } def sstate_init(name, task, d): @@ -94,7 +91,9 @@ def sstate_state_fromvars(d, task = None): bb.fatal("sstate code running without task context?!") task = task.replace("_setscene", "") - name = d.getVarFlag("do_" + task, 'sstate-name', True) + name = task + if task.startswith("do_"): + name = task[3:] inputs = (d.getVarFlag("do_" + task, 'sstate-inputdirs', True) or "").split() outputs = (d.getVarFlag("do_" + task, 'sstate-outputdirs', True) or "").split() plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs', True) or "").split() @@ -297,7 +296,7 @@ def sstate_clean_cachefile(ss, d): def sstate_clean_cachefiles(d): for task in (d.getVar('SSTATETASKS', True) or "").split(): - ss = sstate_state_fromvars(d, task[3:]) + ss = sstate_state_fromvars(d, task) sstate_clean_cachefile(ss, d) def sstate_clean_manifest(manifest, d): @@ -365,11 +364,9 @@ python sstate_cleanall() { if not os.path.exists(manifest_dir): return - namemap = d.getVar('SSTATETASKNAMES', True).split() tasks = d.getVar('SSTATETASKS', True).split() - for name in namemap: - taskname = tasks[namemap.index(name)] - shared_state = sstate_state_fromvars(d, taskname[3:]) + for name in tasks: + shared_state = sstate_state_fromvars(d, name) sstate_clean(shared_state, d) } @@ -592,20 +589,11 @@ sstate_unpack_package () { tar -xmvzf ${SSTATE_PKG} } -# Need to inject information about classes not in the global configuration scope -EXTRASSTATEMAPS += "do_deploy:deploy" - BB_HASHCHECK_FUNCTION = "sstate_checkhashes" def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): ret = [] - mapping = {} - for t in d.getVar("SSTATETASKS", True).split(): - mapping[t] = d.getVarFlag(t, "sstate-name", True) - for extra in d.getVar("EXTRASSTATEMAPS", True).split(): - e = extra.split(":") - mapping[e[0]] = e[1] def getpathcomponents(task, d): # Magic data from BB_HASHFILENAME @@ -614,8 +602,6 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): extrapath = splithashfn[0] tname = sq_task[task][3:] - if sq_task[task] in mapping: - tname = mapping[sq_task[task]] if tname in ["fetch", "unpack", "patch"] and splithashfn[2]: spec = splithashfn[2] diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 3985763f4b..d17a53ebef 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -97,7 +97,6 @@ python do_populate_sysroot () { SSTATETASKS += "do_populate_sysroot" do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" -do_populate_sysroot[sstate-name] = "populate-sysroot" do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/" do_populate_sysroot[stamp-extra-info] = "${MACHINE}" |