From 4a8afd1f3dcc280356b8f239b141e86a9f5bf9f1 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 28 Jul 2007 12:35:25 +0000 Subject: preferred-opie-versions-1.2.3: bump preferred konqueror version. Closes #2696 --- conf/distro/include/preferred-opie-versions-1.2.3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc index da946d4784..1f39916f4f 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc @@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" +PREFERRED_VERSION_konqueror-embedded = "20070212" -- cgit v1.2.3 From f47bdc74bdbf4451361af5533a53b83b533d52ae Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Sat, 28 Jul 2007 22:45:11 +0000 Subject: conf/machine/palmt650.conf: Adding pxa2xx-ac97 module to autoload --- conf/machine/palmt650.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 46e5fafdb5..beaf6cdbbb 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -10,7 +10,8 @@ SERIAL_CONSOLE = "115200 ttyS1" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \ + kernel-module-pxa27x-keyboard \ kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts" -- cgit v1.2.3 From 3ff2de1f481107ffc8f4695a42a91a3613869a58 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Sun, 29 Jul 2007 02:42:52 +0000 Subject: palms: Removed obsolete pxapwm-bl driver from machine configs --- conf/machine/include/palm.conf | 1 - conf/machine/palmld.conf | 1 - conf/machine/palmt650.conf | 1 - conf/machine/palmt680.conf | 14 ++++++++++++++ conf/machine/palmtc.conf | 2 -- conf/machine/palmtt5.conf | 1 - conf/machine/palmtx.conf | 1 - 7 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 conf/machine/palmt680.conf (limited to 'conf') diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf index 565f37b43f..821ebc4c03 100644 --- a/conf/machine/include/palm.conf +++ b/conf/machine/include/palm.conf @@ -41,7 +41,6 @@ module_autoload_pcmcia = "pcmcia" module_autoload_pcmcia_core = "pcmcia-core" module_autoload_pda_power = "pda_power" module_autoload_pxa2xx_core = "pxa2xx-core" -module_autoload_pxapwm_bl = "pxapwm_bl" module_autoload_snd = "snd" module_autoload_snd-ac97-codec = "snd-ac97-codec" module_autoload_snd-mixer-oss = "snd-mixer-oss" diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index 7adb352ba4..3d1d90fbd8 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel-module-pcmcia-core \ kernel-module-pda-power \ kernel-module-pxa2xx-core \ - kernel-module-pxapwm-bl \ kernel-module-snd-pxa2xx-ac97 \ kernel-module-snd-pxa2xx-pcm \ " diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index beaf6cdbbb..4d1032dae8 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -12,7 +12,6 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \ kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts" module_autoload_g_ether = "g_ether" diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf new file mode 100644 index 0000000000..b5e8aebb54 --- /dev/null +++ b/conf/machine/palmt680.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: Palm Treo 680 +#@DESCRIPTION: Machine configuration for the Palm TX + +require conf/machine/include/palm.conf + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ + kernel-module-wm97xx-ts" diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index f4fcb405c5..b1139c21fa 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -12,5 +12,3 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" -MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxapwm-bl" - diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf index aedaf4ba30..d2de3fa87b 100644 --- a/conf/machine/palmtt5.conf +++ b/conf/machine/palmtt5.conf @@ -11,6 +11,5 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmt5-battery" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index d9b934a306..9f1f079cdc 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -14,6 +14,5 @@ ROOT_FLASH_SIZE = "100" SERIAL_CONSOLE = "115200 ttyS0" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ - kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmtx-battery" -- cgit v1.2.3 From 927100f553960d7b87f51f70ae159017fde6010f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 21:01:05 +0000 Subject: bitbake.conf: Forcefully expand the cache path - we don't want this to change beyond this point --- conf/bitbake.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 77d6c1ee83..328125e0b4 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -462,6 +462,10 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" IMAGE_ROOTFS_SIZE_ext3 ?= "65536" IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" +# Forcefully set CACHE now so future changes to things like +# MACHINE don't change the path to the cache +CACHE := "${CACHE}" + ################################################################## # Magic Cookie for SANITY CHECK ################################################################## -- cgit v1.2.3 From 4d57b6bc2f95d8f569db46aa9fb6e02540aa7e46 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 22:20:41 +0000 Subject: image.bbclass: Use system python explicitly, don't use python-native version --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 328125e0b4..e305dc3251 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -246,6 +246,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" -- cgit v1.2.3