diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-02-04 23:06:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-06 09:37:22 +0000 |
commit | 77b1409522abd9bef511a160ec2f768cdd3c7580 (patch) | |
tree | 49096409d9cd3b5436eda032a3bb577d39ec4f84 /meta/recipes-devtools/opkg/opkg-collateral.bb | |
parent | 626dc8b98937bece2793b7f40761bb37b21f8771 (diff) | |
download | poky-77b1409522abd9bef511a160ec2f768cdd3c7580.tar.gz |
ipk: use OPKGLIBDIR in all places
* it's not recommended to change this value, because it breaks upgrade path on target
(all old u-a alternatives are forgot in old OPKGLIBDIR value
* but make it consistent, so if someone really want to change that, then
setting OPKGLIBDIR_distro in distro.conf would be enough
* without this there were at least 4 places to change:
rootfs_ipk: opkglibdir variable (notice that I've removed /opkg from it to correspond
with EXTRA_OECONF option used in opkg recipes
package_ipk: ${target_rootfs}${localstatedir}/lib/opkg/ hardcoded in
package_install_internal_ipk
opkg-collateral: value in lists file
opkg: EXTRA_OECONF for all 3 classes, FILES_libopkg, do_install
* validated with buildhistory that without OPKGLIBDIR explicitly set the
output is the same and that after setting
OPKGLIBDIR_forcevariable := "${libdir}"
everything including empty directory from package_ipk is moved to
libdir
(From OE-Core rev: cf0aa9c4fdae8855803e96b1922d54a2431795d3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg-collateral.bb')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg-collateral.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb index 251c535438..cacd8800e9 100644 --- a/meta/recipes-devtools/opkg/opkg-collateral.bb +++ b/meta/recipes-devtools/opkg/opkg-collateral.bb | |||
@@ -2,18 +2,18 @@ DESCRIPTION = "opkg configuration files" | |||
2 | SECTION = "base" | 2 | SECTION = "base" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
5 | PR = "r1" | 5 | PR = "r2" |
6 | 6 | ||
7 | SRC_URI = "file://opkg.conf.comments \ | 7 | SRC_URI = "file://opkg.conf.comments \ |
8 | file://lists \ | ||
9 | file://dest \ | 8 | file://dest \ |
10 | file://src " | 9 | file://src " |
11 | 10 | ||
11 | OPKGLIBDIR = "${localstatedir}/lib" | ||
12 | do_compile () { | 12 | do_compile () { |
13 | cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf | 13 | cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf |
14 | cat ${WORKDIR}/src >>${WORKDIR}/opkg.conf | 14 | cat ${WORKDIR}/src >>${WORKDIR}/opkg.conf |
15 | cat ${WORKDIR}/dest >>${WORKDIR}/opkg.conf | 15 | cat ${WORKDIR}/dest >>${WORKDIR}/opkg.conf |
16 | cat ${WORKDIR}/lists >>${WORKDIR}/opkg.conf | 16 | echo "lists_dir ext ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf |
17 | } | 17 | } |
18 | 18 | ||
19 | do_install () { | 19 | do_install () { |