From 75c52a3af0a9af10e754198c6ec609ffef775148 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 19:11:31 +0000 Subject: classes/qtopia4core.bbclass: The current name of the include and libdir is qtopia Change the include and library path to end with qtopia as this is where qtopia-core is going to stage the headers in. The full blown Qtopia platform will use the same directory. --- classes/qtopia4core.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 181973d72d..a8364d86ff 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -4,8 +4,8 @@ inherit qmake2 # # override variables set by qmake-base to compile QtopiaCore apps # -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" -- cgit v1.2.3 From d41f87692d50924a4c5b27c9f78250605b724860 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 19:35:12 +0000 Subject: classes/insane.bbclass: Removal of whitespace and tabs --- classes/insane.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 473fe6ebbf..c3ba25ff35 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -29,7 +29,7 @@ PACKAGEFUNCS += " do_package_qa " # # dictionary for elf headers # -# feel free to add and correct. +# feel free to add and correct. # # TARGET_OS TARGET_ARCH MACHINE, OSABI, ABIVERSION, Little Endian, 32bit? def package_qa_get_machine_dict(): @@ -75,7 +75,7 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), }, - + } # factory for a class, embedded in a method @@ -279,7 +279,7 @@ def package_qa_check_arch(path,name,d): import bb, os target_os = bb.data.getVar('TARGET_OS', d, True) target_arch = bb.data.getVar('TARGET_ARCH', d, True) - + # FIXME: Cross package confuse this check, so just skip them if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): return True -- cgit v1.2.3 From 89b4d820b5611b1541581dfb2674adbd59af4019 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 19:51:06 +0000 Subject: classes/insane.bbclass: Try to increase readability, remove deadcode, ask to make desktop errors fatal --- classes/insane.bbclass | 60 +++++++++++++++++--------------------------------- 1 file changed, 20 insertions(+), 40 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c3ba25ff35..c01d453114 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -8,21 +8,18 @@ # -Check the RUNTIME path for the $TMPDIR # -Check if .la files wrongly point to workdir # -Check if .pc files wrongly point to workdir -# -Check if packages contains .debug directories or .so files where they should be in -dev or -dbg +# -Check if packages contains .debug directories or .so files +# where they should be in -dev or -dbg # -Check if config.log contains traces to broken autoconf tests -# # # We need to have the scanelf utility as soon as -# possible and this is contained within the pax-utils-native +# possible and this is contained within the pax-utils-native. +# The package.bbclass can help us here. # - - -# We play a special package function inherit package PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native" -#PACKAGE_DEPENDS += chrpath-native" PACKAGEFUNCS += " do_package_qa " @@ -121,9 +118,9 @@ def package_qa_get_elf(path, bits32): ELFFile.my_assert(self.data[2], 'L') ELFFile.my_assert(self.data[3], 'F') if bits32 : - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) # only 32 bits + ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) else: - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) # only 64 bits + ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) ELFFile.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) self.sex = self.data[ELFFile.EI_DATA] @@ -160,8 +157,6 @@ def package_qa_get_elf(path, bits32): return ELFFile(path) -# -# # Known Error classes # 0 - non dev contains .so # 1 - package contains a dangerous RPATH @@ -170,10 +165,10 @@ def package_qa_get_elf(path, bits32): # 4 - wrong architecture # 5 - .la contains installed=yes or reference to the workdir # 6 - .pc contains reference to /usr/include or workdir -# -# +# 7 - the desktop file is not valid def package_qa_clean_path(path,d): + """ Remove the common prefix from the path. In this case it is the TMPDIR""" import bb return path.replace(bb.data.getVar('TMPDIR',d,True),"") @@ -206,7 +201,8 @@ def package_qa_write_error(error_class, name, path, d): log_path = os.path.join( bb.data.getVar('T', d, True), "log.qa_package" ) f = file( log_path, "a+") - print >> f, "%s, %s, %s" % (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d)) + print >> f, "%s, %s, %s" % \ + (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d)) f.close() @@ -216,28 +212,20 @@ def package_qa_check_rpath(file,name,d): """ import bb, os scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf') - #chrpath = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'chrpath') bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work" bad_dir_test = bb.data.getVar('TMPDIR', d, True) if not os.path.exists(scanelf): bb.fatal("Can not check RPATH, scanelf (part of pax-utils-native) not found") - #if not os.path.exists(chrpath): - # bb.fatal("Can not fix RPATH, chrpath (part of chrpath-native) not found") + if not bad_dir in bb.data.getVar('WORKDIR', d, True): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") - #bb.note("%s -B -F%%r#F %s" % (scanelf,file)) output = os.popen("%s -B -F%%r#F '%s'" % (scanelf,file)) txt = output.readline().split() - #bb.note("???%s???" % bad_dir_test) for line in txt: - #bb.note("===%s===" % line) if bad_dir in line: package_qa_write_error( 1, name, file, d) bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) - #bb.note("Fixing RPATH for you in %s" % file) - #os.popen("%s -r /lib %s" % (chrpath,file)) - #return False return True def package_qa_check_devdbg(path, name,d): @@ -290,31 +278,23 @@ def package_qa_check_arch(path,name,d): return True #if this will throw an exception, then fix the dict above - (machine, osabi, abiversion, littleendian, bits32) = package_qa_get_machine_dict()[target_os][target_arch] + (machine, osabi, abiversion, littleendian, bits32) \ + = package_qa_get_machine_dict()[target_os][target_arch] elf = package_qa_get_elf(path, bits32) - try: - elf.open() - except: - # just for debbugging to check the parser, remove once convinced... - return True + elf.open() + # Check the architecture and endiannes of the binary if not machine == elf.machine(): - bb.error("Architecture did not match (%d to %d) on %s" %(machine, elf.machine(), package_qa_clean_path(path,d))) + bb.error("Architecture did not match (%d to %d) on %s" % \ + (machine, elf.machine(), package_qa_clean_path(path,d))) return not package_qa_make_fatal_error( 4, name, path, d ) elif not littleendian == elf.isLittleEndian(): - bb.error("Endiannes did not match (%d to %d) on %s" % (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d))) + bb.error("Endiannes did not match (%d to %d) on %s" % \ + (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d))) return not package_qa_make_fatal_error( 4, name, path, d ) return True -def package_qa_check_pcla(path,name,d): - """ - .pc and .la files should not point to the WORKDIR - """ - sane = True - # TODO - return sane - def package_qa_check_desktop(path, name, d): """ Run all desktop files through desktop-file-validate. @@ -323,9 +303,9 @@ def package_qa_check_desktop(path, name, d): if path.endswith(".desktop"): validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate') output = os.popen("%s %s" % (validate, path)) - # This only produces output on errors for l in output: bb.error(l.strip()) + return not package_qa_make_fatal_error(7, name, path, d) return True def package_qa_check_staged(path,d): -- cgit v1.2.3 From 158f69464e090fa276e083171f962e72f22612fa Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 20:02:06 +0000 Subject: classes/insane.bbclass: Try to increase the readability --- classes/insane.bbclass | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c01d453114..2b0be932d9 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -225,7 +225,8 @@ def package_qa_check_rpath(file,name,d): for line in txt: if bad_dir in line: package_qa_write_error( 1, name, file, d) - bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) + bb.error("QA Issue package %s contains bad RPATH %s in file %s" % \ + (name, line, file)) return True def package_qa_check_devdbg(path, name,d): @@ -240,14 +241,16 @@ def package_qa_check_devdbg(path, name,d): if not "-dev" in name: if path[-3:] == ".so" and os.path.islink(path): package_qa_write_error( 0, name, path, d ) - bb.error("QA Issue: non -dev package contains symlink .so: %s path '%s'" % (name, package_qa_clean_path(path,d))) + bb.error("QA Issue: non -dev package contains symlink .so: %s path '%s'" % \ + (name, package_qa_clean_path(path,d))) if package_qa_make_fatal_error( 0, name, path, d ): sane = False if not "-dbg" in name: if '.debug' in path: package_qa_write_error( 3, name, path, d ) - bb.error("QA Issue: non debug package contains .debug directory: %s path %s" % (name, package_qa_clean_path(path,d))) + bb.error("QA Issue: non debug package contains .debug directory: %s path %s" % \ + (name, package_qa_clean_path(path,d))) if package_qa_make_fatal_error( 3, name, path, d ): sane = False @@ -301,7 +304,8 @@ def package_qa_check_desktop(path, name, d): """ import bb, os if path.endswith(".desktop"): - validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate') + validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), \ + 'desktop-file-validate') output = os.popen("%s %s" % (validate, path)) for l in output: bb.error(l.strip()) @@ -411,6 +415,9 @@ python do_package_qa () { if not packages: return + checks = [package_qa_check_rpath, package_qa_check_devdbg, + package_qa_check_perm, package_qa_check_arch, + package_qa_check_desktop] walk_sane = True rdepends_sane = True for package in packages.split(): @@ -420,7 +427,7 @@ python do_package_qa () { bb.note("Checking Package: %s" % package) path = "%s/install/%s" % (workdir, package) - if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d): + if not package_qa_walk(path, checks, package, d): walk_sane = False if not package_qa_check_rdepends(package, workdir, d): rdepends_sane = False @@ -446,7 +453,11 @@ python do_qa_configure() { bb.note("Checking sanity of the config.log file") import os for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)): + statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \ + os.path.join(root,"config.log") if "config.log" in files: - if os.system("grep 'CROSS COMPILE Badness:' %s > /dev/null" % (os.path.join(root,"config.log"))) == 0: - bb.fatal("This autoconf log indicates errors, it looked at host includes. Rerun configure task after fixing this. Path was '%s'" % root) + if os.system(statement) == 0: + bb.fatal("This autoconf log indicates errors, it looked at \ + host includes. Rerun configure task after fixing this. \ + Path was '%s'" % root) } -- cgit v1.2.3 From bc9fa9d1d34e5e7451cd57fa4e06ea91a7879e01 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 20:15:30 +0000 Subject: classes/insane.bbclass: Make .la failures non-fatal the right way, split up the .la test in two parts -We have a function that can decide if a failure is fatal, use that instead of setting sane = True. -Test for installed and workdir separately. This allows us to ignore a certain error class and complain on others. --- classes/insane.bbclass | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 2b0be932d9..1a6ea21b5e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -178,7 +178,7 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - if error_class == 0: + if error_class == 0 or error_class == 5: return False else: return True @@ -339,14 +339,21 @@ def package_qa_check_staged(path,d): path = os.path.join(root,file) if file[-2:] == "la": file_content = open(path).read() - if installed in file_content or workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to workdir or installed)" % file ) + if installed in file_content: + bb.error("QA issue: %s failed sanity test (installed) in path %s" % \ + (file,root)) if package_qa_make_fatal_error( 5, "staging", path, d): - sane = True + sane = False + if workdir in file_content: + bb.error("QA issue: %s failed sanity test (workdir) in path %s" % \ + (file,root)) + if package_qa_make_fatal_error( 5, "staging", path, d): + sane = False elif file[-2:] == "pc": file_content = open(path).read() if workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to workdir)" % file ) + bb.error("QA issue: %s failed sanity test (workdir) in path %s" % \ + (file,root)) if package_qa_make_fatal_error( 6, "staging", path, d): sane = False -- cgit v1.2.3 From 653b08bda5f9d81d52272cfd79645ae83febde28 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 20:23:09 +0000 Subject: classes/insane.bbclass: Separate the workdir test and make it fatal --- classes/insane.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 1a6ea21b5e..36961ea811 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -163,9 +163,10 @@ def package_qa_get_elf(path, bits32): # 2 - package depends on debug package # 3 - non dbg contains .so # 4 - wrong architecture -# 5 - .la contains installed=yes or reference to the workdir +# 5 - .la contains installed=yes # 6 - .pc contains reference to /usr/include or workdir # 7 - the desktop file is not valid +# 8 - .la contains reference to the workdir def package_qa_clean_path(path,d): """ Remove the common prefix from the path. In this case it is the TMPDIR""" @@ -347,7 +348,7 @@ def package_qa_check_staged(path,d): if workdir in file_content: bb.error("QA issue: %s failed sanity test (workdir) in path %s" % \ (file,root)) - if package_qa_make_fatal_error( 5, "staging", path, d): + if package_qa_make_fatal_error(8, "staging", path, d): sane = False elif file[-2:] == "pc": file_content = open(path).read() -- cgit v1.2.3 From 4bed3f7b179bc20bcc785080af164d75c1f44144 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 20:54:06 +0000 Subject: classes/insane.bbclass: Handle non-elf files gracefully (again) --- classes/insane.bbclass | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 36961ea811..ca2b33ab8b 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -99,11 +99,10 @@ def package_qa_get_elf(path, bits32): ELFDATA2LSB = 1 ELFDATA2MSB = 2 - def my_assert(expectation, result): + def my_assert(self, expectation, result): if not expectation == result: - #print "'%x','%x'" % (ord(expectation), ord(result)) + #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name) raise Exception("This does not work as expected") - my_assert = staticmethod(my_assert) def __init__(self, name): self.name = name @@ -112,16 +111,16 @@ def package_qa_get_elf(path, bits32): self.file = file(self.name, "r") self.data = self.file.read(ELFFile.EI_NIDENT+4) - ELFFile.my_assert(len(self.data), ELFFile.EI_NIDENT+4) - ELFFile.my_assert(self.data[0], chr(0x7f) ) - ELFFile.my_assert(self.data[1], 'E') - ELFFile.my_assert(self.data[2], 'L') - ELFFile.my_assert(self.data[3], 'F') + self.my_assert(len(self.data), ELFFile.EI_NIDENT+4) + self.my_assert(self.data[0], chr(0x7f) ) + self.my_assert(self.data[1], 'E') + self.my_assert(self.data[2], 'L') + self.my_assert(self.data[3], 'F') if bits32 : - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) + self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) else: - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) - ELFFile.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) + self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) + self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) self.sex = self.data[ELFFile.EI_DATA] if self.sex == chr(ELFFile.ELFDATANONE): @@ -285,7 +284,10 @@ def package_qa_check_arch(path,name,d): (machine, osabi, abiversion, littleendian, bits32) \ = package_qa_get_machine_dict()[target_os][target_arch] elf = package_qa_get_elf(path, bits32) - elf.open() + try: + elf.open() + except: + return True # Check the architecture and endiannes of the binary if not machine == elf.machine(): -- cgit v1.2.3 From ed5018647cb34f2fb0696a5fa54d8098bc2edf7f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 21:12:21 +0000 Subject: classes/insane.bbclass: Decided to not make the workdir issues fatal --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index ca2b33ab8b..14acdb73fb 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -178,7 +178,7 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - if error_class == 0 or error_class == 5: + if error_class in [0, 5, 8]: return False else: return True -- cgit v1.2.3 From d56b2bb2b2fc7c78ef3c405336187926464943ed Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 01:53:46 +0000 Subject: Qt4/QtopiaCore4: Backport QT_LIBINFIX to add a suffix to libraries. Adapt qmake Add the 'E' suffix to QtopiaCore libraries. This allows to install both qtopiacore, qt/X11 at the same time. --- classes/qtopia4core.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index a8364d86ff..fd8939a23f 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -9,3 +9,4 @@ export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" +EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E " -- cgit v1.2.3