From abb60bbc4007efb047a420d56f69ca9ce31e4406 Mon Sep 17 00:00:00 2001 From: Marco Cavallini Date: Wed, 9 Jun 2010 16:45:15 +0200 Subject: kaeilos-2009-preferred-versions.inc: some distro version updates and mainly automake-native 1.11 --- conf/distro/include/kaeilos-2009-preferred-versions.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index 55fd6dbda8..34da301af2 100644 --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc @@ -4,7 +4,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution preferred version #@MAINTAINER: Marco Cavallini -#@VERSION: 20-01-2010 +#@VERSION: 09-06-2010 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -12,7 +12,7 @@ PREFERRED_VERSION_autoconf = "2.65" PREFERRED_VERSION_autoconf-native = "2.65" -PREFERRED_VERSION_automake-native = "1.10.3" +PREFERRED_VERSION_automake-native = "1.11.1" PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_cairo = "1.8.10" PREFERRED_VERSION_dbus = "1.2.22" @@ -87,5 +87,9 @@ SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758" SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e" SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab" - +# +# Apache2 +# +PREFERRED_VERSION_apache2 ?= "2.2.3" +PREFERRED_VERSION_apache2-native ?= "2.2.3" -- cgit v1.2.3 From 0dc02df5726be8b3569d7c806b4f1036413b81ee Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 9 Jun 2010 13:45:43 -0700 Subject: minimal-uclibc.conf: Add pam to DISTRO_FEATURES * if pam is not in the DISTRO_FEATURES then pam modules dont end up in th root file system but when using shadow pam is used for authentication and uclibc needs these modules otherwise login fails. Signed-off-by: Khem Raj --- conf/distro/minimal-uclibc.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index df727697e2..a0af3a6640 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -38,4 +38,5 @@ require conf/distro/minimal.conf DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" # Following features are for ARM and E500 based machines DISTRO_FEATURES += "eabi" - +# pam is needed on uclibc if using shadow +DISTRO_FEATURES += "pam" -- cgit v1.2.3 From 9004bd8f2ee251308a21b8bdb35f070d349266d0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 23 May 2010 10:43:44 -0700 Subject: bitbake.conf: use := for BUILD_OS and BUILD_ARCH These don't change, so their initial values should be just fine. Apparently, in a typical build, those os.uname() snippets are called around 46k times, which seems a tad excessive :) Signed-off-by: Chris Larson --- conf/bitbake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 12a5522029..ee93cd485b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -90,8 +90,8 @@ target_datadir := "${datadir}" # Architecture-dependent build variables. ################################################################## -BUILD_ARCH = "${@os.uname()[4]}" -BUILD_OS = "${@os.uname()[0].lower()}" +BUILD_ARCH := "${@os.uname()[4]}" +BUILD_OS := "${@os.uname()[0].lower()}" BUILD_VENDOR = "" BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" BUILD_PREFIX = "" -- cgit v1.2.3 From 29e61b1d387b8e7b5bba8cbcbb9cfb2e2954ab68 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 21 May 2010 17:11:48 -0700 Subject: bitbake.conf: don't filter out nonexisting paths from FILESPATH It's unnecessary, and can cause problems with amend.bbclass. Signed-off-by: Chris Larson --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ee93cd485b..5dc6772c00 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -272,7 +272,7 @@ export MANIFEST = "${FILESDIR}/manifest" FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" FILESPATHBASE = "${FILE_DIRNAME}" FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." -FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}" +FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':')])}" FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" ################################################################## -- cgit v1.2.3 From 52ef9265223084d9d4ab38a6ff12c5be78ee380d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 19 May 2010 13:27:10 -0700 Subject: bitbake.conf: make the EXTENDPE bits slightly less disturbing Signed-off-by: Chris Larson --- conf/bitbake.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 5dc6772c00..1980f43416 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -178,8 +178,9 @@ PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'de PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" PF = "${PN}-${EXTENDPE}${PV}-${PR}" -EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" -EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" +PE ?= "0" +EXTENDPE = "${@int('${PE}') and '${PE}_' or ''}" +EXTENDPEVER = "${@int('${PE}') and '${PE}:' or ''}" EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}" P = "${PN}-${PV}" -- cgit v1.2.3 From 4d060ecf3da4ee27547e7456df1198a450461ab0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 23 May 2010 10:41:09 -0700 Subject: bitbake.conf: Drop some unnecessary getVar usage in python snippets Signed-off-by: Chris Larson --- conf/bitbake.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 1980f43416..397dbc2701 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -128,7 +128,8 @@ EXEEXT = "${HOST_EXEEXT}" BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" PACKAGE_EXTRA_ARCHS ?= "" -MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" +MACHINE_ARCH = "${@oe.utils.ifelse(bool(d.getVar('MACHINE', True)), '${MACHINE}', \ + 'BASE_PACKAGE_ARCH')}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" MULTIMACH_ARCH = "${PACKAGE_ARCH}" @@ -174,9 +175,9 @@ ASSUME_PROVIDED = "\ ################################################################## # Package default variables. ################################################################## -PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" -PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" -PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" +PN = "${@bb.parse.BBHandler.vars_from_file('${FILE}', d)[0] or 'defaultpkgname'}" +PV = "${@bb.parse.BBHandler.vars_from_file('${FILE}', d)[1] or '1.0'}" +PR = "${@bb.parse.BBHandler.vars_from_file('${FILE}', d)[2] or 'r0'}" PF = "${PN}-${EXTENDPE}${PV}-${PR}" PE ?= "0" EXTENDPE = "${@int('${PE}') and '${PE}_' or ''}" @@ -192,7 +193,7 @@ MACHINE_KERNEL_PR = "" # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian -sdk" -BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}" +BPN = "${@base_prune_suffix('${PN}', '${SPECIAL_PKGSUFFIX}'.split(), d)}" BP = "${BPN}-${PV}" # Package info. -- cgit v1.2.3 From 731e6defe6da58bff482f33508058544ad1013a9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 11 Jun 2010 08:26:03 +0200 Subject: opkg: bump SRCREV for better fix of #50 (incorrect removal of orphaned files) * http://code.google.com/p/opkg/issues/detail?id=50 Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 6b2aa8fc72..de841adb86 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -1,5 +1,5 @@ # this is alphabetical! # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly -OPKG_SRCREV ?= "531" +OPKG_SRCREV ?= "536" EFL_SRCREV ?= "49539" -- cgit v1.2.3 From 7604d56950b21b703470fbee6443a538a732be6a Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Fri, 11 Jun 2010 18:07:52 +0400 Subject: lite5200: update machine config Update Lite5200 board config with correct console definition, kernel provider and kernel image. Signed-off-by: Dmitry Eremin-Solenikov --- conf/machine/lite5200.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 16a723cd1c..4a963ce822 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,7 +1,10 @@ TARGET_ARCH = "powerpc" UBOOT_MACHINE = "Lite5200" -SERIAL_CONSOLE="38400 ttyS0" +SERIAL_CONSOLE="115200 ttyPSC0" IMAGE_FSTYPES = "jffs2 tar.bz2" +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" + require conf/machine/include/tune-ppc603e.inc -- cgit v1.2.3