[oe-commits] org.oe.angstrom-2007.12-stable merge of '2037125f03022c462d6d113ca00a9b0a37c36cc4'
koen commit
openembedded-commits at lists.openembedded.org
Fri Feb 1 10:10:25 UTC 2008
merge of '2037125f03022c462d6d113ca00a9b0a37c36cc4'
and 'f8452fb38816266f46f66669fc03c43436c0935f'
Author: koen at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 55f6e908b9b7217bfb83c2e7c9f567ccb6a002f9
ViewMTN: http://monotone.openembedded.org/revision/info/55f6e908b9b7217bfb83c2e7c9f567ccb6a002f9
Files:
1
BACKPORTS.txt
conf/distro/angstrom-2007.1.conf
packages/linux/linux/simpad/defconfig
packages/linux/linux_2.6.21.bb
packages/bluez/bluez-cups-backend_3.23.bb
packages/bluez/bluez-gstreamer-plugin_3.23.bb
packages/bluez/bluez-utils-alsa_3.23.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.23.bb
Diffs:
#
# mt diff -r2037125f03022c462d6d113ca00a9b0a37c36cc4 -r55f6e908b9b7217bfb83c2e7c9f567ccb6a002f9
#
#
#
# patch "BACKPORTS.txt"
# from [a2f8699999aa1d44c6fe7aac6e267fd00271918e]
# to [bb82628672449656b9db7aa99699b60fef0e7277]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [b8771878b6bcec5acbad09624aae1f3a3e1e0c46]
# to [69601316a679a24839064fa4f70f029c76e58bd8]
#
# patch "packages/linux/linux/simpad/defconfig"
# from [9b2a926304e0d3f59c4cc79fc6222c11947ed80f]
# to [ac1e360a7cdda71682cd334f3c0a28dc02b59533]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [ea3e4abd8395bae51a2fa300c1079ee0a5041860]
# to [446a2c08dfcbb88e02f958f8e29adc438c0e9c2d]
#
============================================================
--- BACKPORTS.txt a2f8699999aa1d44c6fe7aac6e267fd00271918e
+++ BACKPORTS.txt bb82628672449656b9db7aa99699b60fef0e7277
@@ -73,4 +73,5 @@
396d43c9459edaab2f04c5dd3825de0391fc1b73 "
9005ec7475f13738f08b14c023c457704df3f4af "
137c597e5635e94070a8b4e425094f828c7ad56a libmimedir 0.3.1: Remove DEFAULT_PREFERENCE=1, set -1 due to known bugs. (PaulS, Koen, Marcin)
+40ab8178005b44226c94200bdcb19bca0262e49c simpad kernel update (PaulS, Koen)
33c44c7c7ce5fce5da6c869be191126d5fca6f96 bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly. (PaulS, Koen)
============================================================
--- conf/distro/angstrom-2007.1.conf b8771878b6bcec5acbad09624aae1f3a3e1e0c46
+++ conf/distro/angstrom-2007.1.conf 69601316a679a24839064fa4f70f029c76e58bd8
@@ -6,7 +6,7 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
-DISTRO_VERSION = "2007.12-r2"
+DISTRO_VERSION = "2007.12-r3"
DISTRO_REVISION = "52"
require conf/distro/include/sane-srcdates.inc
============================================================
--- packages/linux/linux/simpad/defconfig 9b2a926304e0d3f59c4cc79fc6222c11947ed80f
+++ packages/linux/linux/simpad/defconfig ac1e360a7cdda71682cd334f3c0a28dc02b59533
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21
-# Sat Jul 7 00:02:55 2007
+# Sat Jan 12 20:06:01 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -227,7 +227,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE=" quiet "
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
@@ -413,7 +413,12 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
# CONFIG_BT_HCIBLUECARD is not set
# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
CONFIG_WIRELESS_EXT=y
#
@@ -663,34 +668,40 @@ CONFIG_NET_RADIO=y
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
+CONFIG_NET_WIRELESS_RTNETLINK=y
#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
+CONFIG_ARLAN=m
# CONFIG_WAVELAN is not set
CONFIG_PCMCIA_WAVELAN=m
-# CONFIG_PCMCIA_NETWAVE is not set
+CONFIG_PCMCIA_NETWAVE=m
#
# Wireless 802.11 Frequency Hopping cards support
#
-# CONFIG_PCMCIA_RAYCS is not set
+CONFIG_PCMCIA_RAYCS=m
#
# Wireless 802.11b ISA/PCI cards support
#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
+CONFIG_HERMES=m
+CONFIG_ATMEL=m
#
# Wireless 802.11b Pcmcia/Cardbus cards support
#
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_ATMEL is not set
+CONFIG_PCMCIA_WL3501=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_CS=m
CONFIG_NET_WIRELESS=y
#
@@ -940,10 +951,7 @@ CONFIG_FONT_8x16=y
#
# Logo configuration
#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
#
# Sound
@@ -986,7 +994,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
#
# MMC/SD Card support
#
-# CONFIG_MMC_SPI_BLOCK is not set
+CONFIG_MMC_SPI_BLOCK=m
# CONFIG_MMC is not set
#
@@ -1247,7 +1255,7 @@ CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not set
# CONFIG_CRYPTO_TEA is not set
============================================================
--- packages/linux/linux_2.6.21.bb ea3e4abd8395bae51a2fa300c1079ee0a5041860
+++ packages/linux/linux_2.6.21.bb 446a2c08dfcbb88e02f958f8e29adc438c0e9c2d
@@ -1,10 +1,10 @@ DEFAULT_PREFERENCE_gumstix-verdex = "1"
require linux.inc
DEFAULT_PREFERENCE_at91sam9263ek = "-1"
DEFAULT_PREFERENCE_gumstix-connex = "1"
DEFAULT_PREFERENCE_gumstix-verdex = "1"
-PR = "r11"
+PR = "r12"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://tsc2003.c \
#
# mt diff -rf8452fb38816266f46f66669fc03c43436c0935f -r55f6e908b9b7217bfb83c2e7c9f567ccb6a002f9
#
#
#
# patch "BACKPORTS.txt"
# from [89875afd07266e050ecfa6c0580690e19ef7da24]
# to [bb82628672449656b9db7aa99699b60fef0e7277]
#
# patch "packages/bluez/bluez-cups-backend_3.23.bb"
# from [6d3dd18f0576378f8bae0c3e251bce0ca132176e]
# to [e491d8e99cc578eaf97b32b75363ee5b76ea871b]
#
# patch "packages/bluez/bluez-gstreamer-plugin_3.23.bb"
# from [f67c210c4018f045ec0a87f2baff07aefd2c19ae]
# to [acbaa2370a1d070e2442c34e4a9ab25dc92cd7ee]
#
# patch "packages/bluez/bluez-utils-alsa_3.23.bb"
# from [b7eb82c734b71cf61ac35a052d87da836df665d4]
# to [3b5651c8af6e34651a56c1dd67f7b7a98e391566]
#
# patch "packages/bluez/bluez-utils3.inc"
# from [4e06e74f7b9a84e626e018ff0d2e9969bdd5ac67]
# to [b3f37a9032b9c1218a31d2378732052373254f59]
#
# patch "packages/bluez/bluez-utils_3.23.bb"
# from [e19b966dd298ba92c4980f3df32211c2eeffc8f1]
# to [9b5873bc1f92f70365ffaf73cb383d0478d2a749]
#
============================================================
--- BACKPORTS.txt 89875afd07266e050ecfa6c0580690e19ef7da24
+++ BACKPORTS.txt bb82628672449656b9db7aa99699b60fef0e7277
@@ -74,3 +74,4 @@
9005ec7475f13738f08b14c023c457704df3f4af "
137c597e5635e94070a8b4e425094f828c7ad56a libmimedir 0.3.1: Remove DEFAULT_PREFERENCE=1, set -1 due to known bugs. (PaulS, Koen, Marcin)
40ab8178005b44226c94200bdcb19bca0262e49c simpad kernel update (PaulS, Koen)
+33c44c7c7ce5fce5da6c869be191126d5fca6f96 bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly. (PaulS, Koen)
============================================================
--- packages/bluez/bluez-cups-backend_3.23.bb 6d3dd18f0576378f8bae0c3e251bce0ca132176e
+++ packages/bluez/bluez-cups-backend_3.23.bb e491d8e99cc578eaf97b32b75363ee5b76ea871b
@@ -1,5 +1,5 @@ require bluez-utils3.inc
require bluez-utils3.inc
-
+PR = "r1"
DEPENDS += "cups"
# see bluez-utils3.inc for the explanation of these option
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.23.bb f67c210c4018f045ec0a87f2baff07aefd2c19ae
+++ packages/bluez/bluez-gstreamer-plugin_3.23.bb acbaa2370a1d070e2442c34e4a9ab25dc92cd7ee
@@ -1,5 +1,5 @@ require bluez-utils3.inc
require bluez-utils3.inc
-
+PR = "r1"
DEPENDS += "gstreamer gst-plugins-base "
# see bluez-utils3.inc for the explanation of these option
============================================================
--- packages/bluez/bluez-utils-alsa_3.23.bb b7eb82c734b71cf61ac35a052d87da836df665d4
+++ packages/bluez/bluez-utils-alsa_3.23.bb 3b5651c8af6e34651a56c1dd67f7b7a98e391566
@@ -1,4 +1,5 @@ require bluez-utils3.inc
require bluez-utils3.inc
+PR = "r1"
DEPENDS += "alsa-lib"
============================================================
--- packages/bluez/bluez-utils3.inc 4e06e74f7b9a84e626e018ff0d2e9969bdd5ac67
+++ packages/bluez/bluez-utils3.inc b3f37a9032b9c1218a31d2378732052373254f59
@@ -8,11 +8,14 @@ LICENSE = "GPL"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
+FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
+
# ti patch should be sent it upstream!
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
file://hciattach-ti-bts.patch;patch=1"
+
S = "${WORKDIR}/bluez-utils-${PV}"
inherit autotools update-rc.d
============================================================
--- packages/bluez/bluez-utils_3.23.bb e19b966dd298ba92c4980f3df32211c2eeffc8f1
+++ packages/bluez/bluez-utils_3.23.bb 9b5873bc1f92f70365ffaf73cb383d0478d2a749
@@ -1,5 +1,5 @@ require bluez-utils3.inc
require bluez-utils3.inc
-PR = "r1"
+PR = "r2"
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
More information about the Openembedded-commits
mailing list