diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-06 23:44:06 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-06 23:44:06 +0000 |
| commit | 5ac063a41073fbd98e8bdb703a0bcc1b8b13ff93 (patch) | |
| tree | 0917eab602e4047fec6784ab985f501944692629 | |
| parent | edb488ab04dd2d3fad6cd65ab682ad9c6741e9de (diff) | |
| parent | 4a319dae514c9e5d743211cb7f3262a66e89300a (diff) | |
merge of 'a42973bf7cd903eb0cda39c0e0c9ca3041188bf1'
and 'dead8726201c5039d0257a605f354059105e7c99'
117 files changed, 56574 insertions, 90 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 30b164b734..c3a211eefd 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -219,7 +219,7 @@ def package_qa_check_rpath(file,name,d): #bb.note("???%s???" % bad_dir_test) for line in txt: #bb.note("===%s===" % line) - if bad_dir_test in 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) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index daa579f132..be2a5b88bf 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "41" +DISTRO_REVISION = "42" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -51,6 +51,7 @@ FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" FEED_ARCH_ixp4xx = "armv5te" +FEED_ARCH_ixp4xxle = "armv5te" FEED_ARCH_magician = "armv5te" FEED_ARCH_netbook-pro = "armv5te" FEED_ARCH_nokia770 = "armv5te" @@ -60,6 +61,8 @@ FEED_ARCH_spitz = "armv5te" FEED_ARCH_tosa = "armv5te" +FEED_ARCH_ixp4xxbe = "armv5teb" + #i586 machines FEED_ARCH_epia = "i586" @@ -98,6 +101,9 @@ PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" +PREFERRED_VERSION_perl-native = "5.8.8" +PREFERRED_VERSION_perl = "5.8.8" + CVS_TARBALL_STASH = "\ http://www.angstrom-distribution.org/unstable/sources/ \ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -132,7 +138,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.3" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.4" -PREFERRED_VERSION_glib-2.0 = "2.12.11" |