summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-01-30 13:44:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-01 15:07:42 +0000
commitae3184c96e3f0961de947fa97be89ec6bdd47fb0 (patch)
treefd2b802dd1f4539437f5e2a9e79d8bf655388f58
parent2805ff120e5a9070ed770a29c4c2103a52d4cadb (diff)
downloadpoky-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>
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass10
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/classes/staging.bbclass2
-rw-r--r--meta/classes/toolchain-scripts.bbclass2
5 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 45447e3b33..68a2539c6f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -690,7 +690,7 @@ python split_and_strip_files () {
690 debuglibdir = "/usr/lib/debug" 690 debuglibdir = "/usr/lib/debug"
691 debugsrcdir = "/usr/src/debug" 691 debugsrcdir = "/usr/src/debug"
692 else: 692 else:
693 # Original Poky, a.k.a. ".debug", style debug info 693 # Original OE-core, a.k.a. ".debug", style debug info
694 debugappend = "" 694 debugappend = ""
695 debugdir = "/.debug" 695 debugdir = "/.debug"
696 debuglibdir = "" 696 debuglibdir = ""
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:
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 53584eedf2..a02942875a 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -5,7 +5,7 @@
5SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio" 5SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio"
6 6
7def raise_sanity_error(msg): 7def raise_sanity_error(msg):
8 bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration. 8 bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration.
9 Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). 9 Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
10 Following is the list of potential problems / advisories: 10 Following is the list of potential problems / advisories:
11 11
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 9c9df6af92..66314a7ba8 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -115,7 +115,7 @@ addtask do_populate_sysroot_setscene
115 115
116python () { 116python () {
117 if d.getVar('do_stage', True) is not None: 117 if d.getVar('do_stage', True) is not None:
118 bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with Poky" % d.getVar("FILE", True)) 118 bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with OE-core" % d.getVar("FILE", True))
119} 119}
120 120
121 121
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 5cba403dc7..6fc9c1314b 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -34,7 +34,7 @@ toolchain_create_sdk_env_script () {
34} 34}
35 35
36# This function creates an environment-setup-script in the TMPDIR which enables 36# This function creates an environment-setup-script in the TMPDIR which enables
37# a Poky IDE to integrate with the build tree 37# a OE-core IDE to integrate with the build tree
38toolchain_create_tree_env_script () { 38toolchain_create_tree_env_script () {
39 script=${TMPDIR}/environment-setup-${MULTIMACH_TARGET_SYS} 39 script=${TMPDIR}/environment-setup-${MULTIMACH_TARGET_SYS}
40 rm -f $script 40 rm -f $script