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:26:29 +0000 |
commit | d6bc84192cb144a0d84aecfb0cab868b454cb48a (patch) | |
tree | 5a34252cc73cb570965c0816bcc282d6134fe72f /meta/recipes-devtools/opkg-utils | |
parent | c3b96fffaca74393c239badabfefb11047ab7290 (diff) | |
download | poky-d6bc84192cb144a0d84aecfb0cab868b454cb48a.tar.gz |
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.
(From OE-Core rev: 0afb74e23ee9a1fcdd334865a5f7280526785a4c)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg-utils')
-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/" | |||
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
7 | file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" | 7 | file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083" |
8 | PROVIDES += "virtual/update-alternatives" | 8 | PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" |
9 | 9 | ||
10 | SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a" | 10 | SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a" |
11 | PV = "0.1.8+git${SRCPV}" | 11 | PV = "0.1.8+git${SRCPV}" |
@@ -21,15 +21,21 @@ TARGET_CC_ARCH += "${LDFLAGS}" | |||
21 | PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold" | 21 | PYTHONRDEPS = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold" |
22 | PYTHONRDEPS_class-native = "" | 22 | PYTHONRDEPS_class-native = "" |
23 | 23 | ||
24 | PACKAGECONFIG = "python" | 24 | PACKAGECONFIG = "python update-alternatives" |
25 | PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" | 25 | PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" |
26 | PACKAGECONFIG[update-alternatives] = ",,," | ||
26 | 27 | ||
27 | do_install() { | 28 | do_install() { |
28 | oe_runmake PREFIX=${prefix} DESTDIR=${D} install | 29 | oe_runmake PREFIX=${prefix} DESTDIR=${D} install |
30 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then | ||
31 | rm -f "${D}${bindir}/update-alternatives" | ||
32 | fi | ||
29 | } | 33 | } |
30 | 34 | ||
31 | do_install_append_class-target() { | 35 | do_install_append_class-target() { |
32 | sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${libdir},g' | 36 | if [ -e "${D}${bindir}/update-alternatives" ]; then |
37 | sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${libdir},g' | ||
38 | fi | ||
33 | } | 39 | } |
34 | 40 | ||
35 | PACKAGES =+ "update-alternatives-opkg" | 41 | PACKAGES =+ "update-alternatives-opkg" |