This will be needed again when using patchlevel versions again.
Also make it more generic.
(From OE-Core rev: 7939288700ad35ed43e5988371e16d5afc594a57)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
License-Update: copyright years and holders
(From OE-Core rev: f59334e70313676c7ab3216cb9583eefb27835e6)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The build was deciding whether to rename manpages based upon the presence of
/etc/debian_version. Be explicit about the configuration instead and
ensure determinism.
[YOCTO #13781]
(From OE-Core rev: 09c8a28893e7ca94a44232d802e1cb02a8f34b87)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Include the version number in a format that is comparable to what we get
from NVD.
(From OE-Core rev: fdb2a95d5e0265de1172940b6dc71fc7d602e8d1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport changes to tinfo/comp_hash.c, tinfo/parse_entry.c,
and progs/dump_entry.c from upstream to fix CVEs.
(From OE-Core rev: 69c31032f1ec0e300c3247efa71aa9b4ebdaf23d)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit 91227184b5.
Instead of fixing incorrect regex, the commit actually broke the correct one.
Before the reverted commit:
alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses 6.1 6.1+20181013 Hongxu Jia <hongxu.jia@windriver.com> 7a97a7f937762ba342d5b2fd7cd090885a809835
After the reverted commit:
alexander@alexander-box:~/development/poky$ devtool check-upgrade-status ncurses
INFO: ncurses 6.1 UNKNOWN_BROKEN Hongxu Jia <hongxu.jia@windriver.com>
The code in bitbake/lib/bb/fetch2/git.py actually splits each tag
with '/' as separator and takes only the last part for some reason,
so the "debian/" or "upstream/" prefixes are never a part of the string
that is matched against regex:
https://salsa.debian.org/debian/ncurses/tags
(From OE-Core rev: b6f4c130e5b2df458bf9d1b2d8edc8ac87fecf12)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This can save configure time since it runs configure multiple times:
$ time bitbake ncurses-native -cconfigure
35s -> 25s
Saved 10s
(From OE-Core rev: 5607ae1ca59fa899ba7507ecfda7c7b0e6bf022f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix handling of escape characters in regexs and hence fix python
Deprecation warnings which will be problematic in python 3.8.
Note that some show up as:
"""
meta/classes/package.bbclass:1293: DeprecationWarning: invalid escape sequence \.
"""
where the problem isn't on 1293 in package.bbclass but in some _prepend to a
package.bbclass function in a different file like mesa.inc, often from
do_package_split() calls.
(From OE-Core rev: 4b1c0c7d5525fc4cea9e0f02ec54e92a6fbc6199)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1. Rebase 0001, 0002
2. Fix [already-stripped] QA Issue
Since the following commit add, it strip executables which
are installed by default.
...
commit 087eaf92c621098927f3f98e3652411de48f8b6b
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sun Jan 21 08:01:41 2018 +0100
Import upstream patch 20180120
20180120
+ build-fix in picsmap.c for stdint.h existence.
+ add --disable-stripping option to configure scripts.
...
(From OE-Core rev: 09bc55eeb41a6e06438b35e5456c66198d549b92)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Debian anonscm service in Alioth is shutdown and thus
fetching ncurses sources fails.
https://wiki.debian.org/Alioth
"Alioth is broken, and there is nobody around to fix it. Don't ask the remaining people who give it life support to implement fixes and changes. It is being replaced by a cocktail of ?GitLab (see Salsa), read-only repos and keep-alive mechanisms. See below for more information."
(From OE-Core rev: 8fab5794218445ddb3e8f73a74fa3f130e7c42f6)
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
termlib needs to be disabled on some targets e.g. mingw
this change paves the way for doing that. Functionally
it does not change anything for other platforms
(From OE-Core rev: 88f33e1e5ba4f85093f60a296cba3ee1c1341c43)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ncurses doesn't honour ${libdir} for terminfo, so try more options to remove it.
(From OE-Core rev: 17fd322e925cf492b22c75e296d5fee31e3511db)
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rebase patches:
- tic-hang.patch -> 0001
- configure-reproducible.patch -> 0002
Drop fix-cflags-mangle.patch, which accepted by upstream
...
commit 1b74f120ab7be89011408a6ad0f1c748a314bae8
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sun Feb 26 09:01:34 2017 +0100
Import upstream patch 20170225
20170225
+ fixes for CF_CC_ENV_FLAGS (report by Ross Burton).
...
(From OE-Core rev: a4ad0703e1209fee6cd89bf74088931785c4d8c7)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After switching to Recipe Specific Sysroots, ncurses
will not be populated in its own sysroots, then
siteconfig_gencache fails to find some headers,
so add ${SYSROOT_DESTDIR}/${includedir} into the
search list to fix the issue.
(From OE-Core rev: 2ef34f7fb60ecdff29aae1d54a90a2e765c15e1e)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The --disable-static option doesn't exist in ncurses. Its equivalent is
--without-normal so remove the option which does nothing.
(From OE-Core rev: 974ddd2f99be04f44978c1bce054ed75c9367631)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Build static libraries without the binutils "ar" -U option.
This option deliberately breaks deterministic mode.
The option seems to be a relic from 2015, intended as a workaround
for some unspecified build problems.
[YOCTO#11247]
(From OE-Core rev: 46c757d0ca7ff294a7e55c130698fd256b69b62e)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Having ncurses-terminfo-base before ncurses-terminfo is currently irrelevant
because the current file lists are completely disjunct. However, when building
"stateless" via a .bbappend, the content of curses-terminfo-base also needs
to live under /usr/share and then it becomes important that files
belonging to ncurses-terminfo-base are checked first.
(From OE-Core rev: b868345f533fc0219845b243a29c12c9a19a3ff3)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As "install.libs" also installs header files, it is
redundant to also call "install.includes".
In fact, doing so can lead to a race, as both targets could
try to install the header files at the same time if running
parallel make. Obviously, with only calling "install.libs",
there is no race with "install.includes".
If there is no race, then the patch fix-include-files-race.patch
is no longer needed.
(From OE-Core rev: 8df2060a323acf2a2cc2bc4076623463039c46a6)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both targets install.libs and install.includes install the same
files, resulting in a race condition when running parallel make.
This race is addressed in a patch file, making sure only one
of the targets (install.includes) installes the include files.
This will work properly (i.e.ncurses will install as intended
by the recipe) as long as we always install both targets.
(From OE-Core rev: a3df0aa78af1c2fecf847e87cc480fd2ed9afe89)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch removes a workaround (needed for bitbake python parser) where
closing curly brackets were replaced by ascii code '\x7d'.
This commit requires a bitbake version with the
"data_smart: simple bracket matching inside python expressions" patch
applied.
(From OE-Core rev: c92ed91e40a05d56ab73097844788b185fa6e19c)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To be compatible with ncurses 5, add option '--with-abi-version=5' to EXTRA_OECONF
(From OE-Core rev: 743e97cc80744ca88d72b8db0ee95bb58f350ef9)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Removes ncurses-config from BINCONFIG, that file does not exist at all.
* Adds in ncurses5-config and ncursesw5-config to BINCONFIG.
This fixed following warnings during SDK install:
warning: Removing ncurses-dev-5.9-r15.1@lib32_x86 due to file /usr/bin/ncurses5-config conflicting with ncurses-dev-5.9-r15.1@core2_64
warning: Removing ncurses-dev-5.9-r15.1@lib32_x86 due to file /usr/bin/ncursesw5-config conflicting with ncurses-dev-5.9-r15.1@core2_64
[YOCTO #8801]
(From OE-Core rev: 06a7b63181a4e7a47c920d3e82363786d1a4c1e7)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ncurses source tarball from "current" directory in
ftp://invisible-island.net gets updated/deleted during the release cycle.
We can't depend on that FTP server to fetch source as the maintainer
doesn't guarantee the presence of all patched versions in the server.
ftp://invisible-island.net/ncurses/5.9/README
Fetch sources from debian git server as it is comparatively reliable.
[YOCTO #8713]
(From OE-Core rev: 4d3f84f84147145cfd786362d9cd754bbb93873e)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Nominally tmux sets TERM=screen which we are including in
ncurses-terminfo-base. However, if tmux detects that it's running in a
terminal capable of 256-color output (e.g. xterm-256color), it will
instead use TERM=screen-256color. We aren't including that, and we ought
to be.
(From OE-Core rev: 5624dfcea87da54c49ba1d63b528da020f351908)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without pkgconfig being present at build time it's possible for the .pc files to
not be installed correctly.
(From OE-Core rev: f049a53078b3876be9fefc1e5f64404a3f378724)
Signed-off-by: Christophe Guillon <christophe.guillon@st.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed ncurses.do_configure:
configure: WARNING: did not find library /path/to/tmp/sysroots/qemuarm/usr/lib/pkgconfig
And then anyone requires ncurses.pc will fail.
The configure.in checks:
[snip]
if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
[snip]
Create PKG_CONFIG_LIBDIR in do_configure will fix the problem.
We can reproduce the problem by:
Set SSTATE_DIR=/path/to/sstate-cache
1) In build1, make sure everything is ready in SSTATE_DIR
$ bitbake ncurses
2) In build2, rebuild ncurses only:
$ bitbake ncurses -ccleansstate && bitbake ncurses
Then we will see the warning in log.do_configure.
(From OE-Core rev: ea4010c8398745736b0c22ed037604db8fc43212)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds a binconfig-disabled class which can be used by recipes where
a -config file is installed but we wish to disable it and just rely on
the .pc files instead.
Rather than simply deleting it, we make the script "exit 1" so that it
can be found in PATH and raise a build error rather than something
silently falling back to the build system for example.
Rather than randomly finding -config files, this adds in the
specification of a list of binconfig scripts which is more deterministic
and maintainable moving forward.
This patch converts various users in OE-Core to use this, a world build
of OE-Core tests out ok with this change. There will likely be issues in
other layers however, hence this being a RFT.
(From OE-Core rev: 5870bd272b0b077d0826fb900b251884c1c05061)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop the use of custom Python code and instead use the new lnr script to
generate relative symlinks.
(From OE-Core rev: efe328d3713f60257358cab5d7c6a1d38d1a8d88)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ln -r isn't available in older versions of coreutils such as those
present in Ubuntu 12.04. We'll find an alternative solution.
This reverts commit 65c2439ab6dcbd4c52439cdc96acb8ba222c196b.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of using a Python do_install() and calling
oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink
directly.
(From OE-Core rev: 65c2439ab6dcbd4c52439cdc96acb8ba222c196b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The virtclass overrides will go away at some point (apart from the multilib one).
Change them all to class-xxx instead since people enjoy copy and pasting them.
(From OE-Core rev: d1c073d2813bd913617990cd047507353ea0c09e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The vtX terminfo files aren't being copied on systems where bash isn't
the default shell (debian, etc.). I removed the bash specific syntax
so the files are properly copied on these systems.
(From OE-Core rev: edd7d53c6149b27d5636a458db91650c8c400612)
Signed-off-by: Seth Bollinger <seth.boll@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is to address the buildtools-tarball still having problems with certain
xterms
[YOCTO #4835]
(From OE-Core rev: b367466287e6b1793c38afce6a9524130c48cf86)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The ncurses package was generating the following error as a result
of not specifing the PACKAGES_DYNAMIC correctly. This error only
appear when using the IMAGE_INSTALL list that has been expanded by
the hob or from the pkgdata.
ERROR: Nothing RPROVIDES 'ncurses-libtinfo'
The dynamic packages are named using "${PN}-lib%s". So we check for
${PN}-lib*
(From OE-Core rev: 67dd4e31272918e08b65b5c8d5d6b00e814dbf7f)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
