diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-30 13:44:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-01 15:07:42 +0000 |
commit | ae3184c96e3f0961de947fa97be89ec6bdd47fb0 (patch) | |
tree | fd2b802dd1f4539437f5e2a9e79d8bf655388f58 /meta/classes/package_rpm.bbclass | |
parent | 2805ff120e5a9070ed770a29c4c2103a52d4cadb (diff) | |
download | poky-ae3184c96e3f0961de947fa97be89ec6bdd47fb0.tar.gz |
classes: replace 'Poky' with 'OE-core'
(From OE-Core rev: 1fdcd32520a05465b0d54c062f28bac9cdf74a20)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index bac9de5ad4..a813c8b59c 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -359,7 +359,7 @@ package_install_internal_rpm () { | |||
359 | done | 359 | done |
360 | fi | 360 | fi |
361 | 361 | ||
362 | #### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in Poky.. | 362 | #### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in OE-core.. |
363 | # Add any recommended packages to the image | 363 | # Add any recommended packages to the image |
364 | # RPM does not solve for recommended packages because they are optional... | 364 | # RPM does not solve for recommended packages because they are optional... |
365 | # So we query them and tree them like the ATTEMPTONLY packages above... | 365 | # So we query them and tree them like the ATTEMPTONLY packages above... |
@@ -720,7 +720,7 @@ python write_specfile () { | |||
720 | splitrobsoletes = dep | 720 | splitrobsoletes = dep |
721 | 721 | ||
722 | print_deps(splitrdepends, "Requires", spec_preamble_bottom, d) | 722 | print_deps(splitrdepends, "Requires", spec_preamble_bottom, d) |
723 | # Suggests in RPM are like recommends in Poky! | 723 | # Suggests in RPM are like recommends in OE-core! |
724 | print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d) | 724 | print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d) |
725 | # While there is no analog for suggests... (So call them recommends for now) | 725 | # While there is no analog for suggests... (So call them recommends for now) |
726 | print_deps(splitrsuggests, "Recommends", spec_preamble_bottom, d) | 726 | print_deps(splitrsuggests, "Recommends", spec_preamble_bottom, d) |
@@ -811,7 +811,7 @@ python write_specfile () { | |||
811 | 811 | ||
812 | print_deps(srcdepends, "BuildRequires", spec_preamble_top, d) | 812 | print_deps(srcdepends, "BuildRequires", spec_preamble_top, d) |
813 | print_deps(srcrdepends, "Requires", spec_preamble_top, d) | 813 | print_deps(srcrdepends, "Requires", spec_preamble_top, d) |
814 | # Suggests in RPM are like recommends in Poky! | 814 | # Suggests in RPM are like recommends in OE-core! |
815 | print_deps(srcrrecommends, "Suggests", spec_preamble_top, d) | 815 | print_deps(srcrrecommends, "Suggests", spec_preamble_top, d) |
816 | # While there is no analog for suggests... (So call them recommends for now) | 816 | # While there is no analog for suggests... (So call them recommends for now) |
817 | print_deps(srcrsuggests, "Recommends", spec_preamble_top, d) | 817 | print_deps(srcrsuggests, "Recommends", spec_preamble_top, d) |
@@ -960,7 +960,7 @@ python do_package_rpm () { | |||
960 | outfile.write("\tprintf \"%s\\n\" ${line}\n") | 960 | outfile.write("\tprintf \"%s\\n\" ${line}\n") |
961 | outfile.write("done\n") | 961 | outfile.write("done\n") |
962 | 962 | ||
963 | # Poky dependencies a.k.a. RPM requires | 963 | # OE-core dependencies a.k.a. RPM requires |
964 | outdepends = workdir + "/" + srcname + ".requires" | 964 | outdepends = workdir + "/" + srcname + ".requires" |
965 | 965 | ||
966 | try: | 966 | try: |
@@ -974,7 +974,7 @@ python do_package_rpm () { | |||
974 | dependsfile.close() | 974 | dependsfile.close() |
975 | os.chmod(outdepends, 0755) | 975 | os.chmod(outdepends, 0755) |
976 | 976 | ||
977 | # Poky / RPM Provides | 977 | # OE-core / RPM Provides |
978 | outprovides = workdir + "/" + srcname + ".provides" | 978 | outprovides = workdir + "/" + srcname + ".provides" |
979 | 979 | ||
980 | try: | 980 | try: |