Commit Graph

43 Commits

Author SHA1 Message Date
Seth Bollinger 664eb433d9 ncurses-terminfo: Remove bashism from basic terminfo installation
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 master rev: edd7d53c6149b27d5636a458db91650c8c400612)

(From OE-Core rev: ccb25cd9df9ed4b84b74170336cfde5c1dc3d013)

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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 17:00:09 +00:00
Saul Wold caa4130c68 ncurses: add xterm-256color to terminfo-base
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>
2013-07-13 18:23:38 +01:00
Jason Wessel 4128b217c6 ncurses: Fix problems expanding ncurses-libtinfo when in IMAGE_INSTALL
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>
2013-05-30 20:59:12 +01:00
Richard Purdie 64cd9855c8 ncurses: Fix case where ${B} != ${S}
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>
2013-03-18 13:18:23 +00:00
Jeffrey C Honig bac332acb2 Help ncurses-native find terminfo on RHEL 6
[ 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>
2013-03-02 12:56:54 +00:00
Jason Wessel 1a80329b3f ncurses.inc: Fix display corruption and add fallback for sstate compiled paths
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>
2013-02-11 14:46:11 +00:00
Marcin Juszkiewicz 264ca0fdbe ncurses: update gnu-config files in do_configure()
(From OE-Core rev: 52d4c2cb6cd15f8ebaacc92ddf71274bf7a421d5)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-20 15:31:48 +00:00
Robert Yang 5d94d29f55 recipes-core: replace virtclass-native(sdk) with class-native(sdk)
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>
2012-11-02 16:18:27 +00:00
Robert Yang dfc39d7bd5 nativesdk-ncurses 5.9: files were installed but not shipped
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>
2012-10-24 12:50:45 +01:00
Mark Hatle cf7cff7d23 Cleanup: fix PN == BPN cases
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>
2012-10-02 11:40:50 +01:00
Saul Wold c800fd8b7b ncurses: fix file names for update -alternatives
(From OE-Core rev: 256a832f60ecd8cba6de9457ebd1824b20587952)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-19 10:45:56 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Saul Wold 6e41732550 ncurses: fix packaging issue in multilib build
ERROR: QA Issue: lib32-ncurses: Files/directories were installed but not shipped
  /usr/bin/clear.ncurses
  /usr/bin/reset.ncurses

(From OE-Core rev: e3a29405a59df45ff72f088c602181e1435d8abe)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 16:59:00 +01:00
Mark Hatle 4ca029b30f ncurses: use new update-alternatives
(From OE-Core rev: 54a92bdd0555d776efe92f7cf57a75039562556a)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 12:04:41 +01:00
Xiaofeng Yan 5022c3ecd7 ncurses: Avoid occasional builling failure when having parallel processable task
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>
2012-05-24 08:51:38 +01:00
Lianhao Lu 065a9a6c3b ncurses: ship clear/reset in package.
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>
2012-03-23 12:13:07 +00:00
Nitin A Kamble ce150811a6 ncurses: fix install error
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>
2012-03-15 13:33:51 +00:00
Scott Garman 73371e121e ncurses: fix packaging of moved libraries
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>
2012-03-15 00:11:39 +00:00
Paul Eggleton d1646743bc ncurses: fix build when ENABLE_WIDEC is not set
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>
2012-03-14 13:17:41 +00:00
Scott Garman 7ab3ab9bcb ncurses: move only libncurses and libtinfo to base_libdir
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>
2012-03-13 11:52:12 +00:00
Richard Purdie b1aeaa8b0d meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
 -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
 -i `grep -ril bb.data.expand *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:23:53 -08:00
Christopher Larson 4807e0b3ae ncurses-native: install to libdir, not base_libdir
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>
2012-01-17 14:53:14 +00:00
Scott Garman f8f5c05406 ncurses: move libraries to base_libdir
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>
2012-01-05 11:24:45 +00:00
Darren Hart e559160b88 ncurses: Allow override of ENABLE_WIDEC
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>
2011-12-21 17:16:28 +00:00
Saul Wold 1d2908d910 ncurses: libcurses.so should link to libncurses.so
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>
2011-12-12 21:50:14 +00:00
Darren Hart 90c789e576 ncurses: refactor configure to avoid configuring widec when disabled
The ENABLE_WIDEC variable can be used to disable ncurses wide character support
when your C library doesn't support it. Currently, the do_configure step
configures for both narrow and wide characters regardless and only checks
ENABLE_WIDEC during compilation. This leads to QA failures with host
contamination during configure if the C library doesn't support wide characters.

Refactor do_configure with a new ncurses_configure helper function and only
configure for wide character support if ENABLE_WIDEC is true.

Ensure that configure errors are propogated back through to do_configure.

Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586,
including basic error injection.

V2: INC_PR bump

(From OE-Core rev: 8b995deb046469c1c713fa053510d2fe94454133)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 12:08:57 +00:00
Mark Hatle 19715dafa5 ncurses: Resolve header and man page multilib conflicts
By default man pages are compressed, the way ncurses compresses
them causes differences (timestamp and name) to be embedded into
the gziped file.  So each build will end up with a slightly
different file.  Avoid this, by not compressing the man pages.

Avoid header conflict with curses.h using the multilib header
helper.

(From OE-Core rev: ae5269039511d0f3d8aa6a87cb8d9fcf01d79ddd)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 15:45:48 +01:00
Mark Hatle f306906956 ncurses: Fix site_config
The site_config directory should have been attached to ncurses.

(From OE-Core rev: e85d9ce426168374285cd7a2c87fc82bf9cb675a)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-14 15:02:29 +01:00
Qing He 9deb373671 update patch upstream status
This patch includes the update of patch upstream status of the following
recipes (50 in all):

grub pciutils setserial dhcp iproute2 libnss-mdns nfs-utils openssl portmap
busybox coreutils dbus dropbear ncurses readline sysfsutils sysvinit tinylogin
udev update-rc.d util-linux elfutils file pkgconfig syslinux ubootchart
yaffs2 findutils gamin hdparm libaio libzypp parted procps sat-solver
screen sed sysklogd tcp-wrapper time zypper attr boost createrepo gnutls
hal js libgcrypt libnl libusb-compat

(From OE-Core rev: 1e6f767663b7d5fb6277fd2b214f4a50e24d4ffd)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 11:02:14 +01:00
Richard Purdie 90f803de19 ncurses: Remove unwanted package config from previous .inc merge
This fixes various build warnings and failures.

(From OE-Core rev: 82561aa631c4e0e0756925774e5126e79f8d9907)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-12 10:12:20 -07:00
Tom Rini 2588569c97 ncurses: Update to 5.9
The previous 5.7 release was relatively close to 5.8 due to it bringing
in a patch to sync with upstream work-in-progress.  We skip over the
5.8 release and move to 5.9.  Also, we move most of the contents of the
main recipe into the previously unused ncurses.inc file.

(From OE-Core rev: 296ac8b2b0fe5b84f04a272b33d1df37bdac986f)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-08 06:18:21 -07:00
Dongxiao Xu 0e1f8c2609 ncurses: Change ncurses patch SRC_URI location
One of ncurses's patch has been removed from its original repo
location, use autobuilder cache location instead.

Comment out the original patch address instead of removing it
since we may still need that address when upgrade the recipe later.

This fixes [BUGID #709].

[sgw: fixed having comment embedded in SRC_URI]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-03-01 07:22:06 -08:00
Saul Wold 485aa3a2ff ncurses: reenable PARALLEL_MAKE
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-02-16 07:34:52 -08:00
Richard Purdie 3323759def ncurses: Apply unifdef-native dependency to the task that uses it, not globally
Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
2011-02-10 12:01:04 +00:00
Qing He 5a859fcadc ncurses: upgrade to version 5.7
from 5.4

Largely based on the recipe from OpenEmbedded project
ncurses: fix LIC_FILES_CHKSUM

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-01-02 01:25:40 -08:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Qing He f8fe6482a0 ncurses: update license info
Signed-off-by: Qing He <qing.he@intel.com>
2010-12-01 20:47:04 -08:00
Mark Hatle fa647b9176 recipes-core: Cleanup package descriptions and summaries
[BUGID #281]

Evaluate and update each package in recipes-core to ensure they have a
consistent summary and description.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-10-11 22:15:10 +01:00
Daniel Díaz 8223e50582 ncurses: Fix export of LD_LIBRARY_PATH.
This fixes the following error on do_install:
> line 175: export: `=': not a valid identifier
> line 175: export: `[...]/usr/lib': not a valid identifier

Signed-off-by: Daniel Díaz <yosoy@danieldiaz.org>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-04 09:21:42 +01:00
Richard Purdie 4163767c00 ncurses: Only set LD_LIBRARY_PATH within the do_install
If this is done as a global export it can affect the whole task and the
wrong python libraries can be found for example.

[BUGID #335]

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-02 18:09:14 +01:00
Jeff Polk 2e9d981d76 autotools: enable siteconfig by default
eglibc glibc ncurses uclibc zlib: remove explicit siteconfig

Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
2010-09-10 12:57:16 +01:00
Jeff Polk cd9379c390 ncurses: Add siteconfig cache generation
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
2010-09-03 10:50:02 +01:00
Richard Purdie d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00