diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-11-18 19:42:21 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-11-20 16:38:24 +0300 |
| commit | f034379238f980a8c5ec4295288448eab2a3d015 (patch) | |
| tree | 1787275509bc13436dbec1a548169ef5f8ae0538 /poky/meta-poky/conf | |
| parent | bc442de08ff2e45ae01cb74397ccf010ef9797af (diff) | |
| download | openbmc-f034379238f980a8c5ec4295288448eab2a3d015.tar.xz | |
Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470""
This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673.
A fix has been put up for openbmc/openbmc#3720 so we can bring
this back now
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6
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, 2 insertions, 10 deletions
diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index ed37f4a0b..b719ae429 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -58,14 +58,6 @@ 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 032f2623e..68e71b930 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 necesary to monitor /tmp, if there is no space left the build will fail +# It's necessary 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 44a01690e..62415a43e 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 overriden by spefying USERADD_UID/GID_TABLES. +# the default can be overridden by specifying USERADD_UID/GID_TABLES. # #USERADDEXTENSION = "useradd-staticids" #USERADD_UID_TABLES = "files/passwd" |