mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes: replace 'Poky' with 'OE-core'

Browse Source 
(From OE-Core rev: 1fdcd32520a05465b0d54c062f28bac9cdf74a20)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Koen Kooi
2012-01-30 13:44:47 +01:00
committed by Richard Purdie
parent 2805ff120e
commit ae3184c96e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/package.bbclass
View File

@@ -690,7 +690,7 @@ python split_and_strip_files () {
debuglibdir = "/usr/lib/debug" debuglibdir = "/usr/lib/debug"
debugsrcdir = "/usr/src/debug" debugsrcdir = "/usr/src/debug"
else: else:
# Original Poky, a.k.a. ".debug", style debug info # Original OE-core, a.k.a. ".debug", style debug info
debugappend = "" debugappend = ""
debugdir = "/.debug" debugdir = "/.debug"
debuglibdir = "" debuglibdir = ""

10
meta/classes/package_rpm.bbclass
View File

@@ -359,7 +359,7 @@ package_install_internal_rpm () {
done done
fi fi
#### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in Poky.. #### Note: 'Recommends' is an arbitrary tag that means _SUGGESTS_ in OE-core..
# Add any recommended packages to the image # Add any recommended packages to the image
# RPM does not solve for recommended packages because they are optional... # RPM does not solve for recommended packages because they are optional...
# So we query them and tree them like the ATTEMPTONLY packages above... # So we query them and tree them like the ATTEMPTONLY packages above...
@@ -720,7 +720,7 @@ python write_specfile () {
splitrobsoletes = dep splitrobsoletes = dep
print_deps(splitrdepends, "Requires", spec_preamble_bottom, d) print_deps(splitrdepends, "Requires", spec_preamble_bottom, d)
# Suggests in RPM are like recommends in Poky! # Suggests in RPM are like recommends in OE-core!
print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d) print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d)
# While there is no analog for suggests... (So call them recommends for now) # While there is no analog for suggests... (So call them recommends for now)
print_deps(splitrsuggests, "Recommends", spec_preamble_bottom, d) print_deps(splitrsuggests, "Recommends", spec_preamble_bottom, d)
@@ -811,7 +811,7 @@ python write_specfile () {
print_deps(srcdepends, "BuildRequires", spec_preamble_top, d) print_deps(srcdepends, "BuildRequires", spec_preamble_top, d)
print_deps(srcrdepends, "Requires", spec_preamble_top, d) print_deps(srcrdepends, "Requires", spec_preamble_top, d)
# Suggests in RPM are like recommends in Poky! # Suggests in RPM are like recommends in OE-core!
print_deps(srcrrecommends, "Suggests", spec_preamble_top, d) print_deps(srcrrecommends, "Suggests", spec_preamble_top, d)
# While there is no analog for suggests... (So call them recommends for now) # While there is no analog for suggests... (So call them recommends for now)
print_deps(srcrsuggests, "Recommends", spec_preamble_top, d) print_deps(srcrsuggests, "Recommends", spec_preamble_top, d)
@@ -960,7 +960,7 @@ python do_package_rpm () {
outfile.write("\tprintf \"%s\\n\" ${line}\n") outfile.write("\tprintf \"%s\\n\" ${line}\n")
outfile.write("done\n") outfile.write("done\n")
# Poky dependencies a.k.a. RPM requires # OE-core dependencies a.k.a. RPM requires
outdepends = workdir + "/" + srcname + ".requires" outdepends = workdir + "/" + srcname + ".requires"
try: try:
@@ -974,7 +974,7 @@ python do_package_rpm () {
dependsfile.close() dependsfile.close()
os.chmod(outdepends, 0755) os.chmod(outdepends, 0755)
# Poky / RPM Provides # OE-core / RPM Provides
outprovides = workdir + "/" + srcname + ".provides" outprovides = workdir + "/" + srcname + ".provides"
try: try:

2
meta/classes/sanity.bbclass
View File

@@ -5,7 +5,7 @@
SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio" SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio"
def raise_sanity_error(msg): def raise_sanity_error(msg):
bb.fatal(""" Poky's config sanity checker detected a potential misconfiguration. bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration.
Either fix the cause of this error or at your own risk disable the checker (see sanity.conf). Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
Following is the list of potential problems / advisories: Following is the list of potential problems / advisories:

2
meta/classes/staging.bbclass
View File

@@ -115,7 +115,7 @@ addtask do_populate_sysroot_setscene
python () { python () {
if d.getVar('do_stage', True) is not None: if d.getVar('do_stage', True) is not None:
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)) 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))
} }

2
meta/classes/toolchain-scripts.bbclass
View File

@@ -34,7 +34,7 @@ toolchain_create_sdk_env_script () {
} }
# This function creates an environment-setup-script in the TMPDIR which enables # This function creates an environment-setup-script in the TMPDIR which enables
# a Poky IDE to integrate with the build tree # a OE-core IDE to integrate with the build tree
toolchain_create_tree_env_script () { toolchain_create_tree_env_script () {
script=${TMPDIR}/environment-setup-${MULTIMACH_TARGET_SYS} script=${TMPDIR}/environment-setup-${MULTIMACH_TARGET_SYS}
rm -f $script rm -f $script