[oe-commits] org.oe.dev merge of 'f0d37b436d1ce39437b94acd261109f04af36c38'

oe commit oe at amethyst.openembedded.net
Fri May 9 00:27:52 UTC 2008 

merge of 'f0d37b436d1ce39437b94acd261109f04af36c38'
     and 'fe78c09ce0a1dbc69ac1b86f04d530c6790e6651'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4d9368570e94fc8bc65712d1c95027d8a436eee1
ViewMTN: http://monotone.openembedded.org/revision/info/4d9368570e94fc8bc65712d1c95027d8a436eee1
Files:
1
packages/images/sdr-image.bb
packages/anthy/files/change_anthy_dic_path.patch
packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch
packages/anthy/anthy/native-helpers.patch
packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch
packages/anthy/anthy-native/native-helpers.patch
packages/anthy/anthy-native_7811.bb
packages/anthy/anthy-native_9100e.bb
packages/anthy/anthy_7811.bb
packages/anthy/anthy_9100e.bb
packages/linux/linux-jlime-jornada6xx_2.6.25.bb
packages/uclibc/files/arm_fix_alignment.patch
conf/machine/cm-x270.conf
packages/linux/linux_2.6.24.bb
packages/linux/linux_2.6.25.bb
packages/uclibc/uclibc_svn.bb
Diffs:

#
# mt diff -rf0d37b436d1ce39437b94acd261109f04af36c38 -r4d9368570e94fc8bc65712d1c95027d8a436eee1
#
#
#
# patch "packages/images/sdr-image.bb"
#  from [b98be7ed4825c6edd9d9db45907e271785280358]
#    to [06181e026ef41c34af7a7919a014709c6ded3895]
#
============================================================
--- packages/images/sdr-image.bb	b98be7ed4825c6edd9d9db45907e271785280358
+++ packages/images/sdr-image.bb	06181e026ef41c34af7a7919a014709c6ded3895
@@ -42,6 +42,7 @@ IMAGE_INSTALL = " task-base-extended \
 	python-core perl \
 	uucp picocom \
 	angstrom-zeroconf-audio avahi-utils \
+	${ANGSTROM_EXTRA_INSTALL} \
 "
 
 inherit image


#
# mt diff -rfe78c09ce0a1dbc69ac1b86f04d530c6790e6651 -r4d9368570e94fc8bc65712d1c95027d8a436eee1
#
#
#
# delete "packages/anthy/files/change_anthy_dic_path.patch"
# 
# rename "packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch"
#     to "packages/anthy/anthy/native-helpers.patch"
# 
# rename "packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch"
#     to "packages/anthy/anthy-native/native-helpers.patch"
# 
# rename "packages/anthy/anthy-native_7811.bb"
#     to "packages/anthy/anthy-native_9100e.bb"
# 
# rename "packages/anthy/anthy_7811.bb"
#     to "packages/anthy/anthy_9100e.bb"
# 
# add_file "packages/linux/linux-jlime-jornada6xx_2.6.25.bb"
#  content [edbf6b11b4ef663083e52f158ec1c43aa836656f]
# 
# add_file "packages/uclibc/files/arm_fix_alignment.patch"
#  content [a1e3d197a977661fcf2ef030d1afb0ff58b035a2]
# 
# patch "conf/machine/cm-x270.conf"
#  from [263d992b212de2d80b20d1541d198511ceaf4c60]
#    to [538e33e1822b7e284ea57e0c6d550addae73f8cf]
# 
# patch "packages/anthy/anthy/native-helpers.patch"
#  from [b269891ef32ed179f34b326bc2db3bc4c4e2c399]
#    to [93e91dd3974caa6b21f6b879c04ca9fbfff01f4f]
# 
# patch "packages/anthy/anthy-native/native-helpers.patch"
#  from [aacac62e8a67b913a9c38f638158f9748d458f78]
#    to [803e92a2aa725818c04c1e113c7fc9880f8a2dbf]
# 
# patch "packages/anthy/anthy_9100e.bb"
#  from [4abb2e118da7e6391b59ac03fb937bb49118b4b2]
#    to [35805c976b95b7c21e7ee7c0433ac1c28c40ef7f]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [5140922314a6b7a562cfc145b5cd8bef1a115424]
#    to [d00d1d26eff1df7f8f4b4e251972025636b93a0a]
# 
# patch "packages/linux/linux_2.6.25.bb"
#  from [dfb7619f1379579633ca1e76392a661f4a29aafc]
#    to [ed037c79f846e5b7c53db483560819488aadcdcf]
# 
# patch "packages/uclibc/uclibc_svn.bb"
#  from [980440cf391f74fea1555789067bcd8cd4dc78e8]
#    to [ad24bcc3c7bdb569484f30d9b7580bb5d6de7dc6]
#
============================================================
--- packages/linux/linux-jlime-jornada6xx_2.6.25.bb	edbf6b11b4ef663083e52f158ec1c43aa836656f
+++ packages/linux/linux-jlime-jornada6xx_2.6.25.bb	edbf6b11b4ef663083e52f158ec1c43aa836656f
@@ -0,0 +1,30 @@
+SECTION = "kernel"
+DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx"
+LICENSE = "GPL"
+PR = "r0"
+
+SRCREV = "${AUTOREV}"
+
+COMPATIBLE_HOST = "sh.*-linux"
+#COMPATIBLE_MACHINE = "jornada6xx"
+
+SRC_URI = "git://jlime.org/jlime-stable.git;protocol=git;branch=v2.6.25-stable"
+
+S = "${WORKDIR}/git"
+
+inherit kernel
+
+#Lets let 3.4.x handle the compilation of this one
+KERNEL_CCSUFFIX = "-3.4.4"
+
+ARCH = "sh"
+FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
+
+do_configure_prepend() {
+	install -m 0644 ${S}/config-hp6xx-2.6.25 ${S}/.config
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}
+}
============================================================
--- packages/uclibc/files/arm_fix_alignment.patch	a1e3d197a977661fcf2ef030d1afb0ff58b035a2
+++ packages/uclibc/files/arm_fix_alignment.patch	a1e3d197a977661fcf2ef030d1afb0ff58b035a2
@@ -0,0 +1,19 @@
+ARMV5 can use STRD and LDRD access instructions but these accesses need to be 
+8 byte aligned. The dynamic linker's malloc needs to match this so structures
+become 8 byte aligned to void unaligned accesses.
+
+RP - 14/02/2008
+
+Index: uClibc-0.9.29/ldso/ldso/arm/dl-sysdep.h
+===================================================================
+--- uClibc-0.9.29.orig/ldso/ldso/arm/dl-sysdep.h	2008-02-14 00:58:12.000000000 +0000
++++ uClibc-0.9.29/ldso/ldso/arm/dl-sysdep.h	2008-02-14 00:59:19.000000000 +0000
+@@ -15,6 +15,8 @@
+   GOT_BASE[1] = (unsigned long) MODULE; \
+ }
+ 
++#define DL_MALLOC_ALIGN 8  /* EABI needs 8 byte alignment for STRD LDRD*/
++
+ static inline unsigned long arm_modulus(unsigned long m, unsigned long p)
+ {
+ 	unsigned long i,t,inc;
============================================================
--- conf/machine/cm-x270.conf	263d992b212de2d80b20d1541d198511ceaf4c60
+++ conf/machine/cm-x270.conf	538e33e1822b7e284ea57e0c6d550addae73f8cf
@@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux ?= "2.6.24"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
============================================================
--- packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch	b269891ef32ed179f34b326bc2db3bc4c4e2c399
+++ packages/anthy/anthy/native-helpers.patch	93e91dd3974caa6b21f6b879c04ca9fbfff01f4f
@@ -1,8 +1,12 @@
---- anthy-7811/mkanthydic/Makefile.am~	2006-05-13 18:28:35.000000000 +0900
-+++ anthy-7811/mkanthydic/Makefile.am	2006-06-18 11:07:19.080000000 +0900
+Use native helpers staged by anthy-native.
+
+Index: anthy-9100e/mkanthydic/Makefile.am
+===================================================================
+--- anthy-9100e.orig/mkanthydic/Makefile.am	2008-05-05 00:36:35.000000000 +0200
++++ anthy-9100e/mkanthydic/Makefile.am	2008-05-05 00:37:59.000000000 +0200
 @@ -3,12 +3,12 @@
  CLEANFILES = anthy.dic
- INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\"
+ INCLUDES = -I$(top_srcdir)/ -DSRCDIR=\"$(srcdir)\"
  
 -noinst_PROGRAMS = mkfiledic
 -mkfiledic_SOURCES = mkfiledic.c
@@ -11,16 +15,17 @@
 +#mkfiledic_SOURCES = mkfiledic.c
 +#mkfiledic_LDADD = ../src-diclib/libdiclib.la
  
--anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep
+-anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep ../calctrans/anthy.cand_info ../calctrans/anthy.trans_info ../calctrans/anthy.corpus_array ../calctrans/anthy.corpus_bucket
 -	./mkfiledic
-+anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep
++anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep ../calctrans/anthy.cand_info ../calctrans/anthy.trans_info ../calctrans/anthy.corpus_array ../calctrans/anthy.corpus_bucket
 +	mkfiledic
  
  
  # To install 
-
---- anthy-7811/depgraph/Makefile.am~	2006-06-02 00:20:54.000000000 +0900
-+++ anthy-7811/depgraph/Makefile.am	2006-06-18 11:08:13.350000000 +0900
+Index: anthy-9100e/depgraph/Makefile.am
+===================================================================
+--- anthy-9100e.orig/depgraph/Makefile.am	2008-05-05 00:38:48.000000000 +0200
++++ anthy-9100e/depgraph/Makefile.am	2008-05-05 00:40:24.000000000 +0200
 @@ -9,11 +9,11 @@
  EXTRA_DIST = indepword.txt $(DEPWORDS)
  
@@ -34,51 +39,79 @@
  
 -anthy.dep : mkdepgraph
 -	./mkdepgraph
-+anthy.dep : 
++anthy.dep :
 +	mkdepgraph
  
  noinst_DATA = anthy.dep
-
---- anthy-7811/mkworddic/Makefile.am~	2006-05-13 18:29:07.000000000 +0900
-+++ anthy-7811/mkworddic/Makefile.am	2006-06-18 11:18:35.810000000 +0900
+Index: anthy-9100e/mkworddic/Makefile.am
+===================================================================
+--- anthy-9100e.orig/mkworddic/Makefile.am	2008-05-05 00:40:57.000000000 +0200
++++ anthy-9100e/mkworddic/Makefile.am	2008-05-05 00:41:52.000000000 +0200
 @@ -16,14 +16,14 @@
   udict dict.args.in
  
  # Generate the dictionary
 -noinst_PROGRAMS = mkworddic
--mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
+-mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
 -mkworddic_LDADD = ../src-worddic/libanthydic.la
 +#noinst_PROGRAMS = mkworddic
-+#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
++#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
 +#mkworddic_LDADD = ../src-worddic/libanthydic.la
  
  noinst_DATA = anthy.wdic
  
 -anthy.wdic : mkworddic
 -	   ./mkworddic -f ./dict.args
-+anthy.wdic : 
++anthy.wdic :
 +	   mkworddic -f ./dict.args
  
  
  # To install
---- anthy-7811/mkmatrix/Makefile.am~	2006-06-02 00:19:41.000000000 +0900
-+++ anthy-7811/mkmatrix/Makefile.am	2006-06-18 11:31:37.250000000 +0900
-@@ -1,12 +1,12 @@
- EXTRA_DIST = dep.sorted
+Index: anthy-9100e/calctrans/Makefile.am
+===================================================================
+--- anthy-9100e.orig/calctrans/Makefile.am	2008-05-08 15:05:18.000000000 +0200
++++ anthy-9100e/calctrans/Makefile.am	2008-05-08 15:10:40.000000000 +0200
+@@ -15,31 +15,31 @@
  
--noinst_PROGRAMS = mkmatrix
--INCLUDES = -I$(top_srcdir)/include
--mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
--mkmatrix_SOURCES = mkmatrix.c
-+#noinst_PROGRAMS = mkmatrix
-+#INCLUDES = -I$(top_srcdir)/include
-+#mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
-+#mkmatrix_SOURCES = mkmatrix.c
+ update_params:
+ 	rm -f parsed_data2
+-	./proccorpus $(srcdir)/corpus.?.txt > parsed_data
+-	./calctrans parsed_data -o $(srcdir)/corpus_info
+-	./calctrans parsed_data -e -o $(srcdir)/weak_words
++	proccorpus $(srcdir)/corpus.?.txt > parsed_data
++	calctrans parsed_data -o $(srcdir)/corpus_info
++	calctrans parsed_data -e -o $(srcdir)/weak_words
+ 	make do_update_params
  
- noinst_DATA = matrix
- CLEANFILES = matrix
+ update_params0:
+ 	rm -f parsed_data2
+-	./proccorpus $(srcdir)/corpus.0.txt > parsed_data
+-	./calctrans parsed_data -o $(srcdir)/corpus_info
+-	./calctrans parsed_data -e -o $(srcdir)/weak_words
++	proccorpus $(srcdir)/corpus.0.txt > parsed_data
++	calctrans parsed_data -o $(srcdir)/corpus_info
++	calctrans parsed_data -e -o $(srcdir)/weak_words
+ 	make do_update_params
  
+ update_params2:
+-	./proccorpus $(srcdir)/corpus.?.txt >> parsed_data2
+-	./calctrans parsed_data parsed_data2 -o $(srcdir)/corpus_info
+-	./calctrans parsed_data parsed_data2 -e -o $(srcdir)/weak_words
++	proccorpus $(srcdir)/corpus.?.txt >> parsed_data2
++	calctrans parsed_data parsed_data2 -o $(srcdir)/corpus_info
++	calctrans parsed_data parsed_data2 -e -o $(srcdir)/weak_words
+ 	make do_update_params
+ 
+ do_update_params:
+-	./calctrans -c $(srcdir)/corpus_info
++	calctrans -c $(srcdir)/corpus_info
+ 	rm -f $(dict_source_files)
+ 	make $(dict_source_files)
+ 
+-$(dict_source_files): $(srcdir)/corpus_info $(srcdir)/weak_words calctrans
+-	./calctrans -c $(srcdir)/corpus_info $(srcdir)/weak_words
++$(dict_source_files): $(srcdir)/corpus_info $(srcdir)/weak_words
++	calctrans -c $(srcdir)/corpus_info $(srcdir)/weak_words
+ 
+ noinst_DATA = $(dict_source_files)
+ CLEANFILES = $(dict_source_files) parsed_data parsed_data2 anthy.feature_info
--matrix	: mkmatrix $(top_srcdir)/mkmatrix/dep.sorted
--	./mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix
-+matrix	: $(top_srcdir)/mkmatrix/dep.sorted
-+	mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix
============================================================
--- packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch	aacac62e8a67b913a9c38f638158f9748d458f78
+++ packages/anthy/anthy-native/native-helpers.patch	803e92a2aa725818c04c1e113c7fc9880f8a2dbf
@@ -1,3 +1,6 @@
+Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, 
+calctrans and proccorpus.
+
 --- anthy-7811/mkanthydic/Makefile.am~	2006-05-13 18:28:35.000000000 +0900
 +++ anthy-7811/mkanthydic/Makefile.am	2006-06-18 10:56:25.770000000 +0900
 @@ -3,7 +3,7 @@
@@ -29,17 +32,17 @@
 -noinst_PROGRAMS = mkworddic
 +#noinst_PROGRAMS = mkworddic
 +bin_PROGRAMS = mkworddic
- mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h
+ mkworddic_SOURCES = mkdic.c writewords.c mkudic.c calcfreq.c mkdic.h
  mkworddic_LDADD = ../src-worddic/libanthydic.la
+
+--- anthy-9100e.orig/calctrans/Makefile.am	2008-05-08 15:04:13.000000000 +0200
++++ anthy-9100e/calctrans/Makefile.am	2008-05-08 15:04:24.000000000 +0200
+@@ -3,7 +3,7 @@
+  corpus.3.txt corpus.4.txt corpus.5.txt\
+  corpus_info weak_words
  
---- anthy-7811/mkmatrix/Makefile.am~	2006-06-18 11:29:52.110000000 +0900
-+++ anthy-7811/mkmatrix/Makefile.am	2006-06-18 11:32:30.630000000 +0900
-@@ -1,6 +1,7 @@
- EXTRA_DIST = dep.sorted
+-noinst_PROGRAMS = calctrans proccorpus
++bin_PROGRAMS = calctrans proccorpus
+ INCLUDES = -I$(top_srcdir)/
  
+ calctrans_SOURCES = calctrans.c input_set.c input_set.h corpus.c
--noinst_PROGRAMS = mkmatrix
-+#noinst_PROGRAMS = mkmatrix
-+bin_PROGRAMS = mkmatrix
- INCLUDES = -I$(top_srcdir)/include
- mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm
- mkmatrix_SOURCES = mkmatrix.c
============================================================
--- packages/anthy/anthy_7811.bb	4abb2e118da7e6391b59ac03fb937bb49118b4b2
+++ packages/anthy/anthy_9100e.bb	35805c976b95b7c21e7ee7c0433ac1c28c40ef7f
@@ -1,25 +1,23 @@ DESCRIPTION = "A Japanese input method"
 DESCRIPTION = "A Japanese input method"
+DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
+DESCRIPTION_libanthy0 = "Anthy runtime library"
+DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
 AUTHOR = "Anthy Developers <anthy-dev at lists.sourceforge.jp>"
 HOMEPAGE = "http://anthy.sourceforge.jp"
+SECTION = "inputmethods"
+SECTION_libanthy0 = "libs/inputmethods"
+SECTION_libanthy-dev = "devel/libs"
 LICENSE = "GPL"
 DEPENDS = "anthy-native"
-SECTION = "inputmethods"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
-	   file://not_build_elc.patch;patch=1 \
-	   file://2ch_t.patch;patch=1 \
-	   file://change_anthy_dic_path.patch;patch=1 \
-	   file://native-mkanthydic-mkdepgraph.patch;patch=1"
+SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/29142/anthy-9100e.tar.gz \
+           file://not_build_elc.patch;patch=1 \
+           file://2ch_t.patch;patch=1 \
+           file://native-helpers.patch;patch=1"
 
 inherit autotools pkgconfig
 
-DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
-DESCRIPTION_libanthy0 = "Anthy runtime library"
-DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
-SECTION_libanthy0 = "libs/inputmethods"
-SECTION_libanthy-dev = "devel/libs"
-
 # gettext
 
 LEAD_SONAME = "libanthy.so.0"
============================================================
--- packages/linux/linux_2.6.24.bb	5140922314a6b7a562cfc145b5cd8bef1a115424
+++ packages/linux/linux_2.6.24.bb	d00d1d26eff1df7f8f4b4e251972025636b93a0a
@@ -3,7 +3,6 @@ DEFAULT_PREFERENCE_gesbc-9302 = "1"
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_gesbc-9302 = "1"
-DEFAULT_PREFERENCE_cm-x270 = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_simpad = "1"
 DEFAULT_PREFERENCE_atngw100 = "1"
============================================================
--- packages/linux/linux_2.6.25.bb	dfb7619f1379579633ca1e76392a661f4a29aafc
+++ packages/linux/linux_2.6.25.bb	ed037c79f846e5b7c53db483560819488aadcdcf
@@ -26,6 +26,8 @@ CMDLINE_cm-x270 = "console=${CMX270_CONS
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
+FILES_kernel-image_cm-x270 = ""
+
 python do_compulab_image() {
 	import os
 	import os.path
============================================================
--- packages/uclibc/uclibc_svn.bb	980440cf391f74fea1555789067bcd8cd4dc78e8
+++ packages/uclibc/uclibc_svn.bb	ad24bcc3c7bdb569484f30d9b7580bb5d6de7dc6
@@ -8,7 +8,7 @@ PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r7"
+PR = "r9"
 DEFAULT_PREFERENCE  = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
@@ -31,6 +31,8 @@ SRC_URI += "svn://uclibc.org/trunk;modul
             file://uclibc-arm-ftruncate64.patch;patch=1 \
             file://errno_values.h.patch;patch=1 \
 	    file://build_wcs_upper_buffer.patch;patch=1 \
+            file://arm_fix_alignment.patch;patch=1 \
+	    file://unistd_arm.patch;patch=1 \
             "
 
 S = "${WORKDIR}/uClibc"

More information about the Openembedded-commits mailing list