diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-11-03 03:44:49 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-11-03 23:32:06 +0300 |
commit | 4873add6e11c1bd421c83cd08df589f1184aa673 (patch) | |
tree | aec4845be29329cca2a0b2d7c8f94249e48ed067 /poky/meta-poky/conf | |
parent | 56a8292be03a7cb27f3b3ad762f4779e7e5ff47d (diff) | |
download | openbmc-4873add6e11c1bd421c83cd08df589f1184aa673.tar.xz |
Revert "poky: subtree update:b23aa6b753..ad30a6d470"
This reverts commit af5e4ef732faedf66c6dc1756432e9de2ac72988.
This commit introduced openbmc/openbmc#3720 and no solution has been
forthcoming. Revert until we can get to the bottom of this.
Change-Id: I2fb0d81eb26cf3dadb2f2abdd1a1bb7a95eaf03c
Diffstat (limited to 'poky/meta-poky/conf')
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 8 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index b719ae429..ed37f4a0b 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -58,6 +58,14 @@ SANITY_TESTED_DISTROS ?= " \ debian-10 \n \ opensuseleap-15.1 \n \ " +# +# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in +# an incompatible way. Such changes should usually be detailed in the commit +# that breaks the format and have been previously discussed on the mailing list +# with general agreement from the core team. +# +OELAYOUT_ABI = "12" + # add poky sanity bbclass INHERIT += "poky-sanity" diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 68e71b930..032f2623e 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -191,7 +191,7 @@ PATCHRESOLVE = "noop" # shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. -# It's necessary to monitor /tmp, if there is no space left the build will fail +# It's necesary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 62415a43e..44a01690e 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -301,7 +301,7 @@ DISTRO_FEATURES_remove = "x11" # will correct this condition. # # By default the system looks in the BBPATH for files/passwd and files/group -# the default can be overridden by specifying USERADD_UID/GID_TABLES. +# the default can be overriden by spefying USERADD_UID/GID_TABLES. # #USERADDEXTENSION = "useradd-staticids" #USERADD_UID_TABLES = "files/passwd" |