mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-12 05:11:59 +00:00
Code Issues Projects Releases Wiki Activity

libyui-ncurses: fix indentation, include SRCPV in PV, don't use += and append.

Browse Source 
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>
This commit is contained in:
Zheng Ruoqin
2018-01-08 21:09:08 +00:00
committed by Armin Kuster
parent e4ccc1fdaf
commit 7919c886cd
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
+19 -20
View File
@@ -1,15 +1,14 @@
SUMMARY = "Character Based User Interface for libyui" SUMMARY = "Character Based User Interface for libyui"
LICENSE = "LGPLv3" LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 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" SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -21,26 +20,26 @@ DEPENDS += "boost libyui ncurses"
BBCLASSEXTEND = "nativesdk" BBCLASSEXTEND = "nativesdk"
do_configure_prepend () { do_configure_prepend () {
cd ${S} cd ${S}
git checkout bootstrap.sh git checkout bootstrap.sh
sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh
./bootstrap.sh ./bootstrap.sh
mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ 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/ cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/
cd - cd -
sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt 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 sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake
} }
do_install_append () { do_install_append () {
if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then
mv ${D}/usr/lib64 ${D}/usr/lib mv ${D}/usr/lib64 ${D}/usr/lib
fi fi
} }
do_install_append_class-nativesdk () { do_install_append_class-nativesdk () {
mkdir -p ${D}/${base_prefix} mkdir -p ${D}/${base_prefix}
mv ${D}/usr ${D}/${base_prefix} mv ${D}/usr ${D}/${base_prefix}
} }
FILES_${PN} += "${datadir}/*" FILES_${PN} += "${datadir}/*"