From 26cc941cb4c29b919ed455e4a14e86b424f5f4ec Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 9 May 2018 14:46:43 -0700 Subject: console-tools: move ASNEEDED over-ride into the console-tools recipe Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). Also misc minor recipe cleanup (re-order variables to follow the OE style guide, etc). (From OE-Core rev: c4ceaaea207e15bafd4261c33fd20fdf66d50c7d) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/as-needed.inc | 1 - meta/recipes-core/console-tools/console-tools_0.3.2.bb | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'meta') diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc index 38de3a10f2..91c0762727 100644 --- a/meta/conf/distro/include/as-needed.inc +++ b/meta/conf/distro/include/as-needed.inc @@ -1,7 +1,6 @@ ASNEEDED = "-Wl,--as-needed" -ASNEEDED_pn-console-tools = "" ASNEEDED_pn-distcc = "" ASNEEDED_pn-openobex = "" ASNEEDED_pn-icu = "" diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb index 286c2a4753..6b9c82834c 100644 --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb @@ -1,8 +1,8 @@ +SUMMARY = "Allows you to set-up and manipulate the Linux console" +DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9" -SUMMARY = "Allows you to set-up and manipulate the Linux console" -DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ @@ -26,8 +26,12 @@ SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/" UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P(\d\d?\.)+\d\d?)/" +inherit autotools gettext update-alternatives + CFLAGS_append_aarch64 = " -D_USE_TERMIOS " +ASNEEDED = "" + do_configure_prepend () { mkdir -p ${S}/m4 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/ @@ -35,8 +39,6 @@ do_configure_prepend () { cp ${WORKDIR}/Makevars ${S}/po/ } -inherit autotools gettext update-alternatives - ALTERNATIVE_PRIORITY = "30" bindir_progs = "chvt deallocvt fgconsole openvt" -- cgit v1.2.3-54-g00ecf