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: 421850875a5dafa1deed0647b7b30b76df9b25cf)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2ef34f7fb60ecdff29aae1d54a90a2e765c15e1e)
Signed-off-by: Armin Kuster <akuster808@gmail.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>
Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB]
(From OE-Core rev: e5d1cbbc1a04b0b190f3706e7ab7421c87d46c78)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@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>
Also, put the revision into PV, so that a meaningful upstream version
check can be performed.
(From OE-Core rev: 78064460a7087de5065f035633ea37a7f5b5cff6)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@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>
This change allows ${B} != ${S} builds to work as otherwise
gnu-configize is executed in the incorrect directory.
(From OE-Core rev: 77d09b5ffd7867809004d7e3a6285e19087713b7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[ CQID: WIND00405305 ]
When using ncurses from sstate cache it is not able to find terminfo
for screen on RHEL 6. While RHEL 6 has /lib/terminfo, it is not
complete, the complete terminfo database is in /usr/share/terminfo. This
results failure of programs linked to ncurses, such as menuconfig.
(From OE-Core rev: b2f5c8f7dfda0bc8f07561336c8667c864d9c3bb)
Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
CQID: WIND00402979
Display corruption was occurring on 64 bit hosts using menuconfig for
the kernel and busybox with the ncurses-native or ncurses-nativesdk
because the configure arguments were not sufficient vs the expected
use from the upstream source.
Also changed in this commit is to provide a fallback to the hard
compiled paths for the terminfo and termcap. Eventually this needs to
be fixed another way if we want a truly portable SDK because any SDK
that is relocated or native binaries pulled out of the sstate can end
up referencing terminfo files that no longer are in the same location.
Because the host system has terminfo files that ncurses will happily
use we might as well have a fall back to buy some time for a better
fix, vs having thing just not work occasionally when using sstate.
(From OE-Core rev: c820ae11ce369002063bad8b11ee95e1882c99bb)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: 5193485a42dfb3396d0f12aaa7732c5db29d7338)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is an warning:
$ bitbake nativesdk-ncurses
WARNING: QA Issue: nativesdk-ncurses: Files/directories were installed
but not shipped
/opt/poky/1.3+snapshot/sysroots/i686-pokysdk-linux/usr/bin/clear.ncurses
/opt/poky/1.3+snapshot/sysroots/i686-pokysdk-linux/usr/bin/reset.ncurses
NOTE: Tasks Summary: Attempted 533 tasks of which 521 didn't need to be
rerun and all succeeded.
And there is no clear or reset tool in the SDK.
This is caused by:
ALTERNATIVE_ncurses-tools = "clear reset"
It creates clear.ncurses and reset.ncurses which are used for avoiding
the conflicts with the target busybox, but SDK doesn't need them since
there is no nativesdk-busybox (then no conflicts), so:
ALTERNATIVE_ncurses-tools_class-target = "clear reset"
will fix the problem.
[YOCTO #3325]
(From OE-Core rev: a4a9d2acb60ef4ec9ae8d2ad3ca222e99fb6e986)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building target packages, it used to be enought to check for PN == BPN, however
with the multilib configurations, this can lead to subtle errors. Change instances
of PN == BPN, to ${CLASSOVERRIDE} == 'class-target'.
(From OE-Core rev: acc988272b4e74a9ad1e6da5af5b2d208584197b)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ncurses failure non-gplv3 build (race issue) like the following \
error information:
| tic: error while loading shared libraries: /srv/home/pokybuild \
/yocto-autobuilder/yocto-slave/nightly-non-gpl3/build/build/tmp/\
work/x86_64-linux/ncurses-native-5.9-r8.1/ncurses-5.9/narrowc/lib\
/libtinfo.so.5: file too short
| ? tic could not build /srv/home/pokybuild/yocto-autobuilder/\
yocto-slave/nightly-non-gpl3/build/build/tmp/work/x86_64-linux/\
ncurses-native-5.9-r8.1/image/srv/home/pokybuild/yocto-autobuilder\
/yocto-slave/nightly-non-gpl3/build/build/tmp/sysroots/x86_64-linux\
/usr/share/terminfo
| make[1]: *** [install.data] Error 1
This is a race issue which is caused by
install.libs and install.data:
1) install.data needs run tic
2) tic needs libtinfo.so
3) install.libs would regenerate libtinfo.so
4) but install.data doesn't depend on install.libs, and they can run
parallelly
So there would be errors in a very critical condition: tic is begining
to run at the same time when install.libs is generating libtinfo.so, and
this libtinfo.so is not integrity, then there would be the above error.
Let task install.libs run before install.data for fixing this bug.
[YOCTO #2298]
(From OE-Core rev: 80e4833782edc5fbda2a7f5d003a854f127137ec)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed not shipped packaging warnings.
WARNING: For recipe ncurses-nativesdk, the following files/directories
were installed but not shipped in any package:
WARNING:
/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/bin/reset
WARNING:
/opt/poky/1.1+snapshot/sysroots/x86_64-pokysdk-linux/usr/bin/clear
(From OE-Core rev: c09a2058f6b2f24ab2ae9c5ea357111dd82af39e)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix this issue:
| rm: cannot remove `/srv/home/nitin/builds/build-multilib/tmp/work/x86_64-poky-linux/ncurses-5.9-r6.1/image/usr/lib64/terminfo': No such file or directory
NOTE: package ncurses-5.9-r6.1: task do_install: Failed
PR not bumped as there is no change in the packages output.
(From OE-Core rev: 1e6dce3228a483b2367286e49c4aa8a71733dcbb)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This ensures packaging of the ncurses libraries moved to
base_libdir is done correctly.
(From OE-Core rev: a897c05ae5c70d81f4d88e7186f9bb9a721ee343)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If wide character support is disabled (as it is with poky-tiny, for
example) then we won't have libncursesw.so.*, so skip moving these files
in that case. (Fixes a regression introduced in OE-Core revision
ccd370ab147b78de7a5bd74818f755f4d3ca6d81).
(From OE-Core rev: fa15b1dfbf338969660a352deb870dfd5727bc47)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The previous approach to moving the ncurses libraries to
base_libdir was too aggressive, and it broke curses support
in python.
Instead, move only libncurses, libncursesw, and libtinfo to
base_libdir and leave the remaining libraries in libdir.
Also delete ${libdir}/terminfo as it never gets packaged to
avoid a QA warning.
This fixes [YOCTO #2070] and is a partial fix for [YOCTO #1937].
(From OE-Core rev: ccd370ab147b78de7a5bd74818f755f4d3ca6d81)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For target, both base_libdir and libdir in sysroot can be used, as we pass
--sysroot to the toolchain. For native, we don't do this, and we also only add
-L<sysroot>/${libdir}, not -L<sysroot>/${base_libdir}, resulting in other
native recipes (like readline-native) failing to find the ncurses libraries.
readline-native only built successfully on hosts where it could fall back to
their ncurses/termcap rather than the one in the sysroot.
(From OE-Core rev: dd05e06b89906002f68d616a6326c962e725bc54)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Various utilities (including bash and the util-linux programs) located
in base_bindir (/bin) or base_sbindir (/sbin) dynamically link against
many of the ncurses libraries. So move these libraries from libdir
(/usr/lib) to base_libdir (/lib).
(From OE-Core rev: 796c3d038fb7892a5e5206fb10217623de18853f)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Set ENABLE_WIDEC with ?= instead of = to allow for the external override
by distro definitions.
(From OE-Core rev: 516480b1518093b17c2211be0966b7b31aeb2721)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current libcurses (backward compat) links to libncurses.so.5.9,
this causes a problem since this library also needs libtinfo, the
libncurses.so, uses a "ld script" to include both, libcurses.so
should point to libncurses.so (the script) not the library.
(From OE-Core rev: 6e3a0c0eb6938f3f04fb42784fe1744f30762d3b)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Jackie Huang
Richard Purdie
Juro Bystricky
Hongxu Jia
Trevor Woerner
Patrick Ohly
Alexander Kanavin
Markus Lehtonen
Dengke Du
Ming Liu
Maxin B. John
Richard Tollerton
Christophe Guillon
Khem Raj
Robert Yang
Ross Burton
Seth Bollinger
Saul Wold
Jason Wessel
Jeffrey C Honig
Marcin Juszkiewicz
Mark Hatle
Xiaofeng Yan
Lianhao Lu
Nitin A Kamble
Scott Garman
Paul Eggleton
Christopher Larson
Darren Hart