[oe-commits] org.oe.dev merge of '14a701971b9cd67faba4766a17dd244b687d08a1'

[woglinde2 commit]

merge of '14a701971b9cd67faba4766a17dd244b687d08a1'
     and '69457e2ded5426f232837433da27883e41e78e5a'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 190d4a42923a34843f000aba79e59f6d76086408
ViewMTN: http://monotone.openembedded.org/revision.psp?id=190d4a42923a34843f000aba79e59f6d76086408
Files:
1
conf/machine/fsg3be.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r14a701971b9cd67faba4766a17dd244b687d08a1 -r190d4a42923a34843f000aba79e59f6d76086408
#
# 
# no changes
# 


#
# mt diff -r69457e2ded5426f232837433da27883e41e78e5a -r190d4a42923a34843f000aba79e59f6d76086408
#
# 
# 
# add_file "conf/machine/fsg3be.conf"
#  content [614fcd1196db4ea73e6ea013cbc9b15381004779]
# 
# patch "packages/tasks/task-base.bb"
#  from [6b16edd2133933a5f4f6922ccb991374fbed6a1a]
#    to [8063e1b226de759fef34b1a23b3845f05b89bb7c]
# 
============================================================
--- conf/machine/fsg3be.conf	614fcd1196db4ea73e6ea013cbc9b15381004779
+++ conf/machine/fsg3be.conf	614fcd1196db4ea73e6ea013cbc9b15381004779
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: Freecom FSG-3 (big-endian)
+#@DESCRIPTION: Machine configuration for an FSG3 in big-endian mode
+
+TARGET_ARCH = "armeb"
+
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+
+MACHINE_ARCH = "ixp4xxbe"
+
+OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+require conf/machine/include/ixp4xx.conf
+
+# Match the vendor's latest kernel
+PREFERRED_VERSION_ixp4xx-kernel = "2.6.18"
+KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
+PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
+
+# No room for jffs2 - the rootfs needs to be installed directly to disk
+IMAGE_FSTYPES = "tar.gz"
============================================================
--- packages/tasks/task-base.bb	6b16edd2133933a5f4f6922ccb991374fbed6a1a
+++ packages/tasks/task-base.bb	8063e1b226de759fef34b1a23b3845f05b89bb7c
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r38"
+PR = "r39"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -239,7 +239,11 @@ RRECOMMENDS_task-base-bluetooth = "\
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)}"
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \
+    "
+# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in
+# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer.
 
 RDEPENDS_task-base-irda = "\
     irda-utils"