From 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 17 Aug 2016 14:31:25 -0500 Subject: yocto-poky: Move to import-layers subdir We are going to import additional layers, so create a subdir to hold all of the layers that we import with git-subtree. Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799 Signed-off-by: Patrick Williams --- .../meta/recipes-core/ncurses/files/config.cache | 4 - .../meta/recipes-core/ncurses/files/tic-hang.patch | 27 -- yocto-poky/meta/recipes-core/ncurses/ncurses.inc | 310 --------------------- .../recipes-core/ncurses/ncurses_6.0+20160213.bb | 10 - .../meta/recipes-core/ncurses/site_config/headers | 5 - 5 files changed, 356 deletions(-) delete mode 100644 yocto-poky/meta/recipes-core/ncurses/files/config.cache delete mode 100644 yocto-poky/meta/recipes-core/ncurses/files/tic-hang.patch delete mode 100644 yocto-poky/meta/recipes-core/ncurses/ncurses.inc delete mode 100644 yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb delete mode 100644 yocto-poky/meta/recipes-core/ncurses/site_config/headers (limited to 'yocto-poky/meta/recipes-core/ncurses') diff --git a/yocto-poky/meta/recipes-core/ncurses/files/config.cache b/yocto-poky/meta/recipes-core/ncurses/files/config.cache deleted file mode 100644 index 6a9217d5b..000000000 --- a/yocto-poky/meta/recipes-core/ncurses/files/config.cache +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -cf_cv_func_nanosleep=yes -cf_cv_func_mkstemp=yes diff --git a/yocto-poky/meta/recipes-core/ncurses/files/tic-hang.patch b/yocto-poky/meta/recipes-core/ncurses/files/tic-hang.patch deleted file mode 100644 index cba89d26f..000000000 --- a/yocto-poky/meta/recipes-core/ncurses/files/tic-hang.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -'tic' of some linux distributions (e.g. fedora 11) hang in an infinite -loop when processing the original file. - -Index: ncurses-5.7/misc/terminfo.src -=================================================================== ---- ncurses-5.7.orig/misc/terminfo.src -+++ ncurses-5.7/misc/terminfo.src -@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key - # The value for kbs reflects local customization rather than the settings used - # for XFree86 xterm. - konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, -- kend=\EOF, khome=\EOH, use=konsole+pcfkeys, -- use=konsole-vt100, --# Konsole does not implement shifted cursor-keys. --konsole+pcfkeys|konsole subset of xterm+pcfkeys, -- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, -- use=xterm+pcf0, -+ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, -+ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, -+ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, -+ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, -+ khome=\EOH, use=konsole-vt100, - # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but - # it is still useful for deriving the other entries. - konsole-vt100|KDE console window with vt100 (sic) keyboard, diff --git a/yocto-poky/meta/recipes-core/ncurses/ncurses.inc b/yocto-poky/meta/recipes-core/ncurses/ncurses.inc deleted file mode 100644 index ff0117b82..000000000 --- a/yocto-poky/meta/recipes-core/ncurses/ncurses.inc +++ /dev/null @@ -1,310 +0,0 @@ -SUMMARY = "The New Curses library" -DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." -HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" -SECTION = "libs" -DEPENDS = "ncurses-native" -DEPENDS_class-native = "" - -BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config" - -inherit autotools binconfig-disabled multilib_header pkgconfig - -# Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ -SRC_URI = "git://anonscm.debian.org/collab-maint/ncurses.git" - -EXTRA_AUTORECONF = "-I m4" -CONFIG_SITE =+ "${WORKDIR}/config.cache" - -# Whether to enable separate widec libraries; must be 'true' or 'false' -# -# TODO: remove this variable when widec is supported in every setup? -ENABLE_WIDEC ?= "true" - -# _GNU_SOURCE is required for widec stuff and is detected automatically -# for target objects. But it must be set manually for native and sdk -# builds. -BUILD_CPPFLAGS += "-D_GNU_SOURCE" - -# natives don't generally look in base_libdir -base_libdir_class-native = "${libdir}" - -# Display corruption occurs on 64 bit hosts without these settings -# This was derrived from the upstream debian ncurses which uses -# these settings for 32 and 64 bit hosts. -EXCONFIG_ARGS = "" -EXCONFIG_ARGS_class-native = " \ - --disable-lp64 \ - --with-chtype='long' \ - --with-mmask-t='long'" -EXCONFIG_ARGS_class-nativesdk = " \ - --disable-lp64 \ - --with-chtype='long' \ - --with-mmask-t='long'" - -PACKAGES_DYNAMIC = "^${PN}-lib.*" - -# Fall back to the host termcap / terminfo for -nativesdk and -native -# The reality is a work around for strange problems with things like -# "bitbake -c menuconfig busybox" where it cannot find the terminfo -# because the sstate had a hard coded search path. Until this is fixed -# another way this is deemed good enough. -EX_TERMCAP = "" -EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap" -EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" -EX_TERMINFO = "" -EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" -EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" - -# Helper function for do_configure to allow multiple configurations -# $1 the directory to run configure in -# $@ the arguments to pass to configure -ncurses_configure() { - mkdir -p $1 - cd $1 - shift - oe_runconf \ - --disable-static \ - --without-debug \ - --without-ada \ - --without-gpm \ - --enable-hard-tabs \ - --enable-xmc-glitch \ - --enable-colorfgbg \ - --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap${EX_TERMCAP}' \ - --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo${EX_TERMINFO}' \ - --with-shared \ - --disable-big-core \ - --program-prefix= \ - --with-ticlib \ - --with-termlib=tinfo \ - --enable-sigwinch \ - --enable-pc-files \ - --disable-rpath-hack \ - ${EXCONFIG_ARGS} \ - --with-manpage-format=normal \ - "$@" || return 1 - cd .. -} - -# Override the function from the autotools class; ncurses requires a -# patched autoconf213 to generate the configure script. This autoconf -# is not available so that the shipped script will be used. -do_configure() { - # check does not work with cross-compiling and is generally - # broken because it requires stdin to be pollable (which is - # not the case for /dev/null redirections) - export cf_cv_working_poll=yes - #Remove ${includedir} from CPPFLAGS, need for cross compile - sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" - - # The --enable-pc-files requires PKG_CONFIG_LIBDIR existed - mkdir -p ${PKG_CONFIG_LIBDIR} - ( cd ${S}; gnu-configize --force ) - ncurses_configure "narrowc" || \ - return 1 - ! ${ENABLE_WIDEC} || \ - ncurses_configure "widec" "--enable-widec" "--without-progs" - -} - -do_compile() { - oe_runmake -C narrowc libs - oe_runmake -C narrowc/progs - - ! ${ENABLE_WIDEC} || \ - oe_runmake -C widec libs -} - -# set of expected differences between narrowc and widec header -# -# TODO: the NCURSES_CH_T difference can cause real problems :( -_unifdef_cleanup = " \ - -e '\!/\* \$Id: curses.wide,v!,\!/\* \$Id: curses.tail,v!d' \ - -e '/^#define NCURSES_CH_T /d' \ - -e '/^#include /d' \ - -e '\!^/\* .* \*/!d' \ -" - -do_test[depends] = "unifdef-native:do_populate_sysroot" -do_test[dirs] = "${S}" -do_test() { - ${ENABLE_WIDEC} || return 0 - - # make sure that the narrow and widec header are compatible - # and differ only in minor details. - unifdef -k narrowc/include/curses.h | \ - sed ${_unifdef_cleanup} > curses-narrowc.h - unifdef -k widec/include/curses.h | \ - sed ${_unifdef_cleanup} > curses-widec.h - - diff curses-narrowc.h curses-widec.h -} - -# Split original _install_opts to two parts. -# One is the options to install contents, the other is the parameters \ -# when running command "make install" -# Note that install.libs will also implicitly install header files, -# so we do not need to explicitly specify install.includes. -# Doing so could in fact result in a race condition, as both targets -# (install.libs and install.includes) would install the same headers -# at the same time - -_install_opts = " install.libs install.man " - -_install_cfgs = "\ - DESTDIR='${D}' \ - PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ -" - -do_install() { - # Order of installation is important; widec installs a 'curses.h' - # header with more definitions and must be installed last hence. - # Compatibility of these headers will be checked in 'do_test()'. - oe_runmake -C narrowc ${_install_cfgs} ${_install_opts} \ - install.progs - - # The install.data should run after install.libs, otherwise - # there would be a race issue in a very critical conditon, since - # tic will be run by install.data, and tic needs libtinfo.so - # which would be regenerated by install.libs. - oe_runmake -C narrowc ${_install_cfgs} \ - install.data - - - ! ${ENABLE_WIDEC} || \ - oe_runmake -C widec ${_install_cfgs} ${_install_opts} - - cd narrowc - - # include some basic terminfo files - # stolen ;) from gentoo and modified a bit - for x in ansi console dumb linux rxvt screen screen-256color sun vt52 vt100 vt102 vt200 vt220 xterm-color xterm-xfree86 xterm-256color - do - local termfile="$(find "${D}${datadir}/terminfo/" -name "${x}" 2>/dev/null)" - local basedir="$(basename $(dirname "${termfile}"))" - - if [ -n "${termfile}" ] - then - install -d ${D}${sysconfdir}/terminfo/${basedir} - mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/ - ln -s /etc/terminfo/${basedir}/${x} \ - ${D}${datadir}/terminfo/${basedir}/${x} - fi - done - # i think we can use xterm-color as default xterm - if [ -e ${D}${sysconfdir}/terminfo/x/xterm-color ] - then - ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm - fi - - rm -f ${D}${libdir}/terminfo - - # create linker scripts for libcurses.so and libncurses to - # link against -ltinfo when needed. Some builds might break - # else when '-Wl,--no-copy-dt-needed-entries' has been set in - # linker flags. - for i in libncurses libncursesw; do - f=${D}${libdir}/$i.so - test -h $f || continue - rm -f $f - echo '/* GNU ld script */' >$f - echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f - done - - # Make sure that libcurses is linked so that it gets -ltinfo - # also, this should be addressed upstream really. - ln -sf libncurses.so ${D}${libdir}/libcurses.so - - # create libtermcap.so linker script for backward compatibility - f=${D}${libdir}/libtermcap.so - echo '/* GNU ld script */' >$f - echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f - - if [ ! -d "${D}${base_libdir}" ]; then - # Setting base_libdir to libdir as is done in the -native - # case will skip this code - mkdir ${D}${base_libdir} - mv ${D}${libdir}/libncurses.so.* ${D}${base_libdir} - ! ${ENABLE_WIDEC} || \ - mv ${D}${libdir}/libncursesw.so.* ${D}${base_libdir} - - mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} - rm ${D}${libdir}/libtinfo.so - - # Use lnr to ensure this is a relative link despite absolute paths - # (as we can't know the relationship between base_libdir and libdir). - # At some point we can rely on coreutils 8.16 which has ln -r. - lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so - fi - if [ -d "${D}${includedir}/ncurses" ]; then - for f in `find ${D}${includedir}/ncurses -name "*.h"` - do - f=`basename $f` - test -e ${D}${includedir}/$f && continue - ln -sf ncurses/$f ${D}${includedir}/$f - done - fi - oe_multilib_header curses.h -} - -python populate_packages_prepend () { - libdir = d.expand("${libdir}") - base_libdir = d.expand("${base_libdir}") - pnbase = d.expand("${PN}-lib%s") - do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) - if libdir is not base_libdir: - do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) -} - - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_ncurses-tools_class-target = "clear reset" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES += " \ - ${PN}-tools \ - ${PN}-terminfo-base \ - ${PN}-terminfo \ -" - -FILES_${PN} = "\ - ${bindir}/tput \ - ${bindir}/tset \ - ${bindir}/ncurses5-config \ - ${bindir}/ncursesw5-config \ - ${datadir}/tabset \ -" - -# This keeps only tput/tset in ncurses -# clear/reset are in already busybox -FILES_${PN}-tools = "\ - ${bindir}/tic \ - ${bindir}/toe \ - ${bindir}/infotocap \ - ${bindir}/captoinfo \ - ${bindir}/infocmp \ - ${bindir}/clear${@['', '.${BPN}']['${CLASSOVERRIDE}' == 'class-target']} \ - ${bindir}/reset${@['', '.${BPN}']['${CLASSOVERRIDE}' == 'class-target']} \ - ${bindir}/tack \ - ${bindir}/tabs \ -" - -# 'reset' is a symlink to 'tset' which is in the 'ncurses' package -RDEPENDS_${PN}-tools = "${PN}" - -FILES_${PN}-terminfo = "\ - ${datadir}/terminfo \ -" - -FILES_${PN}-terminfo-base = "\ - ${sysconfdir}/terminfo \ -" - -RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo" -RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base" diff --git a/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb b/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb deleted file mode 100644 index 0d56481a5..000000000 --- a/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160213.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ncurses.inc - -SRC_URI += "file://tic-hang.patch \ - file://config.cache \ -" -# commit id corresponds to the revision in package version -SRCREV = "a25949ff653ac5ae7a204381a3ebfd800feeaa01" -S = "${WORKDIR}/git" -EXTRA_OECONF += "--with-abi-version=5" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)" diff --git a/yocto-poky/meta/recipes-core/ncurses/site_config/headers b/yocto-poky/meta/recipes-core/ncurses/site_config/headers deleted file mode 100644 index 087b7bfd5..000000000 --- a/yocto-poky/meta/recipes-core/ncurses/site_config/headers +++ /dev/null @@ -1,5 +0,0 @@ -curses.h -ncurses/curses.h -ncurses.h -ncurses/termcap.h - -- cgit v1.2.3