diff options
author | Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | 2018-01-08 21:09:08 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-01-16 21:39:48 -0800 |
commit | 7919c886cde4b37fa06df43ef2f898792fd59c7c (patch) | |
tree | 6f1378cefd847a6b18dde4b970117b5d9beabc40 | |
parent | e4ccc1fdaf6293f0bfcf0e9425a12e248427d32a (diff) | |
download | meta-openembedded-contrib-7919c886cde4b37fa06df43ef2f898792fd59c7c.tar.gz |
libyui-ncurses: fix indentation, include SRCPV in PV, don't use += and append.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index 02bcf44363..e445ee0ccd 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -1,15 +1,14 @@ SUMMARY = "Character Based User Interface for libyui" LICENSE = "LGPLv3" LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ - " + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ +" -SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - " +SRC_URI = "git://github.com/libyui/libyui-ncurses.git" -SRC_URI_append_class-target += " file://0001-Fix-the-error-of-can-t-find-header-file.patch" +SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" -PV = "2.48.3+git" +PV = "2.48.3+git${SRCPV}" SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd" S = "${WORKDIR}/git" @@ -21,26 +20,26 @@ DEPENDS += "boost libyui ncurses" BBCLASSEXTEND = "nativesdk" do_configure_prepend () { - cd ${S} - git checkout bootstrap.sh - sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh - ./bootstrap.sh - mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - cd - - sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt - sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake + cd ${S} + git checkout bootstrap.sh + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh + ./bootstrap.sh + mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cd - + sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake } do_install_append () { - if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then - mv ${D}/usr/lib64 ${D}/usr/lib - fi + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi } do_install_append_class-nativesdk () { - mkdir -p ${D}/${base_prefix} - mv ${D}/usr ${D}/${base_prefix} + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} } FILES_${PN} += "${datadir}/*" |