diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-11 17:33:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 10:24:50 +0100 |
| commit | bfd279de3275abbfaf3e630383ec244131e0375f (patch) | |
| tree | 0d1c90461a890d21444f5d2afb13c52b302427f1 /meta/recipes-core | |
| parent | 99203edda6f0b09d817454d656c100b7a8806b18 (diff) | |
| download | poky-bfd279de3275abbfaf3e630383ec244131e0375f.tar.gz | |
Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.24.bb | 30 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 26 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/cross-localedef-native_2.15.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/cross-localedef-native_2.16.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-ld.inc | 90 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-options.inc | 20 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.15.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.16.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 16 |
10 files changed, 101 insertions, 101 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb index 6eeee5cd5b..0d6f580f51 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb | |||
| @@ -52,30 +52,30 @@ base_passwd_sstate_postinst() { | |||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | python populate_packages_prepend() { | 54 | python populate_packages_prepend() { |
| 55 | # Add in the preinst function for ${PN} | 55 | # Add in the preinst function for ${PN} |
| 56 | # We have to do this here as prior to this, passwd/group.master | 56 | # We have to do this here as prior to this, passwd/group.master |
| 57 | # would be unavailable. We need to create these files at preinst | 57 | # would be unavailable. We need to create these files at preinst |
| 58 | # time before the files from the package may be available, hence | 58 | # time before the files from the package may be available, hence |
| 59 | # storing the data from the files in the preinst directly. | 59 | # storing the data from the files in the preinst directly. |
| 60 | 60 | ||
| 61 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') | 61 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') |
| 62 | passwd = "".join(f.readlines()) | 62 | passwd = "".join(f.readlines()) |
| 63 | f.close() | 63 | f.close() |
| 64 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') | 64 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') |
| 65 | group = "".join(f.readlines()) | 65 | group = "".join(f.readlines()) |
| 66 | f.close() | 66 | f.close() |
| 67 | 67 | ||
| 68 | preinst = """#!/bin/sh | 68 | preinst = """#!/bin/sh |
| 69 | if [ ! -e $D${sysconfdir}/passwd ]; then | 69 | if [ ! -e $D${sysconfdir}/passwd ]; then |
| 70 | cat << EOF > $D${sysconfdir}/passwd | 70 | \tcat << EOF > $D${sysconfdir}/passwd |
| 71 | """ + passwd + """EOF | 71 | """ + passwd + """EOF |
| 72 | fi | 72 | fi |
| 73 | if [ ! -e $D${sysconfdir}/group ]; then | 73 | if [ ! -e $D${sysconfdir}/group ]; then |
| 74 | cat << EOF > $D${sysconfdir}/group | 74 | \tcat << EOF > $D${sysconfdir}/group |
| 75 | """ + group + """EOF | 75 | """ + group + """EOF |
| 76 | fi | 76 | fi |
| 77 | """ | 77 | """ |
| 78 | d.setVar('pkg_preinst_${PN}', preinst) | 78 | d.setVar('pkg_preinst_${PN}', preinst) |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | addtask do_package after do_populate_sysroot | 81 | addtask do_package after do_populate_sysroot |
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 82137a3c0e..f5bf247834 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
| @@ -218,23 +218,23 @@ ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${B | |||
| 218 | ALTERNATIVE_TARGET = "/bin/busybox" | 218 | ALTERNATIVE_TARGET = "/bin/busybox" |
| 219 | 219 | ||
| 220 | python do_package_prepend () { | 220 | python do_package_prepend () { |
| 221 | # We need to load the full set of busybox provides from the /etc/busybox.links | 221 | # We need to load the full set of busybox provides from the /etc/busybox.links |
| 222 | # Use this to see the update-alternatives with the right information | 222 | # Use this to see the update-alternatives with the right information |
| 223 | 223 | ||
| 224 | dvar = d.getVar('D', True) | 224 | dvar = d.getVar('D', True) |
| 225 | pn = d.getVar('PN', True) | 225 | pn = d.getVar('PN', True) |
| 226 | f = open('%s/etc/busybox.links' % (dvar), 'r') | 226 | f = open('%s/etc/busybox.links' % (dvar), 'r') |
| 227 | 227 | ||
| 228 | for alt_link_name in f: | 228 | for alt_link_name in f: |
| 229 | alt_link_name = alt_link_name.strip() | 229 | alt_link_name = alt_link_name.strip() |
| 230 | alt_name = os.path.basename(alt_link_name) | 230 | alt_name = os.path.basename(alt_link_name) |
| 231 | 231 | ||
| 232 | # Match coreutils | 232 | # Match coreutils |
| 233 | if alt_name == '[': | 233 | if alt_name == '[': |
| 234 | alt_name = 'lbracket' | 234 | alt_name = 'lbracket' |
| 235 | 235 | ||
| 236 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) | 236 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) |
| 237 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) | 237 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | pkg_postinst_${PN} () { | 240 | pkg_postinst_${PN} () { |
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb index 493eb61a7a..422e0bb118 100644 --- a/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb +++ b/meta/recipes-core/eglibc/cross-localedef-native_2.15.bb | |||
| @@ -20,7 +20,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h | |||
| 20 | S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" | 20 | S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" |
| 21 | 21 | ||
| 22 | do_unpack_append() { | 22 | do_unpack_append() { |
| 23 | bb.build.exec_func('do_move_ports', d) | 23 | bb.build.exec_func('do_move_ports', d) |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | do_move_ports() { | 26 | do_move_ports() { |
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb index 0f870be10c..47f0834003 100644 --- a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb +++ b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb | |||
| @@ -20,7 +20,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h | |||
| 20 | S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" | 20 | S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" |
| 21 | 21 | ||
| 22 | do_unpack_append() { | 22 | do_unpack_append() { |
| 23 | bb.build.exec_func('do_move_ports', d) | 23 | bb.build.exec_func('do_move_ports', d) |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | do_move_ports() { | 26 | do_move_ports() { |
diff --git a/meta/recipes-core/eglibc/eglibc-ld.inc b/meta/recipes-core/eglibc/eglibc-ld.inc index b3eb46e160..e596b5591f 100644 --- a/meta/recipes-core/eglibc/eglibc-ld.inc +++ b/meta/recipes-core/eglibc/eglibc-ld.inc | |||
| @@ -1,54 +1,54 @@ | |||
| 1 | def ld_append_if_tune_exists(d, infos, dict): | 1 | def ld_append_if_tune_exists(d, infos, dict): |
| 2 | tune = d.getVar("DEFAULTTUNE", True) or "" | 2 | tune = d.getVar("DEFAULTTUNE", True) or "" |
| 3 | libdir = d.getVar("base_libdir", True) or "" | 3 | libdir = d.getVar("base_libdir", True) or "" |
| 4 | if dict.has_key(tune): | 4 | if dict.has_key(tune): |
| 5 | infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') | 5 | infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }') |
| 6 | infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) | 6 | infos['lddrewrite'].add(libdir+'/'+dict[tune][0]) |
| 7 | 7 | ||
| 8 | def eglibc_dl_info(d): | 8 | def eglibc_dl_info(d): |
| 9 | ld_info_all = { | 9 | ld_info_all = { |
| 10 | "mips": ["ld.so.1", "FLAG_ELF_LIBC6"], | 10 | "mips": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 11 | "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | 11 | "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 12 | "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"], | 12 | "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 13 | "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"], | 13 | "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 14 | "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | 14 | "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 15 | "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"], | 15 | "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 16 | "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | 16 | "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 17 | "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | 17 | "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 18 | "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | 18 | "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 19 | "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], | 19 | "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 20 | "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | 20 | "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 21 | "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"], | 21 | "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 22 | "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], | 22 | "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"], |
| 23 | "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"], | 23 | "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"], |
| 24 | "powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"], | 24 | "powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"], |
| 25 | "core2": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | 25 | "core2": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], |
| 26 | "core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], | 26 | "core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], |
| 27 | "x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | 27 | "x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], |
| 28 | "x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], | 28 | "x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"], |
| 29 | "i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], | 29 | "i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"], |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | infos = {'ldconfig':set(), 'lddrewrite':set()} | 32 | infos = {'ldconfig':set(), 'lddrewrite':set()} |
| 33 | ld_append_if_tune_exists(d, infos, ld_info_all) | 33 | ld_append_if_tune_exists(d, infos, ld_info_all) |
| 34 | 34 | ||
| 35 | #DEFAULTTUNE_MULTILIB_ORIGINAL | 35 | #DEFAULTTUNE_MULTILIB_ORIGINAL |
| 36 | original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True) | 36 | original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True) |
| 37 | if original_tune: | 37 | if original_tune: |
| 38 | localdata = bb.data.createCopy(d) | 38 | localdata = bb.data.createCopy(d) |
| 39 | localdata.setVar("DEFAULTTUNE", original_tune) | 39 | localdata.setVar("DEFAULTTUNE", original_tune) |
| 40 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | 40 | ld_append_if_tune_exists(localdata, infos, ld_info_all) |
| 41 | 41 | ||
| 42 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | 42 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" |
| 43 | for item in variants.split(): | 43 | for item in variants.split(): |
| 44 | localdata = bb.data.createCopy(d) | 44 | localdata = bb.data.createCopy(d) |
| 45 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 45 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |
| 46 | localdata.setVar("OVERRIDES", overrides) | 46 | localdata.setVar("OVERRIDES", overrides) |
| 47 | bb.data.update_data(localdata) | 47 | bb.data.update_data(localdata) |
| 48 | ld_append_if_tune_exists(localdata, infos, ld_info_all) | 48 | ld_append_if_tune_exists(localdata, infos, ld_info_all) |
| 49 | infos['ldconfig'] = ','.join(infos['ldconfig']) | 49 | infos['ldconfig'] = ','.join(infos['ldconfig']) |
| 50 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) | 50 | infos['lddrewrite'] = ' '.join(infos['lddrewrite']) |
| 51 | return infos | 51 | return infos |
| 52 | 52 | ||
| 53 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}" | 53 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}" |
| 54 | RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}" | 54 | RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}" |
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc index bd90ee79a2..6009278577 100644 --- a/meta/recipes-core/eglibc/eglibc-options.inc +++ b/meta/recipes-core/eglibc/eglibc-options.inc | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | def eglibc_cfg(feature, features, tokens, cnf): | 1 | def eglibc_cfg(feature, features, tokens, cnf): |
| 2 | if type(tokens) == type(""): | 2 | if type(tokens) == type(""): |
| 3 | tokens = [tokens] | 3 | tokens = [tokens] |
| 4 | if type(features) == type([]) and feature in features: | 4 | if type(features) == type([]) and feature in features: |
| 5 | cnf.extend([token + ' = y' for token in tokens]) | 5 | cnf.extend([token + ' = y' for token in tokens]) |
| 6 | else: | 6 | else: |
| 7 | for token in tokens: | 7 | for token in tokens: |
| 8 | cnf.extend([token + ' = n']) | 8 | cnf.extend([token + ' = n']) |
| 9 | if token == 'OPTION_EGLIBC_NSSWITCH': | 9 | if token == 'OPTION_EGLIBC_NSSWITCH': |
| 10 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"]) | 10 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf"]) |
| 11 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"]) | 11 | cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions"]) |
| 12 | 12 | ||
| 13 | # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code | 13 | # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code |
| 14 | def distro_features_check_deps(distro_features): | 14 | def distro_features_check_deps(distro_features): |
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb index 110febfe52..4d4d2cf2ed 100644 --- a/meta/recipes-core/eglibc/eglibc_2.15.bb +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb | |||
| @@ -78,7 +78,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
| 78 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 78 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |
| 79 | 79 | ||
| 80 | do_unpack_append() { | 80 | do_unpack_append() { |
| 81 | bb.build.exec_func('do_move_ports', d) | 81 | bb.build.exec_func('do_move_ports', d) |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | do_move_ports() { | 84 | do_move_ports() { |
| @@ -89,8 +89,8 @@ do_move_ports() { | |||
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | do_patch_append() { | 91 | do_patch_append() { |
| 92 | bb.build.exec_func('do_fix_ia_headers', d) | 92 | bb.build.exec_func('do_fix_ia_headers', d) |
| 93 | bb.build.exec_func('do_fix_readlib_c', d) | 93 | bb.build.exec_func('do_fix_readlib_c', d) |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | # for mips eglibc now builds syscall tables for all abi's | 96 | # for mips eglibc now builds syscall tables for all abi's |
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb index 23a4130185..7e7d68b87d 100644 --- a/meta/recipes-core/eglibc/eglibc_2.16.bb +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb | |||
| @@ -76,7 +76,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
| 76 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 76 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |
| 77 | 77 | ||
| 78 | do_unpack_append() { | 78 | do_unpack_append() { |
| 79 | bb.build.exec_func('do_move_ports', d) | 79 | bb.build.exec_func('do_move_ports', d) |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | do_move_ports() { | 82 | do_move_ports() { |
| @@ -87,7 +87,7 @@ do_move_ports() { | |||
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | do_patch_append() { | 89 | do_patch_append() { |
| 90 | bb.build.exec_func('do_fix_readlib_c', d) | 90 | bb.build.exec_func('do_fix_readlib_c', d) |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | # for mips eglibc now builds syscall tables for all abi's | 93 | # for mips eglibc now builds syscall tables for all abi's |
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index d70fe479d1..ae9c8c2e87 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
| @@ -38,9 +38,9 @@ export STAGING_INCDIR | |||
| 38 | export LDFLAGS += "-ldl" | 38 | export LDFLAGS += "-ldl" |
| 39 | 39 | ||
| 40 | python populate_packages_prepend () { | 40 | python populate_packages_prepend () { |
| 41 | # autonamer would call this libxml2-2, but we don't want that | 41 | # autonamer would call this libxml2-2, but we don't want that |
| 42 | if d.getVar('DEBIAN_NAMES', True): | 42 | if d.getVar('DEBIAN_NAMES', True): |
| 43 | d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') | 43 | d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | PACKAGES += "${PN}-utils" | 46 | PACKAGES += "${PN}-utils" |
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 7cffeca932..c743846438 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
| @@ -119,8 +119,8 @@ _install_cfgs = "\ | |||
| 119 | " | 119 | " |
| 120 | 120 | ||
| 121 | python do_install () { | 121 | python do_install () { |
| 122 | bb.build.exec_func("shell_do_install", d) | 122 | bb.build.exec_func("shell_do_install", d) |
| 123 | oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so")) | 123 | oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so")) |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | shell_do_install() { | 126 | shell_do_install() { |
| @@ -205,12 +205,12 @@ shell_do_install() { | |||
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | python populate_packages_prepend () { | 207 | python populate_packages_prepend () { |
| 208 | libdir = d.expand("${libdir}") | 208 | libdir = d.expand("${libdir}") |
| 209 | base_libdir = d.expand("${base_libdir}") | 209 | base_libdir = d.expand("${base_libdir}") |
| 210 | pnbase = d.expand("${PN}-lib%s") | 210 | pnbase = d.expand("${PN}-lib%s") |
| 211 | do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) | 211 | do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) |
| 212 | if libdir is not base_libdir: | 212 | if libdir is not base_libdir: |
| 213 | do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) | 213 | do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True) |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | 216 | ||
