From 986c1887923b2c61a0056ef82ce3d46399f8dfc4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 18 Feb 2007 15:54:12 +0000 Subject: classes/insane.bbclass: Print the actual error, write a log file -Print all errors of the built packages and if we have printed any errors fail -Log the errors to a log file, so we can see them afterwards -Print the path (- the TMPDIR) of the package in question --- classes/insane.bbclass | 90 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 18 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 2599348351..bf75496cd0 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -24,6 +24,28 @@ inherit package PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " +def package_qa_clean_path(path,d): + import bb + return path.replace(bb.data.getVar('TMPDIR',d,True),"") + +def package_qa_write_error(error_class, name, path, d): + import bb, os + if not bb.data.getVar('QA_LOG', d): + return + + ERROR_NAMES =[ + "dev/dbg contains .so", + "package contains RPATH", + "package depends on debug package", + ] + + + 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)) + f.close() + + def package_qa_check_rpath(file,name,d): """ Check for dangerous RPATHs @@ -32,16 +54,18 @@ def package_qa_check_rpath(file,name,d): scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf') bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work" if not os.path.exists(scanelf): - bb.note("Can not check RPATH scanelf not found") + bb.fatal("Can not check RPATH scanelf 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") output = os.popen("%s -Byr %s" % (scanelf,file)) txt = output.readline().rsplit() if bad_dir in txt: - bb.fatal("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file)) + package_qa_write_error( 1, name, file, d) + bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file)) + return False - pass + return True def package_qa_check_devdbg(path, name,d): """ @@ -50,50 +74,69 @@ def package_qa_check_devdbg(path, name,d): """ import bb + sane = True + if not "-dev" in name: if path[-3:] == ".so": - bb.fatal("QA Issue: non dev package contains .so: %s" % name) + package_qa_write_error( 0, name, path, d ) + bb.error("QA Issue: non dev package contains .so: %s path '%s'" % (name, package_qa_clean_path(path,d))) + sane = False if not "-dbg" in name: if '.debug' in path: - bb.fatal("QA Issue: non debug package contains .debug directory: %s" % name) + package_qa_write_error( 0, name, path, d ) + bb.error("QA Issue: non debug package contains .debug directory: %s path %s" % (name, package_qa_clean_path(path,d))) + sane = False + + return sane def package_qa_check_perm(path,name,d): """ Check the permission of files """ - pass + sane = True + return sane def package_qa_check_arch(path,name,d): """ Check if archs are compatible """ - pass + sane = True + return sane def package_qa_check_pcla(path,name,d): """ - .pc and .la files should not point + .pc and .la files should not point to the WORKDIR """ + sane = True + return sane def package_qa_check_staged(path,d): """ Check staged la and pc files for sanity -e.g. installed being false """ - pass + sane = True + return sane # Walk over all files in a directory and call func def package_qa_walk(path, funcs, package,d): import os + sane = True + for root, dirs, files in os.walk(path): for file in files: path = os.path.join(root,file) for func in funcs: - func(path, package,d) + if not func(path, package,d): + sane = False + + return sane def package_qa_check_rdepends(pkg, workdir, d): - import bb + import bb + sane = True if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg: # Copied from package_ipk.bbclass # boiler plate to update the data @@ -122,7 +165,11 @@ def package_qa_check_rdepends(pkg, workdir, d): # Now do the sanity check!!! for rdepend in rdepends: if "-dbg" in rdepend: - bb.fatal("QA issue, koen give us a better msg!!!") + package_qa_write_error( 2, name, rdepend, d ) + bb.error("QA issue, koen give us a better msg!!!") + sane = False + + return sane # The PACKAGE FUNC to scan each package python do_package_qa () { @@ -134,12 +181,19 @@ python do_package_qa () { if not packages: return + walk_sane = True + rdepends_sane = True for package in packages.split(): - bb.note("Package: %s" % package) + bb.note("Checking Package: %s" % package) path = "%s/install/%s" % (workdir, package) - package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d) - package_qa_check_rdepends(package, workdir, d) - + if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d): + walk_sane = False + if not package_qa_check_rdepends(package, workdir, d): + rdepends_sane = False + + if not walk_sane or not rdepends_sane: + bb.fatal("QA ran found fatal errors. Please consider fixing them") + bb.note("DONE with PACKAGE QA") } @@ -156,8 +210,8 @@ addtask qa_configure after do_configure before do_compile 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('S', d, True)): + for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)): 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") + 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 80ed16db761962e949ef21ec10a9bc199c56cb61 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 18 Feb 2007 17:19:11 +0000 Subject: classes/insane.bbclass: Allow errors to be ignored Add a method to implement koen's skipping of errors of type .so in non dev package. This will turn into a list of known and acked issues which we decided to ignore. I do not yet know how to maintain such a list properly though Split the .so in non-dev package and the .debug in non-dbg package into two different packages --- classes/insane.bbclass | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index bf75496cd0..d11d8ddd7e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -24,19 +24,41 @@ inherit package PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " +# +# +# Known Error classes +# 0 - non dev contains .so +# 1 - package contains a dangerous RPATH +# 2 - package depends on debug package +# 3 - non dbg contains .so +# +# + def package_qa_clean_path(path,d): import bb return path.replace(bb.data.getVar('TMPDIR',d,True),"") +def package_qa_make_fatal_error(error_class, name, path,d): + """ + decide if an error is fatal + + TODO: Load a whitelist of known errors + """ + if error_class == 0: + return False + else: + return True + def package_qa_write_error(error_class, name, path, d): import bb, os if not bb.data.getVar('QA_LOG', d): return ERROR_NAMES =[ - "dev/dbg contains .so", + "non dev contains .so", "package contains RPATH", "package depends on debug package", + "non dbg contains .debug", ] @@ -80,13 +102,15 @@ def package_qa_check_devdbg(path, name,d): if path[-3:] == ".so": package_qa_write_error( 0, name, path, d ) bb.error("QA Issue: non dev package contains .so: %s path '%s'" % (name, package_qa_clean_path(path,d))) - sane = False + 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( 0, name, path, d ) + 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))) - sane = False + if package_qa_make_fatal_error( 3, name, path, d ): + sane = False return sane @@ -167,7 +191,8 @@ def package_qa_check_rdepends(pkg, workdir, d): if "-dbg" in rdepend: package_qa_write_error( 2, name, rdepend, d ) bb.error("QA issue, koen give us a better msg!!!") - sane = False + if package_qa_make_fatal_error( 2, name, rdepend, d ): + sane = False return sane -- cgit v1.2.3 From 614c4bbaf31f91751763192acf657dc03668da1e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 17:48:27 +0000 Subject: angstrom-2007.1.conf: Ship just en-gb locale by default. * Ship just basic locale by default. Locales are big (~1Mb uncompr.), so shipping some adhoc subset will be still useless and size burden for users of all other languages/countries. Instead, worth to make it easy to install additional languages: installer/wizard + metapackages which will RRECOMMEND as much as possible content for a given language (locales, UI transalations, help, etc. - useless for pros, but really helpful for common users). * Approved by Koen Kooi --- conf/distro/angstrom-2007.1.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 0fbe7d19cc..94d4b3f954 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "32" +DISTRO_REVISION = "33" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -16,6 +16,15 @@ require conf/distro/include/sane-srcdates.inc DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" +# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so +# shipping some adhoc subset will be still useless and size burden for +# users of all other languages/countries. Instead, worth to make it easy +# to install additional languages: installer/wizard + metapackages which +# will RRECOMMEND as much as possible content for a given language +# (locales, UI transalations, help, etc. - useless for pros, but really +# helpful for common users). +IMAGE_LINGUAS = "en-gb" + #Set the right arch for the feeds #Alphabetically sorted -- cgit v1.2.3 From 071a9b8f76a5c031cdf5a0b3b11278cf8fdce1d6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 17:49:30 +0000 Subject: angstrom-2007.1.conf: Allow to set DISTRO_TYPE in local.conf. --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 94d4b3f954..b367b3f142 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -13,7 +13,7 @@ DISTRO_REVISION = "33" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc -DISTRO_TYPE = "debug" +DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" # Ship just basic locale by default. Locales are big (~1Mb uncompr.), so -- cgit v1.2.3 From 4f8343ce4d85f0665cf909e241a0a7a235349cc3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 18:38:21 +0000 Subject: task-base: Make "wifi" belong to COMBINED_FEATURES. * This is consistent with how "bluetooth" is handled already, and, assuming that distro supports wifi, essentially allows machine to decide if wifi packages go into rootfs or would be installed from feed. This is helpful for machines which don't have wifi and devoid of any means of external card extension, or for machines with very small ROM (like, for example, h3600 with its 16Mb, in which wifi packages simply don't fit, so h3600 users with CF sleeve and wifi card would need to install support manually, after deleting packages they can sacrifice for this). * Approved by Marcin Juszkiewicz --- packages/tasks/task-base.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b4266a0940..fdbf9f75d2 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r16" +PR = "r17" PACKAGES = "task-base \ task-base-minimal \ @@ -62,10 +62,10 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" -- cgit v1.2.3 From c7e9d91801258b73c621704a1f16715f6084f271 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 18:50:03 +0000 Subject: task-angstrom-x11: Remove dependency on detect-stylus. * detect-stylus is no longer used in OE, which adopted convention of having the touchscreen device at /dev/input/touchscreen0 (for all 2.6 devices being created by udev rule). --- packages/angstrom/task-angstrom-x11.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 95fb0cf0c6..9644d4e527 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -42,7 +42,6 @@ RDEPENDS_angstrom-gpe-task-base := "\ gpe-autostarter \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \ - ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \ suspend-desktop \ teleport \ xauth \ -- cgit v1.2.3 From d26700b3505de269e1238bcb1ee2170d545058a0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 18:52:57 +0000 Subject: task-angstrom-x11: Bump PR for latest change. --- packages/angstrom/task-angstrom-x11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 9644d4e527..36aa431d42 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r27" +PR = "r28" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 4f9f17b0409566ed1f09f95341442d8554449c21 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 18 Feb 2007 23:12:19 +0000 Subject: classes/insane.bbclass: Add a small elf reader and check ABI,ARCH and Endian Add a small ELF parser and read OSABI, ABIVERSION, ENDIAN and MACHINE. This code compares TARGET_OS and TARGET_ARCH to a list of known versions. Currently we have values for linux and linux-uclibc for arm, armeb and powerpc. mips, i386, amd64, ia64 are missing. ABI wise ARM EABI is missing as well, but koen is likely to enter the values into the documented dict --- classes/insane.bbclass | 130 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index d11d8ddd7e..54b6b3b2dc 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -24,6 +24,107 @@ inherit package PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " + +# +# dictionary for elf headers +# +# feel free to add and correct. the ARM EABI needs another column and we +# need mips, i386 and amd64 input (abi versions) +# +# TARGET_OS TARGET_ARCH MACHINE, OSABI, ABIVERSION, Little Endian +def package_qa_get_machine_dict(): + return { + "linux" : { "arm" : (40, 97, 0, True), + "armeb": (40, 97, 0, False), + "powerpc": (20, 0, 0, False), + }, + "linux-uclibc" : { "arm" : (40, 97, 0, True), + "armeb": (40, 97, 0, False), + "powerpc": (20, 0, 0, False), + }, + } + +# factory for a class, embedded in a method +def package_qa_get_elf(path): + class ELFFile: + EI_NIDENT = 16 + + EI_CLASS = 4 + EI_DATA = 5 + EI_VERSION = 6 + EI_OSABI = 7 + EI_ABIVERSION = 8 + + # possible values for EI_CLASS + ELFCLASSNONE = 0 + ELFCLASS32 = 1 + ELFCLASS64 = 2 + + # possible value for EI_VERSION + EV_CURRENT = 1 + + # possible values for EI_DATA + ELFDATANONE = 0 + ELFDATA2LSB = 1 + ELFDATA2MSB = 2 + + def my_assert(expectation, result): + if not expectation == result: + print "'%x','%x'" % (ord(expectation), ord(result)) + raise "This does not work as expected" + my_assert = staticmethod(my_assert) + + def __init__(self, name): + self.name = name + + def open(self): + 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') + ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) # only 32 bits + ELFFile.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) + + self.sex = self.data[ELFFile.EI_DATA] + if self.sex == chr(ELFFile.ELFDATANONE): + raise "Can't be" + elif self.sex == chr(ELFFile.ELFDATA2LSB): + print "little" + self.sex = "<" + elif self.sex == chr(ELFFile.ELFDATA2MSB): + print "big" + self.sex = ">" + else: + raise "Even more worse" + + def osAbi(self): + return ord(self.data[ELFFile.EI_OSABI]) + + def abiVersion(self): + return ord(self.data[ELFFile.EI_ABIVERSION]) + + def isLittleEndian(self): + return self.sex == "<" + + def isBigEngian(self): + return self.sex == ">" + + def machine(self): + """ + We know the sex stored in self.sex and we + know the position + """ + import struct + (a,) = struct.unpack(self.sex+"H", self.data[18:20]) + return a + + return ELFFile(path) + + # # # Known Error classes @@ -31,6 +132,7 @@ PACKAGEFUNCS += " do_package_qa " # 1 - package contains a dangerous RPATH # 2 - package depends on debug package # 3 - non dbg contains .so +# 4 - wrong architecture # # @@ -59,6 +161,7 @@ def package_qa_write_error(error_class, name, path, d): "package contains RPATH", "package depends on debug package", "non dbg contains .debug", + "wrong archutecture", ] @@ -125,7 +228,34 @@ def package_qa_check_arch(path,name,d): """ Check if archs are compatible """ + import bb + target_os = bb.data.getVar('TARGET_OS', d, True) + target_arch = bb.data.getVar('TARGET_ARCH', d, True) + + #this will throw an exception, then fix the dict above + (machine, osabi, abiversion, littleendian) = package_qa_get_machine_dict()[target_os][target_arch] + elf = package_qa_get_elf(path) + try: + elf.open() + except: + # just for debbugging to check the parser, remove once convinced... + bb.note("ELF reading failed on '%s'" % path) + return True + sane = True + 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))) + sane = package_qa_make_fatal_error( 4, name, path, d ) + elif not osabi == elf.osAbi(): + bb.error("OSABI did not match (%d to %d) on %s", (osabi, elf.osAbi(), package_qa_clean_path(path,d))) + sane = package_qa_make_fatal_error( 4, name, path, d ) + elif not abiversion == elf.abiVersion(): + bb.error("ABI version did not match (%d to %d) on %s", (abiversion, elf.abiVersion(), package_qa_clean_path(path,d))) + sane = 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))) + sane = package_qa_make_fatal_error( 4, name, path, d ) + return sane def package_qa_check_pcla(path,name,d): -- cgit v1.2.3 From a4cef58d43b3733a4a513e550b94d8713ee56401 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 18 Feb 2007 23:14:06 +0000 Subject: classes/insane.bbclass: Be less verbose --- classes/insane.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 54b6b3b2dc..cda2ebc917 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -70,7 +70,7 @@ def package_qa_get_elf(path): def my_assert(expectation, result): if not expectation == result: - print "'%x','%x'" % (ord(expectation), ord(result)) + #print "'%x','%x'" % (ord(expectation), ord(result)) raise "This does not work as expected" my_assert = staticmethod(my_assert) @@ -93,10 +93,8 @@ def package_qa_get_elf(path): if self.sex == chr(ELFFile.ELFDATANONE): raise "Can't be" elif self.sex == chr(ELFFile.ELFDATA2LSB): - print "little" self.sex = "<" elif self.sex == chr(ELFFile.ELFDATA2MSB): - print "big" self.sex = ">" else: raise "Even more worse" @@ -239,7 +237,6 @@ def package_qa_check_arch(path,name,d): elf.open() except: # just for debbugging to check the parser, remove once convinced... - bb.note("ELF reading failed on '%s'" % path) return True sane = True -- cgit v1.2.3