[oe-commits] org.oe.dev merge of 'b96176f68bd2545b7289726943c8c98746124533'

pfalcon commit openembedded-commits at lists.openembedded.org
Sat Feb 16 01:08:55 UTC 2008 

merge of 'b96176f68bd2545b7289726943c8c98746124533'
     and 'efa50d2f263b84fff5481de06517aac16a406c5d'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: a635d59f6f07065e2f3d4b3de4e72a4a2e442be3
ViewMTN: http://monotone.openembedded.org/revision/info/a635d59f6f07065e2f3d4b3de4e72a4a2e442be3
Files:
1
packages/cairo/cairo-1.4.14
packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch
packages/cairo/cairo_1.4.14.bb
packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-rt_2.6.24.bb
packages/linux/gumstix-kernel-2.6.21
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex
packages/initrdscripts/files/87-kexecboot.sh
packages/initrdscripts/initramfs-image-ipk_1.0.bb
packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
packages/initrdscripts/kernel-initramfs_1.0.bb
packages/linux/gumstix-kernel-2.6.21/270-usb-gadget-udc.patch
packages/linux/gumstix-kernel-2.6.21/arch-config.patch
packages/linux/gumstix-kernel-2.6.21/bkpxa-pxa-cpu.patch
packages/linux/gumstix-kernel-2.6.21/bkpxa-pxa-cpufreq.patch
packages/linux/gumstix-kernel-2.6.21/board-init.patch
packages/linux/gumstix-kernel-2.6.21/bugfix-i2c-include.patch
packages/linux/gumstix-kernel-2.6.21/bugfix-mmc-clock.patch
packages/linux/gumstix-kernel-2.6.21/bugfix-pxa-cpufreq.patch
packages/linux/gumstix-kernel-2.6.21/bugfix-serial-interrupt.patch
packages/linux/gumstix-kernel-2.6.21/bugfix-serial-register-status.patch
packages/linux/gumstix-kernel-2.6.21/compact-flash.patch
packages/linux/gumstix-kernel-2.6.21/compile-fix-pxa_cpufreq.patch
packages/linux/gumstix-kernel-2.6.21/cpufreq-better-freqs.patch
packages/linux/gumstix-kernel-2.6.21/cpufreq-fixup.patch
packages/linux/gumstix-kernel-2.6.21/cpufreq-ondemand-by-default.patch
packages/linux/gumstix-kernel-2.6.21/disable-uncompress-message.patch
packages/linux/gumstix-kernel-2.6.21/ethernet-config.patch
packages/linux/gumstix-kernel-2.6.21/flash.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-asoc.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb
packages/linux/gumstix-kernel-2.6.21/gumstix-fb-logo.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-pxa270-mmc.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-pxa270-usb-host.patch
packages/linux/gumstix-kernel-2.6.21/header.patch
packages/linux/gumstix-kernel-2.6.21/mach-types-fix.patch
packages/linux/gumstix-kernel-2.6.21/misalignment-handling.patch
packages/linux/gumstix-kernel-2.6.21/mmc-card-detect.patch
packages/linux/gumstix-kernel-2.6.21/modular-init-bluetooth.patch
packages/linux/gumstix-kernel-2.6.21/modular-init-smc91x.patch
packages/linux/gumstix-kernel-2.6.21/modular-init-usb-gadget.patch
packages/linux/gumstix-kernel-2.6.21/pcm-gcc-411-bugfix.patch
packages/linux/gumstix-kernel-2.6.21/proc-gpio.patch
packages/linux/gumstix-kernel-2.6.21/pxa-regs-additions.patch
packages/linux/gumstix-kernel-2.6.21/pxa-regs-fixup.patch
packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch
packages/linux/gumstix-kernel-2.6.21/pxafb-18bpp-mode.patch
packages/linux/gumstix-kernel-2.6.21/pxafb-definition.patch
packages/linux/gumstix-kernel-2.6.21/serial-divisor.patch
packages/linux/gumstix-kernel-2.6.21/serial-ether-addr.patch
packages/linux/gumstix-kernel-2.6.21/smc-ether-addr.patch
packages/linux/gumstix-kernel-2.6.21/smc911x-fixup.patch
packages/linux/gumstix-kernel-2.6.21/tsc2003-config.diff
packages/linux/gumstix-kernel-2.6.21/tsc2003.c
packages/linux/gumstix-kernel-2.6.21/uImage-in-own-partition.patch
packages/linux/gumstix-kernel-2.6.21/ucb1400-ac97-audio.patch
packages/linux/gumstix-kernel_2.6.21.bb
packages/linux/gumstix-linux.inc
packages/linux/linux-rp-2.6.24/pxa27x-resume.patch
packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-002-atmel.1.patch
packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-avr32-fix-sa_onstack.patch
classes/image.bbclass
classes/kernel.bbclass
conf/distro/chinook-compat.conf
conf/local.conf.sample
packages/anki/anki_0.4.3.bb
packages/images/initramfs-bootmenu-image.bb
packages/initrdscripts/devimage/devimage.sh
packages/initrdscripts/devimage_0.1.bb
packages/ipaq-boot-params/files/h5000/params
packages/ipaq-boot-params/files/params
packages/ipaq-boot-params/ipaq-boot-params.bb
packages/libxine/libxine-x11_1.0.bb
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/linux/linux-rp_2.6.24.bb
packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine
packages/uclibc/uclibc_0.9.29.bb
Diffs:

#
# mt diff -rb96176f68bd2545b7289726943c8c98746124533 -ra635d59f6f07065e2f3d4b3de4e72a4a2e442be3
#
# 
# 
# add_dir "packages/cairo/cairo-1.4.14"
# 
# add_file "packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch"
#  content [dbefc4dd2f440b1a5a6c7ae578805c15910c2941]
# 
# add_file "packages/cairo/cairo_1.4.14.bb"
#  content [eac43a4d6029b1df29ac83dda4c2cb828ae13783]
# 
# patch "packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig"
#  from [338a192c1a985147143234c61e9e00e2354e4b88]
#    to [df975876d7fb1fb5becbbaa088d6182ad5d18091]
# 
# patch "packages/linux/linux-rt_2.6.24.bb"
#  from [0d1629abe27c17f6539b15076ccc9e00513e7c4d]
#    to [fe4fc51b6385282cc05c46e7dc7a03308fa9dd1f]
# 
============================================================
--- packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch	dbefc4dd2f440b1a5a6c7ae578805c15910c2941
+++ packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch	dbefc4dd2f440b1a5a6c7ae578805c15910c2941
@@ -0,0 +1,32 @@
+From 7647f29a2a3b69592e38f50890a96d8deeaa2dbb Mon Sep 17 00:00:00 2001
+From: Jan Slupski <jslupski at juljas.net>
+Date: Fri, 15 Feb 2008 00:55:30 +0100
+Subject: [PATCH] Fix for a memory leak in pixman.
+
+Port of a 1.6 fix for a memory leak in pixman_region_init_rects/pixman_rect_alloc
+when the count of boxes is 0.
+---
+ pixman/src/pixregion.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
+index 1ed3ad7..d6caf6c 100644
+--- a/pixman/src/pixregion.c
++++ b/pixman/src/pixregion.c
+@@ -355,6 +355,15 @@ pixman_region_init_rects(pixman_region16_t *region, pixman_box16_t *boxes, int c
+     }
+ 
+     pixman_region_init(region);
++
++    /* if it's 0, don't call pixman_rect_alloc -- 0 rectangles is
++     * a special case, and causing pixman_rect_alloc would cause
++     * us to leak memory (because the 0-rect case should be the
++     * static pixman_region_emptyData data).
++     */
++    if (count == 0)
++        return PIXMAN_REGION_STATUS_SUCCESS;
++
+     if (!pixman_rect_alloc(region, count))
+ 	return PIXMAN_REGION_STATUS_FAILURE;
+ 
+
============================================================
--- packages/cairo/cairo_1.4.14.bb	eac43a4d6029b1df29ac83dda4c2cb828ae13783
+++ packages/cairo/cairo_1.4.14.bb	eac43a4d6029b1df29ac83dda4c2cb828ae13783
@@ -0,0 +1,9 @@
+require cairo.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+file://0001-Fix-for-a-memory-leak-in-pixman.patch;patch=1;p=1"
+
+PR = "r0"
+
============================================================
--- packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig	338a192c1a985147143234c61e9e00e2354e4b88
+++ packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig	df975876d7fb1fb5becbbaa088d6182ad5d18091
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24-rt1
-# Thu Feb 14 00:07:12 2008
+# Fri Feb 15 20:51:04 2008
 #
 # CONFIG_PPC64 is not set
 
@@ -60,7 +60,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -72,10 +72,10 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_FAIR_USER_SCHED is not set
 # CONFIG_FAIR_CGROUP_SCHED is not set
-CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -95,14 +95,14 @@ CONFIG_EVENTFD=y
 # CONFIG_EPOLL is not set
 CONFIG_SIGNALFD=y
 CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SHMEM is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
+CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -120,14 +120,14 @@ CONFIG_IOSCHED_NOOP=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
 
 #
 # Platform support
@@ -166,7 +166,7 @@ CONFIG_TICK_ONESHOT=y
 #
 # CONFIG_HIGHMEM is not set
 CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
+CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_HZ_100 is not set
@@ -211,7 +211,7 @@ CONFIG_HIBERNATION_UP_POSSIBLE=y
 # CONFIG_PM is not set
 CONFIG_SUSPEND_UP_POSSIBLE=y
 CONFIG_HIBERNATION_UP_POSSIBLE=y
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 CONFIG_WANT_DEVICE_TREE=y
 CONFIG_DEVICE_TREE=""
 CONFIG_ISA_DMA_API=y
@@ -237,15 +237,15 @@ CONFIG_PCI_LEGACY=y
 #
 # Advanced setup
 #
-# CONFIG_ADVANCED_OPTIONS is not set
-
-#
-# Default settings for advanced configuration options are used
-#
+CONFIG_ADVANCED_OPTIONS=y
 CONFIG_HIGHMEM_START=0xfe000000
+# CONFIG_LOWMEM_SIZE_BOOL is not set
 CONFIG_LOWMEM_SIZE=0x30000000
+# CONFIG_KERNEL_START_BOOL is not set
 CONFIG_KERNEL_START=0xc0000000
+# CONFIG_TASK_SIZE_BOOL is not set
 CONFIG_TASK_SIZE=0xc0000000
+# CONFIG_BOOT_LOAD_BOOL is not set
 CONFIG_BOOT_LOAD=0x00800000
 
 #
@@ -276,7 +276,7 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_PNP_RARP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
 # CONFIG_NET_IPGRE_BROADCAST is not set
@@ -456,25 +456,18 @@ CONFIG_IP6_NF_RAW=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
+# CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
 CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN 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=m
+# CONFIG_WAN_ROUTER is not set
 CONFIG_NET_SCHED=y
 
 #
@@ -483,7 +476,6 @@ CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_RED=m
@@ -535,31 +527,7 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_LL is not set
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
+# CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 
@@ -581,9 +549,7 @@ CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=m
-CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
 #
@@ -628,6 +594,9 @@ CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_JEDECPROBE is not set
 CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
+# CONFIG_MTD_CFI_NOSWAP is not set
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -710,7 +679,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
-CONFIG_ATA_OVER_ETH=m
+# CONFIG_ATA_OVER_ETH is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_PHANTOM is not set
 CONFIG_EEPROM_93CX6=m
@@ -755,42 +724,7 @@ CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 # CONFIG_FUSION is not set
@@ -952,20 +886,6 @@ CONFIG_ZD1211RW=m
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATM_TCP is not set
-# CONFIG_ATM_LANAI is not set
-# CONFIG_ATM_ENI is not set
-# CONFIG_ATM_FIRESTREAM is not set
-# CONFIG_ATM_ZATM is not set
-# CONFIG_ATM_NICSTAR is not set
-# CONFIG_ATM_IDT77252 is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
-# CONFIG_ATM_FORE200E_MAYBE is not set
-# CONFIG_ATM_HE is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PPP=m
@@ -977,7 +897,6 @@ CONFIG_PPPOE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
 CONFIG_PPPOL2TP=m
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
@@ -986,103 +905,7 @@ CONFIG_SLHC=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_ISDN=m
-CONFIG_ISDN_I4L=m
-# CONFIG_ISDN_PPP is not set
-# CONFIG_ISDN_AUDIO is not set
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_HISAX_HDLC=y
-
-#
-# Active cards
-#
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_GIGASET_UNDOCREQ=y
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
-CONFIG_ISDN_CAPI_CAPI20=m
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
+# CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
 #
@@ -1229,8 +1052,23 @@ CONFIG_SPI_SPIDEV=m
 #
 CONFIG_SPI_AT25=m
 CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-# CONFIG_W1 is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_W1=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+
+#
+# 1-wire Slaves
+#
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
 # CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
@@ -1320,8 +1158,7 @@ CONFIG_SSB_POSSIBLE=y
 #
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
-CONFIG_DAB=y
-# CONFIG_USB_DABUSB is not set
+# CONFIG_DAB is not set
 
 #
 # Graphics support
@@ -1329,7 +1166,7 @@ CONFIG_DAB=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
@@ -1341,128 +1178,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
 #
 # Sound
 #
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# PCI devices
-#
-# CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_ATIIXP is not set
-# CONFIG_SND_ATIIXP_MODEM is not set
-# CONFIG_SND_AU8810 is not set
-# CONFIG_SND_AU8820 is not set
-# CONFIG_SND_AU8830 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_BT87X is not set
-# CONFIG_SND_CA0106 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS5530 is not set
-# CONFIG_SND_DARLA20 is not set
-# CONFIG_SND_GINA20 is not set
-# CONFIG_SND_LAYLA20 is not set
-# CONFIG_SND_DARLA24 is not set
-# CONFIG_SND_GINA24 is not set
-# CONFIG_SND_LAYLA24 is not set
-# CONFIG_SND_MONA is not set
-# CONFIG_SND_MIA is not set
-# CONFIG_SND_ECHO3G is not set
-# CONFIG_SND_INDIGO is not set
-# CONFIG_SND_INDIGOIO is not set
-# CONFIG_SND_INDIGODJ is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_MIXART is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_RIPTIDE is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VIA82XX_MODEM is not set
-# CONFIG_SND_VX222 is not set
-# CONFIG_SND_YMFPCI is not set
-
-#
-# ALSA PowerMac devices
-#
-
-#
-# ALSA PowerPC de%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -refa50d2f263b84fff5481de06517aac16a406c5d -ra635d59f6f07065e2f3d4b3de4e72a4a2e442be3
#
# 
# 
# add_dir "packages/linux/gumstix-kernel-2.6.21"
# 
# add_dir "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex"
# 
# add_dir "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex"
# 
# add_file "packages/initrdscripts/files/87-kexecboot.sh"
#  content [d2082585f4d6be02d62797744802d10c9ddce372]
# 
# add_file "packages/initrdscripts/initramfs-image-ipk_1.0.bb"
#  content [c7fc476faa3c9774365bfc327d27d115bab2153e]
# 
# add_file "packages/initrdscripts/initramfs-module-kexecboot_1.0.bb"
#  content [8f53faf60c2ed70390b85b76940ba0ca9619e5a3]
# 
# add_file "packages/initrdscripts/kernel-initramfs_1.0.bb"
#  content [349b1a158cd6e3c05eab0efe1dd9e719b8d22f13]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/270-usb-gadget-udc.patch"
#  content [46d1e25ee8c6b2057ad12fef37ecff405ac5e046]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/arch-config.patch"
#  content [77e962d186fbf986a7150fcf92fc7e9a2f2e3c6c]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bkpxa-pxa-cpu.patch"
#  content [61c42220d83235a7ed992b29a5be2b15f23c0022]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bkpxa-pxa-cpufreq.patch"
#  content [189b51b1ebd33e9e49934cc272a151dd27314737]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/board-init.patch"
#  content [d713b018e314e882ff245ce9fb326a9614bee226]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bugfix-i2c-include.patch"
#  content [2cc5db320546c0c376dc4ce82183109232b4a4a7]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bugfix-mmc-clock.patch"
#  content [453917381c5760514750f165957c49b478ffc65c]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bugfix-pxa-cpufreq.patch"
#  content [7107883474ca1adbd13644873540c034005a19ed]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bugfix-serial-interrupt.patch"
#  content [61a140ba63e9d2a85c0a659d7db18f46f661fddd]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/bugfix-serial-register-status.patch"
#  content [5947e11a809c8053638b1e70b3f5f544fa60af64]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/compact-flash.patch"
#  content [9915fcdaa91588e41ef5531aaff3ff45a0f17ed6]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/compile-fix-pxa_cpufreq.patch"
#  content [922480ad3b67a47f4da75e43d52f036c56074b4e]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/cpufreq-better-freqs.patch"
#  content [8c8edc8e89041dd1b031e376970c2c3f594b215f]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/cpufreq-fixup.patch"
#  content [2db68113b34b6973ceae2dfdec52a59c3d1e558a]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/cpufreq-ondemand-by-default.patch"
#  content [44a99a89c462703ccc42e071e63960a550d025c0]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/disable-uncompress-message.patch"
#  content [db4d24d8f7d6449fc24795635b90d0df15c97bc1]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/ethernet-config.patch"
#  content [0debcec19adacd79ffaab0baea1f8bee70fcb16c]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/flash.patch"
#  content [028683f763c8358b0f1c076926660440cc783c3d]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-asoc.patch"
#  content [672e82d740da0eefc64b737ada85c935d289999c]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig"
#  content [c68249c5af26ba1934586a39d104122d8f9866db]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex/defconfig-nofb"
#  content [6ba15dc60b3f98cbb67e726cc4adf75d4cfeab13]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig"
#  content [a172027521556198c8ba69d3b4cd86d42ca2b1fa]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex/defconfig-nofb"
#  content [199cea2b71e4ecdb6f9955a9c28eb586a0b0c0d7]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-fb-logo.patch"
#  content [a28f1499776f44a83ad92ed1ad935d24910ed98b]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-pxa270-mmc.patch"
#  content [89dcd8fb19af97d9d8c273e2325242cb06cddb22]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/gumstix-pxa270-usb-host.patch"
#  content [0e1e4ac42a0f99a75833ee8a79996e7e46ee7f80]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/header.patch"
#  content [314b5357903ac812ee8535475165b4ec8a0b785c]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/mach-types-fix.patch"
#  content [18d504ef0214d52e33d2b8a577e0c2dfb8aa0663]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/misalignment-handling.patch"
#  content [27f8266aa43f862763f684ed8d6ef944d5883850]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/mmc-card-detect.patch"
#  content [b2be6748c4f6d4d6f369b35bae315387667d6020]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/modular-init-bluetooth.patch"
#  content [7121c06e9b7abb1bead874386960934fc97e824b]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/modular-init-smc91x.patch"
#  content [95c46437bdc083831d12dfbc91ddc43a092fe687]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/modular-init-usb-gadget.patch"
#  content [e2c91ef570684c54b0ff393820b15d0fcd5812dd]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pcm-gcc-411-bugfix.patch"
#  content [8c06dbae7910651bbcd8731d6851454f1c47d459]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/proc-gpio.patch"
#  content [acee1853db81391f396464e4f2db3b5464f92172]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pxa-regs-additions.patch"
#  content [ee3725192f4fc6fcad730b0bbbe7374351e551f9]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pxa-regs-fixup.patch"
#  content [c0c412734d4bc015112b1d6eb7b6a56359b772fc]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch"
#  content [16ea985d508ff9f01b790060b0dd95a8ad2b7969]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pxafb-18bpp-mode.patch"
#  content [6082e8350f43437141e8c5b574266f732f29e601]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/pxafb-definition.patch"
#  content [f85a97524a544a4224f583f1c3417c4b38c23e56]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/serial-divisor.patch"
#  content [75684ee587587dacdb2a0ccfeeb394be85cdee49]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/serial-ether-addr.patch"
#  content [e93b779ef26803beb9c01abaf035039df4dfdb11]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/smc-ether-addr.patch"
#  content [3e7823c1cf361019e3536add7917cb5f60278370]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/smc911x-fixup.patch"
#  content [d63f61fe6cd3193973005fef9c9a160fdef9cd74]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/tsc2003-config.diff"
#  content [6e834f1d2f675943a3b12ee0abcfcd2d8a6ef5c7]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/tsc2003.c"
#  content [eeb2850bcc15f83ff22d7cbf2e881f98b77081ab]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/uImage-in-own-partition.patch"
#  content [440fe8c2946d0f307271094a940cdcd50526f92d]
# 
# add_file "packages/linux/gumstix-kernel-2.6.21/ucb1400-ac97-audio.patch"
#  content [8cfa72221d4f919c218f0b665ec1e43d64e68633]
# 
# add_file "packages/linux/gumstix-kernel_2.6.21.bb"
#  content [f8f775865e8b332af75c61be2a993ddb23996bf0]
# 
# add_file "packages/linux/gumstix-linux.inc"
#  content [1832359f059ffffee7e93ddf8254be7269d927a5]
# 
# add_file "packages/linux/linux-rp-2.6.24/pxa27x-resume.patch"
#  content [9165b53d2b07e5d3fed32ccf6061ab1e12856c29]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-002-atmel.1.patch"
#  content [b1a4e2194e3a3205defb1102554b7bf2fe0a0686]
# 
# add_file "packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-avr32-fix-sa_onstack.patch"
#  content [d92d542c9cd9b027ad738b2a3cb3b4a0ebd91477]
# 
# patch "classes/image.bbclass"
#  from [6eeae6a01c36465bc36cc737d42ea6b8ab09b152]
#    to [73120c465f8175c72d4001b3985cab785ee72ced]
# 
# patch "classes/kernel.bbclass"
#  from [c1ba23ede74eda992c8e621d047fa3f982ea6506]
#    to [6eb314eeb40f044c37be9df698f02b9c149aa6f8]
# 
# patch "conf/distro/chinook-compat.conf"
#  from [b947a8f2568d5737e4ac97e8f352727f74f5e52d]
#    to [cc908008b4aa26b9b4c0e937044d55dd7905f01d]
# 
# patch "conf/local.conf.sample"
#  from [eea5f30083587d9ac3261c904bbde0f7c622b752]
#    to [fa7f5ad0f812c943367b2c88b4e4f7165797959d]
# 
# patch "packages/anki/anki_0.4.3.bb"
#  from [de5cc8560fa7d2401299249253867146486bcf24]
#    to [9835acc146314e91072d7098eeda6a3a4f40d543]
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [2338c2a27bfad430d95e665a283ae145d7e0dfce]
#    to [38ef36eabeee024e8db27348adc48b175a697764]
# 
# patch "packages/initrdscripts/devimage/devimage.sh"
#  from [26fb23e1daf83ec0e84e9e8e5e3041a222b5df37]
#    to [f91cc923fd960757a10f9f543ca2d0067aee37b6]
# 
# patch "packages/initrdscripts/devimage_0.1.bb"
#  from [927ed0e937df451327d36b29dac515ed51a08844]
#    to [955c0d0e038ef20daa3fd5247047bf341c3f5116]
# 
# patch "packages/ipaq-boot-params/files/h5000/params"
#  from [0a3ccf822c3b43d1e6a224bfb39c76dd43ed6dbb]
#    to [61d996d0d8e2558151d852d4b32982326795d655]
# 
# patch "packages/ipaq-boot-params/files/params"
#  from [e4dfa814602daa7647b96cd12d9da19b71f55a71]
#    to [61d996d0d8e2558151d852d4b32982326795d655]
# 
# patch "packages/ipaq-boot-params/ipaq-boot-params.bb"
#  from [920165bff257c3592b19da8d8fe5512ced184918]
#    to [da409034bea0049185391034b677bcb33f813ea1]
# 
# patch "packages/libxine/libxine-x11_1.0.bb"
#  from [78d36dd5ff6731368f7e612de00c9a98156283a3]
#    to [047dae9a9fb304d0b88425d4f80a45fd14b4e21b]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
#  from [90a93f46c5489e0ccfb819e76f3dbcaf1dd8c7fd]
#    to [a44cdd59955b9b47b9fe122eb0e66ddbf67e9446]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
#  from [afd12a3af4f106f7aed0d17aa11d57ad1926ba67]
#    to [facc0a48b60afe66867b27098484b0c6cf604086]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
#  from [4e01e38b76d921efe1287fa89dedcf60f4be9c60]
#    to [2030b990d38c7a8f16b19ba8cd7f1d5a7efb1a76]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
#  from [c1987ac5e14751d61e0d555c0e2e361362e72c7f]
#    to [8c7b1b1dc3117b5d2551a48f0e214b3f42713c06]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
#  from [dda584217bf23dc94bbc30cfacdbe56087d9fee1]
#    to [9df58234eb8066ea2f25d18ae5db1a0c05e23cee]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
#  from [f92a949985835df6b375a1c419aea95096316c60]
#    to [971e7cc0b77f0096a7e40064c28bba3037c67293]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
#  from [da563aa584be8a2be72ee32964d85d16175fd562]
#    to [13a3f2d1e37ef33a2baef9120b25617c5e8ea53d]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
#  from [99b053b8acb4395312d738a99a6516c987d5d409]
#    to [21ccaec9a02606d6585ed044589763f4eb225f84]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
#  from [460627dfb8addd52f278ba98c63d263a1fcc2784]
#    to [44effc433e89914a9e2a81bad3fe8ea96c854e0c]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
#  from [2040c8752a6f755a6a20d9ff042c5912eb32bb0f]
#    to [d6534c5a049859c9f6fd78ba44c6512b98418e69]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
#  from [32750cd6ada179a51ca03416acd45d51a32ea145]
#    to [a184b532adf07f5fd4a9548e62b3a32d5fb14c7f]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
#  from [85ae080bc9ddf4014b97cd550558c09bfd9ba085]
#    to [b92667f679aeccd03cf1856a05836a4403b0950e]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
#  from [7372bed084e45ce719cdc23451424de4a9893ee0]
#    to [4025521a75f7df7170d9c19821753ced9d1ece60]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
#  from [3585f1fc62fc9915c0103ac0650f5bada27c2146]
#    to [c39affce90233491258ab0a533f6ec4c8aa9d0a2]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
#  from [02bef9c1024f8dbc325f9d13a4f1d05f4d02ef90]
#    to [3c614466e5001317f9bc3eb278336536206fe379]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
#  from [15c4be5203c9d6af61b980beca140c9c48ab1934]
#    to [183ef43ab299f3421a7552d24e9d1a6ae56b0381]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
#  from [cc5addab0c771671efb084b73ad6608304bac4d9]
#    to [0dca322f98670b09686524d776ef72e8b14b1560]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
#  from [473005b7a9ca078839e7f3c06e1d0dbe7b5ce651]
#    to [eb20dffd9686d493a6b983d13f732933ba461e68]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
#  from [ed1fef91e7b0071878107a770c28b2d9157564da]
#    to [bdc1aec0b869819a69f168dfd6aa58af9dbf4a4c]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
#  from [35f12816e4e84ebff59a17593f63de3cca783b9e]
#    to [50ce9c68d453f6faec44e7d9d1913bb06f76f319]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
#  from [0c13f7fa7358c4fd3b369ac0d6398842b4a2f1f5]
#    to [feebc34d47aaf9d70f0d7323acdc7d0e7f2a919d]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
#  from [eb78f0beed41b147084e0b6ab6173d5af624b25f]
#    to [a9a9229bc135d7cea280c9e93d409b7fa00e8266]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
#  from [0037f3ae4cf65609124f84757a2b6b6398b12261]
#    to [e6a911fcadb4cd9fbde3720a4e43cc4e28688e66]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
#  from [013956ef6b10d21772c7e6c1567c4c7771e7fc30]
#    to [d27179c31f550470d418bfc0be9ad1b2dfc0fd92]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [bc3e654644b8b48dce3d66dc216f76289a3ec5f7]
#    to [3889ec5d5287ff88902fa3d5cc7a4c87cdfde3c7]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [4e4d0888003dc67fb428a0930b3605d7a111f4a3]
#    to [660ace9202cedafc6cbeb0a7336411637f497bd5]
# 
# patch "packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine"
#  from [39526ec7c7f496de4a427ff4a8ba8f5b8dd7425c]
#    to [55d10ed455668530a6e7d980654040b46265458e]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [919b3638137d8bf173c16723925c4199648693b5]
#    to [edbe56f785cf900a5e6bd127194027122bef9123]
# 
============================================================
--- packages/initrdscripts/files/87-kexecboot.sh	d2082585f4d6be02d62797744802d10c9ddce372
+++ packages/initrdscripts/files/87-kexecboot.sh	d2082585f4d6be02d62797744802d10c9ddce372
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Allow kexecing to kernel in rootfs
+
+if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/boot/zImage" ]; then
+    echo "Kernel found in rootfs:"
+    ls -l "$BOOT_ROOT/boot/zImage"
+    initramfs=""
+    if [ -f "$BOOT_ROOT/boot/initramfs.bin" ]; then
+	echo "Initramfs found in rootfs:"
+	ls -l "$BOOT_ROOT/boot/initramfs.bin"
+	initramfs="--initrd=$BOOT_ROOT/boot/initramfs.bin"
+    fi
+    echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE"
+    sleep 10
+    /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE"
+    sleep 10000
+fi
============================================================
--- packages/initrdscripts/initramfs-image-ipk_1.0.bb	c7fc476faa3c9774365bfc327d27d115bab2153e
+++ packages/initrdscripts/initramfs-image-ipk_1.0.bb	c7fc476faa3c9774365bfc327d27d115bab2153e
@@ -0,0 +1,15 @@
+DESCRIPTION = "Boot initramfs as a package"
+PR = "r1"
+
+do_compile() {
+	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image
+}
+
+do_install() {
+	install -d ${D}/boot/
+	cd ${TOPDIR}; DISTRO=${USERDISTRO} MACHINE=${MACHINE} ANGSTROM_MODE=uclibc IMAGE_FSTYPES=cpio.gz DEPLOY_TO=${D}/boot/initramfs.bin bitbake initramfs-image -c deploy_to
+}
+
+FILES_${PN} += "/boot/*"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/initrdscripts/initramfs-module-kexecboot_1.0.bb	8f53faf60c2ed70390b85b76940ba0ca9619e5a3
+++ packages/initrdscripts/initramfs-module-kexecboot_1.0.bb	8f53faf60c2ed70390b85b76940ba0ca9619e5a3
@@ -0,0 +1,12 @@
+SRC_URI = "file://87-kexecboot.sh"
+PR = "r0.2"
+DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
+RDEPENDS = "initramfs-uniboot kexec-static"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list