diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/autotools.bbclass | 38 | ||||
| -rw-r--r-- | meta/classes/base.bbclass | 7 | ||||
| -rw-r--r-- | meta/classes/packaged-staging.bbclass | 3 |
3 files changed, 28 insertions, 20 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 83ab06337..365258f65 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -175,6 +175,26 @@ autotools_stage_dir() { fi } +autotools_stage_libdir() { + from="$1" + to="$2" + + olddir=`pwd` + cd $from + las=$(find . -name \*.la -type f) + cd $olddir + echo "Found la files: $las" + for i in $las + do + sed -e 's/^installed=yes$/installed=no/' \ + -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ + -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ + -i $from/$i + done + autotools_stage_dir $from $to +} + + autotools_stage_all() { if [ "${INHIBIT_AUTO_STAGE}" = "1" ] then @@ -193,19 +213,11 @@ autotools_stage_all() { fi if [ -d ${STAGE_TEMP}/${libdir} ] then - olddir=`pwd` - cd ${STAGE_TEMP}/${libdir} - las=$(find . -name \*.la -type f) - cd $olddir - echo "Found la files: $las" - for i in $las - do - sed -e 's/^installed=yes$/installed=no/' \ - -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ - -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ - -i ${STAGE_TEMP}/${libdir}/$i - done - autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR} + autotools_stage_libdir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR} + fi + if [ -d ${STAGE_TEMP}/${base_libdir} ] + then + autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir} fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 1b70bfdd5..76b21382f 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -742,12 +742,9 @@ def generate_git_config(e): f = open(gitconfig_path, 'w') f.write("[core]\n") - ignore_count = 1 - ignore_host = data.getVar('GIT_PROXY_IGNORE_1', e.data, True) - while (ignore_host): + ignore_hosts = data.getVar('GIT_PROXY_IGNORE', e.data, True).split() + for ignore_host in ignore_hosts: f.write(" gitproxy = none for %s\n" % ignore_host) - ignore_count += 1 - ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' % ignore_count, e.data, True) f.write(proxy_command) f.close diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 2497ac4d1..144087fed 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass @@ -159,9 +159,8 @@ staging_helper () { mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/ fi if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then - mkdir -p ${TMPDIR}${layout_libdir}/opkg cd ${TMPDIR}${layout_libdir}/ - ln -sf opkg/ ipkg + ln -sf opkg/ ipkg || true fi } |