diff options
| author | Ulrich Ölmann <u.oelmann@pengutronix.de> | 2024-07-03 16:28:06 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-07-04 22:56:15 +0100 |
| commit | b2bc061f7ce285010218c257c1c293f63db149ef (patch) | |
| tree | f7f4adfb2c63a940f1c883ba378d1a075f0896f5 /meta/classes/buildhistory.bbclass | |
| parent | 56ba6da8e19198e7da266ede4e29b20b5abefd41 (diff) | |
| download | poky-b2bc061f7ce285010218c257c1c293f63db149ef.tar.gz | |
buildhistory: fix typos
Fix some simple typos found while looking through the code.
(From OE-Core rev: c23cb2d89fcd014d1f08944468c7e2d8a7f3e8b0)
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index fd53e92402..c3d049aea3 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
| @@ -58,7 +58,7 @@ SSTATEPOSTUNPACKFUNCS:append = " buildhistory_emit_outputsigs" | |||
| 58 | sstate_installpkgdir[vardepsexclude] += "buildhistory_emit_outputsigs" | 58 | sstate_installpkgdir[vardepsexclude] += "buildhistory_emit_outputsigs" |
| 59 | SSTATEPOSTUNPACKFUNCS[vardepvalueexclude] .= "| buildhistory_emit_outputsigs" | 59 | SSTATEPOSTUNPACKFUNCS[vardepvalueexclude] .= "| buildhistory_emit_outputsigs" |
| 60 | 60 | ||
| 61 | # All items excepts those listed here will be removed from a recipe's | 61 | # All items except those listed here will be removed from a recipe's |
| 62 | # build history directory by buildhistory_emit_pkghistory(). This is | 62 | # build history directory by buildhistory_emit_pkghistory(). This is |
| 63 | # necessary because some of these items (package directories, files that | 63 | # necessary because some of these items (package directories, files that |
| 64 | # we no longer emit) might be obsolete. | 64 | # we no longer emit) might be obsolete. |
| @@ -153,7 +153,7 @@ python buildhistory_emit_pkghistory() { | |||
| 153 | # Variables that need to be written to their own separate file | 153 | # Variables that need to be written to their own separate file |
| 154 | self.filevars = dict.fromkeys(['pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm']) | 154 | self.filevars = dict.fromkeys(['pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm']) |
| 155 | 155 | ||
| 156 | # Should check PACKAGES here to see if anything removed | 156 | # Should check PACKAGES here to see if anything was removed |
| 157 | 157 | ||
| 158 | def readPackageInfo(pkg, histfile): | 158 | def readPackageInfo(pkg, histfile): |
| 159 | pkginfo = PackageInfo(pkg) | 159 | pkginfo = PackageInfo(pkg) |
| @@ -535,7 +535,7 @@ buildhistory_get_installed() { | |||
| 535 | grep -v kernel-module $1/depends-nokernel-nolibc-noupdate.dot > $1/depends-nokernel-nolibc-noupdate-nomodules.dot | 535 | grep -v kernel-module $1/depends-nokernel-nolibc-noupdate.dot > $1/depends-nokernel-nolibc-noupdate-nomodules.dot |
| 536 | fi | 536 | fi |
| 537 | 537 | ||
| 538 | # add complementary package information | 538 | # Add complementary package information |
| 539 | if [ -e ${WORKDIR}/complementary_pkgs.txt ]; then | 539 | if [ -e ${WORKDIR}/complementary_pkgs.txt ]; then |
| 540 | cp ${WORKDIR}/complementary_pkgs.txt $1 | 540 | cp ${WORKDIR}/complementary_pkgs.txt $1 |
| 541 | fi | 541 | fi |
| @@ -573,7 +573,7 @@ buildhistory_get_sdk_installed_target() { | |||
| 573 | 573 | ||
| 574 | buildhistory_list_files() { | 574 | buildhistory_list_files() { |
| 575 | # List the files in the specified directory, but exclude date/time etc. | 575 | # List the files in the specified directory, but exclude date/time etc. |
| 576 | # This is somewhat messy, but handles where the size is not printed for device files under pseudo | 576 | # This is somewhat messy, but handles cases where the size is not printed for device files under pseudo |
| 577 | ( cd $1 | 577 | ( cd $1 |
| 578 | find_cmd='find . ! -path . -printf "%M %-10u %-10g %10s %p -> %l\n"' | 578 | find_cmd='find . ! -path . -printf "%M %-10u %-10g %10s %p -> %l\n"' |
| 579 | if [ "$3" = "fakeroot" ] ; then | 579 | if [ "$3" = "fakeroot" ] ; then |
| @@ -587,7 +587,7 @@ buildhistory_list_files_no_owners() { | |||
| 587 | # List the files in the specified directory, but exclude date/time etc. | 587 | # List the files in the specified directory, but exclude date/time etc. |
| 588 | # Also don't output the ownership data, but instead output just - - so | 588 | # Also don't output the ownership data, but instead output just - - so |
| 589 | # that the same parsing code as for _list_files works. | 589 | # that the same parsing code as for _list_files works. |
| 590 | # This is somewhat messy, but handles where the size is not printed for device files under pseudo | 590 | # This is somewhat messy, but handles cases where the size is not printed for device files under pseudo |
| 591 | ( cd $1 | 591 | ( cd $1 |
| 592 | find_cmd='find . ! -path . -printf "%M - - %10s %p -> %l\n"' | 592 | find_cmd='find . ! -path . -printf "%M - - %10s %p -> %l\n"' |
| 593 | if [ "$3" = "fakeroot" ] ; then | 593 | if [ "$3" = "fakeroot" ] ; then |
| @@ -855,7 +855,7 @@ END | |||
| 855 | CMDLINE="${@buildhistory_get_cmdline(d)}" | 855 | CMDLINE="${@buildhistory_get_cmdline(d)}" |
| 856 | if [ "$repostatus" != "" ] ; then | 856 | if [ "$repostatus" != "" ] ; then |
| 857 | git add -A . | 857 | git add -A . |
| 858 | # porcelain output looks like "?? packages/foo/bar" | 858 | # Porcelain output looks like "?? packages/foo/bar" |
| 859 | # Ensure we commit metadata-revs with the first commit | 859 | # Ensure we commit metadata-revs with the first commit |
| 860 | buildhistory_single_commit "$CMDLINE" "$HOSTNAME" dummy | 860 | buildhistory_single_commit "$CMDLINE" "$HOSTNAME" dummy |
| 861 | git gc --auto --quiet | 861 | git gc --auto --quiet |
| @@ -990,7 +990,7 @@ def write_latest_ptest_result(d, histdir): | |||
| 990 | output_ptest = os.path.join(histdir, 'ptest') | 990 | output_ptest = os.path.join(histdir, 'ptest') |
| 991 | if os.path.exists(input_ptest): | 991 | if os.path.exists(input_ptest): |
| 992 | try: | 992 | try: |
| 993 | # Lock it avoid race issue | 993 | # Lock it to avoid race issue |
| 994 | lock = bb.utils.lockfile(output_ptest + "/ptest.lock") | 994 | lock = bb.utils.lockfile(output_ptest + "/ptest.lock") |
| 995 | bb.utils.mkdirhier(output_ptest) | 995 | bb.utils.mkdirhier(output_ptest) |
| 996 | oe.path.copytree(input_ptest, output_ptest) | 996 | oe.path.copytree(input_ptest, output_ptest) |
