[oe-commits] org.oe.dev merge of '37a4a98782bda17b384e225dc6561e633f49393c'
hrw commit
openembedded-commits at lists.openembedded.org
Tue Jul 10 16:01:04 UTC 2007
merge of '37a4a98782bda17b384e225dc6561e633f49393c'
and '8703e298438768d4c30698e05f523d4554ee2c04'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f11eddc20106a8b07bde25c3ee9e5ffc8d81f7bd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f11eddc20106a8b07bde25c3ee9e5ffc8d81f7bd
Files:
1
conf/machine/include/palm.conf
packages/autoconf/autoconf-2.61/config-site.patch
packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
conf/machine/palmld.conf
conf/machine/palmtt3.conf
conf/machine/palmtx.conf
conf/machine/palmz72.conf
packages/autoconf/autoconf_2.61.bb
packages/gcc/gcc_csl-arm-2005q3.bb
packages/linux/fsg3-kernel_2.6.18.bb
packages/glib-2.0/glib-2.0_2.12.12.bb
packages/glib-2.0/glib.inc
Diffs:
#
# mt diff -r37a4a98782bda17b384e225dc6561e633f49393c -rf11eddc20106a8b07bde25c3ee9e5ffc8d81f7bd
#
#
#
# add_file "conf/machine/include/palm.conf"
# content [67ba46a49721b82b7690b3214c3a2d5451076c5b]
#
# add_file "packages/autoconf/autoconf-2.61/config-site.patch"
# content [b83a5c63b39c809371af530d1b25b207e7c27dbe]
#
# add_file "packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch"
# content [008311dc2f647e2edbc8237be354fcf5f5e71e2f]
#
# patch "conf/machine/palmld.conf"
# from [35967f1aae7db5a316327dcc9e656a7fd33fb278]
# to [5733d4803a281832c68a5a1ff2eb4ead15b8fbba]
#
# patch "conf/machine/palmtt3.conf"
# from [8eb9d7e7f6949204fa8741d734439d4c836f99e1]
# to [15cbbe4d9939a58685fb5359794329dd50b69f91]
#
# patch "conf/machine/palmtx.conf"
# from [60acb514b53dbef8a4ff57caa014edbde0c28384]
# to [62107e3db846dc2f8067bbca79d8050d6ccb4e4c]
#
# patch "conf/machine/palmz72.conf"
# from [2643dcd48c5ef8d7db0dafebc412aac90abf7a6a]
# to [ba207859b5c17a96fc5a1ab6c25d178e8f9159fc]
#
# patch "packages/autoconf/autoconf_2.61.bb"
# from [5b63219a0f5805d538df64bc42bf4707ec3de7c9]
# to [135bc1ab5bc4874de77b64ca663c3fe9d595cdc9]
#
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
# from [f98dfc1e2c2356f88fadc3cab92e030e0d162c0d]
# to [abae682fa0bd645ccf732fd208f25c9391aecd71]
#
# patch "packages/linux/fsg3-kernel_2.6.18.bb"
# from [ce39fe5171bf38acd7aea7c3116494648d56f9b4]
# to [4ac230c89fa86ba1e2157648762a1d6ad36bbc76]
#
============================================================
--- conf/machine/include/palm.conf 67ba46a49721b82b7690b3214c3a2d5451076c5b
+++ conf/machine/include/palm.conf 67ba46a49721b82b7690b3214c3a2d5451076c5b
@@ -0,0 +1,89 @@
+#
+# Hardware-based properties
+#
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+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"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
+module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
+module_autoload_palmtx-battery = "palmtx-battery"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-ac97-bus \
+ kernel-module-apm-power \
+ kernel-module-backlight \
+ kernel-module-battery \
+ kernel-module-led-class \
+ kernel-module-lcd \
+ kernel-module-gpioed \
+ kernel-module-gpioed-ng \
+ kernel-module-external-power \
+ kernel-module-snd \
+ kernel-module-snd-ac97-codec \
+ kernel-module-snd-page-alloc \
+ kernel-module-snd-pcm \
+ kernel-module-snd-seq \
+ kernel-module-snd-seq-device \
+ kernel-module-snd-seq-midi-event \
+ kernel-module-snd-seq-oss \
+ kernel-module-snd-timer \
+ kernel-module-soundcore \
+ "
============================================================
--- packages/autoconf/autoconf-2.61/config-site.patch b83a5c63b39c809371af530d1b25b207e7c27dbe
+++ packages/autoconf/autoconf-2.61/config-site.patch b83a5c63b39c809371af530d1b25b207e7c27dbe
@@ -0,0 +1,13 @@
+Index: autoconf-2.61/lib/autoconf/general.m4
+===================================================================
+--- autoconf-2.61.orig/lib/autoconf/general.m4 2007-07-10 15:09:01.000000000 +0100
++++ autoconf-2.61/lib/autoconf/general.m4 2007-07-10 15:09:17.000000000 +0100
+@@ -1767,7 +1767,7 @@
+ m4_define([AC_SITE_LOAD],
+ [# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+- set x "$CONFIG_SITE"
++ set x $CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
============================================================
--- packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch 008311dc2f647e2edbc8237be354fcf5f5e71e2f
+++ packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch 008311dc2f647e2edbc8237be354fcf5f5e71e2f
@@ -0,0 +1,12 @@
+--- gcc-2005q3/gcc/config/arm/linux-eabi.h~ 2007-07-10 09:19:47.000000000 +0930
++++ gcc-2005q3/gcc/config/arm/linux-eabi.h 2007-07-10 10:42:37.000000000 +0930
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++ " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+ GNU/Linux binaries on an EABI system. */
============================================================
--- conf/machine/palmld.conf 35967f1aae7db5a316327dcc9e656a7fd33fb278
+++ conf/machine/palmld.conf 5733d4803a281832c68a5a1ff2eb4ead15b8fbba
@@ -1,44 +1,16 @@
#@TYPE: Machine
#@NAME: Palm LifeDrive
#@DESCRIPTION: Machine configuration for the Palm LifeDrive
-#
-# Hardware-based properties
-#
+require conf/machine/include/palm.conf
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
-
ROOT_FLASH_SIZE = "100"
-SERIAL_CONSOLE = "115200 ttyS0"
+MACHINE_FEATURES += "pcmcia wifi"
-GUI_MACHINE_CLASS = "bigscreen"
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth pcmcia irda wifi ext2 usbgadget screen"
-
-#
-# Software/packages selection
-#
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_EXTRA_RRECOMMENDS = "\
- kernel-module-ac97-bus \
- kernel-module-apm-power \
- kernel-module-backlight \
- kernel-module-battery \
+MACHINE_EXTRA_RRECOMMENDS += "\
kernel-module-bcm2035-uart \
- kernel-module-external-power \
- kernel-module-gpioed \
- kernel-module-gpioed-ng \
- kernel-module-lcd \
- kernel-module-led-class \
kernel-module-leds-palmld \
kernel-module-ledtrig-heartbeat \
kernel-module-ledtrig-hwtimer \
@@ -50,18 +22,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-pda-power \
kernel-module-pxa2xx-core \
kernel-module-pxapwm-bl \
- kernel-module-snd \
- kernel-module-snd-ac97-codec \
- kernel-module-snd-page-alloc \
- kernel-module-snd-pcm \
kernel-module-snd-pxa2xx-ac97 \
kernel-module-snd-pxa2xx-pcm \
- kernel-module-snd-seq \
- kernel-module-snd-seq-device \
- kernel-module-snd-seq-midi-event \
- kernel-module-snd-seq-oss \
- kernel-module-snd-timer \
- kernel-module-soundcore \
kernel-module-wm97xx-ts \
"
@@ -71,39 +33,3 @@ module_conf_wm97xx-ts = "options wm97xx-
module_conf_wm97xx-ts = "options wm97xx-ts pil=2"
-module_autoload_snd-ac97-bus = "snd-ac97-bus"
-module_autoload_apm_power = "apm_power"
-module_autoload_backlight = "backlight"
-module_autoload_battery = "battery"
-module_autoload_bcm2035_uart = "bcm2035_uart"
-module_autoload_gpioed = "gpioed"
-module_autoload_gpioed-ng = "gpioed-ng"
-module_autoload_lcd = "lcd"
-module_autoload_led-class = "led-class"
-module_autoload_leds-palmld = "leds-palmld"
-module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
-module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
-module_autoload_ledtrig-timer = "ledtrig-timer"
-module_autoload_palmld_battery = "palmld-battery"
-module_autoload_palmld_ide = "palmld-ide"
-module_autoload_palmld_pcmcia = "palmld-pcmcia"
-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"
-module_autoload_snd-page-alloc = "snd-page-alloc"
-module_autoload_snd-pcm = "snd-pcm"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
-module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
-module_autoload_snd-seq = "snd-seq"
-module_autoload_snd-seq-device = "snd-seq-device"
-module_autoload_seq-midi-event = "seq-midi-event"
-module_autoload_snd-seq-oss = "snd-seq-oss"
-module_autoload_snd-timer = "snd-timer"
-module_autoload_soundcore = "soundcore"
-module_autoload_wm97xx-ts = "wm97xx-ts"
============================================================
--- conf/machine/palmtt3.conf 8eb9d7e7f6949204fa8741d734439d4c836f99e1
+++ conf/machine/palmtt3.conf 15cbbe4d9939a58685fb5359794329dd50b69f91
@@ -1,26 +1,9 @@
#@TYPE: Machine
#@NAME: Palm Tungsten|T3
#@DESCRIPTION: Machine configuration for the Palm Tungsten|T3
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+require conf/machine/include/palm.conf
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-PREFERRED_PROVIDER_linux = "linux-hackndev-2.6"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-#SRCDATE_linux-hackndev-2.6 = "20070217"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth ext2 usbgadget screen"
-
ROOT_FLASH_SIZE = "100"
SERIAL_CONSOLE = "115200 ttyS3"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-module_autoload_sa1100-rtc = "sa1100-rtc"
-
-#EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash --eraseblock=0x10000 -n"
============================================================
--- conf/machine/palmtx.conf 60acb514b53dbef8a4ff57caa014edbde0c28384
+++ conf/machine/palmtx.conf 62107e3db846dc2f8067bbca79d8050d6ccb4e4c
@@ -1,32 +1,18 @@
#@TYPE: Machine
#@NAME: Palm TX
#@DESCRIPTION: Machine configuration for the Palm TX
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+require conf/machine/include/palm.conf
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+MACHINE_FEATURES += "pcmcia wifi"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen"
-
ROOT_FLASH_SIZE = "100"
SERIAL_CONSOLE = "115200 ttyS0"
GUI_MACHINE_CLASS = "bigscreen"
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
kernel-module-pxapwm-bl \
kernel-module-wm97xx-ts \
kernel-module-palmtx-battery"
-
-module_autoload_sa1100-rtc = "sa1100-rtc"
-module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_pxapwm-bl = "pxapwm-bl"
-module_autoload_wm97xx-ts = "wm97xx-ts"
-module_autoload_palmtx-battery = "palmtx-battery"
============================================================
--- conf/machine/palmz72.conf 2643dcd48c5ef8d7db0dafebc412aac90abf7a6a
+++ conf/machine/palmz72.conf ba207859b5c17a96fc5a1ab6c25d178e8f9159fc
@@ -1,16 +1,9 @@
#@TYPE: Machine
#@NAME: Palm Zire 72
#@DESCRIPTION: Machine configuration for the Palm Zire 72
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+require conf/machine/include/palm.conf
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda ext2 usbgadget screen"
-
ROOT_FLASH_SIZE = "100"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -18,18 +11,13 @@ GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS = "bigscreen"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
require conf/machine/include/tune-thumb.conf
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-i2c-pxa \
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
kernel-module-i2c-core \
kernel-module-i2c-algo-pxa \
kernel-module-i2c-dev \
kernel-module-palmz72-battery"
-module_autoload_sa1100-rtc = "sa1100-rtc"
-module_autoload_palmz72_battery = "palmz72_battery"
-module_autoload_i2c-dev = "i2c-dev"
-module_autoload_i2c-pxa = "i2c-pxa"
module_autoload_g_ether = "g_ether"
============================================================
--- packages/autoconf/autoconf_2.61.bb 5b63219a0f5805d538df64bc42bf4707ec3de7c9
+++ packages/autoconf/autoconf_2.61.bb 135bc1ab5bc4874de77b64ca663c3fe9d595cdc9
@@ -8,6 +8,7 @@ SRC_URI += "file://autoreconf-include.pa
file://autoreconf-foreign.patch;patch=1 \
file://autoreconf-gnuconfigize.patch;patch=1 \
file://autoheader-nonfatal-warnings.patch;patch=1 \
+ file://config-site.patch;patch=1 \
${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gcc/gcc_csl-arm-2005q3.bb f98dfc1e2c2356f88fadc3cab92e030e0d162c0d
+++ packages/gcc/gcc_csl-arm-2005q3.bb abae682fa0bd645ccf732fd208f25c9391aecd71
@@ -13,7 +13,8 @@ SRC_URI = "http://www.codesourcery.com/p
require gcc-package.inc
SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
- file://gcc_optab_arm.patch;patch=1"
+ file://gcc_optab_arm.patch;patch=1 \
+ file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
do_unpack2() {
cd ${WORKDIR}
============================================================
--- packages/linux/fsg3-kernel_2.6.18.bb ce39fe5171bf38acd7aea7c3116494648d56f9b4
+++ packages/linux/fsg3-kernel_2.6.18.bb 4ac230c89fa86ba1e2157648762a1d6ad36bbc76
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "898"
+IXP4XX_KERNEL_SVN_REV = "902"
#
# The directory containing the patches to be applied is
# specified below
#
# mt diff -r8703e298438768d4c30698e05f523d4554ee2c04 -rf11eddc20106a8b07bde25c3ee9e5ffc8d81f7bd
#
#
#
# patch "packages/glib-2.0/glib-2.0_2.12.12.bb"
# from [030996100e8c5110ee7690dae2a49a7cef321ecf]
# to [83e73c427da8f2e30cb58950bde9a902e2900d65]
#
# patch "packages/glib-2.0/glib.inc"
# from [3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5]
# to [29039e156a12c5bbeada136e27b7e662b1928c8c]
#
============================================================
--- packages/glib-2.0/glib-2.0_2.12.12.bb 030996100e8c5110ee7690dae2a49a7cef321ecf
+++ packages/glib-2.0/glib-2.0_2.12.12.bb 83e73c427da8f2e30cb58950bde9a902e2900d65
@@ -1,6 +1,6 @@ require glib.inc
require glib.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
============================================================
--- packages/glib-2.0/glib.inc 3b5260371e84b9c12db9a8cdc8c5809bab8d2ec5
+++ packages/glib-2.0/glib.inc 29039e156a12c5bbeada136e27b7e662b1928c8c
@@ -10,10 +10,11 @@ PACKAGES =+ " glib-2.0-utils "
DEPENDS += "virtual/libiconv virtual/libintl"
PACKAGES =+ " glib-2.0-utils "
-PR = "r1"
+PR = "r2"
LEAD_SONAME = "libglib-2.0.*"
FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN} = "${libdir}/lib*so.*"
FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0"
EXTRA_OECONF = "--disable-debug "
More information about the Openembedded-commits
mailing list