diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/archiver.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/base.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 13 | ||||
-rw-r--r-- | meta/lib/oe/sstatesig.py | 2 |
6 files changed, 20 insertions, 6 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 990f1d4674..7ca35a573b 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -53,7 +53,7 @@ ARCHIVER_MODE[recipe] ?= "0" | |||
53 | ARCHIVER_MODE[mirror] ?= "split" | 53 | ARCHIVER_MODE[mirror] ?= "split" |
54 | 54 | ||
55 | DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" | 55 | DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" |
56 | ARCHIVER_TOPDIR ?= "${WORKDIR}/deploy-sources" | 56 | ARCHIVER_TOPDIR ?= "${WORKDIR}/archiver-sources" |
57 | ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/" | 57 | ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/" |
58 | ARCHIVER_RPMTOPDIR ?= "${WORKDIR}/deploy-sources-rpm" | 58 | ARCHIVER_RPMTOPDIR ?= "${WORKDIR}/deploy-sources-rpm" |
59 | ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${TARGET_SYS}/${PF}/" | 59 | ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${TARGET_SYS}/${PF}/" |
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7aa2e144eb..a710abdbd7 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -388,6 +388,11 @@ python () { | |||
388 | oe.utils.features_backfill("DISTRO_FEATURES", d) | 388 | oe.utils.features_backfill("DISTRO_FEATURES", d) |
389 | oe.utils.features_backfill("MACHINE_FEATURES", d) | 389 | oe.utils.features_backfill("MACHINE_FEATURES", d) |
390 | 390 | ||
391 | if d.getVar("WORKDIR") != d.getVar("S"): | ||
392 | d.appendVar("PSEUDO_IGNORE_PATHS", ",${S}") | ||
393 | if d.getVar("WORKDIR") != d.getVar("B"): | ||
394 | d.appendVar("PSEUDO_IGNORE_PATHS", ",${B}") | ||
395 | |||
391 | # Handle PACKAGECONFIG | 396 | # Handle PACKAGECONFIG |
392 | # | 397 | # |
393 | # These take the form: | 398 | # These take the form: |
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 196c86814e..70ea46ef5b 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -40,6 +40,8 @@ IMAGE_CMD_wic () { | |||
40 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" | 40 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" |
41 | do_image_wic[cleandirs] = "${WORKDIR}/build-wic" | 41 | do_image_wic[cleandirs] = "${WORKDIR}/build-wic" |
42 | 42 | ||
43 | PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/build-wic" | ||
44 | |||
43 | # Rebuild when the wks file or vars in WICVARS change | 45 | # Rebuild when the wks file or vars in WICVARS change |
44 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" | 46 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" |
45 | WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" | 47 | WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" |
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 39a7cadaf8..dea272c441 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -178,6 +178,8 @@ do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}" | |||
178 | do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" | 178 | do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" |
179 | do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}" | 179 | do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}" |
180 | 180 | ||
181 | PSEUDO_IGNORE_PATHS .= ",${SDKDEPLOYDIR}" | ||
182 | |||
181 | fakeroot create_sdk_files() { | 183 | fakeroot create_sdk_files() { |
182 | cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ | 184 | cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ |
183 | 185 | ||
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index bdade79abe..9cdadb1269 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -686,13 +686,15 @@ SRC_URI = "" | |||
686 | PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" | 686 | PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" |
687 | PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" | 687 | PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" |
688 | PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" | 688 | PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" |
689 | PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts" | ||
690 | |||
689 | export PSEUDO_DISABLED = "1" | 691 | export PSEUDO_DISABLED = "1" |
690 | #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" | 692 | #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" |
691 | #export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" | 693 | #export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" |
692 | #export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib | 694 | #export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib |
693 | FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_DISABLED=1" | 695 | FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=1" |
694 | FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" | 696 | FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" |
695 | FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" | 697 | FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=0" |
696 | FAKEROOTNOENV = "PSEUDO_UNLOAD=1" | 698 | FAKEROOTNOENV = "PSEUDO_UNLOAD=1" |
697 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" | 699 | FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" |
698 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" | 700 | PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" |
@@ -874,8 +876,8 @@ BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log" | |||
874 | 876 | ||
875 | # Setup our default hash policy | 877 | # Setup our default hash policy |
876 | BB_SIGNATURE_HANDLER ?= "OEBasicHash" | 878 | BB_SIGNATURE_HANDLER ?= "OEBasicHash" |
877 | BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ | 879 | BB_HASHEXCLUDE_COMMON ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ |
878 | SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ | 880 | THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ |
879 | USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ | 881 | USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ |
880 | STAMPS_DIR PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ | 882 | STAMPS_DIR PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ |
881 | CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ | 883 | CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ |
@@ -883,7 +885,8 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI | |||
883 | BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ | 885 | BB_WORKERCONTEXT BB_LIMITEDDEPS BB_UNIHASH extend_recipe_sysroot DEPLOY_DIR \ |
884 | SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ | 886 | SSTATE_HASHEQUIV_METHOD SSTATE_HASHEQUIV_REPORT_TASKDATA \ |
885 | SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES" | 887 | SSTATE_HASHEQUIV_OWNER CCACHE_TOP_DIR BB_HASHSERVE GIT_CEILING_DIRECTORIES" |
886 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ | 888 | BB_HASHBASE_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} PSEUDO_IGNORE_PATHS BUILDHISTORY_DIR SSTATE_DIR " |
889 | BB_HASHCONFIG_WHITELIST ?= "${BB_HASHEXCLUDE_COMMON} DATE TIME SSH_AGENT_PID \ | ||
887 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ | 890 | SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ |
888 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ | 891 | PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ |
889 | GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ | 892 | GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ |
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d5a6200562..beaccdc909 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -477,6 +477,8 @@ def OEOuthashBasic(path, sigfile, task, d): | |||
477 | h = hashlib.sha256() | 477 | h = hashlib.sha256() |
478 | prev_dir = os.getcwd() | 478 | prev_dir = os.getcwd() |
479 | include_owners = os.environ.get('PSEUDO_DISABLED') == '0' | 479 | include_owners = os.environ.get('PSEUDO_DISABLED') == '0' |
480 | if "package_write_" in task or task == "package_qa": | ||
481 | include_owners = False | ||
480 | include_timestamps = False | 482 | include_timestamps = False |
481 | if task == "package": | 483 | if task == "package": |
482 | include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' | 484 | include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' |