diff options
11 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 312631881f..9459b0027f 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -79,7 +79,7 @@ license_create_manifest() { | |||
79 | INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest` | 79 | INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest` |
80 | # list of installed packages is broken for deb | 80 | # list of installed packages is broken for deb |
81 | for pkg in ${INSTALLED_PKGS}; do | 81 | for pkg in ${INSTALLED_PKGS}; do |
82 | # not the best way to do this but licenses are not arch dependant iirc | 82 | # not the best way to do this but licenses are not arch-dependent iirc |
83 | files=`find ${TMPDIR}/pkgdata/*/runtime -name ${pkg}| head -1` | 83 | files=`find ${TMPDIR}/pkgdata/*/runtime -name ${pkg}| head -1` |
84 | for filename in $files; do | 84 | for filename in $files; do |
85 | pkged_pn="$(sed -n 's/^PN: //p' ${filename})" | 85 | pkged_pn="$(sed -n 's/^PN: //p' ${filename})" |
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass index 22ebcfde40..c0a538036f 100644 --- a/meta/classes/qemu.bbclass +++ b/meta/classes/qemu.bbclass | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # This class contains functions for recipes that need QEMU or test for its | 2 | # This class contains functions for recipes that need QEMU or test for its |
3 | # existance. | 3 | # existence. |
4 | # | 4 | # |
5 | 5 | ||
6 | def qemu_target_binary(data): | 6 | def qemu_target_binary(data): |
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index d984d0d656..f4d62418c6 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -40,7 +40,7 @@ ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib p | |||
40 | for which automatic shlib dependency tracking doesn't work." | 40 | for which automatic shlib dependency tracking doesn't work." |
41 | 41 | ||
42 | PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \ | 42 | PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \ |
43 | machine dependant configuration options in your bitbake file add a \ | 43 | machine-dependent configuration options in your bitbake file add a \ |
44 | PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' | 44 | PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' |
45 | 45 | ||
46 | PACKAGE_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority' | 46 | PACKAGE_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority' |
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant.conf b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant.conf index f0c993d195..68258f5ee2 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant.conf +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant.conf | |||
@@ -28,7 +28,7 @@ | |||
28 | # Parameters for the control interface. If this is specified, wpa_supplicant | 28 | # Parameters for the control interface. If this is specified, wpa_supplicant |
29 | # will open a control interface that is available for external programs to | 29 | # will open a control interface that is available for external programs to |
30 | # manage wpa_supplicant. The meaning of this string depends on which control | 30 | # manage wpa_supplicant. The meaning of this string depends on which control |
31 | # interface mechanism is used. For all cases, the existance of this parameter | 31 | # interface mechanism is used. For all cases, the existence of this parameter |
32 | # in configuration is used to determine whether the control interface is | 32 | # in configuration is used to determine whether the control interface is |
33 | # enabled. | 33 | # enabled. |
34 | # | 34 | # |
diff --git a/meta/recipes-devtools/distcc/files/distcc-avahi.patch b/meta/recipes-devtools/distcc/files/distcc-avahi.patch index 30b4c91866..1f15d4b82a 100644 --- a/meta/recipes-devtools/distcc/files/distcc-avahi.patch +++ b/meta/recipes-devtools/distcc/files/distcc-avahi.patch | |||
@@ -899,7 +899,7 @@ Upstream-Status: Pending | |||
899 | + AvahiServiceResolver *resolver; | 899 | + AvahiServiceResolver *resolver; |
900 | +}; | 900 | +}; |
901 | + | 901 | + |
902 | +/* A generic, system independant lock routine, similar to sys_lock, | 902 | +/* A generic, system-independent lock routine, similar to sys_lock, |
903 | + * but more powerful: | 903 | + * but more powerful: |
904 | + * rw: if non-zero: r/w lock instead of r/o lock | 904 | + * rw: if non-zero: r/w lock instead of r/o lock |
905 | + * enable: lock or unlock | 905 | + * enable: lock or unlock |
diff --git a/meta/recipes-devtools/opkg/opkg/fix_installorder.patch b/meta/recipes-devtools/opkg/opkg/fix_installorder.patch index 5e6c40d649..9dd10b28e1 100644 --- a/meta/recipes-devtools/opkg/opkg/fix_installorder.patch +++ b/meta/recipes-devtools/opkg/opkg/fix_installorder.patch | |||
@@ -55,7 +55,7 @@ Index: trunk/libopkg/opkg_install.c | |||
55 | + opkg_msg(DEBUG2,"Calling opkg_install_pkg.\n"); | 55 | + opkg_msg(DEBUG2,"Calling opkg_install_pkg.\n"); |
56 | + err = opkg_install_pkg(dep, 0); | 56 | + err = opkg_install_pkg(dep, 0); |
57 | + /* mark this package as having been automatically installed to | 57 | + /* mark this package as having been automatically installed to |
58 | + * satisfy a dependancy */ | 58 | + * satisfy a dependency */ |
59 | + dep->auto_installed = 1; | 59 | + dep->auto_installed = 1; |
60 | + if (err) { | 60 | + if (err) { |
61 | + pkg_vec_free(depends); | 61 | + pkg_vec_free(depends); |
diff --git a/meta/recipes-devtools/opkg/opkg/track_parents.patch b/meta/recipes-devtools/opkg/opkg/track_parents.patch index 1f54256c2d..ef327e3ef0 100644 --- a/meta/recipes-devtools/opkg/opkg/track_parents.patch +++ b/meta/recipes-devtools/opkg/opkg/track_parents.patch | |||
@@ -23,7 +23,7 @@ Index: trunk/libopkg/opkg_install.c | |||
23 | + pkg_vec_insert(dep->wanted_by, pkg); | 23 | + pkg_vec_insert(dep->wanted_by, pkg); |
24 | err = opkg_install_pkg(dep, 0); | 24 | err = opkg_install_pkg(dep, 0); |
25 | /* mark this package as having been automatically installed to | 25 | /* mark this package as having been automatically installed to |
26 | * satisfy a dependancy */ | 26 | * satisfy a dependency */ |
27 | @@ -115,6 +121,8 @@ | 27 | @@ -115,6 +121,8 @@ |
28 | /* The package was uninstalled when we started, but another | 28 | /* The package was uninstalled when we started, but another |
29 | dep earlier in this loop may have depended on it and pulled | 29 | dep earlier in this loop may have depended on it and pulled |
diff --git a/meta/recipes-devtools/perl/perl-rdepends_5.14.2.inc b/meta/recipes-devtools/perl/perl-rdepends_5.14.2.inc index 26239d2d52..ae695c400a 100644 --- a/meta/recipes-devtools/perl/perl-rdepends_5.14.2.inc +++ b/meta/recipes-devtools/perl/perl-rdepends_5.14.2.inc | |||
@@ -7,7 +7,7 @@ | |||
7 | #egrep -r "use|require" perl-module-* | grep ";" | egrep "\.pm:require | \.pm:use" | sed "s-/.*\.pm: *- += -g" | sed "s/[\"\']//g" | sed "s/;.*/\"/g" | sed "s/require */\"perl-module-/g" | sed "s/CPANPLUS::.*/cpanplus/g" | sed "s/CPAN::.*/cpan/g" | tr [:upper:] [:lower:] | sed "s/::/-/g" | grep -v perl-module-5 | sed "s/ [^+\"].*//g" | grep -v "\\$" | sed "s/_/-/g" | sed "s/\.pl\"$/\"/" | grep -v "\-vms\-" | sort -u > /tmp/1 | 7 | #egrep -r "use|require" perl-module-* | grep ";" | egrep "\.pm:require | \.pm:use" | sed "s-/.*\.pm: *- += -g" | sed "s/[\"\']//g" | sed "s/;.*/\"/g" | sed "s/require */\"perl-module-/g" | sed "s/CPANPLUS::.*/cpanplus/g" | sed "s/CPAN::.*/cpan/g" | tr [:upper:] [:lower:] | sed "s/::/-/g" | grep -v perl-module-5 | sed "s/ [^+\"].*//g" | grep -v "\\$" | sed "s/_/-/g" | sed "s/\.pl\"$/\"/" | grep -v "\-vms\-" | sort -u > /tmp/1 |
8 | #find . -type f | sed "s-\./--" | sed "s-/.*--" | sort -u > /tmp/2 | 8 | #find . -type f | sed "s-\./--" | sed "s-/.*--" | sort -u > /tmp/2 |
9 | #cat /tmp/1 | cut -f3 -d" " | sed "s/[\"\']//g" | sort -u > /tmp/3 | 9 | #cat /tmp/1 | cut -f3 -d" " | sed "s/[\"\']//g" | sort -u > /tmp/3 |
10 | ## these dependancies do not exist | 10 | ## these dependencies do not exist |
11 | #diff -u /tmp/2 /tmp/3 | grep ^+perl-module | 11 | #diff -u /tmp/2 /tmp/3 | grep ^+perl-module |
12 | 12 | ||
13 | 13 | ||
diff --git a/meta/recipes-extended/at/files/fix_parallel_build_error.patch b/meta/recipes-extended/at/files/fix_parallel_build_error.patch index 877be35aaf..66ff3e1c11 100644 --- a/meta/recipes-extended/at/files/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/files/fix_parallel_build_error.patch | |||
@@ -5,7 +5,7 @@ make -j was failing sometimesa like this | |||
5 | | make: *** [lex.yy.o] Error 1 | 5 | | make: *** [lex.yy.o] Error 1 |
6 | | make: *** Waiting for unfinished jobs.... | 6 | | make: *** Waiting for unfinished jobs.... |
7 | 7 | ||
8 | Fixed the issue by adding a dependancy in the makefile. | 8 | Fixed the issue by adding a dependency in the makefile. |
9 | Nitin <nitin.a.kamble@intel.com> | 9 | Nitin <nitin.a.kamble@intel.com> |
10 | 2010/09/02 | 10 | 2010/09/02 |
11 | 11 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb index 5043634fdb..37d291f353 100644 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "Generic PCI access library for X" | 1 | SUMMARY = "Generic PCI access library for X" |
2 | 2 | ||
3 | DESCRIPTION = "libpciaccess provides functionality for X to access the \ | 3 | DESCRIPTION = "libpciaccess provides functionality for X to access the \ |
4 | PCI bus and devices in a platform-independant way." | 4 | PCI bus and devices in a platform-independent way." |
5 | 5 | ||
6 | require xorg-lib-common.inc | 6 | require xorg-lib-common.inc |
7 | 7 | ||
diff --git a/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch b/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch index 18237f24be..bf45b2f310 100644 --- a/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch +++ b/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch | |||
@@ -1027,7 +1027,7 @@ Index: taglib-1.6.1/acinclude.m4 | |||
1027 | - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ | 1027 | - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ |
1028 | - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then | 1028 | - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then |
1029 | - | 1029 | - |
1030 | - # We can hardcode non-existant directories. | 1030 | - # We can hardcode non-existent directories. |
1031 | - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && | 1031 | - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && |
1032 | - # If the only mechanism to avoid hardcoding is shlibpath_var, we | 1032 | - # If the only mechanism to avoid hardcoding is shlibpath_var, we |
1033 | - # have to relink, otherwise we might link with an installed library | 1033 | - # have to relink, otherwise we might link with an installed library |