diff options
| -rw-r--r-- | meta/packages/ncurses/ncurses-native_5.4.bb | 2 | ||||
| -rw-r--r-- | meta/packages/ncurses/ncurses-sdk_5.4.bb | 3 | ||||
| -rw-r--r-- | meta/packages/ncurses/ncurses.inc | 20 |
3 files changed, 17 insertions, 8 deletions
diff --git a/meta/packages/ncurses/ncurses-native_5.4.bb b/meta/packages/ncurses/ncurses-native_5.4.bb index 19e379a15c..310a4bb27c 100644 --- a/meta/packages/ncurses/ncurses-native_5.4.bb +++ b/meta/packages/ncurses/ncurses-native_5.4.bb @@ -1,6 +1,4 @@ -SECTION = "libs" require ncurses_${PV}.bb inherit native EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}" diff --git a/meta/packages/ncurses/ncurses-sdk_5.4.bb b/meta/packages/ncurses/ncurses-sdk_5.4.bb new file mode 100644 index 0000000000..fb69c1ec7d --- /dev/null +++ b/meta/packages/ncurses/ncurses-sdk_5.4.bb @@ -0,0 +1,3 @@ +require ncurses_${PV}.bb +inherit sdk +EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc index 60cc9db66b..fd0885356b 100644 --- a/meta/packages/ncurses/ncurses.inc +++ b/meta/packages/ncurses/ncurses.inc @@ -19,6 +19,8 @@ FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabse PARALLEL_MAKE="" +FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}" + EXTRA_OECONF = "--with-shared \ --with-libtool \ --without-profile \ @@ -74,18 +76,24 @@ do_install() { ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm fi - mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN} - mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN} + if [ "${PN}" = "ncurses" ]; then + mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN} + mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN} + fi } pkg_postinst_ncurses-tools () { - update-alternatives --install ${bindir}/clear clear clear.${PN} 100 - update-alternatives --install ${bindir}/reset reset reset.${PN} 100 + if [ "${PN}" = "ncurses" ]; then + update-alternatives --install ${bindir}/clear clear clear.${PN} 100 + update-alternatives --install ${bindir}/reset reset reset.${PN} 100 + fi } pkg_prerm_ncurses-tools () { - update-alternatives --remove clear clear.${PN} - update-alternatives --remove reset reset.${PN} + if [ "${PN}" = "ncurses" ]; then + update-alternatives --remove clear clear.${PN} + update-alternatives --remove reset reset.${PN} + fi } |