summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-20 15:19:39 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-20 15:19:39 +0000
commite09dab061470154bb14d172f79c5589d232b3c12 (patch)
tree0657681c4a60c3e7903591a0641a18d0ea6b7ac0
parent4015d48fcfec627821e9dd420b6c37fa1c60369e (diff)
downloadpoky-e09dab061470154bb14d172f79c5589d232b3c12.tar.gz
classes: Sync with OE - mainly quoting fixes or other minor updates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@885 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/base.bbclass1
-rw-r--r--meta/classes/cpan.bbclass21
-rw-r--r--meta/classes/debian.bbclass2
-rw-r--r--meta/classes/devshell.bbclass6
-rw-r--r--meta/classes/distutils-base.bbclass2
-rw-r--r--meta/classes/icecc.bbclass2
-rw-r--r--meta/classes/module_strip.bbclass6
-rw-r--r--meta/classes/mozilla.bbclass2
-rw-r--r--meta/classes/multimachine.bbclass8
-rw-r--r--meta/classes/oelint.bbclass4
-rw-r--r--meta/classes/rm_work.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass6
-rw-r--r--meta/classes/srec.bbclass2
-rw-r--r--meta/classes/tinderclient.bbclass13
-rw-r--r--meta/classes/update-rc.d.bbclass9
15 files changed, 59 insertions, 27 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a7d025bf56..8a4edf9133 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -1,5 +1,4 @@
1BB_DEFAULT_TASK = "build" 1BB_DEFAULT_TASK = "build"
2PATCHES_DIR = "${S}"
3 2
4def base_dep_prepend(d): 3def base_dep_prepend(d):
5 import bb; 4 import bb;
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 78b902f85d..74bbebf882 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -1,17 +1,32 @@
1#
2# This is for perl modules that use the old Makefile.PL build system
3#
1FILES_${PN} += '${libdir}/perl5' 4FILES_${PN} += '${libdir}/perl5'
2EXTRA_CPANFLAGS = "" 5EXTRA_CPANFLAGS = ""
3 6
7DEPENDS += "perl-native"
8RDEPENDS += "perl"
9
4cpan_do_configure () { 10cpan_do_configure () {
5 perl Makefile.PL ${EXTRA_CPANFLAGS} 11 perl Makefile.PL ${EXTRA_CPANFLAGS}
6 if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then 12 if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
7 . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh 13 . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
8 sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new 14 sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
9 mv Makefile.new Makefile 15 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
16 -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
17 -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
18 -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
19 Makefile
10 fi 20 fi
11} 21}
12 22
13cpan_do_compile () { 23cpan_do_compile () {
14 oe_runmake PASTHRU_INC="${CFLAGS}" 24 # You must use gcc to link on sh
25 OPTIONS=""
26 if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then
27 OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc"
28 fi
29 oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" $OPTIONS
15} 30}
16 31
17cpan_do_install () { 32cpan_do_install () {
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 7ffa6c1a27..3992a76084 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/classes/debian.bbclass
@@ -101,5 +101,5 @@ python debian_package_name_hook () {
101 101
102EXPORT_FUNCTIONS package_name_hook 102EXPORT_FUNCTIONS package_name_hook
103 103
104DEBIAN_NAMES = 1 104DEBIAN_NAMES = "1"
105 105
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 118e5e4a2a..14f957e12b 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -1,8 +1,8 @@
1EXTRA_OEMAKE[export] = 1 1EXTRA_OEMAKE[export] = "1"
2 2
3do_devshell[dirs] = "${S}" 3do_devshell[dirs] = "${S}"
4do_devshell[nostamp] = 1 4do_devshell[nostamp] = "1"
5do_devshell[interactive] = 1 5do_devshell[interactive] = "1"
6devshell_do_devshell() { 6devshell_do_devshell() {
7 bash -i 7 bash -i
8} 8}
diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass
index 68d7112166..15e945d518 100644
--- a/meta/classes/distutils-base.bbclass
+++ b/meta/classes/distutils-base.bbclass
@@ -10,5 +10,5 @@ def python_dir(d):
10 raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" 10 raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
11 11
12PYTHON_DIR = "${@python_dir(d)}" 12PYTHON_DIR = "${@python_dir(d)}"
13FILES_${PN} = "${bindir} ${libdir} ${libdir}/${PYTHON_DIR}" 13FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}"
14 14
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 66a5bf79e3..2f34d408d2 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -10,7 +10,7 @@ def icc_determine_gcc_version(gcc):
10 10
11 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' 11 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)'
12 """ 12 """
13 return os.popen("%s --version" % gcc ).readline()[2] 13 return os.popen("%s --version" % gcc ).readline().split()[2]
14 14
15def create_env(bb,d): 15def create_env(bb,d):
16 """ 16 """
diff --git a/meta/classes/module_strip.bbclass b/meta/classes/module_strip.bbclass
index 116e8b902f..63e6569799 100644
--- a/meta/classes/module_strip.bbclass
+++ b/meta/classes/module_strip.bbclass
@@ -5,7 +5,11 @@ do_strip_modules () {
5 if test -e ${WORKDIR}/install/$p/lib/modules; then 5 if test -e ${WORKDIR}/install/$p/lib/modules; then
6 modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`" 6 modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`"
7 if [ -n "$modules" ]; then 7 if [ -n "$modules" ]; then
8 ${STRIP} -v -g $modules 8 for module in $modules ; do
9 if ! [ -d "$module" ] ; then
10 ${STRIP} -v -g $module
11 fi
12 done
9# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules 13# NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules
10 fi 14 fi
11 fi 15 fi
diff --git a/meta/classes/mozilla.bbclass b/meta/classes/mozilla.bbclass
index 629f2531da..3295c2b270 100644
--- a/meta/classes/mozilla.bbclass
+++ b/meta/classes/mozilla.bbclass
@@ -4,7 +4,7 @@ DEPENDS += "gnu-config-native virtual/libintl xt libxi \
4LICENSE = "MPL NPL" 4LICENSE = "MPL NPL"
5SRC_URI += "file://mozconfig" 5SRC_URI += "file://mozconfig"
6 6
7inherit gettext 7inherit gettext pkgconfig
8 8
9EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \ 9EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \
10 --build=${BUILD_SYS} --prefix=${prefix}" 10 --build=${BUILD_SYS} --prefix=${prefix}"
diff --git a/meta/classes/multimachine.bbclass b/meta/classes/multimachine.bbclass
index 0bd6abe419..4187a00ec3 100644
--- a/meta/classes/multimachine.bbclass
+++ b/meta/classes/multimachine.bbclass
@@ -1,10 +1,11 @@
1STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" 1STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
2WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}-${TARGET_OS}/${PF}" 2WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
3STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${TARGET_OS}/kernel" 3STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
4 4
5# Find any machine specific sub packages and if present, mark the 5# Find any machine specific sub packages and if present, mark the
6# whole package as machine specific for multimachine purposes. 6# whole package as machine specific for multimachine purposes.
7 7
8
8def multi_machine_after_parse(d): 9def multi_machine_after_parse(d):
9 import bb 10 import bb
10 packages = bb.data.getVar('PACKAGES', d, 1).split() 11 packages = bb.data.getVar('PACKAGES', d, 1).split()
@@ -22,6 +23,7 @@ def multi_machine_after_parse(d):
22 23
23 bb.data.setVar('MULTIMACH_ARCH', multiarch, d) 24 bb.data.setVar('MULTIMACH_ARCH', multiarch, d)
24 25
26
25python __anonymous () { 27python __anonymous () {
26 multi_machine_after_parse(d) 28 multi_machine_after_parse(d)
27} 29}
diff --git a/meta/classes/oelint.bbclass b/meta/classes/oelint.bbclass
index baa1c630b4..f2e7540dcf 100644
--- a/meta/classes/oelint.bbclass
+++ b/meta/classes/oelint.bbclass
@@ -1,5 +1,5 @@
1addtask lint before do_fetch 1addtask lint before do_fetch
2do_lint[nostamp] = 1 2do_lint[nostamp] = "1"
3python do_lint() { 3python do_lint() {
4 def testVar(var, explain=None): 4 def testVar(var, explain=None):
5 try: 5 try:
@@ -67,7 +67,7 @@ python do_lint() {
67 # Test for valid MAINTAINER 67 # Test for valid MAINTAINER
68 # 68 #
69 s = testVar("MAINTAINER") 69 s = testVar("MAINTAINER")
70 if s=="OpenEmbedded Team <oe@handhelds.org>": 70 if s=="OpenEmbedded Team <openembedded-devel@openembedded.org>":
71 bb.error("explicit MAINTAINER is missing, using default") 71 bb.error("explicit MAINTAINER is missing, using default")
72 elif s and s.find("@") == -1: 72 elif s and s.find("@") == -1:
73 bb.error("You forgot to put an e-mail address into MAINTAINER") 73 bb.error("You forgot to put an e-mail address into MAINTAINER")
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 340446917e..7f590e1b15 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -19,4 +19,4 @@ do_rm_work () {
19} 19}
20 20
21addtask rm_work before do_build 21addtask rm_work before do_build
22addtask rm_work after do_package 22addtask rm_work after do_populate_staging
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index ef3a94f4f3..f59f2b2137 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -10,9 +10,9 @@ DEPENDS_append=" ${EXTRA_IMAGEDEPENDS}"
10 10
11PACKAGES = "" 11PACKAGES = ""
12 12
13do_rootfs[nostamp] = 1 13do_rootfs[nostamp] = "1"
14do_rootfs[dirs] = ${TOPDIR} 14do_rootfs[dirs] = "${TOPDIR}"
15do_build[nostamp] = 1 15do_build[nostamp] = "1"
16 16
17IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" 17IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
18 18
diff --git a/meta/classes/srec.bbclass b/meta/classes/srec.bbclass
index e7bdc6c75d..a869a4f1f3 100644
--- a/meta/classes/srec.bbclass
+++ b/meta/classes/srec.bbclass
@@ -10,7 +10,7 @@ SREC_CMD = "${TARGET_PREFIX}objcopy -O srec -I binary --adjust-vma ${SREC_VMAADD
10# Do not build srec files for these types of images: 10# Do not build srec files for these types of images:
11SREC_SKIP = "tar" 11SREC_SKIP = "tar"
12 12
13do_srec[nostamp] = 1 13do_srec[nostamp] = "1"
14 14
15do_srec () { 15do_srec () {
16 if [ ${SREC_VMAADDR} = "" ] ; then 16 if [ ${SREC_VMAADDR} = "" ] ; then
diff --git a/meta/classes/tinderclient.bbclass b/meta/classes/tinderclient.bbclass
index d36ef0b343..3f5183cc8f 100644
--- a/meta/classes/tinderclient.bbclass
+++ b/meta/classes/tinderclient.bbclass
@@ -60,7 +60,18 @@ def tinder_format_http_post(d,status,log):
60 "os" : os.uname()[0], 60 "os" : os.uname()[0],
61 "os_version" : os.uname()[2], 61 "os_version" : os.uname()[2],
62 "compiler" : "gcc", 62 "compiler" : "gcc",
63 "clobber" : data.getVar('TINDER_CLOBBER', d, True) 63 "clobber" : data.getVar('TINDER_CLOBBER', d, True),
64 "srcdate" : data.getVar('SRCDATE', d, True),
65 "PN" : data.getVar('PN', d, True),
66 "PV" : data.getVar('PV', d, True),
67 "PR" : data.getVar('PR', d, True),
68 "FILE" : data.getVar('FILE', d, True) or "N/A",
69 "TARGETARCH" : data.getVar('TARGET_ARCH', d, True),
70 "TARGETFPU" : data.getVar('TARGET_FPU', d, True) or "Unknown",
71 "TARGETOS" : data.getVar('TARGET_OS', d, True) or "Unknown",
72 "MACHINE" : data.getVar('MACHINE', d, True) or "Unknown",
73 "DISTRO" : data.getVar('DISTRO', d, True) or "Unknown",
74 "zecke-rocks" : "sure",
64 } 75 }
65 76
66 # optionally add the status 77 # optionally add the status
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 768ca61b93..9821eec5b2 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -26,6 +26,7 @@ updatercd_postrm() {
26update-rc.d $D ${INITSCRIPT_NAME} remove 26update-rc.d $D ${INITSCRIPT_NAME} remove
27} 27}
28 28
29
29def update_rc_after_parse(d): 30def update_rc_after_parse(d):
30 import bb 31 import bb
31 if bb.data.getVar('INITSCRIPT_PACKAGES', d) == None: 32 if bb.data.getVar('INITSCRIPT_PACKAGES', d) == None:
@@ -56,10 +57,10 @@ python populate_packages_prepend () {
56 prerm = '#!/bin/sh\n' 57 prerm = '#!/bin/sh\n'
57 prerm += bb.data.getVar('updatercd_prerm', localdata, 1) 58 prerm += bb.data.getVar('updatercd_prerm', localdata, 1)
58 bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d) 59 bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d)
59 postrm = bb.data.getVar('pkg_postrm', localdata, 1) 60 postrm = bb.data.getVar('pkg_postrm', localdata, 1)
60 if not postrm: 61 if not postrm:
61 postrm = '#!/bin/sh\n' 62 postrm = '#!/bin/sh\n'
62 postrm += bb.data.getVar('updatercd_postrm', localdata, 1) 63 postrm += bb.data.getVar('updatercd_postrm', localdata, 1)
63 bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d) 64 bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
64 65
65 pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) 66 pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1)