[oe-commits] org.oe.dev merge of '27de58a95c41839b956f23d0aba523fd7b5b6560'
daniel commit
openembedded-commits at lists.openembedded.org
Thu Jan 17 21:08:17 UTC 2008
merge of '27de58a95c41839b956f23d0aba523fd7b5b6560'
and '41476408af360dd3a822d53b5492d058b04347ab'
Author: daniel at openembedded.org
Branch: org.openembedded.dev
Revision: 2538d8c9c6f9647baba548394a1e20a2e4467a19
ViewMTN: http://monotone.openembedded.org/revision/info/2538d8c9c6f9647baba548394a1e20a2e4467a19
Files:
1
conf/machine/chumby.conf
conf/machine/include/collie-2.6.inc
conf/machine/include/poodle-2.6.inc
packages/asterisk-core-sounds-en-alaw
packages/asterisk-core-sounds-en-g729
packages/asterisk-core-sounds-en-gsm
packages/asterisk-core-sounds-en-ulaw
packages/asterisk-extra-sounds-en-alaw
packages/asterisk-extra-sounds-en-g729
packages/asterisk-extra-sounds-en-gsm
packages/asterisk-extra-sounds-en-ulaw
packages/asterisk-moh-freeplay-alaw
packages/asterisk-moh-freeplay-g729
packages/asterisk-moh-freeplay-gsm
packages/asterisk-moh-freeplay-ulaw
packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-4.2.2/fortran-static-linking.patch
packages/gnutls/gnutls
packages/gnutls/gnutls-1.6.3
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/gpe-scap/gpe-scap-1.3
packages/swt
packages/swt/files
packages/xcursor-transparent-theme/xcursor-watchonly-theme
classes/java-library.bbclass
classes/java.bbclass
packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch
packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch
packages/orinoco/orinoco-modules.inc
packages/supertux/files/gp2x.patch
packages/supertux/files/img-resize.sh
packages/supertux/files/supertux-smallsize-data.tar.bz2
packages/supertux/supertux-qvga_0.1.3.bb
packages/swt/files/Makefile
packages/swt/files/swt-hildon.patch
packages/swt/swt-gtk.inc
packages/swt/swt3.3-gtk_3.3.1.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
packages/tasks/task-openmoko-toolchain-host.bb
packages/wifistix/wifistix-modules/sk_buff.patch
packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent
packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/collie.conf
conf/machine/fic-gta02.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/include/zaurus-clamshell.inc
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.6.3.bb
packages/gpe-scap/gpe-scap_1.3.bb
packages/gpe-session-scripts/files/angstrom/matchbox-session
packages/gpe-session-scripts/files/matchbox-session
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/orinoco/orinoco-modules_0.13e.bb
packages/orinoco/orinoco-modules_0.15rc1.bb
packages/orinoco/orinoco-modules_0.15rc2.bb
packages/orinoco/orinoco-modules_cvs.bb
packages/supertux/files/supertux.desktop
packages/tasks/task-openmoko-debug.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
mtn:manual_merge
true
mtn:execute
Diffs:
#
# mt diff -r27de58a95c41839b956f23d0aba523fd7b5b6560 -r2538d8c9c6f9647baba548394a1e20a2e4467a19
#
#
#
# patch "conf/machine/chumby.conf"
# from [83ab431ac03a48b06b82de26db56cd04bf9a912a]
# to [3f79ba25d77b0de2d1df16d71274c719ac18b5ed]
#
============================================================
--- conf/machine/chumby.conf 83ab431ac03a48b06b82de26db56cd04bf9a912a
+++ conf/machine/chumby.conf 3f79ba25d77b0de2d1df16d71274c719ac18b5ed
@@ -11,6 +11,10 @@ PREFERRED_PROVIDER_virtual/kernel = "${M
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-modules \
+
+
require conf/machine/include/tune-arm926ejs.inc
# used by sysvinit_2
@@ -18,3 +22,5 @@ ROOT_FLASH_SIZE = "22"
# used by opie-collections.inc
ROOT_FLASH_SIZE = "22"
+
+IMAGE_FSTYPES += "cramfs"
#
# mt diff -r41476408af360dd3a822d53b5492d058b04347ab -r2538d8c9c6f9647baba548394a1e20a2e4467a19
#
#
#
# delete "conf/machine/include/collie-2.6.inc"
#
# delete "conf/machine/include/poodle-2.6.inc"
#
# delete "packages/asterisk-core-sounds-en-alaw"
#
# delete "packages/asterisk-core-sounds-en-g729"
#
# delete "packages/asterisk-core-sounds-en-gsm"
#
# delete "packages/asterisk-core-sounds-en-ulaw"
#
# delete "packages/asterisk-extra-sounds-en-alaw"
#
# delete "packages/asterisk-extra-sounds-en-g729"
#
# delete "packages/asterisk-extra-sounds-en-gsm"
#
# delete "packages/asterisk-extra-sounds-en-ulaw"
#
# delete "packages/asterisk-moh-freeplay-alaw"
#
# delete "packages/asterisk-moh-freeplay-g729"
#
# delete "packages/asterisk-moh-freeplay-gsm"
#
# delete "packages/asterisk-moh-freeplay-ulaw"
#
# rename "packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb"
#
# rename "packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb"
#
# rename "packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb"
#
# rename "packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb"
#
# rename "packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb"
#
# rename "packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb"
#
# rename "packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb"
#
# rename "packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
#
# rename "packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb"
# to "packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb"
#
# rename "packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb"
# to "packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb"
#
# rename "packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb"
# to "packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb"
#
# rename "packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb"
# to "packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb"
#
# rename "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
# to "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
#
# rename "packages/gnutls/gnutls"
# to "packages/gnutls/gnutls-1.6.3"
#
# rename "packages/tasks/task-toolchain-openmoko-sdk.bb"
# to "packages/tasks/task-openmoko-toolchain-target.bb"
#
# add_dir "packages/gpe-scap/gpe-scap-1.3"
#
# add_dir "packages/swt"
#
# add_dir "packages/swt/files"
#
# add_dir "packages/xcursor-transparent-theme/xcursor-watchonly-theme"
#
# add_file "classes/java-library.bbclass"
# content [ba884554b916e0ee77988f7e42644eb50f0bcf92]
#
# add_file "classes/java.bbclass"
# content [4c1064a0c1677fa3f136bebf5736ace413a11f30]
#
# add_file "packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch"
# content [544859e05e08d2a0b5639e1182a8a2a4ef114d07]
#
# add_file "packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch"
# content [3fca637842d4f56756161b44d99ea894218489ab]
#
# add_file "packages/orinoco/orinoco-modules.inc"
# content [a0f71de24feba1b09e5a8e110fed2b234ea823b7]
#
# add_file "packages/supertux/files/gp2x.patch"
# content [26a86f577e4742adc10c15df42c058f4cea5183a]
#
# add_file "packages/supertux/files/img-resize.sh"
# content [0179d1a7105160d62d20293a7513dd948a13cd3c]
#
# add_file "packages/supertux/files/supertux-smallsize-data.tar.bz2"
# content [982bfb74c80c28fa6574ec3ccd3facae4e943404]
#
# add_file "packages/supertux/supertux-qvga_0.1.3.bb"
# content [53598bc864a257e7201e4e07636d2e6c83095af2]
#
# add_file "packages/swt/files/Makefile"
# content [6a0e11147f246807075b03fa7fa27e739f8b6e5d]
#
# add_file "packages/swt/files/swt-hildon.patch"
# content [cc6d6cb67722d189122f70411ef01e0639206d86]
#
# add_file "packages/swt/swt-gtk.inc"
# content [bcadfa700e7fc0872ab1d3a38e456f41e5ebefed]
#
# add_file "packages/swt/swt3.3-gtk_3.3.1.bb"
# content [ac1e6656f8358a0ce3928cd18fcdc21d2d36511e]
#
# add_file "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
# content [2659ee0d88eeab0a2f7012db8f483cc8a4e0373c]
#
# add_file "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
# content [cf948019bf5ff1d457cbe1999cc6651269b7ea70]
#
# add_file "packages/tasks/task-openmoko-toolchain-host.bb"
# content [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
#
# add_file "packages/wifistix/wifistix-modules/sk_buff.patch"
# content [07ad752e578a675b4aaf3843012740c28acd3d2d]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
# content [a5b22f1aa71c4d2079e2875c22ecfb1735d68612]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch"
# content [6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [2f7cb2290c8041be1845553e70a09af8c92e718d]
# to [1243c122ad661be1683a045938d93537f205ce15]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8119c811984dd538a4b239217a82174295ecb22f]
# to [d560814623625b6b57fc9aad038a6e4e6b62f271]
#
# patch "conf/machine/collie.conf"
# from [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
# to [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
#
# patch "conf/machine/fic-gta02.conf"
# from [47adecd1ee4496da827ee13c515774484b0373ec]
# to [9c53b1252d1b563a297e0d6174f4eb462b003de1]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
# to [0baab00ebcdca461a1c5f13d5bcba53c6099622a]
#
# patch "conf/machine/include/zaurus-clamshell.inc"
# from [460b6649ab7636b92a7031abd0f2850fcb6700f5]
# to [75189b78d2f98b4b5156904ea7515f88fcd23b77]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [eafe51eac49ac2790c536077488698261ee29452]
# to [6e5e1fdfb04ba1e035eaf6f8c6f911ce99d8769c]
#
# patch "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
# from [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
# to [e51538f27d036e3418faae17b7dcd656ae38313a]
#
# patch "packages/gcc/gcc-cross-sdk_4.2.2.bb"
# from [8ef30993fffbbd19108406cd37d0b36449e5143d]
# to [c51f994c61ce378fb2761f8e6d0cc77071b8dcfe]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [bd6eaf9021e129dcbd70794a3e80ac820d764246]
# to [638f8a17318b6c935909d7b7f11cc6506e57d6af]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [6bcef9ceeb471bcf1d54c4ae08e78e9b80d6a44c]
# to [b649640ada6aa7b3be9155792213ea7689d6e6ac]
#
# patch "packages/gnutls/gnutls.inc"
# from [cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a]
# to [684fa353da238f622dd47843a2ab39f725289869]
#
# patch "packages/gnutls/gnutls_1.6.3.bb"
# from [dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85]
# to [00f6ee42f807520ea4255904e757ed8cd210a4da]
#
# patch "packages/gpe-scap/gpe-scap_1.3.bb"
# from [ea05f8ee476d853b1883d58d4bc62e8d23ba9041]
# to [73e961b984f8eaea1c3a6678341b1484dd688c22]
#
# patch "packages/gpe-session-scripts/files/angstrom/matchbox-session"
# from [5f2775906eeda8b22303d2452c158ba979a9595d]
# to [cd7ffc92541caae372d21de0550aacc7d535d533]
#
# patch "packages/gpe-session-scripts/files/matchbox-session"
# from [5c0f9302bc62e8b8612888f54ec5d2c9300d75ab]
# to [864395d7fb408233687a04db272c51799b6d5d5d]
#
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
# from [e886f9c3d56e6dba00f20b02fdb8cff205713397]
# to [b9030ecb91f1a88e063dc31e35f8a61d905d29eb]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [fd3ecb56d2f926384dc852689d17e18430014b2e]
# to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
# from [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
# to [76d692ed056a9397df52f5d27a16c97f29b032cd]
#
# patch "packages/meta/meta-toolchain.bb"
# from [b52d096ec913c333f9bb14b192bc922b80854834]
# to [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
#
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
# from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
# to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
# to [90b2cf8a49d86bb43022f62052a46f47d57edcee]
#
# patch "packages/orinoco/orinoco-modules_0.13e.bb"
# from [b3160262a35ad7ebdea0018698a346c8d779e410]
# to [42df7a5fe957c5a457e5b6d10f5fa99b0eccf8ee]
#
# patch "packages/orinoco/orinoco-modules_0.15rc1.bb"
# from [b585752da378cdbadf684f6e4698451b398e8f12]
# to [2e800a3702a89c002b802721cb278ccc07a0c3c7]
#
# patch "packages/orinoco/orinoco-modules_0.15rc2.bb"
# from [812f6cf32cdf408de6e218e5e20e447358fc8e68]
# to [365c34b2f550cda6dee19a2707bddd5521d4426f]
#
# patch "packages/orinoco/orinoco-modules_cvs.bb"
# from [b5b9752f46dc04b12fb12c8786ae4924cb7142a0]
# to [5deb2baa3d4811d2c877109a966a271eed2abc9d]
#
# patch "packages/supertux/files/supertux.desktop"
# from [ca0d07025948eea625b61a4c138657fd300ff7ac]
# to [f35df068437792660755385fb36d3287092c27ea]
#
# patch "packages/tasks/task-openmoko-debug.bb"
# from [6f16b58858e9a8858a34530bccc7db757e1303ab]
# to [7f29d58704ca954c5e6e5ff766840cc0cff0eb5e]
#
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
# from [4526d09a7c1a87ae65eac1a78599062dad98e280]
# to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
#
# patch "packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb"
# from [83636847e2f3799d184bc0748eee686270a61c79]
# to [d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8]
#
# patch "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
# from [96f40a33b74048e73d3054500e402469dc47f737]
# to [ecb7bdd88141efe8406a5d86de1c5c26340090c9]
#
# set "packages/supertux/files/supertux-smallsize-data.tar.bz2"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
# attr "mtn:execute"
# value "true"
#
============================================================
--- classes/java-library.bbclass ba884554b916e0ee77988f7e42644eb50f0bcf92
+++ classes/java-library.bbclass ba884554b916e0ee77988f7e42644eb50f0bcf92
@@ -0,0 +1,37 @@
+# Inherit this bbclass for each java recipe that builds a Java library (jar file[s]).
+#
+# It automatically adds important build dependencies, defines JPN (Java Package Name)
+# a package named ${JPN} whose contents are those of ${datadir}/java (the jar location).
+#
+# The JPN is basically lib${PN}-java but takes care of the fact that ${PN} already
+# starts with "lib" and/or ends with "-java". In case the "lib" prefix is part of
+# your package's normal name (e.g. liberator) the guessing is wrong and you have
+# to set JPN manually!
+
+inherit java
+
+def java_package_name(d):
+ import bb;
+
+ pre=""
+ post=""
+
+ pn = bb.data.getVar('PN', d, 1)
+ if not pn.startswith("lib"):
+ pre='lib'
+
+ if not pn.endswith("-java"):
+ post='-java'
+
+ return pre + pn + post
+
+JPN ?= "${@java_package_name(d)}"
+
+DEPENDS_prepend = "virtual/javac-native fastjar-native "
+
+PACKAGES = "${JPN}"
+
+PACKAGE_ARCH_${JPN} = "all"
+
+FILES_${JPN} = "${datadir_java}"
+
============================================================
--- classes/java.bbclass 4c1064a0c1677fa3f136bebf5736ace413a11f30
+++ classes/java.bbclass 4c1064a0c1677fa3f136bebf5736ace413a11f30
@@ -0,0 +1,62 @@
+# Defines the commonly used target directories and provides a convenience
+# function to install jar files.
+
+# Jar location on target
+datadir_java ?= ${datadir}/java
+
+# JNI library location on target
+libdir_jni ?= ${libdir}/jni
+
+STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java
+STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni
+
+oe_jarinstall() {
+ # Purpose: Install a jar file and create all the given symlinks to it.
+ # Example:
+ # oe_jarinstall foo-1.3.jar foo.jar
+ # Installs foo-1.3.jar and creates symlink foo.jar.
+ #
+ # oe_jarinstall -s foo-1.3.jar foo.jar
+ # Installs foo-1.3.jar to staging and creates symlink foo.jar.
+ #
+ # oe_jarinstall -r foo-1.3.jar foo_1_3.jar foo.jar
+ # Installs foo_1_3.jar as foo-1.3.jar and creates a symlink to this.
+ #
+ dir=${D}${datadir_java}
+ destname=""
+ while [ "$#" -gt 0 ]; do
+ case "$1" in
+ -s)
+ dir=${STAGING_DATADIR_JAVA}
+ ;;
+ -r)
+ shift
+ destname=$1
+ ;;
+ -*)
+ oefatal "oe_jarinstall: unknown option: $1"
+ ;;
+ *)
+ break;
+ ;;
+ esac
+ shift
+ done
+
+ jarname=$1
+ destname=${destname:-`basename $jarname`}
+ shift
+
+ install -d $dir
+ install -m 0644 $jarname $dir/$destname
+
+ # Creates symlinks out of the remaining arguments.
+ while [ "$#" -gt 0 ]; do
+ if [ -e $dir/$1 ]; then
+ oewarn "file was in the way. removing:" $dir/$1
+ rm $dir/$1
+ fi
+ ln -s $destname $dir/$1
+ shift
+ done
+}
============================================================
--- packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch 544859e05e08d2a0b5639e1182a8a2a4ef114d07
+++ packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch 544859e05e08d2a0b5639e1182a8a2a4ef114d07
@@ -0,0 +1,30 @@
+* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
+ used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
+ directory.
+
+diff --git a/libgfortran/configure b/libgfortran/configure
+index f7d86fb..d0966ec 100755
+--- a/libgfortran/configure
++++ b/libgfortran/configure
+@@ -4475,6 +4475,6 @@ exec 5>>./config.log
+
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ ac_ext=${FC_SRCEXT-f}
+ ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+\ No newline at end of file
+diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
+index 4661306..9f83e55 100644
+--- a/libgfortran/configure.ac
++++ b/libgfortran/configure.ac
+@@ -140,7 +140,7 @@ AC_SUBST(enable_static)
+
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ AC_PROG_FC(gfortran)
+
+ # extra LD Flags which are required for targets
============================================================
--- packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch 3fca637842d4f56756161b44d99ea894218489ab
+++ packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch 3fca637842d4f56756161b44d99ea894218489ab
@@ -0,0 +1,26 @@
+Index: gpe-scap-1.3/configure
+===================================================================
+--- gpe-scap-1.3.orig/configure 2008-01-17 17:01:49.000000000 +0100
++++ gpe-scap-1.3/configure 2008-01-17 17:03:01.000000000 +0100
+@@ -6327,7 +6327,7 @@
+
+
+
+-GLADE_MODULES="libglade-2.0 >= 2.4.2"
++GLADE_MODULES="libglade-2.0 >= 2.4.0"
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GLADE" >&5
+Index: gpe-scap-1.3/configure.ac
+===================================================================
+--- gpe-scap-1.3.orig/configure.ac 2008-01-17 17:35:15.000000000 +0100
++++ gpe-scap-1.3/configure.ac 2008-01-17 17:35:20.000000000 +0100
+@@ -29,7 +29,7 @@
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
+-GLADE_MODULES="libglade-2.0 >= 2.4.2"
++GLADE_MODULES="libglade-2.0 >= 2.4.0"
+ PKG_CHECK_MODULES(GLADE, $GLADE_MODULES)
+ AC_SUBST(GLADE_CFLAGS)
+ AC_SUBST(GLADE_LIBS)
============================================================
--- packages/orinoco/orinoco-modules.inc a0f71de24feba1b09e5a8e110fed2b234ea823b7
+++ packages/orinoco/orinoco-modules.inc a0f71de24feba1b09e5a8e110fed2b234ea823b7
@@ -0,0 +1,21 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \
+Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family."
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+PROVIDES = "spectrum-modules"
+LICENSE = "GPL"
+
+SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz"
+S = "${WORKDIR}/orinoco-${PV%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list