Skip to contentSkip to conversation

meta: Fix for ncurses minicom and archiver.bbclass

PATCH New Robert Yang 1 participant 4 messages Dec 8, 2020

lore
Share & tools
lore
#0 lore raw

cover meta: Fix for ncurses minicom and archiver.bbclass

The following changes since commit e995e67bc7a3d30adf9f8d0d2f4df92a941baeae:

meta/lib/oeqa/manual/oe-core.json: Update test_bitbake_devshell (2020-12-06 23:16:50 +0000)

are available in the Git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/3fixes

Robert Yang (3):
ncurses: Make ncurses-tools depend on ncurses-terminfo-base
minicom: RDEPENDS on ncurses-terminfo-base archiver.bbclass: Fix --runall=deploy_archives for images

 meta/classes/archiver.bbclass                  | 1 +
 meta/recipes-core/ncurses/ncurses.inc          | 2 +-
 meta/recipes-extended/minicom/minicom_2.7.1.bb | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 ncurses: Make ncurses-tools depend on ncurses-terminfo-base

Fixed when ncurses-terminfo-base is not installed:

$ infocmp
infocmp: couldn't open terminfo file linux.

The required file is in ncurses-terminfo-base

---
 meta/recipes-core/ncurses/ncurses.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/ncurses/ncurses.inc +1 -1
index 4b618896680..fe4e8a5d6e1 100644
@@ -312,7 +312,7 @@ FILES_${PN}-tools = "\
 "
 
 # 'reset' is a symlink to 'tset' which is in the 'ncurses' package
-RDEPENDS_${PN}-tools = "${PN}"
+RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base"
 
 FILES_${PN}-terminfo = "\
   ${datadir}/terminfo \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 minicom: RDEPENDS on ncurses-terminfo-base

In reply to Robert Yang

Fixed when ncurses-terminfo-base is not installed:

$ minicom
No termcap database present!
---
 meta/recipes-extended/minicom/minicom_2.7.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/minicom/minicom_2.7.1.bb +2 -0
index c584b7589e2..12003ff49eb 100644
@@ -29,3 +29,5 @@ do_install() {
 }
 
 RRECOMMENDS_${PN} += "lrzsz"
+
+RDEPENDS_${PN} += "ncurses-terminfo-base"
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/3 archiver.bbclass: Fix --runall=deploy_archives for images

In reply to Robert Yang

Fixed:
INHERIT += "archiver"
COPYLEFT_LICENSE_INCLUDE = "*"

$ bitbake core-image-minimal --runall=deploy_archives
[snip]
KeyError: '/path/to/meta/recipes-core/images/core-image-minimal.bb:do_ar_original'
[snip]
---
 meta/classes/archiver.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/archiver.bbclass +1 -0
index 598298ef6f6..858507b3439 100644
@@ -590,6 +590,7 @@ addtask do_dumpdata
 addtask do_ar_recipe
 addtask do_deploy_archives
 do_build[recrdeptask] += "do_deploy_archives"
+do_rootfs[recrdeptask] += "do_deploy_archives"
 do_populate_sdk[recrdeptask] += "do_deploy_archives"
 
 python () {
Signature · 1 line
2.17.1