diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2015-11-10 14:07:19 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:23:15 +0000 |
| commit | 0afb74e23ee9a1fcdd334865a5f7280526785a4c (patch) | |
| tree | 7fe43e4e0c190ac9df080b43c54a169ba3d2494d | |
| parent | f78c640f1f41eb12ef7919e7dc99aae7db6f6b17 (diff) | |
| download | openembedded-core-0afb74e23ee9a1fcdd334865a5f7280526785a4c.tar.gz openembedded-core-0afb74e23ee9a1fcdd334865a5f7280526785a4c.tar.bz2 openembedded-core-0afb74e23ee9a1fcdd334865a5f7280526785a4c.zip | |
opkg-utils: add update-alternatives PACKAGECONFIG
This lets someone use a different update-alternatives-native provider. Without
this available, they'll step on one another in the sysroot unconditionally,
since we need to build opkg-utils-native for ipk based builds regardless.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index 5f518d22d1..b242d1f3fb 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -5,7 +5,7 @@ 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}" @@ -21,15 +21,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,${libdir},g' + fi } PACKAGES =+ "update-alternatives-opkg" |