This is consistently seen with musl and grep from busybox
Therefore backport a patch from upstream to fix it
(From OE-Core rev: 769290794fc23894211c56b1878a73634fd20283)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 511bcd965af658e6bb0c61d9f2adb1af75af773b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This test assumes that if a child process writes one line to stderr and
then another line to stdout, and stderr is redirected to stdout, that
the order the lines will be read is stable.
This isn't the case and occasionally the lines will be read in a
different order. Change the test to ignore line ordering.
[ YOCTO #14469 ]
(From OE-Core rev: 9f72693736a3a7a06a83022d98b389f1218532f1)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1ddbe4d2bd8d8da10dac8a054f130fcd1d242219)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise, the build results would be different w/o host's /usr/sbin/sendmail:
1) The /usr/share/quilt/compat/sendmail will be genrated if no
/usr/sbin/sendmail on host
2) No /usr/share/quilt/compat/sendmail if host's has /usr/sbin/sendmail
Use --without-sendmail to make it always generate /usr/share/quilt/compat/sendmail.
(From OE-Core rev: 3f9320816ac9f9ec8815754d1951cecb58612f70)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
=========
- Call pager with original LANG environment variable
- Consistently complain early if no series file is found
- Fix handling of symbolic links by several commands
- Tighten the patch format parsing
- Reuse the shell (performance)
- Document the series file format further
- Document that quilt loads /etc/quilt.quiltrc
- configure: Make stat configurable
- series: Minor optimizations
- setup: Don't obey the settings of any englobing .pc
- setup: Default to fast mode
- quilt.el: Fix documentation of quilt-pc-directory
- quilt.el: Load /etc/quilt.quiltrc if ~/.quiltrc doesn't exist
- quilt.el: Fix quilt-editable when QUILT_PATCHES_PREFIX is set
(From OE-Core rev: fa71afcee9ab42198c619333b77a15bd2ae02b20)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.
(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I've seen local differences in the quilt output depending on whether the column
binary was available in the sysroot. Fix determinism issues by being specific
about configuration.
(From OE-Core rev: 0cd5fba8634bcc679518f98cc25be66a51081372)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The quilt "series" option relies on "less -R" but, since that
option is not enabled by busybox in oe-core by default,
hard-code the dependency on 'less'.
>From 'man less':
-r or --raw-control-chars
Causes "raw" control characters to be displayed. ...
-R or --RAW-CONTROL-CHARS
Like -r, but only ANSI "color" escape sequences are
output in "raw" form. ...
In 2018, BusyBox's less added:
8528d3d4f less: optional support of -R
but it is not enable by default for oe-core. While we could
enable the option, all known use-cases involve larger, more
developer-oriented recipes such as quilt or man pages.
(From OE-Core rev: 64f9fd2a1ebfad102140801f8be8b8be33082d61)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This fixes the ptest to work in minimal images.
(From OE-Core rev: 2a74e127cbb1972923d8b35f6f41b6fba6cf96fa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The style of this recipe is dated, move most of the code into the main
shared include file, making some of the configuration much clearer using
modern overrides to do so.
(From OE-Core rev: b422d94b1b42fd3be42fd1ba95dbcab10e2ab4ef)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Minor comment update and re-order variables to align more closely to
the OE style-guide.
(From OE-Core rev: 0b0c294ed3a9f901b9a6afaf984ff4958c327c0e)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using += with an over-ride can be a source of confusion so try to
avoid the construct in core recipes.
In this case, the _darwin over-ride seems to be unmaintained. It was
added in early 2013 but has not been accounted for in subsequent
updates to the recipe and (from inspection) now appears to be broken.
Remove the _darwin over-ride rather than try to debug or fix it.
(From OE-Core rev: 74e87700f4eb8c96aa7db3c722dd122c7e6f4bd6)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently some shebang lines end up as
#! /usr/bin/env perl -w
env does not like the argument. Also the current sed to insert env
does not cover the copies ptests use. Fix these issues by:
- using --with-perl to insert "env"
- Replacing "-w" in shebang lines with a new "use warning;" line
Remove a EXTRA_OECONF_append_class_target from the native recipe.
Don't overwrite EXTRA_OECONF in native: the values should be correct
for native as well.
--with-patch is used within the gnu patch wrapper only: before this
commit the wrapper contained a (build host) path to native patch.
Also tweak one test so busybox mv output is accepted.
All ptests should now pass: Fixes [YOCTO #11221].
(From OE-Core rev: 4b667d268fe410a21cacaecd1b5e3bfbbe7d53d8)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Avoids:
quilt-0.65-r0 do_package_qa: QA Issue: /usr/lib/quilt/ptest/quilt/scripts/edmail contained in package
quilt-ptest requires /media/build1/poky/build/tmp/hosttools/perl, but no providers found in
RDEPENDS_quilt-ptest? [file-rdeps]
(From OE-Core rev: e0188f6ccebaaf7c9948c771d3da5b07eed09a94)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This triggers warnings about absolute symlink paths with the PATH changes.
In reality we simply don't need/care about these so just remove/disable
them.
(From OE-Core rev: b319e43b9fee62f30c11d266a23cea4ff30addcd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Removed install.patch since it is already in the patch.
* Fix indent for file://test.sh
(From OE-Core rev: bd8b1d79b50819486e5882db05abb6b358b7392a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Starting from tar 1.29 the --exclude option won't work
anymore if is not used before the path. There are some
recipes that copy the ptest using tar and --exclude
option. This fixes these for OE-Core recipes.
[YOCTO #9763]
(From OE-Core rev: 2ba55933c81f78f4e4c36e21c59e935f74ce0f52)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When the user is root, run quilt ptest, the faildiff.test failed.
Because in the faildiff.test, we drop the read permission of the
file test.txt, we can't "quilt refresh" as normal user, so we got
the following:
>~ .*diff:test\.txt: Permission denied
> Diff failed on file 'test.txt', aborting
But when the user is root, we can access the file, so we got the
following:
> Nothing in patch patchs/test.diff
So the faildiff.test was failed. We should create a normal user
to run the ptest in the run-ptest scripts to slove the problem.
(From OE-Core rev: f7d52d12f943b9e1f79b32758308607036d6a760)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
quilt-0.63.inc -> quilt.inc: we don't have multiple quilt-xxx.inc, so
use quilt.inc rather than quilt-0.63.inc.
(From OE-Core rev: 941be822ee7772b70fe78e6b61278bb8567bc905)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gnu_patch_test_fix.patch : this patch removed as it is already
upstream now.
Renamed quilt.inc to quilt-0.50.inc and moved the dupicate information
from native & target recipe files into the quilt-0.50.inc file.
Clean up the unpackaged files warning
These warnings are avoided:
WARNING: For recipe quilt, the following files/directories were
installed but not shipped in any package:
WARNING: /usr/bin/quiltrc
WARNING: /usr/share/emacs
WARNING: /usr/share/emacs/site-lisp
WARNING: /usr/share/emacs/site-lisp/quilt.el
The /usr/bin/quiltrc is purposely not packaged, as it is needed
for native recipe only.
(From OE-Core rev: ffb10e51dae3e360822f26d1425c3327213a7e81)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit bc31351f69.
This change is already applied against configure, not configure.ac. This change forces a
reautoconf of quilt-native before we've built autoconf and if "git-desc" isn't present it
can result in further problems. The simplest solution is to revert this change.
An investigation into undocumented variables uncovered a handful
of LIC_FILES_CHKSUM spelling errors
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
OpenSuSE 11.3 uses GNU patch 2.6.1.81-5b68 which breaks quilt's
configure test for patch version.
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
