From 90aa788957e46603a457d972e100fd547695ead2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Dec 2007 10:17:00 +0000 Subject: angstrom: use ${ANGSTROM_FEED_CONFIGS} var for feed config, thanks to Jeremy Laine for spotting this --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 4e187a6887..0d5fd4f013 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral angstrom-feed-configs \ + ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ -- cgit v1.2.3 From ce8dec58012a1dbf2d23455c140acc7b96abe10d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Dec 2007 10:35:59 +0000 Subject: sanity.conf: bump bitbake to 1.8.9 for lockfile changes --- conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/sanity.conf b/conf/sanity.conf index fe1e2282e4..842cab52d6 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.8.8" +BB_MIN_VERSION = "1.8.9" INHERIT += "sanity" -- cgit v1.2.3 From cc09c532e73687d83e742bb2c51fdb3a7a5319dc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Dec 2007 16:43:35 +0000 Subject: package_ipk.bbclass, sanity.conf: attemp to be compatible with bitbake 1.8.8 again --- conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/sanity.conf b/conf/sanity.conf index 842cab52d6..fe1e2282e4 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.8.9" +BB_MIN_VERSION = "1.8.8" INHERIT += "sanity" -- cgit v1.2.3 From 5042d7cf071d441ae5b3a6a830b210865cd3ed43 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 7 Dec 2007 18:14:34 +0000 Subject: package_ipk.bbclass: Fix one remaining occurence of bb.utils.lockfile(), so that it works with bitbake 1.8.8. --- conf/distro/include/angstrom-eglibc.inc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 6726710aa9..837aec9f2d 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -5,14 +5,12 @@ PREFERRED_PROVIDER_virtual/libc = "eglibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" - - +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -- cgit v1.2.3