[OE-core] [PATCH] fix various, innocuous typos

Peter Kjellerstedt peter.kjellerstedt at axis.com
Sun Feb 16 12:52:27 UTC 2020


> -----Original Message-----
> From: openembedded-core-bounces at lists.openembedded.org <openembedded-core-bounces at lists.openembedded.org> On Behalf Of Robert P. J. Day
> Sent: den 16 februari 2020 08:50
> To: OE Core mailing list <openembedded-core at lists.openembedded.org>
> Subject: [OE-core] [PATCH] fix various, innocuous typos
> 
> Corrections:
> 
>   - environment
>   - variable
>   - accommodate
>   - conversion
>   - compatible
> 
> Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
> 
> ---
> 
> diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
> index 75f0f2c3e3..359f240b0b 100644
> --- a/meta/classes/testimage.bbclass
> +++ b/meta/classes/testimage.bbclass
> @@ -243,7 +243,7 @@ def testimage_main(d):
>      if d.getVar("TEST_TARGET") == "qemu":
>          fstypes = [fs for fs in fstypes if fs in supported_fstypes]
>          if not fstypes:
> -            bb.fatal('Unsupported image type built. Add a comptible image to '
> +            bb.fatal('Unsupported image type built. Add a compatible image to '
>                       'IMAGE_FSTYPES. Supported types: %s' %
>                       ', '.join(supported_fstypes))
>      qfstype = fstypes[0]
> diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
> index 1c586a3bc6..751424d1b6 100644
> --- a/meta/conf/licenses.conf
> +++ b/meta/conf/licenses.conf
> @@ -1,7 +1,7 @@
>  # Standards are great! Everyone has their own. In an effort to standardize licensing
>  # names, common-licenses will use the SPDX standard license names. In order to not
>  # break the non-standardized license names that we find in LICENSE, we'll set
> -# up a bunch of VarFlags to accomodate non-SPDX license names.
> +# up a bunch of VarFlags to accommodate non-SPDX license names.
>  #
>  # We should really discuss standardizing this field, but that's a longer term goal.
>  # For now, we can do this and it should grab the most common LICENSE
> naming variations.
> diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json
> index 9869150dcf..d77d0e673b 100644
> --- a/meta/lib/oeqa/manual/eclipse-plugin.json
> +++ b/meta/lib/oeqa/manual/eclipse-plugin.json
> @@ -82,7 +82,7 @@
>              ],
>              "execution": {
>                  "1": {
> -                    "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ",
> +                    "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ",
>                      "expected_results": ""
>                  },
>                  "2": {
> @@ -164,7 +164,7 @@
>              ],
>              "execution": {
>                  "1": {
> -                    "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ",
> +                    "action": "Launch a QEMU of target environment.(Reference to case \"ADT - Launch qemu by eclipse\") ",
>                      "expected_results": ""
>                  },
>                  "2": {
> @@ -319,4 +319,4 @@
>              "summary": "Eclipse_Poky_installation_and_setup"
>          }
>      }
> -]
> \ No newline at end of file
> +]
> diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py
> index 09e77c19fe..01c38c24e6 100644
> --- a/meta/lib/oeqa/sdk/context.py
> +++ b/meta/lib/oeqa/sdk/context.py
> @@ -136,7 +136,7 @@ class OESDKTestContextExecutor(OETestContextExecutor):
>          sdk_envs = OESDKTestContextExecutor._get_sdk_environs(args.sdk_dir)
>          if not sdk_envs:
>              raise argparse_oe.ArgumentUsageError("No available SDK "\
> -                   "enviroments found at %s" % args.sdk_dir, self.name)
> +                   "environments found at %s" % args.sdk_dir, self.name)
> 
>          if args.list_sdk_env:
>              self._display_sdk_envs(logger.info, args, sdk_envs)
> diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
> index e2f91bcb6c..5886862d6c 100644
> --- a/meta/lib/oeqa/selftest/cases/devtool.py
> +++ b/meta/lib/oeqa/selftest/cases/devtool.py
> @@ -1741,7 +1741,7 @@ class DevtoolUpgradeTests(DevtoolBase):
>                           when building the kernel.
>           """
>          kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel')
> -        # Clean up the enviroment
> +        # Clean up the environment
>          bitbake('%s -c clean' % kernel_provider)
>          tempdir = tempfile.mkdtemp(prefix='devtoolqa')
>          tempdir_cfg = tempfile.mkdtemp(prefix='config_qa')
> diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> index 6d80827652..d4664bd0df 100644
> --- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> +++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
> @@ -45,7 +45,7 @@ class TestBlobParsing(OESelftestTestCase):
> 
>      def test_blob_to_dict(self):
>          """
> -        Test convertion of git blobs to dictionary
> +        Test conversion of git blobs to dictionary
>          """
>          from oe.buildhistory_analysis import blob_to_dict
>          valuesmap = { "foo" : "1", "bar" : "2" }
> diff --git a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
> index a09e2a257e..1823dfee3f 100644
> --- a/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
> +++ b/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
> @@ -985,7 +985,7 @@ index 7d9a34a..12f8fb8 100644
>   }
> 
>   /****************************************************************************
> -@@ -259,38 +263,39 @@ cpu-state-varible M.x86.mode. There are several potential states:
> +@@ -259,38 +263,39 @@ cpu-state-variable M.x86.mode. There are several potential states:

Don't change this. It is part of the patch context information. Even if the 
part after the second @@ is just a comment, it matches information in the 
existing file and that is no longer true if you change it. Moreover, it will 
just be reset if someone refreshes the patch.

> 
>   Each of the above 7 items are handled with a bit in the mode field.
>   ****************************************************************************/
> diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch
> index eda5565371..14d0548b81 100644
> --- a/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch
> +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Cross-building-and-testing-instructions.patch
> @@ -533,7 +533,7 @@ index 0000000000..b67b468466
>  +  Here, 'my-wrapper' must ensure that the value it sees for
>  +  'GCONV_PATH' will be seen by the dynamic linker, and thus 'tst-foo'
>  +  itself.  (The wrapper supplied with GLIBC simply preserves the
> -+  values of *all* enviroment variables, with a fixed set of
> ++  values of *all* environment variables, with a fixed set of
>  +  exceptions.)
>  +
>  +  If your wrapper is a shell script, take care to correctly propagate
> diff --git a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
> index e6998f6e68..e59144a13c 100644
> --- a/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
> +++ b/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
> @@ -148,7 +148,7 @@ index 2d7a6f5..1c53585 100644
>  -        printf("*** being found. The easiest way to fix this is to remove the old version\n");
>  -        printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
>  -        printf("*** correct copy of xml2-config. (In this case, you will have to\n");
> --        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
> +-        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");

You cannot change this. Then the patch will no longer apply since this 
part removes stuff from the upstream contents.

>  -        printf("*** so that the correct libraries are found at run-time))\n");
>  -    }
>  -  return 1;
> diff --git a/scripts/pybootchartgui/pybootchartgui/draw.py b/scripts/pybootchartgui/pybootchartgui/draw.py
> index add5c53882..53324b9f8b 100644
> --- a/scripts/pybootchartgui/pybootchartgui/draw.py
> +++ b/scripts/pybootchartgui/pybootchartgui/draw.py
> @@ -308,7 +308,7 @@ sec_w_base = 1 # the width of a second
>  proc_h = 16 # the height of a process
>  leg_s = 10
>  MIN_IMG_W = 800
> -CUML_HEIGHT = 2000 # Increased value to accomodate CPU and I/O Graphs
> +CUML_HEIGHT = 2000 # Increased value to accommodate CPU and I/O Graphs
>  OPTIONS = None
> 
>  def extents(options, xscale, trace):
> 
> --
> 
> ========================================================================
> Robert P. J. Day                                 Ottawa, Ontario, CANADA
>                          http://crashcourse.ca
> 
> Twitter:                                       http://twitter.com/rpjday
> LinkedIn:                               http://ca.linkedin.com/in/rpjday
> ========================================================================
> --

//Peter



More information about the Openembedded-core mailing list