[oe-commits] org.oe.dev merge of '2375d2fb670fe2ce998bde5533f4ef0498268ca5'
rpurdie commit
openembedded-commits at lists.openembedded.org
Fri Dec 28 19:45:55 UTC 2007
merge of '2375d2fb670fe2ce998bde5533f4ef0498268ca5'
and 'dabc3297e759e315e1277ff276c735684af8e55d'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d29538b0eb5c9c4e87f14d64419ced1243b64bf3
ViewMTN: http://monotone.openembedded.org/revision/info/d29538b0eb5c9c4e87f14d64419ced1243b64bf3
Files:
1
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp_2.6.23.bb
packages/altboot/altboot_1.1.1+wip-SVNR70.bb
packages/altboot/altboot_1.1.1+wip-SVNR73.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/moko-autorev.inc
packages/settings-daemon/settings-daemon_svn.bb
packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
Diffs:
#
# mt diff -r2375d2fb670fe2ce998bde5533f4ef0498268ca5 -rd29538b0eb5c9c4e87f14d64419ced1243b64bf3
#
#
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
# from [abff8906321b4af660f6c670ad4057da0a0f3e94]
# to [9089b908d87d4678ba180892f1b7031db32f17f1]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [8b22f93210932a77b77f1c73ea21fdfda97e9530]
# to [df3efc4bdc8fdbcaa19a0e0aeeb4dff97c353477]
#
============================================================
--- packages/linux/linux-rp-2.6.23/defconfig-poodle abff8906321b4af660f6c670ad4057da0a0f3e94
+++ packages/linux/linux-rp-2.6.23/defconfig-poodle 9089b908d87d4678ba180892f1b7031db32f17f1
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23
-# Fri Dec 28 13:57:57 2007
+# Fri Dec 28 17:28:59 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -302,7 +302,7 @@ CONFIG_NET=y
#
# Networking options
#
-CONFIG_PACKET=y
+CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
@@ -324,9 +324,9 @@ CONFIG_INET_TUNNEL=m
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
@@ -1400,7 +1400,7 @@ CONFIG_RTC_INTF_DEV=y
#
# on-CPU RTC drivers
#
-CONFIG_RTC_DRV_SA1100=y
+CONFIG_RTC_DRV_SA1100=m
#
# DMA Engine support
@@ -1627,8 +1627,8 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_SCHED_DEBUG=y
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHED_DEBUG is not set
# CONFIG_SCHEDSTATS is not set
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_SLAB is not set
@@ -1661,11 +1661,11 @@ CONFIG_CRYPTO=y
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI=m
CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HMAC=m
# CONFIG_CRYPTO_XCBC is not set
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_MD4=m
@@ -1695,10 +1695,10 @@ CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
============================================================
--- packages/linux/linux-rp_2.6.23.bb 8b22f93210932a77b77f1c73ea21fdfda97e9530
+++ packages/linux/linux-rp_2.6.23.bb df3efc4bdc8fdbcaa19a0e0aeeb4dff97c353477
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r15"
+PR = "r16"
DEFAULT_PREFERENCE_qemuarm = "-1"
DEFAULT_PREFERENCE_qemux86 = "-1"
#
# mt diff -rdabc3297e759e315e1277ff276c735684af8e55d -rd29538b0eb5c9c4e87f14d64419ced1243b64bf3
#
#
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR70.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR73.bb"
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [4db8dbf03e1191f658c8c81598c6299b3daa281b]
# to [62c9fe4233d8ba12cb368d90400784630b8d4641]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [936fa5b0bafa49c816782957d4d6d7de12cee042]
# to [bfb54642af40a5440c951be6f7f4845770a7fb31]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR73.bb"
# from [d8549450283b67303bed9444e9ce7b672b4ef6b7]
# to [96164c033b2c0fe28e30604b817aa4dfddcaae1d]
#
# patch "packages/settings-daemon/settings-daemon_svn.bb"
# from [645f5cd35518ca1a4b650a7c494a2bed8154ac61]
# to [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
#
# patch "packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb"
# from [8f9f753bc2c5c49521344050b8d6c56e4ec93404]
# to [14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34]
#
============================================================
--- conf/distro/angstrom-2007.1.conf 4db8dbf03e1191f658c8c81598c6299b3daa281b
+++ conf/distro/angstrom-2007.1.conf 62c9fe4233d8ba12cb368d90400784630b8d4641
@@ -6,7 +6,11 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
-# The release will the 2007.12
+# If you want to use the angstrom 2007.12 release or if
+# you want to base you distro on angstrom 2007, switch to
+# the org.openembedded.angstrom-2007.12-stable branch
+# THIS FILE WILL GO AWAY IN JANUARY 2008!!
+
DISTRO_VERSION = "2007.11RC3"
DISTRO_REVISION = "51"
============================================================
--- conf/distro/include/moko-autorev.inc 936fa5b0bafa49c816782957d4d6d7de12cee042
+++ conf/distro/include/moko-autorev.inc bfb54642af40a5440c951be6f7f4845770a7fb31
@@ -44,7 +44,7 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
-SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
+SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-usbpath ?= "${AUTOREV}"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR70.bb d8549450283b67303bed9444e9ce7b672b4ef6b7
+++ packages/altboot/altboot_1.1.1+wip-SVNR73.bb 96164c033b2c0fe28e30604b817aa4dfddcaae1d
@@ -1,8 +1,8 @@ PR = "r0"
require altboot.inc
PR = "r0"
-SVN_REV = "70"
+SVN_REV = "73"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
"
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb 645f5cd35518ca1a4b650a7c494a2bed8154ac61
+++ packages/settings-daemon/settings-daemon_svn.bb f266cffda5f763fbd31050c83eb2c9e97bfcaaac
@@ -1,10 +1,12 @@ LICENSE = "GPL"
DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
LICENSE = "GPL"
-DEPENDS = "gconf glib-2.0"
+DEPENDS = "gconf glib-2.0 gtk+"
RDEPENDS = "xrdb"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://70settings-daemon"
============================================================
--- packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb 8f9f753bc2c5c49521344050b8d6c56e4ec93404
+++ packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb 14ec8ad5c0ad1804acbd36d6ffacce6f3ffb4e34
@@ -1,4 +1,4 @@
-require uboot-openmoko_svn.bb
+require u-boot-openmoko_svn.bb
inherit native
More information about the Openembedded-commits
mailing list