[oe-commits] org.oe.dev merge of '4a084d17d8150e500fccc6f78c116ab863359656'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Dec 20 14:05:58 UTC 2007
merge of '4a084d17d8150e500fccc6f78c116ab863359656'
and '634115f7cb55bed1cb0ad082cb66c596be1b6d40'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: fe8b059d402ce06dc82f689e1c41665bb055b755
ViewMTN: http://monotone.openembedded.org/revision/info/fe8b059d402ce06dc82f689e1c41665bb055b755
Files:
1
conf/distro/openwrt-sdk.conf
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom.inc
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/mainstone.conf
contrib/angstrom/build-feeds.sh
contrib/angstrom/build-release.sh
packages/linux/mainstone-kernel/mainstone_defconfig
packages/linux/mainstone-kernel_2.6.18.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/tasks/task-python-everything.bb
packages/uboot/uboot-openmoko_svn.bb
packages/images/base-image.bb
Diffs:
#
# mt diff -r4a084d17d8150e500fccc6f78c116ab863359656 -rfe8b059d402ce06dc82f689e1c41665bb055b755
#
#
#
# add_file "conf/distro/openwrt-sdk.conf"
# content [8b396941add259495d68102ab8ff2429a211f943]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [d8d0f67a5e9722eb7dc52f96947593807cceb55b]
# to [688dc186110395d3f027a2a69beda654e77eb77d]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [71653d68abac9cadecd9c4f46a1cfadaff2d3f11]
# to [db7d798ae0bfb0247447e34639d0beebb064abc6]
#
# patch "conf/distro/include/angstrom.inc"
# from [ef356d78c89cc9b9de013a2e8d617f6125f760dd]
# to [6d2902857b621e681b3f0d4780dcd51ee236074e]
#
# patch "conf/machine/fic-gta01.conf"
# from [56e3567a9b043a97909716a4bb78777a1f1f48a2]
# to [f27cbc4ecf805a9d8cb70b26d9922a2880880dfc]
#
# patch "conf/machine/fic-gta02.conf"
# from [5a64c25ce56c6c837bea67eadf19100fe0d59337]
# to [ccf9b87c36d24e1c3e118f08f60012f6c27e2dd8]
#
# patch "conf/machine/mainstone.conf"
# from [134b815b2cb6f8a28e428420e907a46d4d279dd1]
# to [cb04f4db21cd13e636401655fb4fdeaabc171584]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [94751537edad00e471f43c6fa461aea634716679]
# to [3ccfd168723e3ef76a4a34ac3f630adb2dc4df3b]
#
# patch "contrib/angstrom/build-release.sh"
# from [f2199cfa4af0b86c2d7bf508cb53516c468b13f5]
# to [47b470ed8a0841c920889e9c992dc07dc4334413]
#
# patch "packages/linux/mainstone-kernel/mainstone_defconfig"
# from [49c6683a123e056a9dfec037e9a8400fb5b4c2a8]
# to [f65d1e19ca553f0183aa70264c609d007c7916c5]
#
# patch "packages/linux/mainstone-kernel_2.6.18.bb"
# from [76dd39cb1faf78b2f6fd5770e7aba9d18413bf23]
# to [08ce2daf2b8f1e478a29ccade5b10df1891a1bbc]
#
# patch "packages/qt/qt4-x11-free_4.3.2.bb"
# from [706fc53c8f4c041fca267bea9825aa99010fa460]
# to [b7e59e0489502bdfca8e0b0220da5df284fb0995]
#
# patch "packages/tasks/task-python-everything.bb"
# from [cb2d01f802774b542aaf3c1f69ba9931e7cb3982]
# to [3729081d243f947b170d93ab5c2e5503ee8fe392]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [f7e8df9fab2b480e384525d33ccc0b0221c3f575]
# to [8a7b89b1fde79e94c6ddfbc706a42b171be5f547]
#
============================================================
--- conf/distro/openwrt-sdk.conf 8b396941add259495d68102ab8ff2429a211f943
+++ conf/distro/openwrt-sdk.conf 8b396941add259495d68102ab8ff2429a211f943
@@ -0,0 +1,26 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenWRT-SDK
+#@DESCRIPTION: Building packages for OpenWRT using its official SDK.
+#
+#@COMMENT: This allows to build packages only, not the whole images.
+#@COMMENT: You should install and have in path an SDK from the www.openwrt.org.
+#@COMMENT: SDK installers are both host and target specific (so look in download
+#@COMMENT: dir for your target). If there is no SDK for your host arch,
+#@COMMENT: you can also look at downloads of x-wrt.org, a sister project.
+#@COMMENT: To build a package, use command like:
+#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package>
+#-----------------------------------------------------------------------------
+
+require conf/distro/generic-uclibc.conf
+
+#
+# Header
+#
+DISTRO_NAME = "OpenWRT"
+
+# This is what lives in SDK
+ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+
+# Make sure that we have correct package dependencies for SDK-provided libs.
+ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
============================================================
--- conf/distro/angstrom-2007.1.conf d8d0f67a5e9722eb7dc52f96947593807cceb55b
+++ conf/distro/angstrom-2007.1.conf 688dc186110395d3f027a2a69beda654e77eb77d
@@ -251,3 +251,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
avahi-autoipd \
openssh-sftp-server \
"
+
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+
============================================================
--- conf/distro/angstrom-2008.1.conf 71653d68abac9cadecd9c4f46a1cfadaff2d3f11
+++ conf/distro/angstrom-2008.1.conf db7d798ae0bfb0247447e34639d0beebb064abc6
@@ -187,3 +187,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
avahi-autoipd \
openssh-sftp-server \
"
+
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+
============================================================
--- conf/distro/include/angstrom.inc ef356d78c89cc9b9de013a2e8d617f6125f760dd
+++ conf/distro/include/angstrom.inc 6d2902857b621e681b3f0d4780dcd51ee236074e
@@ -256,7 +256,7 @@ SEPPUKU_QUERY = "http://bugs.open
# seppuku bbclass
SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?"
SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?"
-SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
SEPPUKU_AUTOBUILD = "1"
============================================================
--- conf/machine/fic-gta01.conf 56e3567a9b043a97909716a4bb78777a1f1f48a2
+++ conf/machine/fic-gta01.conf f27cbc4ecf805a9d8cb70b26d9922a2880880dfc
@@ -11,7 +11,7 @@ UBOOT_ENTRYPOINT = "30008000"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
============================================================
--- conf/machine/fic-gta02.conf 5a64c25ce56c6c837bea67eadf19100fe0d59337
+++ conf/machine/fic-gta02.conf ccf9b87c36d24e1c3e118f08f60012f6c27e2dd8
@@ -11,7 +11,7 @@ UBOOT_ENTRYPOINT = "30008000"
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
============================================================
--- conf/machine/mainstone.conf 134b815b2cb6f8a28e428420e907a46d4d279dd1
+++ conf/machine/mainstone.conf cb04f4db21cd13e636401655fb4fdeaabc171584
@@ -15,6 +15,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
SERIAL_CONSOLE = "115200 ttyS0"
# used by opie-collections.inc
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "16"
MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000"
============================================================
--- contrib/angstrom/build-feeds.sh 94751537edad00e471f43c6fa461aea634716679
+++ contrib/angstrom/build-feeds.sh 3ccfd168723e3ef76a4a34ac3f630adb2dc4df3b
@@ -35,16 +35,16 @@ do
for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz
do
BUILD_MACHINE=$machine
- BUILD_CLEAN="libtool-cross"
+ BUILD_CLEAN="libtool-cross qmake2-native"
BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \
task-proper-tools mc screen \
mono perl python ruby \
gtk+ qt-x11-free qt4-x11-free \
gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
- boa cherokee lighttpd thttpd \
- gpe-gallery gpe-scap pidgin \
+ apache2 boa cherokee lighttpd thttpd \
+ gpe-gallery gpe-scap notecase pidgin \
gpsdrive navit \
- xmms mplayer \
+ xmms mplayer quasar \
wpa-gui wifi-radar \
gpe-bluetooth bluez-gnome python-pybluez \
abiword gnumeric evince gimp \
============================================================
--- contrib/angstrom/build-release.sh f2199cfa4af0b86c2d7bf508cb53516c468b13f5
+++ contrib/angstrom/build-release.sh 47b470ed8a0841c920889e9c992dc07dc4334413
@@ -95,10 +95,10 @@ done
done
# populate feeds
-for machine in ep93xx a780 efika collie ixp4xxbe
-do
- BUILD_MACHINE=$machine
- BUILD_TARGETS="meta-angstrom-2007"
- do_build
-done
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+# BUILD_MACHINE=$machine
+# BUILD_TARGETS="meta-angstrom-2007"
+# do_build
+#done
============================================================
--- packages/linux/mainstone-kernel/mainstone_defconfig 49c6683a123e056a9dfec037e9a8400fb5b4c2a8
+++ packages/linux/mainstone-kernel/mainstone_defconfig f65d1e19ca553f0183aa70264c609d007c7916c5
@@ -1,74 +1,113 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11
-# Sat Mar 5 10:39:38 2005
+# Linux kernel version: 2.6.18
+# Wed Dec 19 15:51:05 2007
#
CONFIG_ARM=y
CONFIG_MMU=y
-CONFIG_UID16=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
#
# General setup
#
CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
#
# Loadable module support
#
CONFIG_MODULES=y
# CONFIG_MODULE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
#
+# Block layer
+#
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
# System Type
#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS7500 is not set
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_IOP3XX is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
@@ -76,17 +115,16 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
#
# Intel PXA2xx Implementations
#
# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
CONFIG_MACH_MAINSTONE=y
# CONFIG_ARCH_PXA_IDP is not set
# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
CONFIG_IWMMXT=y
@@ -99,7 +137,6 @@ CONFIG_CPU_TLB_V4WBI=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_CACHE_VIVT=y
CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
#
# Processor Features
@@ -108,59 +145,255 @@ CONFIG_XSCALE_PMU=y
CONFIG_XSCALE_PMU=y
#
-# General setup
+# Bus support
#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_XIP_KERNEL is not set
#
# PCCARD (PCMCIA/CardBus) support
#
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
#
# PC-card bridges
#
+CONFIG_PCMCIA_PXA2XX=m
#
-# At least one math emulation must be selected
+# Kernel Features
#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queuei%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r634115f7cb55bed1cb0ad082cb66c596be1b6d40 -rfe8b059d402ce06dc82f689e1c41665bb055b755
#
#
#
# patch "packages/images/base-image.bb"
# from [b505988725f2bce81ebd364549ae0d4a1bcfca4f]
# to [a1e5aad1ac0a18575912aad884dfdc89508d7d46]
#
============================================================
--- packages/images/base-image.bb b505988725f2bce81ebd364549ae0d4a1bcfca4f
+++ packages/images/base-image.bb a1e5aad1ac0a18575912aad884dfdc89508d7d46
@@ -24,7 +24,8 @@ DEPENDS = "\
task-distro-base task-machine-base \
${DISTRO_SSH_DAEMON} \
${DISTRO_PACKAGE_MANAGER} \
- task-base-usbhost task-base-ext2 \
+ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
"
IMAGE_INSTALL = "\
@@ -32,7 +33,8 @@ IMAGE_INSTALL = "\
task-distro-base task-machine-base \
${DISTRO_SSH_DAEMON} \
${DISTRO_PACKAGE_MANAGER} \
- task-base-usbhost task-base-ext2 \
+ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
"
export IMAGE_BASENAME = "base-image"
More information about the Openembedded-commits
mailing list