diff options
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb')
| -rw-r--r-- | yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index 5f518d22d..8873b2870 100644 --- a/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -5,13 +5,14 @@ HOMEPAGE = "http://code.google.com/p/opkg/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" -PROVIDES += "virtual/update-alternatives" +PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a" PV = "0.1.8+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/opkg-utils" - +SRC_URI = "git://git.yoctoproject.org/opkg-utils \ + file://opkg-build-Exit-when-fail-to-list-files.patch \ + file://0001-opkg-build-re-do-find-ls-code-to-not-fail-on-filenam.patch" SRC_URI_append_class-native = " file://tar_ignore_error.patch" S = "${WORKDIR}/git" @@ -21,15 +22,21 @@ TARGET_CC_ARCH += "${LDFLAGS}" PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold" PYTHONRDEPS_class-native = "" -PACKAGECONFIG = "python" +PACKAGECONFIG = "python update-alternatives" PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" +PACKAGECONFIG[update-alternatives] = ",,," do_install() { oe_runmake PREFIX=${prefix} DESTDIR=${D} install + if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then + rm -f "${D}${bindir}/update-alternatives" + fi } do_install_append_class-target() { - sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${libdir},g' + if [ -e "${D}${bindir}/update-alternatives" ]; then + sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' + fi } PACKAGES =+ "update-alternatives-opkg" |