[oe-commits] org.oe.dev merge of '841a5712bf3e160a32fddc18de65062237b46ed6'
crofton commit
openembedded-commits at lists.openembedded.org
Wed Oct 3 23:53:31 UTC 2007
merge of '841a5712bf3e160a32fddc18de65062237b46ed6'
and 'f73119cc933563eddde899dd80930c0dfb4625e3'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: a3be1f345b92ff1e694349d8c599e588ad2106c8
ViewMTN: http://monotone.openembedded.org/revision/info/a3be1f345b92ff1e694349d8c599e588ad2106c8
Files:
1
conf/machine/include/gumstix.inc
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/mono/mono-native_1.2.2.1.bb
packages/mono/mono-native_1.2.4.bb
packages/mono/mono.inc
packages/mono/mono_1.2.2.1.bb
packages/mono/mono_1.2.4.bb
packages/mono/mono_1.2.4.inc
argtable
argtable/argtable_2.7.bb
packages/mono/files/genmdesc-cpp.patch
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
MAINTAINERS
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01
packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02
packages/linux/linux-openmoko_2.6.22.5.bb
packages/mono/mono-mcs-intermediate_1.2.5.1.bb
packages/mono/mono-native_1.2.5.1.bb
packages/mono/mono_1.2.5.1.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
Diffs:
#
# mt diff -r841a5712bf3e160a32fddc18de65062237b46ed6 -ra3be1f345b92ff1e694349d8c599e588ad2106c8
#
#
#
# patch "conf/machine/include/gumstix.inc"
# from [917537468325dc5643453f037aad76fbeb9bb147]
# to [eb4259ad420749938a7a708e08b50b37dd682ba2]
#
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
# from [d30c1b6220264072c4381f7f1942780b702a3a01]
# to [7f8add04c207296a2d5147aec681067eb504be22]
#
============================================================
--- conf/machine/include/gumstix.inc 917537468325dc5643453f037aad76fbeb9bb147
+++ conf/machine/include/gumstix.inc eb4259ad420749938a7a708e08b50b37dd682ba2
@@ -13,6 +13,7 @@ module_autoload_smc91x = "smc91x"
module_autoload_gumstix_gadget = "gumstix_gadget"
module_autoload_g_ether = "g_ether"
module_autoload_smc91x = "smc91x"
+module_autoload_smc911x = "smc911x"
UBOOT_ENTRYPOINT = "a0008000"
@@ -33,9 +34,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "k
kernel-module-rtc-sysfs \
kernel-module-smc91x \
kernel-module-gumstix-smc91x \
- "
+ kernel-module-smc911x \
+ kernel-module-gumstix-smc911x \
+ "
-
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0 vt100"
============================================================
--- packages/linux/linux-2.6.21/gumstix-verdex/defconfig d30c1b6220264072c4381f7f1942780b702a3a01
+++ packages/linux/linux-2.6.21/gumstix-verdex/defconfig 7f8add04c207296a2d5147aec681067eb504be22
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21
-# Thu Sep 13 14:49:02 2007
+# Wed Oct 3 16:35:16 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -828,7 +828,8 @@ CONFIG_SMC91X_GUMSTIX=m
CONFIG_SMC91X=m
CONFIG_SMC91X_GUMSTIX=m
# CONFIG_DM9000 is not set
-# CONFIG_SMC911X is not set
+CONFIG_SMC911X=m
+CONFIG_SMC911X_GUMSTIX=m
#
# Ethernet (1000 Mbit)
#
# mt diff -rf73119cc933563eddde899dd80930c0dfb4625e3 -ra3be1f345b92ff1e694349d8c599e588ad2106c8
#
#
#
# delete "packages/mono/mono-native_1.2.2.1.bb"
#
# delete "packages/mono/mono-native_1.2.4.bb"
#
# delete "packages/mono/mono.inc"
#
# delete "packages/mono/mono_1.2.2.1.bb"
#
# delete "packages/mono/mono_1.2.4.bb"
#
# delete "packages/mono/mono_1.2.4.inc"
#
# add_dir "argtable"
#
# add_file "argtable/argtable_2.7.bb"
# content [cf967045cd0c012adf5d5ffb3ddfd4710261863e]
#
# add_file "packages/mono/files/genmdesc-cpp.patch"
# content [d0f79014a52fe58cdfe83ce842232de945c55860]
#
# add_file "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
# content [d1e9c06ce4952ff0a7dabcde128cdf5e40cb4a95]
#
# patch "MAINTAINERS"
# from [2a084f5f3bee231871caabc70d598fdcd33c6214]
# to [5080a341dfa97a07da2e61219e5e82138c3c6cfb]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [5d252a434632ec2bd023dab3ea432972270f3467]
# to [af45a2489208d242783d3c9acda6d2681fa1ac97]
#
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01"
# from [e0d5e01862edf513ce61dd257d3e4a6790a4bfab]
# to [9ce705f09c4f3ca5b6bf2e39a378fd35167af5e0]
#
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02"
# from [e0d5e01862edf513ce61dd257d3e4a6790a4bfab]
# to [9ce705f09c4f3ca5b6bf2e39a378fd35167af5e0]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [f3b1d99f1b43cbae85ff7d9ceb04575f5f70393c]
# to [74cf9545f327bec956585be1f56bb8cf83366097]
#
# patch "packages/mono/mono-mcs-intermediate_1.2.5.1.bb"
# from [cfb4d3805aa5678e130a2fe308b7bc1c5c8a9ded]
# to [2ee32eae113d1eb2ffece418f247aa0795b8d560]
#
# patch "packages/mono/mono-native_1.2.5.1.bb"
# from [161daeba7bb6f373f0acea01b5d4fa973e519bb2]
# to [e463e56ce2e9dae0cd9780d8e21578fbe2c87ead]
#
# patch "packages/mono/mono_1.2.5.1.bb"
# from [fcfef733807a03e005b267996fee10306b1d8df0]
# to [be8f0f7903f7dd49e23fcda794b122607da10add]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [8f9ad5c93b1857a0649e886d81d0470451dab960]
# to [6420f38b554beea805e3d0e7428a5751cfb6eae3]
#
# patch "packages/uboot/u-boot-mkimage-openmoko-native_oe.bb"
# from [811efcb68b9e1157d7d80f7525f1c0fe7506a91e]
# to [c01c65b1498babb2fc3be4730cb705493ee6c823]
#
============================================================
--- argtable/argtable_2.7.bb cf967045cd0c012adf5d5ffb3ddfd4710261863e
+++ argtable/argtable_2.7.bb cf967045cd0c012adf5d5ffb3ddfd4710261863e
@@ -0,0 +1,21 @@
+DESCRIPTION = "Argtable is an ANSI C library for parsing GNU style command line options."
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://argtable.sourceforge.net/"
+
+PR = "r0"
+
+DEPENDS = "libtool-cross"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/argtable/argtable2-6.tar.gz"
+
+S = ${WORKDIR}/argtable2-6
+
+inherit autotools
+
+do_stage () {
+ oe_libinstall -a -so libargtable2 ${STAGING_LIBDIR}
+ install -m 0644 src/argtable2.h ${STAGING_INCDIR}
+}
+
+
============================================================
--- packages/mono/files/genmdesc-cpp.patch d0f79014a52fe58cdfe83ce842232de945c55860
+++ packages/mono/files/genmdesc-cpp.patch d0f79014a52fe58cdfe83ce842232de945c55860
@@ -0,0 +1,22 @@
+--- mono-1.2.5.1/mono/mini/genmdesc.pl.orig 2007-10-03 21:02:07.000000000 +0200
++++ mono-1.2.5.1/mono/mini/genmdesc.pl 2007-10-03 21:06:16.000000000 +0200
+@@ -36,7 +36,9 @@
+ $i++;
+ }
+ close (OPS);
+- my $cpp = "cpp -undef ";
++ my $cpp = $ENV{"CPP"};
++ $cpp = "cpp" unless defined $cpp;
++ $cpp .= " -undef ";
+ foreach (@defines) {
+ $cpp .= " -U$_";
+ $arch_found = 1 if $arch eq $_;
+@@ -44,7 +46,7 @@
+ die "$arch arch is not supported.\n" unless $arch_found;
+
+ $cpp .= " -D$arch $srcdir/mini-ops.h|";
+- #print "Running: $cpp\n";
++ print "Running: $cpp\n";
+ open (OPS, $cpp) || die "Cannot execute cpp: $!";
+ while (<OPS>) {
+ next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/;
============================================================
--- packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch d1e9c06ce4952ff0a7dabcde128cdf5e40cb4a95
+++ packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch d1e9c06ce4952ff0a7dabcde128cdf5e40cb4a95
@@ -0,0 +1,17 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile 2007-10-03 16:51:38.000000000 +0100
++++ git/tools/Makefile 2007-10-03 16:52:03.000000000 +0100
+@@ -114,9 +114,9 @@
+ #
+ # Use native tools and options
+ #
+-CPPFLAGS = -idirafter $(SRCTREE)/include \
+- -idirafter $(OBJTREE)/include2 \
+- -idirafter $(OBJTREE)/include \
++CPPFLAGS = -I$(SRCTREE)/include \
++ -I$(OBJTREE)/include2 \
++ -I$(OBJTREE)/include \
+ -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+ CFLAGS = $(HOST_CFLAGS) $(CPPFLAGS) -O
+ AFLAGS = -D__ASSEMBLY__ $(CPPFLAGS)
============================================================
--- MAINTAINERS 2a084f5f3bee231871caabc70d598fdcd33c6214
+++ MAINTAINERS 5080a341dfa97a07da2e61219e5e82138c3c6cfb
@@ -39,7 +39,7 @@ Machines: compulab-pxa270, logicpd-pxa
Website: http://bec-systems.com
Interests: Support in OE for single board computers, web application support
Machines: compulab-pxa270, logicpd-pxa270,
-Recipes: mono
+Recipes: mono argtable
Person: Erik Hovland
Mail: erik at hovland.org
============================================================
--- conf/distro/include/sane-srcrevs.inc 5d252a434632ec2bd023dab3ea432972270f3467
+++ conf/distro/include/sane-srcrevs.inc af45a2489208d242783d3c9acda6d2681fa1ac97
@@ -18,7 +18,7 @@ SRCREV_pn-hildon-1 ?= "14173"
SRCREV_pn-gconf-dbus ?= "606"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-hildon-1 ?= "14173"
-SRCREV_pn-libgsmd ?= "2957"
+SRCREV_pn-libgsmd ?= "3074"
SRCREV_pn-libmokogsmd2 ?= "2950"
SRCREV_pn-libmokojournal2 ?= "2780"
SRCREV_pn-libmokopanelui2 ?= "2958"
@@ -33,7 +33,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-keyboard ?= "1675"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3058"
+SRCREV_pn-moko-gtk-engine ?= "3069"
SRCREV_pn-neod ?= "2956"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
@@ -51,7 +51,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "617"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2976"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
SRCREV_pn-openmoko-feedreader2 ?= "3060"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "2873"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
SRCREV_pn-openmoko-panel-demo ?= "1622"
SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "2936"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
SRCREV_pn-openmoko-panel-usb ?= "2893"
SRCREV_pn-openmoko-session ?= "152"
============================================================
--- packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01 e0d5e01862edf513ce61dd257d3e4a6790a4bfab
+++ packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01 9ce705f09c4f3ca5b6bf2e39a378fd35167af5e0
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
-# Thu Jul 26 22:01:38 2007
+# Linux kernel version: 2.6.22.5
+# Wed Oct 3 13:55:25 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -200,11 +200,12 @@ CONFIG_MACH_NEO1973_GTA02=y
CONFIG_SMDK2440_CPU2440=y
CONFIG_MACH_HXD8=y
CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_CPU_S3C2442=y
#
# S3C2442 Machines
#
-# CONFIG_SMDK2440_CPU2442 is not set
+CONFIG_SMDK2440_CPU2442=y
#
# S3C2443 Machines
@@ -282,6 +283,7 @@ CONFIG_FPE_NWFPE=y
# At least one emulation must be selected
#
CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
#
@@ -1196,9 +1198,6 @@ CONFIG_FONT_6x11=y
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_LOGO is not set
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
@@ -1586,7 +1585,7 @@ CONFIG_YAFFS_YAFFS1=y
# CONFIG_EFS_FS is not set
CONFIG_YAFFS_FS=y
CONFIG_YAFFS_YAFFS1=y
-# CONFIG_YAFFS_DOES_ECC is not set
+CONFIG_YAFFS_9BYTE_TAGS=y
CONFIG_YAFFS_YAFFS2=y
CONFIG_YAFFS_AUTO_YAFFS2=y
# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
============================================================
--- packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02 e0d5e01862edf513ce61dd257d3e4a6790a4bfab
+++ packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02 9ce705f09c4f3ca5b6bf2e39a378fd35167af5e0
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
-# Thu Jul 26 22:01:38 2007
+# Linux kernel version: 2.6.22.5
+# Wed Oct 3 13:55:25 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -200,11 +200,12 @@ CONFIG_MACH_NEO1973_GTA02=y
CONFIG_SMDK2440_CPU2440=y
CONFIG_MACH_HXD8=y
CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_CPU_S3C2442=y
#
# S3C2442 Machines
#
-# CONFIG_SMDK2440_CPU2442 is not set
+CONFIG_SMDK2440_CPU2442=y
#
# S3C2443 Machines
@@ -282,6 +283,7 @@ CONFIG_FPE_NWFPE=y
# At least one emulation must be selected
#
CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
#
@@ -1196,9 +1198,6 @@ CONFIG_FONT_6x11=y
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
# CONFIG_LOGO is not set
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
@@ -1586,7 +1585,7 @@ CONFIG_YAFFS_YAFFS1=y
# CONFIG_EFS_FS is not set
CONFIG_YAFFS_FS=y
CONFIG_YAFFS_YAFFS1=y
-# CONFIG_YAFFS_DOES_ECC is not set
+CONFIG_YAFFS_9BYTE_TAGS=y
CONFIG_YAFFS_YAFFS2=y
CONFIG_YAFFS_AUTO_YAFFS2=y
# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb f3b1d99f1b43cbae85ff7d9ceb04575f5f70393c
+++ packages/linux/linux-openmoko_2.6.22.5.bb 74cf9545f327bec956585be1f56bb8cf83366097
@@ -8,4 +8,4 @@ PV = "${VANILLA_VERSION}-${MOKOR}"
VANILLA_VERSION = "2.6.22.5"
MOKOR = "moko11+svnr${SRCREV}"
PV = "${VANILLA_VERSION}-${MOKOR}"
+PR = "r3"
-PR = "r2"
============================================================
--- packages/mono/mono-mcs-intermediate_1.2.5.1.bb cfb4d3805aa5678e130a2fe308b7bc1c5c8a9ded
+++ packages/mono/mono-mcs-intermediate_1.2.5.1.bb 2ee32eae113d1eb2ffece418f247aa0795b8d560
@@ -7,8 +7,10 @@ PR = "r0"
require mono_1.2.5.inc
PR = "r0"
-DEPENDS = "mono-native glib-2.0-native"
+DEPENDS = "mono-native glib-2.0-native perl-native"
+PARALLEL_MAKE = ""
+
SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
# Inherit native to set up compiler and paths ...
============================================================
--- packages/mono/mono-native_1.2.5.1.bb 161daeba7bb6f373f0acea01b5d4fa973e519bb2
+++ packages/mono/mono-native_1.2.5.1.bb e463e56ce2e9dae0cd9780d8e21578fbe2c87ead
@@ -1,9 +1,11 @@ PR = "r1"
require mono_1.2.5.inc
PR = "r1"
-DEPENDS = "glib-2.0-native"
+DEPENDS = "glib-2.0-native perl-native"
SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
+PARALLEL_MAKE = ""
+
inherit native
#do_stage_prepend() {
============================================================
--- packages/mono/mono_1.2.5.1.bb fcfef733807a03e005b267996fee10306b1d8df0
+++ packages/mono/mono_1.2.5.1.bb be8f0f7903f7dd49e23fcda794b122607da10add
@@ -1,10 +1,11 @@ require mono_1.2.5.inc
require mono_1.2.5.inc
-DEPENDS = "mono-native mono-mcs-intermediate glib-2.0"
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
PR = "r2"
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch;patch=1 \
+ file://genmdesc-cpp.patch;patch=1"
# Per http://www.mono-project.com/Mono:ARM
EXTRA_OECONF += " --disable-mcs-build "
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb 8f9ad5c93b1857a0649e886d81d0470451dab960
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb 6420f38b554beea805e3d0e7428a5751cfb6eae3
@@ -1,8 +1,8 @@ PV = "0.1.0+${SVNREV}"
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
RCONFLICTS = "openmoko-theme-standard"
PV = "0.1.0+${SVNREV}"
-PR = "r3"
+PR = "r4"
inherit openmoko2
@@ -15,11 +15,7 @@ do_install() {
cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
- install -d ${D}${sysconfdir}/gtk-2.0
- echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
-CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
-
PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
-FILES_${PN} = "${datadir} ${sysconfdir}"
============================================================
--- packages/uboot/u-boot-mkimage-openmoko-native_oe.bb 811efcb68b9e1157d7d80f7525f1c0fe7506a91e
+++ packages/uboot/u-boot-mkimage-openmoko-native_oe.bb c01c65b1498babb2fc3be4730cb705493ee6c823
@@ -55,6 +55,7 @@ file://unbusy-i2c.patch;patch=1 \
file://uboot-s3c2443.patch;patch=1 \
file://uboot-smdk2443.patch;patch=1 \
file://unbusy-i2c.patch;patch=1 \
+file://makefile-no-dirafter.patch;patch=1 \
"
PROVIDES = ""
More information about the Openembedded-commits
mailing list