sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

image-mklibs/package_ipk: Remove bashisms 

We now support using dash but these bashisms triggered build failures for me
when using it. This replaces the code with something which works on dash.

(From OE-Core rev: 4a85312568a6bb052cc511c15b4ae842ff7f8e59)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-01-05 12:50:11 +00:00
parent a10af679ec
commit 5797feac5f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/image-mklibs.bbclass
View File

@ -60,7 +60,7 @@ mklibs_optimize_image_doit() {
mklibs_optimize_image() {
for img in ${MKLIBS_OPTIMIZED_IMAGES}
do
if [ "${img}" == "${PN}" ] || [ "${img}" == "all" ]
if [ "${img}" = "${PN}" ] || [ "${img}" = "all" ]
then
mklibs_optimize_image_doit
break

8
meta/classes/package_ipk.bbclass
View File

@ -72,8 +72,10 @@ package_tryout_install_multilib_ipk() {
local ipkg_args="-f ${INSTALL_CONF_IPK} -o ${target_rootfs} --force_overwrite"
local selected_pkg=""
local pkgname_prefix="${item}-"
local pkgname_len=${#pkgname_prefix}
for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do
if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then
local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
if [ ${pkgname} = ${pkgname_prefix} ]; then
selected_pkg="${selected_pkg} ${pkg}"
fi
done
@ -94,7 +96,9 @@ split_multilib_packages() {
is_multilib=0
for item in ${MULTILIB_VARIANTS}; do
local pkgname_prefix="${item}-"
if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then
local pkgname_len=${#pkgname_prefix}
local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
if [ ${pkgname} = ${pkgname_prefix} ]; then
is_multilib=1
break
fi