diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-10-05 08:47:22 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-05 08:47:22 +0000 |
| commit | 5c05fd4ebbaedd10edca4f40dda8e4bbdc371e44 (patch) | |
| tree | 48c23f17dc7291d0fc49c27eb8e7f9b66a1f1965 | |
| parent | 8ba0bb7b56e77048ecbabe11907a3f57d4d5d997 (diff) | |
| parent | 6b04085d53ecaa1643f5ff0798f7b61d7fe4415f (diff) | |
| download | openembedded-5c05fd4ebbaedd10edca4f40dda8e4bbdc371e44.tar.gz | |
merge of '22673a8489eb3fbf2a5e89620fbecf65ca14d642'
and '60dded794c41670fb786d889795e95be3bd8665f'
277 files changed, 3011 insertions, 2908 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d9ba201571..ba1e5abfe7 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -911,6 +911,23 @@ python () { base_after_parse(d) } +def check_app_exists(app, d): + from bb import which, data + + app = data.expand(app, d) + path = data.getVar('PATH', d, 1) + return len(which(path, app)) != 0 + +def check_gcc3(data): + + gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' + + for gcc3 in gcc3_versions.split(): + if check_app_exists(gcc3, data): + return gcc3 + + return False + # Patch handling inherit patch diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 840ebf6eff..83272da9be 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -60,6 +60,7 @@ def package_qa_get_machine_dict(): "i686": ( 3, 0, 0, True, True), "mipsel": ( 8, 0, 0, True, True), "avr32": (6317, 0, 0, False, True), + "sh4": ( 42, 0, 0, True, True), }, "uclinux-uclibc" : { "bfin": ( 106, 0, 0, True, True), diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index cc413b7011..43d8c25cfe 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -24,14 +24,6 @@ def check_conf_exists(fn, data): return True return False -def check_app_exists(app, d): - from bb import which, data - - app = data.expand(app, d) - path = data.getVar('PATH', d) - return len(which(path, app)) != 0 - - def check_sanity(e): from bb import note, error, data, __version__ from bb.event import Handled, NotHandled, getName @@ -91,6 +83,12 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," + if os.path.exists("/proc/sys/vm/mmap_min_addr"): + f = file("/proc/sys/vm/mmap_min_addr", "r") + if (f.read().strip() != "0"): + messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n" + f.close() + required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" for util in required_utilities.split(): diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index fb7ea605f7..cea85c27b4 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -32,7 +32,7 @@ def seppuku_login(opener, login, user, password): the resulting page then @param opened = cookie enabled urllib2 opener - @param login = http://bugs.openembedded.org/query.cgi? + @param login = http://bugs.openembedded.net/query.cgi? @param user = Your username @param password = Your password """ @@ -116,12 +116,12 @@ def seppuku_find_bug_report(debug_file, opener, query, product, component, bugna and the status. @param opener = urllib2 opener - @param query = e.g. http://bugs.openembedded.org/query.cgi? + @param query = e.g. http://bugs.openembedded.net/query.cgi? @param product = search for this product @param component = search for this component @param bugname = the bug to search for - http://bugs.openembedded.org/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com + http://bugs.openembedded.net/buglist.cgi?short_desc_type=substring&short_desc=manual+test+bug&product=Openembedded&emailreporter2=1&emailtype2=substring&email2=freyther%40yahoo.com but it does not support ctype=csv... """ import urllib @@ -154,7 +154,7 @@ def seppuku_reopen_bug(poster, file, product, component, bug_number, bugname, te Same as with opening a new report, some bits need to be inside the url - http://bugs.openembedded.org/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=Build&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo + http://bugs.openembedded.net/process_bug.cgi?id=239&bug_file_loc=http%3A%2F%2F&version=Angstrom&longdesclength=2&product=Openembedded&component=org.openembedded.stable&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&knob=reopen&short_desc=foo """ import urllib2 @@ -189,7 +189,7 @@ def seppuku_file_bug(poster, file, product, component, bugname, text): Create a completely new bug report - http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=Build&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other + http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&product=Openembedded&component=org.openembedded.stable&short_desc=foo&comment=bla&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other You are forced to add some default values to the bugzilla query and stop with '&' diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index bd9526a491..1facdc1909 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,7 +6,7 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -DISTRO_VERSION = "2007.12-r14" +DISTRO_VERSION = "2007.12-r18" DISTRO_REVISION = "52" require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 7f09baad7f..6927df57be 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -338,8 +338,8 @@ PREFERRED_VERSION_faad2 ?= "2.0" PREFERRED_VERSION_fakechroot ?= "2.5" PREFERRED_VERSION_fakechroot-native ?= "2.5" PREFERRED_VERSION_fakeconnect ?= "1.2.1" -PREFERRED_VERSION_fakeroot ?= "1.7.1" -PREFERRED_VERSION_fakeroot-native ?= "1.7.1" +PREFERRED_VERSION_fakeroot ?= "1.9.6" +PREFERRED_VERSION_fakeroot-native ?= "1.9.6" PREFERRED_VERSION_fam ?= "2.7.0" PREFERRED_VERSION_farsight ?= "0.1.5" PREFERRED_VERSION_fastcgi ?= "2.4.0" @@ -476,8 +476,8 @@ PREFERRED_VERSION_glrr ?= "20050529" PREFERRED_VERSION_glrr-widgets ?= "20050529" PREFERRED_VERSION_glurp ?= "0.11.3" PREFERRED_VERSION_gmailfs ?= "0.7.3" -PREFERRED_VERSION_gmp ?= "4.2.1" -PREFERRED_VERSION_gmp-native ?= "4.2.1" +PREFERRED_VERSION_gmp ?= "4.2.2" +PREFERRED_VERSION_gmp-native ?= "4.2.2" PREFERRED_VERSION_gmpc ?= "0.13.0" PREFERRED_VERSION_gnash ?= "0.8.0" PREFERRED_VERSION_gnocky ?= "0.0.3" @@ -503,7 +503,7 @@ PREFERRED_VERSION_gnomesword ?= "2.1.2" PREFERRED_VERSION_gnuchess ?= "5.05" PREFERRED_VERSION_gnumeric ?= "1.6.3" PREFERRED_VERSION_gnupg ?= "1.4.2.2" -PREFERRED_VERSION_gnuplot ?= "4.2.0" +PREFERRED_VERSION_gnuplot ?= "4.2.3" PREFERRED_VERSION_gnuradio ?= "3.0.4" PREFERRED_VERSION_gnutls ?= "1.6.3" PREFERRED_VERSION_gob2 ?= "2.0.14" @@ -780,7 +780,7 @@ PREFERRED_VERSION_lame ?= "3.96.1" PREFERRED_VERSION_lbreakout2 ?= "2.6beta" PREFERRED_VERSION_lcdproc ?= "0.5.1" PREFERRED_VERSION_lcms ?= "1.15" -PREFERRED_VERSION_leafpad ?= "0.8.9" +PREFERRED_VERSION_leafpad ?= "0.8.15" PREFERRED_VERSION_led ?= "0.0cvs20060814" PREFERRED_VERSION_lemon ?= "3.3.5" PREFERRED_VERSION_lemon-native ?= "3.3.5" @@ -1624,7 +1624,7 @@ PREFERRED_VERSION_radvd ?= "1.0" PREFERRED_VERSION_rage ?= "0.2.0.003" PREFERRED_VERSION_randrext ?= "1.0" PREFERRED_VERSION_randrproto ?= "1.2.1" -PREFERRED_VERSION_rdesktop ?= "1.5.0" +PREFERRED_VERSION_rdesktop ?= "1.6.0" PREFERRED_VERSION_rdiff-backup ?= "1.1.5" PREFERRED_VERSION_readline ?= "4.3" PREFERRED_VERSION_readline-native ?= "4.3" @@ -1872,7 +1872,7 @@ PREFERRED_VERSION_twutils ?= "0.2" PREFERRED_VERSION_txdrug ?= "0.1" PREFERRED_VERSION_tximage ?= "0.2" PREFERRED_VERSION_tzcode-native ?= "2007e" -PREFERRED_VERSION_tzdata ?= "2007e" +PREFERRED_VERSION_tzdata ?= "2007k" PREFERRED_VERSION_u-boot ?= "1.2.0" PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" @@ -1954,11 +1954,11 @@ PREFERRED_VERSION_wiggle-native ?= "0.6" PREFERRED_VERSION_win4 ?= "1.0.1" PREFERRED_VERSION_windowswmproto ?= "1.0.3" PREFERRED_VERSION_wireshark ?= "0.99.4" -PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7" -PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7" +PREFERRED_VERSION_wlan-ng-modules ?= "0.2.8" +PREFERRED_VERSION_wlan-ng-utils ?= "0.2.8" PREFERRED_VERSION_wmctrl ?= "1.07" PREFERRED_VERSION_wpa-gui ?= "0.4.8" -PREFERRED_VERSION_wpa-supplicant ?= "0.5.5" +PREFERRED_VERSION_wpa-supplicant ?= "0.5.10" PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6" PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6" PREFERRED_VERSION_wrt-imagetools-native ?= "1.0" @@ -1971,9 +1971,10 @@ PREFERRED_VERSION_wview-vpro ?= "3.1.3" PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3" PREFERRED_VERSION_wview-wxt510 ?= "3.1.3" PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3" -PREFERRED_VERSION_wxwidgets ?= "2.6.3" +PREFERRED_VERSION_wxbase ?= "2.8.9" +PREFERRED_VERSION_wxwidgets ?= "2.8.9" PREFERRED_VERSION_x11perf ?= "1.4.1" -PREFERRED_VERSION_x11vnc ?= "0.9.3" +PREFERRED_VERSION_x11vnc ?= "0.9.4" PREFERRED_VERSION_xaos ?= "3.2.3" PREFERRED_VERSION_xauth ?= "1.0.2" PREFERRED_VERSION_xawtv ?= "3.93" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index bf2116f998..cfabb6ff7c 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -257,15 +257,15 @@ TINDER_REPORT = "1" # in their local.conf # seppuku bbclass -SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" -SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" -SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" -SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" +SEPPUKU_LOGIN = "http://bugs.openembedded.net/query.cgi?" +SEPPUKU_QUERY = "http://bugs.openembedded.net/buglist.cgi?" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi?" SEPPUKU_AUTOBUILD = "1" SEPPUKU_PRODUCT = "Openembedded" -SEPPUKU_COMPONENT = "build" +SEPPUKU_COMPONENT = "org.openembedded.stable" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 8f82eb4611..af94e53430 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -118,6 +118,7 @@ SRCDATE_dvbtraffic ?= "20060814" SRCDATE_dvbtune ?= "20060814" SRCDATE_fdclock ?= "20060814" SRCDATE_fltk ?= "20060814" +SRCDATE_gnuplot ?= "20080328" SRCDATE_ipatience ?= "20061112" SRCDATE_ipkg-link ?= "20050930" SRCDATE_ipkg-link-1 ?= "20050930" @@ -140,6 +141,7 @@ SRCDATE_portaudio ?= "20060814" SRCDATE_putty ?= "20060814" SRCDATE_python-cairo ?= "20060814" SRCDATE_qemu-native ?= "20070613" +SRCDATE_rdesktop ?= "20080917" SRCDATE_roadster ?= "20060814" SRCDATE_sctzap ?= "20060814" SRCDATE_tslib ?= "20051101" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 453f7d3c1f..05724209d6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -127,6 +127,8 @@ SRCREV_pn-webkit-gtk ?= "28656" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" +SRCREV_pn-wlan-ng-modules ?= "1859" +SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-networkmanager ?= "2887" diff --git a/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty b/conf/distro/unmaintained/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty +++ b/conf/distro/unmaintained/.mtn2git_empty diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/unmaintained/amsdelta-oe.conf index 6d3ad7bd6b..6d3ad7bd6b 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/unmaintained/amsdelta-oe.conf diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/unmaintained/angstrom-2007.1-legacy.conf index 298c8589e3..298c8589e3 100644 --- a/conf/distro/angstrom-2007.1-legacy.conf +++ b/conf/distro/unmaintained/angstrom-2007.1-legacy.conf diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/unmaintained/angstrom-2008.1.conf index 44a7791ea2..44a7791ea2 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/unmaintained/angstrom-2008.1.conf diff --git a/conf/distro/asusoe.conf b/conf/distro/unmaintained/asusoe.conf index 35be6a4fab..35be6a4fab 100644 --- a/conf/distro/asusoe.conf +++ b/conf/distro/unmaintained/asusoe.conf diff --git a/conf/distro/celinux-test.conf b/conf/distro/unmaintained/celinux-test.conf index 03dcd22d79..03dcd22d79 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/unmaintained/celinux-test.conf diff --git a/conf/distro/colinuxoe.conf b/conf/distro/unmaintained/colinuxoe.conf index 7454c0167f..7454c0167f 100644 --- a/conf/distro/colinuxoe.conf +++ b/conf/distro/unmaintained/colinuxoe.conf diff --git a/conf/distro/ezx.conf b/conf/distro/unmaintained/ezx.conf index 5b12b6f93b..5b12b6f93b 100644 --- a/conf/distro/ezx.conf +++ b/conf/distro/unmaintained/ezx.conf diff --git a/conf/distro/foonas.conf b/conf/distro/unmaintained/foonas.conf index 234c92f62a..234c92f62a 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/unmaintained/foonas.conf diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/unmaintained/generic-uclibc.conf index 26e78f89c1..26e78f89c1 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/unmaintained/generic-uclibc.conf diff --git a/conf/distro/generic.conf b/conf/distro/unmaintained/generic.conf index 0286666495..0286666495 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/unmaintained/generic.conf diff --git a/conf/distro/gmustix.conf b/conf/distro/unmaintained/gmustix.conf index b359c926b0..b359c926b0 100644 --- a/conf/distro/gmustix.conf +++ b/conf/distro/unmaintained/gmustix.conf diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/unmaintained/jlime-donkey.conf index 3c4dc11bb8..3c4dc11bb8 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/unmaintained/jlime-donkey.conf diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/unmaintained/jlime-shrek.conf index 19379862ae..19379862ae 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/unmaintained/jlime-shrek.conf diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/unmaintained/maemo-1.0.conf index b8592fdf68..b8592fdf68 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/unmaintained/maemo-1.0.conf diff --git a/conf/distro/mamona.conf b/conf/distro/unmaintained/mamona.conf index 26bf8b94f1..26bf8b94f1 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/unmaintained/mamona.conf diff --git a/conf/distro/mokoslug.conf b/conf/distro/unmaintained/mokoslug.conf index 2c039dbcce..2c039dbcce 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/unmaintained/mokoslug.conf diff --git a/conf/distro/nylon.conf b/conf/distro/unmaintained/nylon.conf index 334c8bba9b..334c8bba9b 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/unmaintained/nylon.conf diff --git a/conf/distro/openmn.conf b/conf/distro/unmaintained/openmn.conf index 9de6c7d9e1..9de6c7d9e1 100644 --- a/conf/distro/openmn.conf +++ b/conf/distro/unmaintained/openmn.conf diff --git a/conf/distro/openmoko.conf b/conf/distro/unmaintained/openmoko.conf index f2007c231f..f2007c231f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/unmaintained/openmoko.conf diff --git a/conf/distro/openprotium.conf b/conf/distro/unmaintained/openprotium.conf index 928817d815..928817d815 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/unmaintained/openprotium.conf diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/unmaintained/openwrt-sdk.conf index fc760f9ea0..fc760f9ea0 100644 --- a/conf/distro/openwrt-sdk.conf +++ b/conf/distro/unmaintained/openwrt-sdk.conf diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/unmaintained/oplinux-uclibc.conf index 0d31c8c8ac..0d31c8c8ac 100644 --- a/conf/distro/oplinux-uclibc.conf +++ b/conf/distro/unmaintained/oplinux-uclibc.conf diff --git a/conf/distro/oplinux.conf b/conf/distro/unmaintained/oplinux.conf index 03e56b0148..03e56b0148 100644 --- a/conf/distro/oplinux.conf +++ b/conf/distro/unmaintained/oplinux.conf diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/unmaintained/sharprom-compatible.conf index 92fd42f4f8..92fd42f4f8 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/unmaintained/sharprom-compatible.conf diff --git a/conf/distro/slugos-native.conf b/conf/distro/unmaintained/slugos-native.conf index 77258c7148..77258c7148 100644 --- a/conf/distro/slugos-native.conf +++ b/conf/distro/unmaintained/slugos-native.conf diff --git a/conf/distro/slugos.conf b/conf/distro/unmaintained/slugos.conf index 29c96ce384..29c96ce384 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/unmaintained/slugos.conf diff --git a/conf/distro/ucslugc.conf b/conf/distro/unmaintained/ucslugc.conf index 441c3484ef..441c3484ef 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/unmaintained/ucslugc.conf diff --git a/conf/distro/unslung.conf b/conf/distro/unmaintained/unslung.conf index 0cf5e8e81e..0cf5e8e81e 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unmaintained/unslung.conf diff --git a/conf/distro/wrt54oe.conf b/conf/distro/unmaintained/wrt54oe.conf index 90babfdc1a..90babfdc1a 100644 --- a/conf/distro/wrt54oe.conf +++ b/conf/distro/unmaintained/wrt54oe.conf diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 3f84138ac8..ae36f789c9 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -35,7 +35,7 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" -MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" +MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_collie = "smallscreen" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index a4e5e6b5e8..b781af29c8 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -38,14 +38,14 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 +for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \ man \ usbutils pciutils mtd-utils usbview hal setserial \ - task-proper-tools mc screen findutils \ + task-proper-tools mc screen findutils fakeroot gzip \ mono perl \ python python-pygtk \ ruby \ @@ -54,7 +54,7 @@ do gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ samba meta-nas-server \ apache2 boa cherokee lighttpd thttpd \ - rox-filer gpe-gallery gpe-scap notecase \ + rox-filer gpe-gallery gpe-scap notecase leafpad \ pidgin irssi \ roadmap-gtk2 gpsdrive navit gpsbabel \ xmms mplayer quasar vlc-gpe gnome-mplayer \ @@ -70,22 +70,13 @@ do asterisk \ gnuradio gnuplot mpfr gmp fftw fftwf fftwl \ gphoto2 gqview imagemagick ufraw \ - rdesktop \ + rdesktop x11vnc \ tzdata \ xserver-kdrive xserver-xorg \ xf86-video-fbdev xf86-video-ati xf86-video-vesa \ xf86-input-evdev xf86-input-keyboard xf86-input-mouse \ - task-opie task-opie-games \ - opie-bartender opie-calculator opie-checkbook opie-embeddedkonsole opie-keypebble opie-sheet opie-wellenreiter opie-write opie-zsafe opie-oxygen opie-eye opie-ftp qpdf2 \ - konqueror-embedded ubahnnav freenote inkwp opie-notes mileage pocketcellar timesleuth zgscore \ - zlapspeed zuc zddice camera-assistant slcalc sliderulez resistorui \ - atomic checkers fish glider hexatrolic icebloxx labyrinth mahjongg maki nmm pairs pdamaze \ - pipeman shisensho sokoban tron win4 zauralign ziq zrev7 zsubhunt ztappy zudoku iaimaster \ - qmatrix qfish2 froot \ - opie-today-weatherplugin \ - opie-datebook-nationalholidayplugin opie-datebook-chrisholidayplugin \ - opie-style-liquid opie-style-metal opie-theme \ - opie-dvorak opie-unikeyboard opie-keyview \ + task-opie \ + task-gpe-apps task-gpe-pim task-gpe-settings task-gpe-connectivity \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ hildon-1 hildon-base-lib hildon-lgpl hildon-libs hildon-thumbnail libconic libgpsbt libgpsmgr libhildonfm libhildonhelp libhildonmime libosso-gsf libosso-help libosso mce-dev osso-gwconnect osso-ic-oss osso-thumbnail outo \ kbdd \ diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index d1e32a880c..8923136443 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -38,15 +38,17 @@ case "$arch" in "arm-oabi") machines="h3600 h3800 collie simpad htcwallaby" ;; "armv4t") - machines="ep93xx h6300 fic-gta01 fic-gta02" ;; + machines="ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") machines="davinci-dvevm gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6") - machines="mx31ads nokia800 beagleboard" ;; + machines="mx31ads nokia800 davinci-sffsdr" ;; "armv7") - machine="beagleboard" ;; + machines="" ;; + "armv7a") + machines="beagleboard" ;; "avr32") machines="atngw100 at32stk1000" ;; "bfin") @@ -136,7 +138,7 @@ echo "Processing 'all' feed" for i in `find . -name "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done (cd ../all && ipkg-make-index -p Packages -m . >& /dev/null) -for arch in arm-oabi armv4t armv5teb armv5te armv6 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do +for arch in arm-oabi armv4t armv5teb armv5te armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do do_sort done diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 554d787e25..b5de4e6305 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -8,28 +8,34 @@ REMOTEM=angstrom@linuxtogo.org # Feed dir we want to upload to -REMOTED=website/feeds/2007/ipk/glibc +REMOTED=website/feeds/2007/ipk/$(basename $PWD) # create upload dir mkdir -p upload-queue || true # Find and delete morgue dirs, we don't need them +echo "Deleting morgue directories" find ipk/ -name "morgue" -exec rm -rf \{\} \; # Copy all packages to an upload queue +echo "Copying packages to upload queue" find ipk/ -name "*.ipk" -exec cp \{\} upload-queue/ \; # Find file already present on webserver -ssh $REMOTEM "find $REMOTED/ -name "*.ipk" -exec basename \{\} \;" > /tmp/files-remote -ls upload-queue/ | grep -v morgue >/tmp/files-local +echo "Getting file list from server" +scp $REMOTEM:$REMOTED/unsorted/files-sorted files-remote +ls upload-queue/ | grep -v morgue > files-local # Check for files already present on webserver -cat /tmp/files-remote /tmp/files-local | sort | uniq -u >/tmp/files-uniq -cat /tmp/files-uniq /tmp/files-local | sort | uniq -d > /tmp/files-trans +echo "Checking for duplicates" +cat files-remote files-local | sort | uniq -u >files-uniq +cat files-uniq files-local | sort | uniq -d > files-trans # Copy over non-duplicate files -rsync -vz --files-from=/tmp/files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ +echo "Starting rsync..." +rsync -avz --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ # Clean up temporary files -rm /tmp/files-remote /tmp/files-local /tmp/files-uniq /tmp/files-trans +echo "Removing upload queue" +rm -rf files-remote files-local files-uniq files-trans upload-queue diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 796f74d973..fa75c961ef 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r8" +PR = "r9" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-state/tosa/asound.state b/packages/alsa/alsa-state/tosa/asound.state index 12eaf2e036..c38265d792 100644 --- a/packages/alsa/alsa-state/tosa/asound.state +++ b/packages/alsa/alsa-state/tosa/asound.state @@ -37,13 +37,23 @@ state.Tosa { } control.5 { comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 31' + iface MIXER + name 'PCM Playback Volume' + value.0 23 + value.1 23 + } + control.6 { + comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Speaker Playback ZC Switch' value true } - control.6 { + control.7 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -51,7 +61,7 @@ state.Tosa { name 'Speaker Playback Invert Switch' value true } - control.7 { + control.8 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -59,7 +69,7 @@ state.Tosa { name 'Headphone Playback ZC Switch' value true } - control.8 { + control.9 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -67,7 +77,7 @@ state.Tosa { name 'Mono Playback ZC Switch' value false } - control.9 { + control.10 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -76,7 +86,7 @@ state.Tosa { name 'Mono Playback Volume' value 0 } - control.10 { + control.11 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -85,16 +95,16 @@ state.Tosa { name 'ALC Target Volume' value 11 } - control.11 { + control.12 { comment.access 'read write' comment.type INTEGER comment.count 1 comment.range '0 - 15' iface MIXER name 'ALC Hold Time' - value 0 + value 2 } - control.12 { + control.13 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -103,7 +113,7 @@ state.Tosa { name 'ALC Decay Time' value 3 } - control.13 { + control.14 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -112,7 +122,7 @@ state.Tosa { name 'ALC Attack Time' value 2 } - control.14 { + control.15 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -124,7 +134,7 @@ state.Tosa { name 'ALC Function' value None } - control.15 { + control.16 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -133,7 +143,7 @@ state.Tosa { name 'ALC Max Volume' value 7 } - control.16 { + control.17 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -142,7 +152,7 @@ state.Tosa { name 'ALC ZC Timeout' value 0 } - control.17 { + control.18 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -150,7 +160,7 @@ state.Tosa { name 'ALC ZC Switch' value false } - control.18 { + control.19 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -158,7 +168,7 @@ state.Tosa { name 'ALC NG Switch' value false } - control.19 { + control.20 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -168,7 +178,7 @@ state.Tosa { name 'ALC NG Type' value 'Constant Gain' } - control.20 { + control.21 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -177,16 +187,16 @@ state.Tosa { name 'ALC NG Threshold' value 31 } - control.21 { + control.22 { comment.access 'read write' comment.type INTEGER comment.count 1 comment.range '0 - 7' iface MIXER name 'Mic Headphone Volume' - value 3 + value 7 } - control.22 { + control.23 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -195,7 +205,7 @@ state.Tosa { name 'ALC Headphone Volume' value 5 } - control.23 { + control.24 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -203,7 +213,7 @@ state.Tosa { name 'Out3 Switch' value false } - control.24 { + control.25 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -211,7 +221,7 @@ state.Tosa { name 'Out3 ZC Switch' value true } - control.25 { + control.26 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -220,7 +230,7 @@ state.Tosa { name 'Out3 Volume' value 0 } - control.26 { + control.27 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -229,7 +239,7 @@ state.Tosa { name 'PCBeep Bypass Headphone Volume' value 0 } - control.27 { + control.28 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -238,7 +248,7 @@ state.Tosa { name 'PCBeep Bypass Speaker Volume' value 0 } - control.28 { + control.29 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -247,16 +257,16 @@ state.Tosa { name 'PCBeep Bypass Phone Volume' value 0 } - control.29 { + control.30 { comment.access 'read write' comment.type INTEGER comment.count 1 comment.range '0 - 7' iface MIXER name 'Aux Playback Headphone Volume' - value 6 + value 5 } - control.30 { + control.31 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -265,7 +275,7 @@ state.Tosa { name 'Aux Playback Speaker Volume' value 0 } - control.31 { + control.32 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -274,7 +284,7 @@ state.Tosa { name 'Aux Playback Phone Volume' value 0 } - control.32 { + control.33 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -283,7 +293,7 @@ state.Tosa { name 'Phone Volume' value 0 } - control.33 { + control.34 { comment.access 'read write' comment.type INTEGER comment.count 2 @@ -293,7 +303,7 @@ state.Tosa { value.0 23 value.1 23 } - control.34 { + control.35 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -301,7 +311,7 @@ state.Tosa { name 'Capture 20dB Boost Switch' value true } - control.35 { + control.36 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -309,7 +319,7 @@ state.Tosa { name 'Capture to Phone 20dB Boost Switch' value true } - control.36 { + control.37 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -317,7 +327,7 @@ state.Tosa { name '3D Upper Cut-off Switch' value false } - control.37 { + control.38 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -325,7 +335,7 @@ state.Tosa { name '3D Lower Cut-off Switch' value false } - control.38 { + control.39 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -334,7 +344,7 @@ state.Tosa { name '3D Playback Volume' value 0 } - control.39 { + control.40 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -344,7 +354,7 @@ state.Tosa { name 'Bass Control' value 'Adaptive Boost' } - control.40 { + control.41 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -352,7 +362,7 @@ state.Tosa { name 'Bass Cut-off Switch' value true } - control.41 { + control.42 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -360,7 +370,7 @@ state.Tosa { name 'Tone Cut-off Switch' value false } - control.42 { + control.43 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -368,7 +378,7 @@ state.Tosa { name 'Playback Attenuate (-6dB) Switch' value false } - control.43 { + control.44 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -377,7 +387,7 @@ state.Tosa { name 'Bass Volume' value 8 } - control.44 { + control.45 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -386,7 +396,7 @@ state.Tosa { name 'Treble Volume' value 5 } - control.45 { + control.46 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -394,7 +404,7 @@ state.Tosa { name 'Capture ADC Switch' value false } - control.46 { + control.47 { comment.access 'read write' comment.type ENUMERATED comment.count 2 @@ -405,17 +415,17 @@ state.Tosa { value.0 '+0.75dB Steps' value.1 '+0.75dB Steps' } - control.47 { + control.48 { comment.access 'read write' comment.type INTEGER comment.count 2 comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 63 - value.1 63 + value.0 0 + value.1 0 } - control.48 { + control.49 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -423,7 +433,7 @@ state.Tosa { name 'Capture ZC Switch' value false } - control.49 { + control.50 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -432,7 +442,7 @@ state.Tosa { name 'Mic 1 Volume' value 23 } - control.50 { + control.51 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -441,7 +451,7 @@ state.Tosa { name 'Mic 2 Volume' value 23 } - control.51 { + control.52 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -449,7 +459,7 @@ state.Tosa { name 'Mic 20dB Boost Switch' value false } - control.52 { + control.53 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -457,7 +467,7 @@ state.Tosa { name 'Speaker Mixer PCBeep Bypass Swi' value false } - control.53 { + control.54 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -465,7 +475,7 @@ state.Tosa { name 'Speaker Mixer Aux Playback Swit' value false } - control.54 { + control.55 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -473,7 +483,7 @@ state.Tosa { name 'Speaker Mixer Phone Bypass Swit' value false } - control.55 { + control.56 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -481,7 +491,7 @@ state.Tosa { name 'Speaker Mixer Line Bypass Switc' value false } - control.56 { + control.57 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -489,7 +499,7 @@ state.Tosa { name 'Speaker Mixer PCM Playback Swit' value true } - control.57 { + control.58 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -497,7 +507,7 @@ state.Tosa { name 'Phone Mixer PCBeep Bypass Switc' value false } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -505,7 +515,7 @@ state.Tosa { name 'Phone Mixer Aux Playback Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -513,7 +523,7 @@ state.Tosa { name 'Phone Mixer Line Bypass Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -521,7 +531,7 @@ state.Tosa { name 'Phone Mixer PCM Playback Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -529,7 +539,7 @@ state.Tosa { name 'Phone Mixer Mic 1 Sidetone Swit' value false } - control.62 { + control.63 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -537,55 +547,103 @@ state.Tosa { name 'Phone Mixer Mic 2 Sidetone Swit' value false } - control.63 { + control.64 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer PCBeep Bypass Switch' + name 'Right HP Mixer PCBeep Bypass Sw' value false } - control.64 { + control.65 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Aux Playback Switch' + name 'Right HP Mixer Aux Playback Swi' value false } - control.65 { + control.66 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Phone Bypass Switch' + name 'Right HP Mixer Phone Bypass Swi' value false } - control.66 { + control.67 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Line Bypass Switch' + name 'Right HP Mixer Line Bypass Swit' value false } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer PCM Playback Switch' + name 'Right HP Mixer PCM Playback Swi' value true } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER - name 'HP Mixer Mic Sidetone Switch' + name 'Right HP Mixer Mic Sidetone Swi' value false } - control.69 { + control.70 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer PCBeep Bypass Swi' + value false + } + control.71 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Aux Playback Swit' + value false + } + control.72 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Phone Bypass Swit' + value false + } + control.73 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Line Bypass Switc' + value false + } + control.74 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer PCM Playback Swit' + value true + } + control.75 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left HP Mixer Mic Sidetone Swit' + value false + } + control.76 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -595,7 +653,7 @@ state.Tosa { name 'Differential Source' value Mic } - control.70 { + control.77 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -607,7 +665,7 @@ state.Tosa { name 'Mic Select Source' value Differential } - control.71 { + control.78 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -623,7 +681,7 @@ state.Tosa { name 'Right Capture Select' value Mic } - control.72 { + control.79 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -639,7 +697,7 @@ state.Tosa { name 'Left Capture Select' value Mic } - control.73 { + control.80 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -651,7 +709,7 @@ state.Tosa { name 'Capture Phone Mux' value Mute } - control.74 { + control.81 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -659,9 +717,9 @@ state.Tosa { comment.item.1 'Headphone Mix' iface MIXER name 'Speaker Mux' - value 'Headphone Mix' + value 'Speaker Mix' } - control.75 { + control.82 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -673,7 +731,7 @@ state.Tosa { name 'Out3 Mux' value Left } - control.76 { + control.83 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -685,7 +743,7 @@ state.Tosa { name 'ALC Sidetone Mux' value Stereo } - control.77 { + control.84 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -696,17 +754,16 @@ state.Tosa { comment.item.4 Off iface MIXER name 'Jack Function' - value Headphone + value Off } - control.78 { + control.85 { comment.access 'read write' comment.type ENUMERATED comment.count 1 - comment.item.0 Auto - comment.item.1 On - comment.item.2 Off + comment.item.0 On + comment.item.1 Off iface MIXER name 'Speaker Function' - value Auto + value On } } diff --git a/packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch b/packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch deleted file mode 100644 index 8830328eb5..0000000000 --- a/packages/fakeroot/fakeroot-native-1.8.3/configure-libtool.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- fakeroot-1.8.3/configure.ac.orig 2007-10-31 00:17:27.000000000 -0500 -+++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500 -@@ -1,14 +1,12 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot]) - AC_PREREQ(2.61) --LT_PREREQ(2.1a) - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE - AC_CONFIG_HEADERS([config.h]) - AC_PROG_MAKE_SET --LT_INIT --LT_LANG(C) -+AC_PROG_LIBTOOL - - AC_ARG_WITH([ipc], - AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@], diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb deleted file mode 100644 index 9d48d65229..0000000000 --- a/packages/fakeroot/fakeroot-native_1.2.13.bb +++ /dev/null @@ -1,20 +0,0 @@ -SECTION = "base" -PR = "r0" -require fakeroot_${PV}.bb -inherit native -RDEPENDS="util-linux-native" - -SRC_URI += "file://fix-prefix.patch;patch=1" -S = "${WORKDIR}/fakeroot-${PV}" - -EXTRA_OECONF = " --program-prefix=" - -# Compatability for the rare systems not using or having SYSV -python () { - if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': - bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) -} - -do_stage_append () { - oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ -} diff --git a/packages/fakeroot/fakeroot-native_1.7.1.bb b/packages/fakeroot/fakeroot-native_1.7.1.bb index 8b3d2a1590..8a54d6497c 100644 --- a/packages/fakeroot/fakeroot-native_1.7.1.bb +++ b/packages/fakeroot/fakeroot-native_1.7.1.bb @@ -1,7 +1,6 @@ -SECTION = "base" require fakeroot_${PV}.bb inherit native -RDEPENDS="util-linux-native" +RDEPENDS = "util-linux-native" SRC_URI += "file://fix-prefix.patch;patch=1 " S = "${WORKDIR}/fakeroot-${PV}" @@ -17,4 +16,3 @@ python () { do_stage_append () { oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ } - diff --git a/packages/fakeroot/fakeroot-native_1.8.3.bb b/packages/fakeroot/fakeroot-native_1.9.6.bb index 8b3d2a1590..77d6f58651 100644 --- a/packages/fakeroot/fakeroot-native_1.8.3.bb +++ b/packages/fakeroot/fakeroot-native_1.9.6.bb @@ -1,11 +1,12 @@ -SECTION = "base" require fakeroot_${PV}.bb -inherit native + RDEPENDS="util-linux-native" SRC_URI += "file://fix-prefix.patch;patch=1 " S = "${WORKDIR}/fakeroot-${PV}" +inherit native + EXTRA_OECONF = " --program-prefix=" # Compatability for the rare systems not using or having SYSV diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb deleted file mode 100644 index e29cf162b4..0000000000 --- a/packages/fakeroot/fakeroot_1.2.13.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Gives a fake root environment" -HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html" -SECTION = "base" -LICENSE = "GPL" -# fakeroot needs getopt which is provided by the util-linux package -RDEPENDS = "util-linux" -PR = "r1" - -SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz" - -inherit autotools - -do_stage() { - install -d ${STAGING_INCDIR}/fakeroot - install -m 644 *.h ${STAGING_INCDIR}/fakeroot - autotools_stage_all -} diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.7.1.bb index 803b5f3ff4..ea3806d2f5 100644 --- a/packages/fakeroot/fakeroot_1.7.1.bb +++ b/packages/fakeroot/fakeroot_1.7.1.bb @@ -5,8 +5,10 @@ LICENSE = "GPL" RDEPENDS = "util-linux" PR = "r2" -SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \ - file://work-with-older-libtool.patch;patch=1" +SRC_URI = "\ + ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz \ + file://work-with-older-libtool.patch;patch=1 \ +" inherit autotools diff --git a/packages/fakeroot/fakeroot_1.8.3.bb b/packages/fakeroot/fakeroot_1.9.6.bb index ef4d1ba55c..aaf696d79d 100644 --- a/packages/fakeroot/fakeroot_1.8.3.bb +++ b/packages/fakeroot/fakeroot_1.9.6.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Gives a fake root environment" +HOMEPAGE = "http://fakeroot.alioth.debian.org/" SECTION = "base" LICENSE = "GPL" # fakeroot needs getopt which is provided by the util-linux package RDEPENDS = "util-linux" PR = "r1" -SRC_URI = "ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ file://configure-libtool.patch;patch=1" inherit autotools diff --git a/packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch b/packages/fakeroot/files/configure-libtool.patch index 8830328eb5..8830328eb5 100644 --- a/packages/fakeroot/fakeroot-1.8.3/configure-libtool.patch +++ b/packages/fakeroot/files/configure-libtool.patch diff --git a/packages/git/files/git-gui-install-mode-arg-spaces.patch b/packages/git/files/git-gui-install-mode-arg-spaces.patch new file mode 100644 index 0000000000..10e4eb2e1c --- /dev/null +++ b/packages/git/files/git-gui-install-mode-arg-spaces.patch @@ -0,0 +1,32 @@ +--- git/git-gui/Makefile.orig 2007-12-26 17:16:42.000000000 +1030 ++++ git/git-gui/Makefile 2007-12-26 17:17:16.000000000 +1030 +@@ -31,11 +31,11 @@ + INSTALL = install + endif + +-INSTALL_D0 = $(INSTALL) -d -m755 # space is required here ++INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here + INSTALL_D1 = +-INSTALL_R0 = $(INSTALL) -m644 # space is required here ++INSTALL_R0 = $(INSTALL) -m 644 # space is required here + INSTALL_R1 = +-INSTALL_X0 = $(INSTALL) -m755 # space is required here ++INSTALL_X0 = $(INSTALL) -m 755 # space is required here + INSTALL_X1 = + INSTALL_L0 = rm -f # space is required here + INSTALL_L1 = && ln # space is required here +@@ -50,11 +50,11 @@ + QUIET_2DEVNULL = 2>/dev/null + + INSTALL_D0 = dir= +- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" ++ INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" + INSTALL_R0 = src= +- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src ++ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src + INSTALL_X0 = src= +- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src ++ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src + + INSTALL_L0 = dst= + INSTALL_L1 = && src= diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index ff68185bcc..eb6182055f 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.7+svnr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://etc/ld.so.conf \ file://generate-supported.mk" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 50fae44bf3..d847d28379 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -79,9 +79,6 @@ do_install() { mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED done rm -f ${D}/etc/rpc - rm -f ${D}${includedir}/scsi/sg.h - rm -f ${D}${includedir}/scsi/scsi_ioctl.h - rm -f ${D}${includedir}/scsi/scsi.h } TMP_LOCALE="/tmp/locale${libdir}/locale" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 2a3bfd26df..f0f582f10f 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r13" +PR = "r14" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index c44bf7dd15..d82c4fff77 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r23" +PR = "r24" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 9290c9b831..56c7a78ff8 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r12" +PR = "r13" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 829ef8f64e..89e36cdc42 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r8" +PR = "r9" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index b94025881e..ed3a8a6a6e 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r8" +PR = "r9" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index 0a3759b6d2..02acb99322 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r6" +PR = "r7" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 46fc230d29..fd4a200cdb 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 62cfd21cb9..a92830f10b 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r15" +PR = "r16" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 67446cad7d..85dfcb7f59 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r13" +PR = "r14" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index f50c85b1d0..bce629543b 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r9" +PR = "r10" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index d2816f83b1..210f6d937d 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r2" +PR = "r3" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 357196e5a7..1301712ebc 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r0" +PR = "r1" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 9dbea14876..d6377c8915 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r6" +PR = "r7" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/fakeroot/fakeroot-native-1.8.3/.mtn2git_empty b/packages/gmp/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/fakeroot/fakeroot-native-1.8.3/.mtn2git_empty +++ b/packages/gmp/files/.mtn2git_empty diff --git a/packages/gmp/gmp-4.1.4/sh4-asmfix.patch b/packages/gmp/files/sh4-asmfix.patch index 1a01f61533..1a01f61533 100644 --- a/packages/gmp/gmp-4.1.4/sh4-asmfix.patch +++ b/packages/gmp/files/sh4-asmfix.patch diff --git a/packages/gmp/gmp-4.2.1/x86-fat.diff b/packages/gmp/files/x86-fat.diff index 2a54622a26..2a54622a26 100644 --- a/packages/gmp/gmp-4.2.1/x86-fat.diff +++ b/packages/gmp/files/x86-fat.diff diff --git a/packages/gnuplot/gnuplot-4.2.0/.mtn2git_empty b/packages/gmp/gmp-4.2.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnuplot/gnuplot-4.2.0/.mtn2git_empty +++ b/packages/gmp/gmp-4.2.2/.mtn2git_empty diff --git a/packages/gmp/gmp-4.2.2/02_noexec-stack.diff b/packages/gmp/gmp-4.2.2/02_noexec-stack.diff new file mode 100644 index 0000000000..613589e347 --- /dev/null +++ b/packages/gmp/gmp-4.2.2/02_noexec-stack.diff @@ -0,0 +1,74 @@ +Index: acinclude.m4 +=================================================================== +RCS file: /cvsroot/pkg-gmp/gmp/acinclude.m4,v +retrieving revision 1.3 +diff -u -b -B -r1.3 acinclude.m4 +--- gmp-4.2.2.orig/acinclude.m4 14 Apr 2006 22:48:55 -0000 1.3 ++++ gmp-4.2.2/acinclude.m4 15 Apr 2006 06:11:48 -0000 +@@ -1613,6 +1613,34 @@ + ]) + + ++dnl Checks whether the stack can be marked nonexecutable by passing an option ++dnl to the C-compiler when acting on .s files. Appends that option to ASFLAGS. ++dnl This macro is adapted from one found in GLIBC-2.3.5. ++AC_DEFUN([CL_AS_NOEXECSTACK],[ ++dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else ++AC_CACHE_CHECK([whether assembler supports --noexecstack option], ++cl_cv_as_noexecstack, [dnl ++ cat > conftest.c <<EOF ++void foo() {} ++EOF ++ if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS ++ -S -o conftest.s conftest.c >/dev/null]) \ ++ && grep -q .note.GNU-stack conftest.s \ ++ && AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack ++ -c -o conftest.o conftest.s >/dev/null]) ++ then ++ cl_cv_as_noexecstack=yes ++ else ++ cl_cv_as_noexecstack=no ++ fi ++ rm -f conftest*]) ++ if test "$cl_cv_as_noexecstack" = yes; then ++ ASMFLAGS="$ASMFLAGS -Wa,--noexecstack" ++ fi ++ AC_SUBST(ASMFLAGS) ++]) ++ ++ + dnl GMP_ASM_LABEL_SUFFIX + dnl -------------------- + dnl : - is usual. +Index: configure.in +=================================================================== +RCS file: /cvsroot/pkg-gmp/gmp/configure.in,v +retrieving revision 1.3 +diff -u -b -B -r1.3 configure.in +--- gmp-4.2.2.orig/configure.in 14 Apr 2006 22:48:55 -0000 1.3 ++++ gmp-4.2.2/configure.in 15 Apr 2006 06:11:49 -0000 +@@ -2024,6 +2024,8 @@ + # Automake ansi2knr support. + AM_C_PROTOTYPES + ++CL_AS_NOEXECSTACK ++ + GMP_PROG_AR + GMP_PROG_NM + +Index: mpn/Makeasm.am +=================================================================== +RCS file: /cvsroot/pkg-gmp/gmp/mpn/Makeasm.am,v +retrieving revision 1.5 +diff -u -b -B -r1.5 Makeasm.am +--- gmp-4.2.2.orig/mpn/Makeasm.am 14 Apr 2006 22:48:59 -0000 1.5 ++++ gmp-4.2.2/mpn/Makeasm.am 15 Apr 2006 06:11:49 -0000 +@@ -24,7 +24,7 @@ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) + + # Flags used for preprocessing (in ansi2knr rules). + # diff --git a/packages/gmp/gmp-4.2.2/03_gnu89-inline.diff b/packages/gmp/gmp-4.2.2/03_gnu89-inline.diff new file mode 100644 index 0000000000..17e8915fbb --- /dev/null +++ b/packages/gmp/gmp-4.2.2/03_gnu89-inline.diff @@ -0,0 +1,23 @@ +Index: gmp-h.in +=================================================================== +RCS file: /cvsroot/pkg-gmp/gmp/gmp-h.in,v +retrieving revision 1.4 +diff -u -b -B -r1.4 gmp-h.in +--- gmp-4.2.2.orig/gmp-h.in 15 Sep 2007 23:05:28 -0000 1.4 ++++ gmp-4.2.2/gmp-h.in 9 Apr 2008 05:30:42 -0000 +@@ -418,9 +418,13 @@ + for an inline too, so as to correctly specify "dllimport" on windows, in + case the function is called rather than inlined. + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 +- inline semantics, unless -fgnu89-inline is used. */ ++ inline semantics, unless -fgnu89-inline is used. ++ ++ With GCC 4.2, `__GNUC_STDC_INLINE__' is never defined (because C99 inline ++ semantics are not supported), but a warning is issued in C99 mode if ++ `__gnu_inline__' is not used. */ + #ifdef __GNUC__ +-#ifdef __GNUC_STDC_INLINE__ ++#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) + #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) + #else + #define __GMP_EXTERN_INLINE extern __inline__ diff --git a/packages/gmp/gmp-4.2.2/amd64.patch b/packages/gmp/gmp-4.2.2/amd64.patch new file mode 100644 index 0000000000..67be9dd350 --- /dev/null +++ b/packages/gmp/gmp-4.2.2/amd64.patch @@ -0,0 +1,14 @@ +--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200 ++++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200 +@@ -738,8 +738,10 @@ + count is only an int. */ + #define count_trailing_zeros(count, x) \ + do { \ ++ UDItype __cbtmp; \ + ASSERT ((x) != 0); \ +- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ ++ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ ++ (count) = __cbtmp; \ + } while (0) + #endif /* x86_64 */ + diff --git a/packages/gmp/gmp-4.2.2/configure.patch b/packages/gmp/gmp-4.2.2/configure.patch new file mode 100644 index 0000000000..2a3b0e6fc1 --- /dev/null +++ b/packages/gmp/gmp-4.2.2/configure.patch @@ -0,0 +1,207 @@ + acinclude.m4 | 26 ++++++++++++++------------ + configure.in | 24 +++++++++--------------- + 2 files changed, 23 insertions(+), 27 deletions(-) + +Index: gmp-4.2.2/acinclude.m4 +=================================================================== +--- gmp-4.2.2.orig/acinclude.m4 2008-05-01 11:07:43.000000000 +0200 ++++ gmp-4.2.2/acinclude.m4 2008-05-01 11:07:48.000000000 +0200 +@@ -30,20 +30,20 @@ + dnl conftest.exe - various DOS compilers + + +-define(IA64_PATTERN, ++define([IA64_PATTERN], + [[ia64*-*-* | itanium-*-* | itanium2-*-*]]) + + dnl Need to be careful not to match m6811, m6812, m68hc11 and m68hc12, all + dnl of which config.sub accepts. (Though none of which are likely to work + dnl with GMP.) + dnl +-define(M68K_PATTERN, ++define([M68K_PATTERN], + [[m68k-*-* | m68[0-9][0-9][0-9]-*-*]]) + +-define(POWERPC64_PATTERN, ++define([POWERPC64_PATTERN], + [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-* | powerpc970-*-* | power[3-9]-*-*]]) + +-define(X86_PATTERN, ++define([X86_PATTERN], + [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]]) + + +@@ -62,7 +62,7 @@ + dnl x86/k6 -> k6 + dnl x86/k6/mmx -> k6_mmx + +-define(GMP_FAT_SUFFIX, ++define([GMP_FAT_SUFFIX], + [[$1=`echo $2 | sed -e '/\//s:^[^/]*/::' -e 's:[\\/]:_:g'`]]) + + +@@ -71,7 +71,7 @@ + dnl Emit code to remove any occurance of ITEM from $LISTVAR. ITEM can be a + dnl shell expression like $foo if desired. + +-define(GMP_REMOVE_FROM_LIST, ++define([GMP_REMOVE_FROM_LIST], + [remove_from_list_tmp= + for remove_from_list_i in $[][$1]; do + if test $remove_from_list_i = [$2]; then :; +@@ -87,12 +87,12 @@ + dnl ---------------------- + dnl Strip entries subdir from $path and $fat_path. + +-define(GMP_STRIP_PATH, ++define([GMP_STRIP_PATH], + [GMP_STRIP_PATH_VAR(path, [$1]) + GMP_STRIP_PATH_VAR(fat_path, [$1]) + ]) + +-define(GMP_STRIP_PATH_VAR, ++define([GMP_STRIP_PATH_VAR], + [tmp_path= + for i in $[][$1]; do + case $i in +@@ -113,7 +113,7 @@ + dnl Dummy values for __GMP_BITS_PER_MP_LIMB and GMP_LIMB_BITS are enough + dnl for all current configure-time uses of gmp.h. + +-define(GMP_INCLUDE_GMP_H, ++define([GMP_INCLUDE_GMP_H], + [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS + #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */ +@@ -129,7 +129,7 @@ + dnl FILE. The regexps here aren't very rugged, but are enough for gmp. + dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. + +-define(GMP_HEADER_GETVAL, ++define([GMP_HEADER_GETVAL], + [patsubst(patsubst( + esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), + [^.*$1[ ]+],[]), +@@ -143,7 +143,7 @@ + dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits + dnl like 3.0.1 if patchlevel > 0. + +-define(GMP_VERSION, ++define([GMP_VERSION], + [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl + .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl + ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1, +@@ -1489,7 +1489,9 @@ + echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4 + + # All CPUs use asm-defs.m4 +-echo ["include][(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i ++echo -n ["include("] >>$gmp_tmpconfigm4i ++echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i ++echo [")"] >>$gmp_tmpconfigm4i + ]) + + +Index: gmp-4.2.2/configure.in +=================================================================== +--- gmp-4.2.2.orig/configure.in 2008-05-01 11:07:43.000000000 +0200 ++++ gmp-4.2.2/configure.in 2008-05-01 11:07:48.000000000 +0200 +@@ -29,12 +29,6 @@ + AC_PREREQ(2.59) + AC_INIT(GNU MP, GMP_VERSION, gmp-bugs@swox.com, gmp) + AC_CONFIG_SRCDIR(gmp-impl.h) +-m4_pattern_forbid([^[ \t]*GMP_]) +-m4_pattern_allow(GMP_LDFLAGS) +-m4_pattern_allow(GMP_LIMB_BITS) +-m4_pattern_allow(GMP_MPARAM_H_SUGGEST) +-m4_pattern_allow(GMP_NAIL_BITS) +-m4_pattern_allow(GMP_NUMB_BITS) + + # If --target is not used then $target_alias is empty, but if say + # "./configure athlon-pc-freebsd3.5" is used, then all three of +@@ -275,7 +269,7 @@ + # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is + # called. User selections of CC etc are respected. + # +-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP ++# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP + # pre-testing, since they of course depend on AC_PROG_CC, and also some of + # them cache their results, which is not wanted. + # +@@ -367,7 +361,7 @@ + # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring + # c89 over cc here. But note that on HP-UX c89 provides a castrated + # environment, and would want to be excluded somehow. Maybe +-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and ++# already does enough to stick cc into ANSI mode and + # we don't need to worry. + # + cclist="gcc cc" +@@ -1518,7 +1512,7 @@ + CFLAGS_or_unset=${CFLAGS-'(unset)'} + CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} + +-cat >&AC_FD_CC <<EOF ++cat >&AS_MESSAGE_LOG_FD() <<EOF + User: + ABI=$ABI + CC=$CC +@@ -1889,7 +1883,6 @@ + + # The C compiler and preprocessor, put into ANSI mode if possible. + AC_PROG_CC +-AC_PROG_CC_STDC + AC_PROG_CPP + GMP_H_ANSI + +@@ -1912,11 +1905,11 @@ + + # The C++ compiler, if desired. + want_cxx=no ++AC_PROG_CXX + if test $enable_cxx != no; then + test_CXXFLAGS=${CXXFLAGS+set} +- AC_PROG_CXX + +- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC ++ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() + cxxflags_ac_prog_cxx=$CXXFLAGS + cxxflags_list=ac_prog_cxx + +@@ -2022,7 +2015,7 @@ + esac + + +-cat >&AC_FD_CC <<EOF ++cat >&AS_MESSAGE_LOG_FD() <<EOF + Decided: + ABI=$ABI + CC=$CC +@@ -3199,7 +3192,7 @@ + # FIXME: Upcoming version of autoconf/automake may not like broken lines. + # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. + +-AC_OUTPUT(Makefile \ ++AC_CONFIG_FILES([Makefile \ + mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \ + mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \ + tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \ +@@ -3208,4 +3201,5 @@ + tests/cxx/Makefile \ + doc/Makefile tune/Makefile \ + demos/Makefile demos/calc/Makefile demos/expr/Makefile \ +- gmp.h:gmp-h.in mp.h:mp-h.in) ++ gmp.h:gmp-h.in mp.h:mp-h.in]) ++AC_OUTPUT +Index: gmp-4.2.2/gmp-h.in +=================================================================== +--- gmp-4.2.2.orig/gmp-h.in 2007-09-03 18:05:40.000000000 +0200 ++++ gmp-4.2.2/gmp-h.in 2008-05-01 11:10:42.000000000 +0200 +@@ -516,6 +516,7 @@ + + #if defined (__cplusplus) + extern "C" { ++#include <cstdio> + #ifdef _GMP_H_HAVE_FILE + using std::FILE; + #endif diff --git a/packages/gmp/gmp-4.2.2/mpf_set_str_c.diff b/packages/gmp/gmp-4.2.2/mpf_set_str_c.diff new file mode 100644 index 0000000000..1924611640 --- /dev/null +++ b/packages/gmp/gmp-4.2.2/mpf_set_str_c.diff @@ -0,0 +1,38 @@ +*** gmp-4.2.2.orig/mpf/set_str.c 30 Aug 2007 18:19:41 -0000 +--- gmp-4.2.2/mpf/set_str.c 10 Dec 2007 04:47:18 -0000 +*************** mpf_set_str (mpf_ptr x, const char *str, +*** 272,277 **** + + if (expptr != 0) +! /* FIXME: Should do some error checking here. */ +! exp_in_base = strtol (expptr, (char **) 0, exp_base); + else + exp_in_base = 0; +--- 272,298 ---- + + if (expptr != 0) +! { +! /* Scan and convert the exponent, in base exp_base. */ +! long dig, neg = -(long) ('-' == expptr[0]); +! expptr -= neg; /* conditional increment */ +! c = (unsigned char) *expptr++; +! dig = digit_value[c]; +! if (dig >= exp_base) +! { +! TMP_FREE; +! return -1; +! } +! exp_in_base = dig; +! c = (unsigned char) *expptr++; +! dig = digit_value[c]; +! while (dig < exp_base) +! { +! exp_in_base = exp_in_base * exp_base; +! exp_in_base += dig; +! c = (unsigned char) *expptr++; +! dig = digit_value[c]; +! } +! exp_in_base = (exp_in_base ^ neg) - neg; /* conditional negation */ +! } + else + exp_in_base = 0; diff --git a/packages/gmp/gmp-4.2.2/sh4-asmfix.patch b/packages/gmp/gmp-4.2.2/sh4-asmfix.patch new file mode 100644 index 0000000000..1a01f61533 --- /dev/null +++ b/packages/gmp/gmp-4.2.2/sh4-asmfix.patch @@ -0,0 +1,26 @@ +--- gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:44:00 1.1 ++++ gmp-4.1.4/mpn/sh/add_n.s 2005/11/17 08:18:57 +@@ -29,8 +29,8 @@ + + .text + .align 2 +- .global ___gmpn_add_n +-___gmpn_add_n: ++ .global __gmpn_add_n ++__gmpn_add_n: + mov #0,r3 ! clear cy save reg + + Loop: mov.l @r5+,r1 +--- gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:44:04 1.1 ++++ gmp-4.1.4/mpn/sh/sub_n.s 2005/11/17 08:18:59 +@@ -29,8 +29,8 @@ + + .text + .align 2 +- .global ___gmpn_sub_n +-___gmpn_sub_n: ++ .global __gmpn_sub_n ++__gmpn_sub_n: + mov #0,r3 ! clear cy save reg + + Loop: mov.l @r5+,r1 diff --git a/packages/gmp/gmp-4.2.2/x86-fat.diff b/packages/gmp/gmp-4.2.2/x86-fat.diff new file mode 100644 index 0000000000..2a54622a26 --- /dev/null +++ b/packages/gmp/gmp-4.2.2/x86-fat.diff @@ -0,0 +1,122 @@ +See: + + http://gmplib.org/patches/x86-fat.diff + http://gmplib.org/list-archives/gmp-bugs/2006-October/000579.html + http://gmplib.org/#BUGREPORTS + +Removed the configure part of the patch since we patch configure.in. It was +only needed for FAT binaries anyway and this is being included to fix +linking errors. + +Index: mpn/generic/addsub_n.c +=================================================================== +RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -p -2 -r1.1 -r1.2 +*** mpn/generic/addsub_n.c 14 Mar 2006 15:57:54 -0000 1.1 +--- mpn/generic/addsub_n.c 15 May 2006 22:38:42 -0000 1.2 +*************** +*** 1,5 **** + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +--- 1,5 ---- + /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length. + +! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 59,63 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 59,63 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 65,69 **** + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 65,69 ---- + acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 82,86 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 82,86 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 88,92 **** + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +--- 88,92 ---- + scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo); + #endif +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 98,102 **** + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +--- 98,102 ---- + else + { +! /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa) + Need temporary storage. */ + mp_limb_t tp[PART_SIZE]; +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 106,110 **** + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +--- 106,110 ---- + { + this_n = MIN (n - off, PART_SIZE); +! #if HAVE_NATIVE_mpn_add_nc + acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo); + #else +*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp +*** 112,116 **** + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else +--- 112,116 ---- + acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo); + #endif +! #if HAVE_NATIVE_mpn_sub_nc + scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo); + #else diff --git a/packages/gmp/gmp-native_4.2.2.bb b/packages/gmp/gmp-native_4.2.2.bb new file mode 100644 index 0000000000..af85db61f2 --- /dev/null +++ b/packages/gmp/gmp-native_4.2.2.bb @@ -0,0 +1,2 @@ +PV = "4.2.2" +require gmp-native.inc diff --git a/packages/gmp/gmp_4.2.2.bb b/packages/gmp/gmp_4.2.2.bb new file mode 100644 index 0000000000..295237f0f3 --- /dev/null +++ b/packages/gmp/gmp_4.2.2.bb @@ -0,0 +1,8 @@ +PR = "r1" + +SRC_URI_append += "file://02_noexec-stack.diff;patch=1 \ + file://03_gnu89-inline.diff;patch=1 \ + file://mpf_set_str_c.diff;patch=1 \ + file://sh4-asmfix.patch;patch=1 \ + " +require gmp.inc diff --git a/packages/gnuplot/files/subdirs.patch b/packages/gnuplot/files/subdirs.patch index 69c7753973..8c7d1f0d35 100644 --- a/packages/gnuplot/files/subdirs.patch +++ b/packages/gnuplot/files/subdirs.patch @@ -1,16 +1,11 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- gnuplot-4.0.0/Makefile.am~nodocs -+++ gnuplot-4.0.0/Makefile.am +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign 1.2h --SUBDIRS = config m4 term src docs lisp man demo tutorial -+SUBDIRS = config m4 term src man tutorial +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/packages/gnuplot/files/term.patch b/packages/gnuplot/files/term.patch index 2979b5ec9e..41aa8e7a97 100644 --- a/packages/gnuplot/files/term.patch +++ b/packages/gnuplot/files/term.patch @@ -1,14 +1,14 @@ ---- gnuplot-4.0.0/src/term.h.old 2005-03-01 15:17:46.424111687 +0000 -+++ gnuplot-4.0.0/src/term.h 2005-03-01 15:18:50.961405665 +0000 -@@ -54,6 +54,7 @@ +--- gnuplot-4.2.0/src/term.h.old 2007-11-16 01:21:09.000000000 -0600 ++++ gnuplot-4.2.0/src/term.h 2007-11-16 01:22:45.000000000 -0600 +@@ -70,6 +70,7 @@ */ #ifdef SHORT_TERMLIST # include "dumb.trm" /* dumb terminal */ +# include "qtopia.trm" /* QTopia terminal */ - # include "post.trm" /* postscript */ - # include "table.trm" /* built-in, but used for the documentation */ - # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA)) -@@ -432,6 +433,9 @@ + + # ifdef GP_ENH_EST + # include "estimate.trm" /* used for enhanced text processing */ +@@ -436,6 +437,9 @@ /* TeXDraw drawing package for LaTeX */ #include "texdraw.trm" diff --git a/packages/qemu/files/.mtn2git_empty b/packages/gnuplot/gnuplot-4.0.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qemu/files/.mtn2git_empty +++ b/packages/gnuplot/gnuplot-4.0.0/.mtn2git_empty diff --git a/packages/gnuplot/files/debian-separate-x11-package.patch b/packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch index 7afa0ee00e..7afa0ee00e 100644 --- a/packages/gnuplot/files/debian-separate-x11-package.patch +++ b/packages/gnuplot/gnuplot-4.0.0/debian-separate-x11-package.patch diff --git a/packages/gnuplot/files/matrix.patch b/packages/gnuplot/gnuplot-4.0.0/matrix.patch index 10f56d9f6a..10f56d9f6a 100644 --- a/packages/gnuplot/files/matrix.patch +++ b/packages/gnuplot/gnuplot-4.0.0/matrix.patch diff --git a/packages/gnuplot/gnuplot-4.2.0/subdirs.patch b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch index 8c7d1f0d35..69c7753973 100644 --- a/packages/gnuplot/gnuplot-4.2.0/subdirs.patch +++ b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch @@ -1,11 +1,16 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- gnuplot-4.0.0/Makefile.am~nodocs ++++ gnuplot-4.0.0/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = foreign 1.2h --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share +-SUBDIRS = config m4 term src docs lisp man demo tutorial ++SUBDIRS = config m4 term src man tutorial EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/packages/gnuplot/gnuplot-4.0.0/term.patch b/packages/gnuplot/gnuplot-4.0.0/term.patch new file mode 100644 index 0000000000..2979b5ec9e --- /dev/null +++ b/packages/gnuplot/gnuplot-4.0.0/term.patch @@ -0,0 +1,20 @@ +--- gnuplot-4.0.0/src/term.h.old 2005-03-01 15:17:46.424111687 +0000 ++++ gnuplot-4.0.0/src/term.h 2005-03-01 15:18:50.961405665 +0000 +@@ -54,6 +54,7 @@ + */ + #ifdef SHORT_TERMLIST + # include "dumb.trm" /* dumb terminal */ ++# include "qtopia.trm" /* QTopia terminal */ + # include "post.trm" /* postscript */ + # include "table.trm" /* built-in, but used for the documentation */ + # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA)) +@@ -432,6 +433,9 @@ + /* TeXDraw drawing package for LaTeX */ + #include "texdraw.trm" + ++/* Qtopia */ ++#include "qtopia.trm" ++ + /* METAFONT */ + #include "metafont.trm" + diff --git a/packages/gnuplot/gnuplot-4.2.0/term.patch b/packages/gnuplot/gnuplot-4.2.0/term.patch deleted file mode 100644 index 41aa8e7a97..0000000000 --- a/packages/gnuplot/gnuplot-4.2.0/term.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gnuplot-4.2.0/src/term.h.old 2007-11-16 01:21:09.000000000 -0600 -+++ gnuplot-4.2.0/src/term.h 2007-11-16 01:22:45.000000000 -0600 -@@ -70,6 +70,7 @@ - */ - #ifdef SHORT_TERMLIST - # include "dumb.trm" /* dumb terminal */ -+# include "qtopia.trm" /* QTopia terminal */ - - # ifdef GP_ENH_EST - # include "estimate.trm" /* used for enhanced text processing */ -@@ -436,6 +437,9 @@ - /* TeXDraw drawing package for LaTeX */ - #include "texdraw.trm" - -+/* Qtopia */ -+#include "qtopia.trm" -+ - /* METAFONT */ - #include "metafont.trm" - diff --git a/packages/gnuplot/gnuplot.inc b/packages/gnuplot/gnuplot.inc index 9f1eebf003..bf442527af 100644 --- a/packages/gnuplot/gnuplot.inc +++ b/packages/gnuplot/gnuplot.inc @@ -4,18 +4,16 @@ HOMEPAGE = "http://www.gnuplot.info/" SECTION = "console/scientific" LICENSE = "BSD-4" PRIORITY = "optional" -DEPENDS = "pango cairo virtual/libx11 libpng gd readline" +DEPENDS = "virtual/libx11 readline" inherit autotools acpaths = "" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-plot \ - --with-png=${STAGING_LIBDIR}/.. \ - --with-gd=${STAGING_LIBDIR}/.. \ --without-lisp-files \ - --without-tutorial" + --without-tutorial \ + --disable-wxwidgets" do_compile_prepend() { install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index 6e1be52173..abf519ae6e 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -1,6 +1,6 @@ require gnuplot.inc -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ file://subdirs.patch;patch=1 \ diff --git a/packages/gnuplot/gnuplot_4.2.0.bb b/packages/gnuplot/gnuplot_4.2.3.bb index 1df0c9fa21..478f6e2b0f 100644 --- a/packages/gnuplot/gnuplot_4.2.0.bb +++ b/packages/gnuplot/gnuplot_4.2.3.bb @@ -1,6 +1,6 @@ require gnuplot.inc -PR = "r1" +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \ diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb new file mode 100644 index 0000000000..ff3e9b3810 --- /dev/null +++ b/packages/gnuplot/gnuplot_cvs.bb @@ -0,0 +1,19 @@ +require gnuplot.inc + +PV = "4.3.0+cvs${SRCDATE}" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \ + file://subdirs.patch;patch=1 \ + file://term.patch;patch=1 \ + file://gnuplot.desktop \ + file://gnuplot.png" + +S = "${WORKDIR}/${PN}" + +do_configure_prepend() { + ./prepare +} diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb index 80b3e4a603..cc57260f49 100644 --- a/packages/gnuplot/qtplot_0.2.bb +++ b/packages/gnuplot/qtplot_0.2.bb @@ -1,14 +1,14 @@ DESCRIPTION = "QT Gnuplot is a front end for Gnuplot. Install Opie-Embedded \ console to enable the Launch Gnuplot menu option." +HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html" SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -PRIORITY = "optional" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gnuplot" +RDEPDENDS_${PN} = "gnuplot" -DEPENDS = "gnuplot" -RDEPDENDS = "gnuplot" +PR = "r1" -HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html" SRC_URI = "http://www.mneuroth.de/privat/zaurus/qtplot-${PV}.tar.gz" APPTYPE = "binary" diff --git a/packages/gob2/gob2_2.0.14.bb b/packages/gob2/gob2_2.0.14.bb index 89f64d00e0..eca8d13795 100644 --- a/packages/gob2/gob2_2.0.14.bb +++ b/packages/gob2/gob2_2.0.14.bb @@ -3,7 +3,7 @@ DESCRIPTION = "A library to make creating GObjects easier" HOMEPAGE = "http://www.5z.com/jirka/gob.html" SECTION = "libs" DEPENDS = "gtk+ bison flex" -SRC_URI = "http://ftp.5z.com/pub/gob/gob2-${PV}.tar.gz" +SRC_URI = "http://ftp.5z.com/pub/gob/old/gob2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/keymaps/files/tosa/keymap-2.6.map b/packages/keymaps/files/tosa/keymap-2.6.map index f83e4bfe39..8533612121 100644 --- a/packages/keymaps/files/tosa/keymap-2.6.map +++ b/packages/keymaps/files/tosa/keymap-2.6.map @@ -1,297 +1,123 @@ # Default kernel keymap. This uses 7 modifier combinations. keymaps 0-2,4-5,8,12 +# Change the above line into +# keymaps 0-2,4-6,8,12 +# in case you want the entries +# altgr control keycode 83 = Boot +# altgr control keycode 111 = Boot +# below. # -keycode 1 = Escape Escape -# alt keycode 1 = Meta_Escape -#keycode 2 = one exclam -# alt keycode 2 = Meta_one -#keycode 3 = two at at -# control keycode 3 = nul -# shift control keycode 3 = nul -# alt keycode 3 = Meta_two -#keycode 4 = three numbersign -# control keycode 4 = Escape -# alt keycode 4 = Meta_three -#keycode 5 = four dollar dollar -# control keycode 5 = Control_backslash -# alt keycode 5 = Meta_four -#keycode 6 = five percent -# control keycode 6 = Control_bracketright -# alt keycode 6 = Meta_five -#keycode 7 = six asciicircum -# control keycode 7 = Control_asciicircum -# alt keycode 7 = Meta_six -#keycode 8 = seven ampersand braceleft -# control keycode 8 = Control_underscore -# alt keycode 8 = Meta_seven -#keycode 9 = eight asterisk bracketleft -# control keycode 9 = Delete -# alt keycode 9 = Meta_eight -#keycode 10 = nine parenleft bracketright -# alt keycode 10 = Meta_nine -#keycode 11 = zero parenright braceright -# alt keycode 11 = Meta_zero -#keycode 12 = minus underscore backslash -# control keycode 12 = Control_underscore -# shift control keycode 12 = Control_underscore -# alt keycode 12 = Meta_minus -#keycode 13 = equal plus -# alt keycode 13 = Meta_equal -keycode 14 = BackSpace BackSpace - altgr keycode 14 = Delete -#keycode 14 = Delete Delete -# control keycode 14 = BackSpace -# alt keycode 14 = Meta_Delete -keycode 15 = Tab Tab - altgr keycode 15 = Caps_Lock -keycode 16 = q - altgr keycode 16 = one -keycode 17 = w - altgr keycode 17 = two -keycode 18 = e - altgr keycode 18 = three -# altgr keycode 18 = Hex_E -keycode 19 = r - altgr keycode 19 = four -keycode 20 = t - altgr keycode 20 = five -keycode 21 = y - altgr keycode 21 = six -keycode 22 = u - altgr keycode 22 = seven -keycode 23 = i - altgr keycode 23 = eight -keycode 24 = o - altgr keycode 24 = nine -keycode 25 = p - altgr keycode 25 = zero -#keycode 26 = bracketleft braceleft -# control keycode 26 = Escape -# alt keycode 26 = Meta_bracketleft -#keycode 27 = bracketright braceright asciitilde -# control keycode 27 = Control_bracketright -# alt keycode 27 = Meta_bracketright -keycode 28 = Return - altgr keycode 28 = greater -# alt keycode 28 = Meta_Control_m -keycode 29 = Control -keycode 30 = a - altgr keycode 30 = exclam -# altgr keycode 30 = Hex_A -keycode 31 = s - altgr keycode 31 = at -keycode 32 = d - altgr keycode 32 = numbersign -# altgr keycode 32 = Hex_D -keycode 33 = f - altgr keycode 33 = dollar -# altgr keycode 33 = Hex_F -keycode 34 = g - altgr keycode 34 = percent -keycode 35 = h - altgr keycode 35 = underscore -keycode 36 = j - altgr keycode 36 = ampersand -keycode 37 = k - altgr keycode 37 = asterisk -keycode 38 = l - altgr keycode 38 = parenleft -#keycode 39 = semicolon colon -# alt keycode 39 = Meta_semicolon -keycode 40 = apostrophe quotedbl - altgr keycode 40 = asciitilde -# control keycode 40 = Control_g -# alt keycode 40 = Meta_apostrophe -#keycode 41 = grave asciitilde -# control keycode 41 = nul -# alt keycode 41 = Meta_grave -keycode 42 = Shift -#keycode 43 = backslash bar -# control keycode 43 = Control_backslash -# alt keycode 43 = Meta_backslash -keycode 44 = z -## alt keycode 44 = -keycode 45 = x - altgr keycode 45 = Control_x -keycode 46 = c - altgr keycode 46 = Control_c -# altgr keycode 46 = Hex_C -keycode 47 = v - altgr keycode 47 = Control_v -keycode 48 = b - altgr keycode 48 = minus -# altgr keycode 48 = Hex_B -keycode 49 = n - altgr keycode 49 = plus -keycode 50 = m - altgr keycode 50 = equal -keycode 51 = comma semicolon - altgr keycode 51 = parenright -#keycode 51 = comma less -# alt keycode 51 = Meta_comma -keycode 52 = period colon - control keycode 52 = Compose - altgr keycode 52 = less -#keycode 52 = period greater -# control keycode 52 = Compose -# alt keycode 52 = Meta_period -keycode 53 = slash question - altgr keycode 53 = Num_Lock -# control keycode 53 = Delete -# alt keycode 53 = Meta_slash -keycode 54 = Shift -#keycode 55 = KP_Multiply -#keycode 56 = Alt -keycode 57 = space space - altgr keycode 57 = bar -# control keycode 57 = nul -# alt keycode 57 = Meta_space -#keycode 58 = Caps_Lock -#keycode 59 = F1 F11 Console_13 -# control keycode 59 = F1 -# alt keycode 59 = Console_1 -# control alt keycode 59 = Console_1 -#keycode 60 = F2 F12 Console_14 -# control keycode 60 = F2 -# alt keycode 60 = Console_2 -# control alt keycode 60 = Console_2 -#keycode 61 = F3 F13 Console_15 -# control keycode 61 = F3 -# alt keycode 61 = Console_3 -# control alt keycode 61 = Console_3 -#keycode 62 = F4 F14 Console_16 -# control keycode 62 = F4 -# alt keycode 62 = Console_4 -# control alt keycode 62 = Console_4 -#keycode 63 = F5 F15 Console_17 -# control keycode 63 = F5 -# alt keycode 63 = Console_5 -# control alt keycode 63 = Console_5 -#keycode 64 = F6 F16 Console_18 -# control keycode 64 = F6 -# alt keycode 64 = Console_6 -# control alt keycode 64 = Console_6 -#keycode 65 = F7 F17 Console_19 -# control keycode 65 = F7 -# alt keycode 65 = Console_7 -# control alt keycode 65 = Console_7 -#keycode 66 = F8 F18 Console_20 -# control keycode 66 = F8 -# alt keycode 66 = Console_8 -# control alt keycode 66 = Console_8 -#keycode 67 = F9 F19 Console_21 -# control keycode 67 = F9 -# alt keycode 67 = Console_9 -# control alt keycode 67 = Console_9 -#keycode 68 = F10 F20 Console_22 -# control keycode 68 = F10 -# alt keycode 68 = Console_10 -# control alt keycode 68 = Console_10 -#keycode 69 = Num_Lock -# shift keycode 69 = Bare_Num_Lock -#keycode 70 = Scroll_Lock Show_Memory Show_Registers -# control keycode 70 = Show_State -# alt keycode 70 = Scroll_Lock -#keycode 71 = KP_7 -# alt keycode 71 = Ascii_7 -# altgr keycode 71 = Hex_7 -#keycode 72 = KP_8 -# alt keycode 72 = Ascii_8 -# altgr keycode 72 = Hex_8 -#keycode 73 = KP_9 -# alt keycode 73 = Ascii_9 -# altgr keycode 73 = Hex_9 -#keycode 74 = KP_Subtract -#keycode 75 = KP_4 -# alt keycode 75 = Ascii_4 -# altgr keycode 75 = Hex_4 -#keycode 76 = KP_5 -# alt keycode 76 = Ascii_5 -# altgr keycode 76 = Hex_5 -#keycode 77 = KP_6 -# alt keycode 77 = Ascii_6 -# altgr keycode 77 = Hex_6 -#keycode 78 = KP_Add -#keycode 79 = KP_1 -# alt keycode 79 = Ascii_1 -# altgr keycode 79 = Hex_1 -#keycode 80 = KP_2 -# alt keycode 80 = Ascii_2 -# altgr keycode 80 = Hex_2 -#keycode 81 = KP_3 -# alt keycode 81 = Ascii_3 -# altgr keycode 81 = Hex_3 -#keycode 82 = KP_0 -# alt keycode 82 = Ascii_0 -# altgr keycode 82 = Hex_0 -#keycode 83 = KP_Period -## altgr control keycode 83 = Boot -# control alt keycode 83 = Boot -#keycode 84 = Last_Console -#keycode 85 = -#keycode 86 = less greater bar -# alt keycode 86 = Meta_less -#keycode 87 = F11 F11 Console_23 -# control keycode 87 = F11 -# alt keycode 87 = Console_11 -# control alt keycode 87 = Console_11 -#keycode 88 = F12 F12 Console_24 -# control keycode 88 = F12 -# alt keycode 88 = Console_12 -# control alt keycode 88 = Console_12 -#keycode 89 = -#keycode 90 = -keycode 91 = space -#keycode 91 = -keycode 92 = Return -#keycode 92 = -#keycode 93 = -#keycode 94 = -#keycode 95 = -#keycode 96 = KP_Enter -#keycode 97 = Control -#keycode 98 = KP_Divide -#keycode 99 = Control_backslash -# control keycode 99 = Control_backslash -# alt keycode 99 = Control_backslash -keycode 100 = AltGr -#keycode 101 = Break -#keycode 102 = Find -keycode 103 = Up - altgr keycode 103 = Prior - shift keycode 104 = Scroll_Backward -#keycode 104 = Prior -# shift keycode 104 = Scroll_Backward -keycode 105 = Left - altgr keycode 105 = Decr_Console -keycode 106 = Right - altgr keycode 106 = Incr_Console -#keycode 107 = Select -keycode 108 = Down - altgr keycode 108 = Next - shift keycode 108 = Scroll_Forward -#keycode 109 = Next -# shift keycode 109 = Scroll_Forward -#keycode 110 = Insert -#keycode 111 = Remove -## altgr control keycode 111 = Boot -# control alt keycode 111 = Boot -#keycode 112 = Macro -#keycode 113 = F13 -#keycode 114 = F14 -#keycode 115 = Help -#keycode 116 = Do -#keycode 117 = F17 -#keycode 118 = KP_MinPlus -#keycode 119 = Pause -#keycode 120 = -#keycode 121 = -#keycode 122 = -#keycode 123 = -#keycode 124 = -#keycode 125 = -#keycode 126 = -#keycode 127 = +keycode 1 = +keycode 14 = BackSpace + altgr keycode 14 = Delete +keycode 15 = Tab + altgr keycode 15 = Caps_Lock +keycode 16 = q + altgr keycode 16 = one +keycode 17 = w + altgr keycode 17 = two +keycode 18 = e + altgr keycode 18 = three +keycode 19 = r + altgr keycode 19 = four +keycode 20 = t + altgr keycode 20 = five +keycode 21 = y + altgr keycode 21 = six +keycode 22 = u + altgr keycode 22 = seven +keycode 23 = i + altgr keycode 23 = eight +keycode 24 = o + altgr keycode 24 = nine +keycode 25 = p + altgr keycode 25 = zero +keycode 26 = +keycode 27 = +keycode 28 = Return + altgr keycode 28 = greater +keycode 29 = Control +keycode 30 = a + altgr keycode 30 = exclam +keycode 31 = s + altgr keycode 31 = at +keycode 32 = d + altgr keycode 32 = numbersign +keycode 33 = f + altgr keycode 33 = dollar +keycode 34 = g + altgr keycode 34 = percent +keycode 35 = h + altgr keycode 35 = underscore +keycode 36 = j + altgr keycode 36 = ampersand +keycode 37 = k + altgr keycode 37 = asterisk +keycode 38 = l + altgr keycode 38 = parenleft +keycode 39 = +keycode 40 = apostrophe quotedbl + altgr keycode 40 = asciitilde +keycode 41 = +keycode 42 = Shift +keycode 43 = +keycode 44 = z + altgr keycode 44 = backslash +keycode 45 = x +keycode 46 = c + altgr keycode 46 = Control_c +keycode 47 = v + altgr keycode 47 = Control_v +keycode 48 = b + altgr keycode 48 = minus +keycode 49 = n + altgr keycode 49 = plus +keycode 50 = m + altgr keycode 50 = equal +keycode 51 = comma semicolon + altgr keycode 51 = parenright +keycode 52 = period colon + altgr keycode 52 = less + control keycode 52 = Compose +keycode 53 = slash question + altgr keycode 53 = Num_Lock +keycode 54 = Shift +keycode 55 = +keycode 56 = Alt +keycode 57 = space space + altgr keycode 57 = bar +keycode 58 = +keycode 59 = F9 # Calendar + altgr keycode 59 = braceleft +keycode 60 = F10 # Contact + altgr keycode 60 = bracketleft +keycode 61 = AltGr # Fn +keycode 62 = Escape # Cancel +keycode 63 = space # Bulleye +keycode 64 = Control # Dot +keycode 65 = F15 # Backlight/Rotate + altgr keycode 65 = asciicircum +keycode 66 = F24 # Rec +keycode 67 = F12 # Home + altgr keycode 67 = grave +keycode 68 = F13 # Email + altgr keycode 68 = braceright +keycode 79 = F15 +keycode 80 = F16 +keycode 82 = F17 +keycode 87 = Return # OK +keycode 88 = F11 # Menu + altgr keycode 88 = bracketright +keycode 97 = Control +keycode 99 = F12 +keycode 103 = Up Scroll_Backward + altgr keycode 103 = PageUp +keycode 105 = Left Prior + altgr keycode 105 = Decr_Console +keycode 106 = Right Next + altgr keycode 106 = Incr_Console +keycode 108 = Down Scroll_Forward + altgr keycode 108 = PageDown string F1 = "\033[[A" string F2 = "\033[[B" string F3 = "\033[[C" diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index dd10b64099..c4d22d4b13 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r18" +PR = "r19" inherit update-rc.d diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb new file mode 100644 index 0000000000..9017c11dbf --- /dev/null +++ b/packages/leafpad/leafpad_0.8.15.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GTK+ based simple text editor" +DESCRIPTION_${PN}-icons = "Extra icon files for leafpad text editor" +HOMEPAGE = "http://tarot.freeshell.org/leafpad" +AUTHOR = "Tarot Osuji <tarot@sdf.lonestar.org>" +SECTION = "x11/applications" +LICENSE = "GPLv2" +DEPENDS = "gtk+ intltool-native" +SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz" + +PR = "r1" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print" + +PACKAGES =+ "${PN}-icons" + +FILES_${PN}-icons = "${datadir}/icons" +FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons" diff --git a/packages/leafpad/leafpad_0.8.9.bb b/packages/leafpad/leafpad_0.8.9.bb deleted file mode 100644 index 1b1d23fa2a..0000000000 --- a/packages/leafpad/leafpad_0.8.9.bb +++ /dev/null @@ -1,21 +0,0 @@ -LICENSE = "GPLv2" -DEPENDS = "gtk+ intltool-native" -SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \ - file://leafpad.desktop \ - file://leafpad.png" -PR = "r1" - -inherit autotools pkgconfig - -EXTRA_OECONF = " --enable-chooser --disable-gtktest --disable-print" - -do_install_append () { - install -d ${D}/${datadir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps/ - - install -m 0644 ${WORKDIR}/leafpad.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications -} - -FILES_${PN} += "${datadir}/applications/leafpad.desktop ${datadir}/pixmaps/leafpad.png" diff --git a/packages/linux-libc-headers/linux-libc-headers.inc b/packages/linux-libc-headers/linux-libc-headers.inc index 43f0958863..257cd1a732 100644 --- a/packages/linux-libc-headers/linux-libc-headers.inc +++ b/packages/linux-libc-headers/linux-libc-headers.inc @@ -2,4 +2,8 @@ DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." SECTION = "devel" LICENSE = "GPL" -DEPENDS = "cross-linkage"
\ No newline at end of file +DEPENDS = "cross-linkage" + +do_install_append() { + rm -rf ${D}${includedir}/scsi +} diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb index 3f5cc3a0b5..e316a2c6c1 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" # standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here INHIBIT_DEFAULT_DEPS = "1" -PR = "r2" +PR = "r3" SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \ file://keyboard.patch;patch=1" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb index 0dba90dc97..0c61d2acc4 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb @@ -13,7 +13,7 @@ require linux-libc-headers.inc # since we assume GPL for linux i think we can also assume it here DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" -PR = "r4" +PR = "r5" SRC_URI = "http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-${PV}.tar.bz2 \ file://keyboard.patch;patch=1 \ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb index 73e9b07d7f..e2aef053fb 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb @@ -2,6 +2,7 @@ require linux-libc-headers.inc DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" +PR = "r1" SRC_URI = " \ ${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index 014fd23705..d71b68a930 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://arm-syscall-define.patch;patch=1" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb index 8794b17d96..587d21e1e4 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb index 595edde810..0e5debcfa3 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb index 595edde810..0e5debcfa3 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://procinfo.h" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb index 932440b9d8..1c7a5885d2 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb @@ -1,7 +1,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" -PR = "r3" +PR = "r4" # NOTE: no need to package these headers, since the c library includes them. PACKAGES = "" diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb index 3ca17ea9a3..5e1c71ef1f 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/" # standard linux kernel license applies. # since we assume GPL for linux i think we can also assume it here INHIBIT_DEFAULT_DEPS = "1" -PR = "r7" +PR = "r8" # NOTE: no need to package these headers, since the c library includes them. PACKAGES = "" diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig index 5998f99db6..2bcec91560 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig @@ -196,7 +196,8 @@ CONFIG_HX4700_POWER2=y # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y CONFIG_PXA_SUSPEND_SAVE_EXTRA_REGS=y -# CONFIG_PXA27x_VOLTAGE is not set +CONFIG_PXA27x_VOLTAGE=m +CONFIG_PXA27x_VOLTAGE_MAX158xx=m # # Linux As Bootloader diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index 672d038619..a9cbff4d7e 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r15" +PR = "r16" DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa index 34f0cc1210..ac66232a21 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Mon Feb 25 01:57:38 2008 +# Thu Jun 5 12:08:42 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -158,7 +158,6 @@ CONFIG_PXA_SHARPSL=y # CONFIG_MACH_ARMCORE is not set CONFIG_PXA_SHARPSL_25x=y # CONFIG_PXA_SHARPSL_27x is not set -# CONFIG_MACH_HTCUNIVERSAL is not set # CONFIG_MACH_POODLE is not set # CONFIG_MACH_CORGI is not set # CONFIG_MACH_SHEPHERD is not set @@ -225,7 +224,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y -CONFIG_OABI_COMPAT=y +# CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -278,8 +277,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # At least one emulation must be selected # -# CONFIG_FPE_NWFPE is not set -# CONFIG_FPE_FASTFPE is not set # # Userspace binary formats @@ -319,6 +316,8 @@ CONFIG_NET_KEY=m CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_ASK_IP_FIB_HASH is not set +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set @@ -338,6 +337,12 @@ CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set @@ -430,6 +435,9 @@ CONFIG_IP_NF_ARP_MANGLE=m # CONFIG_IP6_NF_IPTABLES is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +# CONFIG_SCTP_HMAC_MD5 is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -658,7 +666,7 @@ CONFIG_BLK_DEV_IDE=y # CONFIG_BLK_DEV_IDE_SATA is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=y +CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECD=m # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set @@ -761,6 +769,12 @@ CONFIG_NETDEV_10000=y # # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set +# CONFIG_B43_DMA_AND_PIO_MODE is not set +# CONFIG_B43_DMA_MODE is not set +# CONFIG_B43_PIO_MODE is not set +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set # # USB Network Adapters @@ -1000,8 +1014,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_TC6387XB is not set CONFIG_MFD_TC6393XB=y # CONFIG_MFD_SM501 is not set -# CONFIG_HTC_ASIC3 is not set -# CONFIG_HTC_ASIC3_DS1WM is not set # # Multimedia devices @@ -1535,7 +1547,7 @@ CONFIG_JFFS2_SUMMARY=y # CONFIG_JFFS2_SYSFS is not set CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_LZO=y CONFIG_JFFS2_RTIME=y CONFIG_JFFS2_RUBIN=y # CONFIG_JFFS2_CMODE_NONE is not set @@ -1722,6 +1734,8 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch b/packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch new file mode 100644 index 0000000000..14c496a31a --- /dev/null +++ b/packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch @@ -0,0 +1,221 @@ +--- + drivers/usb/gadget/pxa2xx_udc.c | 88 ++++++++++++++++++++++------------------ + drivers/usb/gadget/pxa2xx_udc.h | 4 + + 2 files changed, 53 insertions(+), 39 deletions(-) + +--- g26.orig/drivers/usb/gadget/pxa2xx_udc.c 2008-02-19 12:47:06.000000000 -0800 ++++ g26/drivers/usb/gadget/pxa2xx_udc.c 2008-02-19 14:07:17.000000000 -0800 +@@ -103,6 +103,12 @@ static const char ep0name [] = "ep0"; + #error "Can't configure both IXP and PXA" + #endif + ++/* IXP doesn't yet support <linux/clk.h> */ ++#define clk_get(dev,name) NULL ++#define clk_enable(clk) do { } while (0) ++#define clk_disable(clk) do { } while (0) ++#define clk_put(clk) do { } while (0) ++ + #endif + + #include "pxa2xx_udc.h" +@@ -934,20 +940,31 @@ static void udc_disable(struct pxa2xx_ud + /* We disable the UDC -- and its 48 MHz clock -- whenever it's not + * in active use. + */ +-static int pullup(struct pxa2xx_udc *udc, int is_active) ++static int pullup(struct pxa2xx_udc *udc) + { +- is_active = is_active && udc->vbus && udc->pullup; ++ int is_active = udc->vbus && udc->pullup && !udc->suspended; + DMSG("%s\n", is_active ? "active" : "inactive"); +- if (is_active) +- udc_enable(udc); +- else { +- if (udc->gadget.speed != USB_SPEED_UNKNOWN) { +- DMSG("disconnect %s\n", udc->driver +- ? udc->driver->driver.name +- : "(no driver)"); +- stop_activity(udc, udc->driver); ++ if (is_active) { ++ if (!udc->active) { ++ udc->active = 1; ++ /* Enable clock for USB device */ ++ clk_enable(udc->clk); ++ udc_enable(udc); + } +- udc_disable(udc); ++ } else { ++ if (udc->active) { ++ if (udc->gadget.speed != USB_SPEED_UNKNOWN) { ++ DMSG("disconnect %s\n", udc->driver ++ ? udc->driver->driver.name ++ : "(no driver)"); ++ stop_activity(udc, udc->driver); ++ } ++ udc_disable(udc); ++ /* Disable clock for USB device */ ++ clk_disable(udc->clk); ++ udc->active = 0; ++ } ++ + } + return 0; + } +@@ -958,9 +975,9 @@ static int pxa2xx_udc_vbus_session(struc + struct pxa2xx_udc *udc; + + udc = container_of(_gadget, struct pxa2xx_udc, gadget); +- udc->vbus = is_active = (is_active != 0); ++ udc->vbus = (is_active != 0); + DMSG("vbus %s\n", is_active ? "supplied" : "inactive"); +- pullup(udc, is_active); ++ pullup(udc); + return 0; + } + +@@ -975,9 +992,8 @@ static int pxa2xx_udc_pullup(struct usb_ + if (!udc->mach->gpio_pullup && !udc->mach->udc_command) + return -EOPNOTSUPP; + +- is_active = (is_active != 0); +- udc->pullup = is_active; +- pullup(udc, is_active); ++ udc->pullup = (is_active != 0); ++ pullup(udc); + return 0; + } + +@@ -1146,11 +1162,6 @@ static void udc_disable(struct pxa2xx_ud + + udc_clear_mask_UDCCR(UDCCR_UDE); + +-#ifdef CONFIG_ARCH_PXA +- /* Disable clock for USB device */ +- clk_disable(dev->clk); +-#endif +- + ep0_idle (dev); + dev->gadget.speed = USB_SPEED_UNKNOWN; + } +@@ -1191,11 +1202,6 @@ static void udc_enable (struct pxa2xx_ud + { + udc_clear_mask_UDCCR(UDCCR_UDE); + +-#ifdef CONFIG_ARCH_PXA +- /* Enable clock for USB device */ +- clk_enable(dev->clk); +-#endif +- + /* try to clear these bits before we enable the udc */ + udc_ack_int_UDCCR(UDCCR_SUSIR|/*UDCCR_RSTIR|*/UDCCR_RESIR); + +@@ -1286,7 +1292,7 @@ fail: + * for set_configuration as well as eventual disconnect. + */ + DMSG("registered gadget driver '%s'\n", driver->driver.name); +- pullup(dev, 1); ++ pullup(dev); + dump_state(dev); + return 0; + } +@@ -1329,7 +1335,8 @@ int usb_gadget_unregister_driver(struct + return -EINVAL; + + local_irq_disable(); +- pullup(dev, 0); ++ dev->pullup = 0; ++ pullup(dev); + stop_activity(dev, driver); + local_irq_enable(); + +@@ -2131,13 +2138,11 @@ static int __init pxa2xx_udc_probe(struc + if (irq < 0) + return -ENODEV; + +-#ifdef CONFIG_ARCH_PXA + dev->clk = clk_get(&pdev->dev, "UDCCLK"); + if (IS_ERR(dev->clk)) { + retval = PTR_ERR(dev->clk); + goto err_clk; + } +-#endif + + pr_debug("%s: IRQ %d%s%s\n", driver_name, irq, + dev->has_cfr ? "" : " (!cfr)", +@@ -2250,10 +2255,8 @@ lubbock_fail0: + if (dev->mach->gpio_vbus) + gpio_free(dev->mach->gpio_vbus); + err_gpio_vbus: +-#ifdef CONFIG_ARCH_PXA + clk_put(dev->clk); + err_clk: +-#endif + return retval; + } + +@@ -2269,7 +2272,9 @@ static int __exit pxa2xx_udc_remove(stru + if (dev->driver) + return -EBUSY; + +- udc_disable(dev); ++ dev->pullup = 0; ++ pullup(dev); ++ + remove_proc_files(); + + if (dev->got_irq) { +@@ -2289,9 +2294,7 @@ static int __exit pxa2xx_udc_remove(stru + if (dev->mach->gpio_pullup) + gpio_free(dev->mach->gpio_pullup); + +-#ifdef CONFIG_ARCH_PXA + clk_put(dev->clk); +-#endif + + platform_set_drvdata(pdev, NULL); + the_controller = NULL; +@@ -2317,10 +2320,15 @@ static int __exit pxa2xx_udc_remove(stru + static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state) + { + struct pxa2xx_udc *udc = platform_get_drvdata(dev); ++ unsigned long flags; + + if (!udc->mach->gpio_pullup && !udc->mach->udc_command) + WARN("USB host won't detect disconnect!\n"); +- pullup(udc, 0); ++ udc->suspended = 1; ++ ++ local_irq_save(flags); ++ pullup(udc); ++ local_irq_restore(flags); + + return 0; + } +@@ -2328,8 +2336,12 @@ static int pxa2xx_udc_suspend(struct pla + static int pxa2xx_udc_resume(struct platform_device *dev) + { + struct pxa2xx_udc *udc = platform_get_drvdata(dev); ++ unsigned long flags; + +- pullup(udc, 1); ++ udc->suspended = 0; ++ local_irq_save(flags); ++ pullup(udc); ++ local_irq_restore(flags); + + return 0; + } +--- g26.orig/drivers/usb/gadget/pxa2xx_udc.h 2008-02-19 12:47:06.000000000 -0800 ++++ g26/drivers/usb/gadget/pxa2xx_udc.h 2008-02-19 12:57:42.000000000 -0800 +@@ -119,7 +119,9 @@ struct pxa2xx_udc { + has_cfr : 1, + req_pending : 1, + req_std : 1, +- req_config : 1; ++ req_config : 1, ++ suspended : 1, ++ active : 1; + + #define start_watchdog(dev) mod_timer(&dev->timer, jiffies + (HZ/200)) + struct timer_list timer; +- diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 0f81bd4221..1d2c4f2936 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -95,12 +95,15 @@ do_configure() { if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi + # Misc fixups: + echo "CONFIG_FUSE_FS=m" >> ${S}/.config + if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then echo "CONFIG_LOGO=y" >> ${S}/.config echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config @@ -130,6 +133,7 @@ do_configure() { -e '/CONFIG_LOGO_OZ240_CLUT224=/d' \ -e '/CONFIG_LOGO_OZ480_CLUT224=/d' \ -e '/CONFIG_LOGO_OZ640_CLUT224=/d' \ + -e '/CONFIG_FUSE_FS/d' \ '${WORKDIR}/${KERNEL_DEFCONFIG}' >>'${S}/.config' yes '' | oe_runmake oldconfig diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 04074d383c..df732ac1d5 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r5" +PR = "r9" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE_collie = "1" @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_akita = "1" DEFAULT_PREFERENCE_c7x0 = "1" DEFAULT_PREFERENCE_spitz = "1" DEFAULT_PREFERENCE_tosa = "1" - +DEFAULT_PREFERENCE_poodle = "1" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -203,4 +203,8 @@ SRC_URI_append_zylonite ="\ file://zylonite-boot.patch;patch=1 \ " +SRC_URI_append_c7x0 ="\ + file://pxa2xx_udc-clock.patch;patch=1 \ + " + S = "${WORKDIR}/linux-2.6.24" diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index 33f95853f6..f09189063a 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,7 +3,7 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r6" +PR = "r7" # This is the default package, thus we lock to a specific git version so # upstream changes will not break builds. @@ -36,7 +36,11 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ do_install () { install -d ${D}${bindir} + install -d ${D}${includedir}/mtd for binary in ${mtd_utils}; do install -m 0755 $binary ${D}${bindir} done + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir}/mtd/ + done } diff --git a/packages/pciutils/pciutils-2.2.4/configure.patch b/packages/pciutils/pciutils-2.2.4/configure.patch index 78d113c498..cfb5ef71d5 100644 --- a/packages/pciutils/pciutils-2.2.4/configure.patch +++ b/packages/pciutils/pciutils-2.2.4/configure.patch @@ -1,13 +1,8 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - Index: pciutils-2.2.4/lib/configure =================================================================== --- pciutils-2.2.4.orig/lib/configure 2006-09-09 13:06:10.000000000 +0200 -+++ pciutils-2.2.4/lib/configure 2006-10-31 11:52:13.000000000 +0100 -@@ -12,15 +12,15 @@ ++++ pciutils-2.2.4/lib/configure 2008-06-17 10:15:07.000000000 +0200 +@@ -12,15 +12,15 @@ echo_n() { echo_n "Configuring libpci for your system..." idsdir=${1:-/usr/share} version=${2:-0.0} @@ -26,10 +21,15 @@ Index: pciutils-2.2.4/lib/configure fi if [ "$sys" = "GNU/kFreeBSD" ] then -@@ -34,6 +34,11 @@ +@@ -34,6 +34,16 @@ rel=${4:-$rel} echo " $host $rel" zlib=$5 ++if [ "$host" = "linux--gnuspe" ] ++then ++ sys=linux ++fi ++ +if [ "$host" = "linux--gnueabi" ] +then + sys=linux diff --git a/packages/pciutils/pciutils_2.2.4.bb b/packages/pciutils/pciutils_2.2.4.bb index 0cd335eb32..2a909af26f 100644 --- a/packages/pciutils/pciutils_2.2.4.bb +++ b/packages/pciutils/pciutils_2.2.4.bb @@ -8,12 +8,12 @@ DEPENDS = "zlib" SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ - file://configure-uclibc.patch;patch=1 \ + file://configure-uclibc.patch;patch=1 \ file://pcimodules-pciutils.diff;patch=1" PARALLEL_MAKE = "" -PR="r1" +PR="r3" do_configure () { (cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH}) @@ -29,10 +29,32 @@ LDFLAGS += "-lz" do_install () { oe_runmake install } + do_install_append () { install -d ${D}/${prefix}/share install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share + + # The makefile does not install the development files: + # libpci.a pci.h header.h config.h types.s + install -d ${D}/${libdir} + install -d ${D}/${includedir}/pci + + oe_libinstall -a -C lib libpci ${D}/${libdir} + install -m 0644 ${S}/lib/pci.h ${D}/${includedir}/pci/ + install -m 0644 ${S}/lib/header.h ${D}/${includedir}/pci/ + install -m 0644 ${S}/lib/config.h ${D}/${includedir}/pci/ + install -m 0644 ${S}/lib/types.h ${D}/${includedir}/pci/ } +do_stage () { + oe_libinstall -a -C lib libpci ${STAGING_LIBDIR} + install -m 0755 -d ${STAGING_INCDIR}/pci + install -m 0644 ${S}/lib/pci.h ${STAGING_INCDIR}/pci/ + install -m 0644 ${S}/lib/header.h ${STAGING_INCDIR}/pci/ + install -m 0644 ${S}/lib/config.h ${STAGING_INCDIR}/pci/ + install -m 0644 ${S}/lib/types.h ${STAGING_INCDIR}/pci/ +} + + PACKAGES =+ "pciutils-ids" FILES_pciutils-ids="${prefix}/share/pci.ids" diff --git a/packages/psplash/files/logo-math.patch b/packages/psplash/files/logo-math.patch index 87574b1855..21467af0ec 100644 --- a/packages/psplash/files/logo-math.patch +++ b/packages/psplash/files/logo-math.patch @@ -1,3 +1,5 @@ +upstream: http://bugzilla.openedhand.com/show_bug.cgi?id=801 +comment: Do better math when showing logo vs progressbar. --- psplash/psplash.c.org 2007-09-22 20:33:36.000000000 +0300 diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index 17b459a15f..7e19ce3cbb 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.o-hand.com/psplash" SECTION = "base" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r12" +PR = "r13" RDEPENDS = "initscripts" # You can create your own pslash-hand-img.h by doing @@ -36,6 +36,6 @@ do_install_prepend() { } INITSCRIPT_NAME = "psplash" -INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." +INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ." FILES_${PN} += "/mnt/.psplash" diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/.mtn2git_empty b/packages/qemu/qemu-0.9.0+cvs20070613/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qemu/qemu-0.9.0+cvs20070701/.mtn2git_empty +++ b/packages/qemu/qemu-0.9.0+cvs20070613/.mtn2git_empty diff --git a/packages/qemu/files/02_snapshot_use_tmpdir.patch b/packages/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch index bd955b6db3..bd955b6db3 100644 --- a/packages/qemu/files/02_snapshot_use_tmpdir.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/02_snapshot_use_tmpdir.patch diff --git a/packages/qemu/files/03_machines_list_no_error.patch b/packages/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch index 73f31550fe..73f31550fe 100644 --- a/packages/qemu/files/03_machines_list_no_error.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/03_machines_list_no_error.patch diff --git a/packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch b/packages/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch index 1575cbce63..1575cbce63 100644 --- a/packages/qemu/files/04_do_not_print_rtc_freq_if_ok.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/04_do_not_print_rtc_freq_if_ok.patch diff --git a/packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch b/packages/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch index b7c4732f24..b7c4732f24 100644 --- a/packages/qemu/files/05_non-fatal_if_linux_hd_missing.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/05_non-fatal_if_linux_hd_missing.patch diff --git a/packages/qemu/files/06_exit_segfault.patch b/packages/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch index 447c3550b8..447c3550b8 100644 --- a/packages/qemu/files/06_exit_segfault.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/06_exit_segfault.patch diff --git a/packages/qemu/files/10_signal_jobs.patch b/packages/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch index 794a538676..794a538676 100644 --- a/packages/qemu/files/10_signal_jobs.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/10_signal_jobs.patch diff --git a/packages/qemu/files/11_signal_sigaction.patch b/packages/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch index 5446efc562..5446efc562 100644 --- a/packages/qemu/files/11_signal_sigaction.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/11_signal_sigaction.patch diff --git a/packages/qemu/files/12_signal_powerpc_support.patch b/packages/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch index d8d4198784..d8d4198784 100644 --- a/packages/qemu/files/12_signal_powerpc_support.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/12_signal_powerpc_support.patch diff --git a/packages/qemu/files/22_net_tuntap_stall.patch b/packages/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch index e9b31dfe40..e9b31dfe40 100644 --- a/packages/qemu/files/22_net_tuntap_stall.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/22_net_tuntap_stall.patch diff --git a/packages/qemu/files/30_syscall_ipc.patch b/packages/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch index 3dc58102ad..3dc58102ad 100644 --- a/packages/qemu/files/30_syscall_ipc.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/30_syscall_ipc.patch diff --git a/packages/qemu/files/31_syscalls.patch b/packages/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch index 3878079f19..3878079f19 100644 --- a/packages/qemu/files/31_syscalls.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/31_syscalls.patch diff --git a/packages/qemu/files/32_syscall_sysctl.patch b/packages/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch index d175cf96ba..d175cf96ba 100644 --- a/packages/qemu/files/32_syscall_sysctl.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/32_syscall_sysctl.patch diff --git a/packages/qemu/files/33_syscall_ppc_clone.patch b/packages/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch index a71f8b1944..a71f8b1944 100644 --- a/packages/qemu/files/33_syscall_ppc_clone.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/33_syscall_ppc_clone.patch diff --git a/packages/qemu/files/39_syscall_fadvise64.patch b/packages/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch index 0a7f4c48dd..0a7f4c48dd 100644 --- a/packages/qemu/files/39_syscall_fadvise64.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/39_syscall_fadvise64.patch diff --git a/packages/qemu/files/41_arm_fpa_sigfpe.patch b/packages/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch index d579dbc66e..d579dbc66e 100644 --- a/packages/qemu/files/41_arm_fpa_sigfpe.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/41_arm_fpa_sigfpe.patch diff --git a/packages/qemu/files/52_ne2000_return.patch b/packages/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch index f0316c8042..f0316c8042 100644 --- a/packages/qemu/files/52_ne2000_return.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/52_ne2000_return.patch diff --git a/packages/qemu/files/61_safe_64bit_int.patch b/packages/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch index 553e57623e..553e57623e 100644 --- a/packages/qemu/files/61_safe_64bit_int.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/61_safe_64bit_int.patch diff --git a/packages/qemu/files/63_sparc_build.patch b/packages/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch index 32a6bc0ee0..32a6bc0ee0 100644 --- a/packages/qemu/files/63_sparc_build.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/63_sparc_build.patch diff --git a/packages/qemu/files/64_ppc_asm_constraints.patch b/packages/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch index e4858b79d7..e4858b79d7 100644 --- a/packages/qemu/files/64_ppc_asm_constraints.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/64_ppc_asm_constraints.patch diff --git a/packages/qemu/files/65_kfreebsd.patch b/packages/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch index ea060811a1..ea060811a1 100644 --- a/packages/qemu/files/65_kfreebsd.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/65_kfreebsd.patch diff --git a/packages/qemu/files/66_tls_ld.patch b/packages/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch index 54e02eff8b..54e02eff8b 100644 --- a/packages/qemu/files/66_tls_ld.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/66_tls_ld.patch diff --git a/packages/qemu/files/91-oh-sdl-cursor.patch b/packages/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch index 5280a5bd4a..5280a5bd4a 100644 --- a/packages/qemu/files/91-oh-sdl-cursor.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/91-oh-sdl-cursor.patch diff --git a/packages/qemu/files/93-oh-pl110-rgb.patch b/packages/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch index 4911ac131f..4911ac131f 100644 --- a/packages/qemu/files/93-oh-pl110-rgb.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/93-oh-pl110-rgb.patch diff --git a/packages/qemu/files/arm_nptl.patch b/packages/qemu/qemu-0.9.0+cvs20070613/arm_nptl.patch index f9b10aebc5..f9b10aebc5 100644 --- a/packages/qemu/files/arm_nptl.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/arm_nptl.patch diff --git a/packages/qemu/files/compiler.patch b/packages/qemu/qemu-0.9.0+cvs20070613/compiler.patch index dad18b3a61..dad18b3a61 100644 --- a/packages/qemu/files/compiler.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/compiler.patch diff --git a/packages/qemu/files/configure.patch b/packages/qemu/qemu-0.9.0+cvs20070613/configure.patch index ea83f8cd6d..ea83f8cd6d 100644 --- a/packages/qemu/files/configure.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/configure.patch diff --git a/packages/qemu/files/fix_segfault.patch b/packages/qemu/qemu-0.9.0+cvs20070613/fix_segfault.patch index 976c75cd60..976c75cd60 100644 --- a/packages/qemu/files/fix_segfault.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/fix_segfault.patch diff --git a/packages/qemu/files/makefile.patch b/packages/qemu/qemu-0.9.0+cvs20070613/makefile.patch index 75b5ac9c71..75b5ac9c71 100644 --- a/packages/qemu/files/makefile.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/makefile.patch diff --git a/packages/qemu/files/no-strip.patch b/packages/qemu/qemu-0.9.0+cvs20070613/no-strip.patch index 59ed8771fe..59ed8771fe 100644 --- a/packages/qemu/files/no-strip.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/no-strip.patch diff --git a/packages/qemu/files/pl110_rgb-r0.patch b/packages/qemu/qemu-0.9.0+cvs20070613/pl110_rgb-r0.patch index 09e5898d3a..09e5898d3a 100644 --- a/packages/qemu/files/pl110_rgb-r0.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/pl110_rgb-r0.patch diff --git a/packages/qemu/files/qemu-0.9.0-nptl-update.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl-update.patch index 869acba2cf..869acba2cf 100644 --- a/packages/qemu/files/qemu-0.9.0-nptl-update.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl-update.patch diff --git a/packages/qemu/files/qemu-0.9.0-nptl.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl.patch index fc7b0cfa4b..fc7b0cfa4b 100644 --- a/packages/qemu/files/qemu-0.9.0-nptl.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-0.9.0-nptl.patch diff --git a/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-amd64-32b-mapping-0.9.0.patch index d9303e3464..d9303e3464 100644 --- a/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-amd64-32b-mapping-0.9.0.patch diff --git a/packages/qemu/files/qemu-pci-irq-sharing.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-pci-irq-sharing.patch index c47e89895f..c47e89895f 100644 --- a/packages/qemu/files/qemu-pci-irq-sharing.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-pci-irq-sharing.patch diff --git a/packages/qemu/files/qemu-sdl-cursor.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-sdl-cursor.patch index bd6a51a1f5..bd6a51a1f5 100644 --- a/packages/qemu/files/qemu-sdl-cursor.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-sdl-cursor.patch diff --git a/packages/qemu/files/qemu-usb-wacom-0.8.2.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-0.8.2.patch index 33a6db3f18..33a6db3f18 100644 --- a/packages/qemu/files/qemu-usb-wacom-0.8.2.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-0.8.2.patch diff --git a/packages/qemu/files/qemu-usb-wacom-buttons.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-buttons.patch index ee24c15780..ee24c15780 100644 --- a/packages/qemu/files/qemu-usb-wacom-buttons.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-buttons.patch diff --git a/packages/qemu/files/qemu-usb-wacom-pressure.patch b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-pressure.patch index 668d50d5f2..668d50d5f2 100644 --- a/packages/qemu/files/qemu-usb-wacom-pressure.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/qemu-usb-wacom-pressure.patch diff --git a/packages/qemu/files/workaround_bad_futex_headers.patch b/packages/qemu/qemu-0.9.0+cvs20070613/workaround_bad_futex_headers.patch index cc122ebdba..cc122ebdba 100644 --- a/packages/qemu/files/workaround_bad_futex_headers.patch +++ b/packages/qemu/qemu-0.9.0+cvs20070613/workaround_bad_futex_headers.patch diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/configure-0.9.0.patch b/packages/qemu/qemu-0.9.0+cvs20070701/configure-0.9.0.patch deleted file mode 100644 index d92f6a8264..0000000000 --- a/packages/qemu/qemu-0.9.0+cvs20070701/configure-0.9.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru qemu-snapshot-2007-06-24_05.orig/configure qemu-snapshot-2007-06-24_05/configure ---- qemu-snapshot-2007-06-24_05.orig/configure 2007-06-23 18:03:35.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/configure 2007-06-24 16:30:32.000000000 +0200 -@@ -711,7 +711,7 @@ - echo "CC=$cc" >> $config_mak - echo "HOST_CC=$host_cc" >> $config_mak - echo "AR=$ar" >> $config_mak --echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak -+echo "STRIP=$strip" >> $config_mak - echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak - echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak - echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/pl110_rgb-r0-0.9.0.patch b/packages/qemu/qemu-0.9.0+cvs20070701/pl110_rgb-r0-0.9.0.patch deleted file mode 100644 index 3ad4115e73..0000000000 --- a/packages/qemu/qemu-0.9.0+cvs20070701/pl110_rgb-r0-0.9.0.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -Naru qemu-neo1973.orig/hw/pl110.c qemu-neo1973/hw/pl110.c ---- qemu-neo1973.orig/hw/pl110.c 2007-06-24 13:56:37.000000000 +0200 -+++ qemu-neo1973/hw/pl110.c 2007-06-24 14:12:09.000000000 +0200 -@@ -10,6 +10,7 @@ - #include "vl.h" - - #define PL110_CR_EN 0x001 -+#define PL110_CR_BGR 0x100 - #define PL110_CR_BEBO 0x200 - #define PL110_CR_BEPO 0x400 - #define PL110_CR_PWR 0x800 -@@ -114,6 +115,7 @@ - int first, last = 0; - int dirty, new_dirty; - int i; -+ int bpp_offset; - - if (!pl110_enabled(s)) - return; -@@ -145,12 +147,17 @@ - fprintf(stderr, "pl110: Bad color depth\n"); - exit(1); - } -+ if (s->cr & PL110_CR_BGR) -+ bpp_offset = 0; -+ else -+ bpp_offset = 18; -+ - if (s->cr & PL110_CR_BEBO) -- fn = fntable[s->bpp + 6]; -+ fn = fntable[s->bpp + 6 + bpp_offset]; - else if (s->cr & PL110_CR_BEPO) -- fn = fntable[s->bpp + 12]; -+ fn = fntable[s->bpp + 12 + bpp_offset]; - else -- fn = fntable[s->bpp]; -+ fn = fntable[s->bpp + bpp_offset]; - - src_width = s->cols; - switch (s->bpp) { -diff -Naru qemu-neo1973.orig/hw/pl110_template.h qemu-neo1973/hw/pl110_template.h ---- qemu-neo1973.orig/hw/pl110_template.h 2007-06-24 13:56:37.000000000 +0200 -+++ qemu-neo1973/hw/pl110_template.h 2007-06-24 14:12:09.000000000 +0200 -@@ -24,6 +24,16 @@ - #error unknown bit depth - #endif - -+#undef RGB -+#define BORDER bgr -+#define ORDER 0 -+#include "pl110_template.h" -+#define ORDER 1 -+#include "pl110_template.h" -+#define ORDER 2 -+#include "pl110_template.h" -+#define RGB -+#define BORDER rgb - #define ORDER 0 - #include "pl110_template.h" - #define ORDER 1 -@@ -33,26 +43,47 @@ - - static drawfn glue(pl110_draw_fn_,BITS)[18] = - { -- glue(pl110_draw_line1_lblp,BITS), -- glue(pl110_draw_line2_lblp,BITS), -- glue(pl110_draw_line4_lblp,BITS), -- glue(pl110_draw_line8_lblp,BITS), -- glue(pl110_draw_line16_lblp,BITS), -- glue(pl110_draw_line32_lblp,BITS), -- -- glue(pl110_draw_line1_bbbp,BITS), -- glue(pl110_draw_line2_bbbp,BITS), -- glue(pl110_draw_line4_bbbp,BITS), -- glue(pl110_draw_line8_bbbp,BITS), -- glue(pl110_draw_line16_bbbp,BITS), -- glue(pl110_draw_line32_bbbp,BITS), -- -- glue(pl110_draw_line1_lbbp,BITS), -- glue(pl110_draw_line2_lbbp,BITS), -- glue(pl110_draw_line4_lbbp,BITS), -- glue(pl110_draw_line8_lbbp,BITS), -- glue(pl110_draw_line16_lbbp,BITS), -- glue(pl110_draw_line32_lbbp,BITS) -+ glue(pl110_draw_line1_lblp_bgr,BITS), -+ glue(pl110_draw_line2_lblp_bgr,BITS), -+ glue(pl110_draw_line4_lblp_bgr,BITS), -+ glue(pl110_draw_line8_lblp_bgr,BITS), -+ glue(pl110_draw_line16_lblp_bgr,BITS), -+ glue(pl110_draw_line32_lblp_bgr,BITS), -+ -+ glue(pl110_draw_line1_bbbp_bgr,BITS), -+ glue(pl110_draw_line2_bbbp_bgr,BITS), -+ glue(pl110_draw_line4_bbbp_bgr,BITS), -+ glue(pl110_draw_line8_bbbp_bgr,BITS), -+ glue(pl110_draw_line16_bbbp_bgr,BITS), -+ glue(pl110_draw_line32_bbbp_bgr,BITS), -+ -+ glue(pl110_draw_line1_lbbp_bgr,BITS), -+ glue(pl110_draw_line2_lbbp_bgr,BITS), -+ glue(pl110_draw_line4_lbbp_bgr,BITS), -+ glue(pl110_draw_line8_lbbp_bgr,BITS), -+ glue(pl110_draw_line16_lbbp_bgr,BITS), -+ glue(pl110_draw_line32_lbbp_bgr,BITS), -+ -+ glue(pl110_draw_line1_lblp_rgb,BITS), -+ glue(pl110_draw_line2_lblp_rgb,BITS), -+ glue(pl110_draw_line4_lblp_rgb,BITS), -+ glue(pl110_draw_line8_lblp_rgb,BITS), -+ glue(pl110_draw_line16_lblp_rgb,BITS), -+ glue(pl110_draw_line32_lblp_rgb,BITS), -+ -+ glue(pl110_draw_line1_bbbp_rgb,BITS), -+ glue(pl110_draw_line2_bbbp_rgb,BITS), -+ glue(pl110_draw_line4_bbbp_rgb,BITS), -+ glue(pl110_draw_line8_bbbp_rgb,BITS), -+ glue(pl110_draw_line16_bbbp_rgb,BITS), -+ glue(pl110_draw_line32_bbbp_rgb,BITS), -+ -+ glue(pl110_draw_line1_lbbp_rgb,BITS), -+ glue(pl110_draw_line2_lbbp_rgb,BITS), -+ glue(pl110_draw_line4_lbbp_rgb,BITS), -+ glue(pl110_draw_line8_lbbp_rgb,BITS), -+ glue(pl110_draw_line16_lbbp_rgb,BITS), -+ glue(pl110_draw_line32_lbbp_rgb,BITS), - }; - - #undef BITS -@@ -61,18 +92,18 @@ - #else - - #if ORDER == 0 --#define NAME glue(lblp, BITS) -+#define NAME glue(glue(lblp_, BORDER), BITS) - #ifdef WORDS_BIGENDIAN - #define SWAP_WORDS 1 - #endif - #elif ORDER == 1 --#define NAME glue(bbbp, BITS) -+#define NAME glue(glue(bbbp_, BORDER), BITS) - #ifndef WORDS_BIGENDIAN - #define SWAP_WORDS 1 - #endif - #else - #define SWAP_PIXELS 1 --#define NAME glue(lbbp, BITS) -+#define NAME glue(glue(lbbp_, BORDER), BITS) - #ifdef WORDS_BIGENDIAN - #define SWAP_WORDS 1 - #endif -@@ -195,27 +226,34 @@ - #ifdef SWAP_WORDS - data = bswap32(data); - #endif -+#ifdef RGB -+#define LSB r -+#define MSB b -+#else -+#define LSB b -+#define MSB r -+#endif - #if 0 -- r = data & 0x1f; -+ LSB = data & 0x1f; - data >>= 5; - g = data & 0x3f; - data >>= 6; -- b = data & 0x1f; -+ MSB = data & 0x1f; - data >>= 5; - #else -- r = (data & 0x1f) << 3; -+ LSB = (data & 0x1f) << 3; - data >>= 5; - g = (data & 0x3f) << 2; - data >>= 6; -- b = (data & 0x1f) << 3; -+ MSB = (data & 0x1f) << 3; - data >>= 5; - #endif - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); -- r = (data & 0x1f) << 3; -+ LSB = (data & 0x1f) << 3; - data >>= 5; - g = (data & 0x3f) << 2; - data >>= 6; -- b = (data & 0x1f) << 3; -+ MSB = (data & 0x1f) << 3; - data >>= 5; - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); - width -= 2; -@@ -229,14 +267,21 @@ - unsigned int r, g, b; - while (width > 0) { - data = *(uint32_t *)src; -+#ifdef RGB -+#define LSB r -+#define MSB b -+#else -+#define LSB b -+#define MSB r -+#endif - #ifdef SWAP_WORDS -- r = data & 0xff; -+ LSB = data & 0xff; - g = (data >> 8) & 0xff; -- b = (data >> 16) & 0xff; -+ MSB = (data >> 16) & 0xff; - #else -- r = (data >> 24) & 0xff; -+ LSB = (data >> 24) & 0xff; - g = (data >> 16) & 0xff; -- b = (data >> 8) & 0xff; -+ MSB = (data >> 8) & 0xff; - #endif - COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); - width--; diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/qemu-0.9.0-gcc4.patch b/packages/qemu/qemu-0.9.0+cvs20070701/qemu-0.9.0-gcc4.patch deleted file mode 100644 index 189cd09b67..0000000000 --- a/packages/qemu/qemu-0.9.0+cvs20070701/qemu-0.9.0-gcc4.patch +++ /dev/null @@ -1,881 +0,0 @@ -diff -Naru qemu-neo1973.orig/dyngen.c qemu-neo1973/dyngen.c ---- qemu-neo1973.orig/dyngen.c 2007-06-24 13:56:38.000000000 +0200 -+++ qemu-neo1973/dyngen.c 2007-06-24 14:33:11.000000000 +0200 -@@ -32,6 +32,8 @@ - - #include "config-host.h" - -+//#define DEBUG_OP -+ - /* NOTE: we test CONFIG_WIN32 instead of _WIN32 to enabled cross - compilation */ - #if defined(CONFIG_WIN32) -@@ -1429,6 +1431,644 @@ - #endif - - -+#if defined(HOST_I386) || defined(HOST_X86_64) -+ -+/* This byte is the first byte of an instruction. */ -+#define FLAG_INSN (1 << 0) -+/* This byte has been processed as part of an instruction. */ -+#define FLAG_SCANNED (1 << 1) -+/* This instruction is a return instruction. Gcc cometimes generates prefix -+ bytes, so may be more than one byte long. */ -+#define FLAG_RET (1 << 2) -+/* This is either the target of a jump, or the preceeding instruction uses -+ a pc-relative offset. */ -+#define FLAG_TARGET (1 << 3) -+/* This is a magic instruction that needs fixing up. */ -+#define FLAG_EXIT (1 << 4) -+#define MAX_EXITS 5 -+ -+static void -+bad_opcode(const char *name, uint32_t op) -+{ -+ error("Unsupported opcode %0*x in %s", (op > 0xff) ? 4 : 2, op, name); -+} -+ -+/* Mark len bytes as scanned, Returns insn_size + len. Reports an error -+ if these bytes have already been scanned. */ -+static int -+eat_bytes(const char *name, char *flags, int insn, int insn_size, int len) -+{ -+ while (len > 0) { -+ /* This should never occur in sane code. */ -+ if (flags[insn + insn_size] & FLAG_SCANNED) -+ error ("Overlapping instructions in %s", name); -+ flags[insn + insn_size] |= FLAG_SCANNED; -+ insn_size++; -+ len--; -+ } -+ return insn_size; -+} -+ -+static void -+trace_i386_insn (const char *name, uint8_t *start_p, char *flags, int insn, -+ int len) -+{ -+ uint8_t *ptr; -+ uint8_t op; -+ int modrm; -+ int is_prefix; -+ int op_size; -+ int addr_size; -+ int insn_size; -+ int is_ret; -+ int is_condjmp; -+ int is_jmp; -+ int is_exit; -+ int is_pcrel; -+ int immed; -+ int seen_rexw; -+ int32_t disp; -+ -+ ptr = start_p + insn; -+ /* nonzero if this insn has a ModR/M byte. */ -+ modrm = 1; -+ /* The size of the immediate value in this instruction. */ -+ immed = 0; -+ /* The operand size. */ -+ op_size = 4; -+ /* The address size */ -+ addr_size = 4; -+ /* The total length of this instruction. */ -+ insn_size = 0; -+ is_prefix = 1; -+ is_ret = 0; -+ is_condjmp = 0; -+ is_jmp = 0; -+ is_exit = 0; -+ seen_rexw = 0; -+ is_pcrel = 0; -+ -+ while (is_prefix) { -+ op = ptr[insn_size]; -+ insn_size = eat_bytes(name, flags, insn, insn_size, 1); -+ is_prefix = 0; -+ switch (op >> 4) { -+ case 0: -+ case 1: -+ case 2: -+ case 3: -+ if (op == 0x0f) { -+ /* two-byte opcode. */ -+ op = ptr[insn_size]; -+ insn_size = eat_bytes(name, flags, insn, insn_size, 1); -+ switch (op >> 4) { -+ case 0: -+ if ((op & 0xf) > 3) -+ modrm = 0; -+ break; -+ case 1: /* vector move or prefetch */ -+ case 2: /* various moves and vector compares. */ -+ case 4: /* cmov */ -+ case 5: /* vector instructions */ -+ case 6: -+ case 13: -+ case 14: -+ case 15: -+ break; -+ case 7: /* mmx */ -+ if (op & 0x77) /* emms */ -+ modrm = 0; -+ break; -+ case 3: /* wrmsr, rdtsc, rdmsr, rdpmc, sysenter, sysexit */ -+ modrm = 0; -+ break; -+ case 8: /* long conditional jump */ -+ is_condjmp = 1; -+ immed = op_size; -+ modrm = 0; -+ break; -+ case 9: /* setcc */ -+ break; -+ case 10: -+ switch (op & 0x7) { -+ case 0: /* push fs/gs */ -+ case 1: /* pop fs/gs */ -+ case 2: /* cpuid/rsm */ -+ modrm = 0; -+ break; -+ case 4: /* shld/shrd immediate */ -+ immed = 1; -+ break; -+ default: /* Normal instructions with a ModR/M byte. */ -+ break; -+ } -+ break; -+ case 11: -+ switch (op & 0xf) { -+ case 10: /* bt, bts, btr, btc */ -+ immed = 1; -+ break; -+ default: -+ /* cmpxchg, lss, btr, lfs, lgs, movzx, btc, bsf, bsr -+ undefined, and movsx */ -+ break; -+ } -+ break; -+ case 12: -+ if (op & 8) { -+ /* bswap */ -+ modrm = 0; -+ } else { -+ switch (op & 0x7) { -+ case 2: -+ case 4: -+ case 5: -+ case 6: -+ immed = 1; -+ break; -+ default: -+ break; -+ } -+ } -+ break; -+ } -+ } else if ((op & 0x07) <= 0x3) { -+ /* General arithmentic ax. */ -+ } else if ((op & 0x07) <= 0x5) { -+ /* General arithmetic ax, immediate. */ -+ if (op & 0x01) -+ immed = op_size; -+ else -+ immed = 1; -+ modrm = 0; -+ } else if ((op & 0x23) == 0x22) { -+ /* Segment prefix. */ -+ is_prefix = 1; -+ } else { -+ /* Segment register push/pop or DAA/AAA/DAS/AAS. */ -+ modrm = 0; -+ } -+ break; -+ -+#if defined(HOST_X86_64) -+ case 4: /* rex prefix. */ -+ is_prefix = 1; -+ /* The address/operand size is actually 64-bit, but the immediate -+ values in the instruction are still 32-bit. */ -+ op_size = 4; -+ addr_size = 4; -+ if (op & 8) -+ seen_rexw = 1; -+ break; -+#else -+ case 4: /* inc/dec register. */ -+#endif -+ case 5: /* push/pop general register. */ -+ modrm = 0; -+ break; -+ -+ case 6: -+ switch (op & 0x0f) { -+ case 0: /* pusha */ -+ case 1: /* popa */ -+ modrm = 0; -+ break; -+ case 2: /* bound */ -+ case 3: /* arpl */ -+ break; -+ case 4: /* FS */ -+ case 5: /* GS */ -+ is_prefix = 1; -+ break; -+ case 6: /* opcode size prefix. */ -+ op_size = 2; -+ is_prefix = 1; -+ break; -+ case 7: /* Address size prefix. */ -+ addr_size = 2; -+ is_prefix = 1; -+ break; -+ case 8: /* push immediate */ -+ immed = op_size; -+ modrm = 0; -+ break; -+ case 10: /* push 8-bit immediate */ -+ immed = 1; -+ modrm = 0; -+ break; -+ case 9: /* imul immediate */ -+ immed = op_size; -+ break; -+ case 11: /* imul 8-bit immediate */ -+ immed = 1; -+ break; -+ case 12: /* insb */ -+ case 13: /* insw */ -+ case 14: /* outsb */ -+ case 15: /* outsw */ -+ modrm = 0; -+ break; -+ } -+ break; -+ -+ case 7: /* Short conditional jump. */ -+ is_condjmp = 1; -+ immed = 1; -+ modrm = 0; -+ break; -+ -+ case 8: -+ if ((op & 0xf) <= 3) { -+ /* arithmetic immediate. */ -+ if ((op & 3) == 1) -+ immed = op_size; -+ else -+ immed = 1; -+ } -+ /* else test, xchg, mov, lea or pop general. */ -+ break; -+ -+ case 9: -+ /* Various single-byte opcodes with no modrm byte. */ -+ modrm = 0; -+ if (op == 10) { -+ /* Call */ -+ immed = 4; -+ } -+ break; -+ -+ case 10: -+ switch ((op & 0xe) >> 1) { -+ case 0: /* mov absoliute immediate. */ -+ case 1: -+ if (seen_rexw) -+ immed = 8; -+ else -+ immed = addr_size; -+ break; -+ case 4: /* test immediate. */ -+ if (op & 1) -+ immed = op_size; -+ else -+ immed = 1; -+ break; -+ default: /* Various string ops. */ -+ break; -+ } -+ modrm = 0; -+ break; -+ -+ case 11: /* move immediate to register */ -+ if (op & 8) { -+ if (seen_rexw) -+ immed = 8; -+ else -+ immed = op_size; -+ } else { -+ immed = 1; -+ } -+ modrm = 0; -+ break; -+ -+ case 12: -+ switch (op & 0xf) { -+ case 0: /* shift immediate */ -+ case 1: -+ immed = 1; -+ break; -+ case 2: /* ret immediate */ -+ immed = 2; -+ modrm = 0; -+ bad_opcode(name, op); -+ break; -+ case 3: /* ret */ -+ modrm = 0; -+ is_ret = 1; -+ case 4: /* les */ -+ case 5: /* lds */ -+ break; -+ case 6: /* mov immediate byte */ -+ immed = 1; -+ break; -+ case 7: /* mov immediate */ -+ immed = op_size; -+ break; -+ case 8: /* enter */ -+ /* TODO: Is this right? */ -+ immed = 3; -+ modrm = 0; -+ break; -+ case 10: /* retf immediate */ -+ immed = 2; -+ modrm = 0; -+ bad_opcode(name, op); -+ break; -+ case 13: /* int */ -+ immed = 1; -+ modrm = 0; -+ break; -+ case 11: /* retf */ -+ case 15: /* iret */ -+ modrm = 0; -+ bad_opcode(name, op); -+ break; -+ default: /* leave, int3 or into */ -+ modrm = 0; -+ break; -+ } -+ break; -+ -+ case 13: -+ if ((op & 0xf) >= 8) { -+ /* Coprocessor escape. For our purposes this is just a normal -+ instruction with a ModR/M byte. */ -+ } else if ((op & 0xf) >= 4) { -+ /* AAM, AAD or XLAT */ -+ modrm = 0; -+ } -+ /* else shift instruction */ -+ break; -+ -+ case 14: -+ switch ((op & 0xc) >> 2) { -+ case 0: /* loop or jcxz */ -+ is_condjmp = 1; -+ immed = 1; -+ break; -+ case 1: /* in/out immed */ -+ immed = 1; -+ break; -+ case 2: /* call or jmp */ -+ switch (op & 3) { -+ case 0: /* call */ -+ immed = op_size; -+ break; -+ case 1: /* long jump */ -+ immed = 4; -+ is_jmp = 1; -+ break; -+ case 2: /* far jmp */ -+ bad_opcode(name, op); -+ break; -+ case 3: /* short jmp */ -+ immed = 1; -+ is_jmp = 1; -+ break; -+ } -+ break; -+ case 3: /* in/out register */ -+ break; -+ } -+ modrm = 0; -+ break; -+ -+ case 15: -+ switch ((op & 0xe) >> 1) { -+ case 0: -+ case 1: -+ is_prefix = 1; -+ break; -+ case 2: -+ case 4: -+ case 5: -+ case 6: -+ modrm = 0; -+ /* Some privileged insns are used as markers. */ -+ switch (op) { -+ case 0xf4: /* hlt: Exit translation block. */ -+ is_exit = 1; -+ break; -+ case 0xfa: /* cli: Jump to label. */ -+ is_exit = 1; -+ immed = 4; -+ break; -+ case 0xfb: /* sti: TB patch jump. */ -+ /* Mark the insn for patching, but continue sscanning. */ -+ flags[insn] |= FLAG_EXIT; -+ immed = 4; -+ break; -+ } -+ break; -+ case 3: /* unary grp3 */ -+ if ((ptr[insn_size] & 0x38) == 0) { -+ if (op == 0xf7) -+ immed = op_size; -+ else -+ immed = 1; /* test immediate */ -+ } -+ break; -+ case 7: /* inc/dec grp4/5 */ -+ /* TODO: This includes indirect jumps. We should fail if we -+ encounter one of these. */ -+ break; -+ } -+ break; -+ } -+ } -+ -+ if (modrm) { -+ if (addr_size != 4) -+ error("16-bit addressing mode used in %s", name); -+ -+ disp = 0; -+ modrm = ptr[insn_size]; -+ insn_size = eat_bytes(name, flags, insn, insn_size, 1); -+ modrm &= 0xc7; -+ switch ((modrm & 0xc0) >> 6) { -+ case 0: -+ if (modrm == 5) -+ disp = 4; -+ break; -+ case 1: -+ disp = 1; -+ break; -+ case 2: -+ disp = 4; -+ break; -+ } -+ if ((modrm & 0xc0) != 0xc0 && (modrm & 0x7) == 4) { -+ /* SIB byte */ -+ if (modrm == 4 && (ptr[insn_size] & 0x7) == 5) { -+ disp = 4; -+ is_pcrel = 1; -+ } -+ insn_size = eat_bytes(name, flags, insn, insn_size, 1); -+ } -+ insn_size = eat_bytes(name, flags, insn, insn_size, disp); -+ } -+ insn_size = eat_bytes(name, flags, insn, insn_size, immed); -+ if (is_condjmp || is_jmp) { -+ if (immed == 1) { -+ disp = (int8_t)*(ptr + insn_size - 1); -+ } else { -+ disp = (((int32_t)*(ptr + insn_size - 1)) << 24) -+ | (((int32_t)*(ptr + insn_size - 2)) << 16) -+ | (((int32_t)*(ptr + insn_size - 3)) << 8) -+ | *(ptr + insn_size - 4); -+ } -+ disp += insn_size; -+ /* Jumps to external symbols point to the address of the offset -+ before relocation. */ -+ /* ??? These are probably a tailcall. We could fix them up by -+ replacing them with jmp to EOB + call, but it's easier to just -+ prevent the compiler generating them. */ -+ if (disp == 1) -+ error("Unconditional jump (sibcall?) in %s", name); -+ disp += insn; -+ if (disp < 0 || disp > len) -+ error("Jump outside instruction in %s", name); -+ -+ if ((flags[disp] & (FLAG_INSN | FLAG_SCANNED)) == FLAG_SCANNED) -+ error("Overlapping instructions in %s", name); -+ -+ flags[disp] |= (FLAG_INSN | FLAG_TARGET); -+ is_pcrel = 1; -+ } -+ if (is_pcrel) { -+ /* Mark the following insn as a jump target. This will stop -+ this instruction being moved. */ -+ flags[insn + insn_size] |= FLAG_TARGET; -+ } -+ if (is_ret) -+ flags[insn] |= FLAG_RET; -+ -+ if (is_exit) -+ flags[insn] |= FLAG_EXIT; -+ -+ if (!(is_jmp || is_ret || is_exit)) -+ flags[insn + insn_size] |= FLAG_INSN; -+} -+ -+/* Scan a function body. Returns the position of the return sequence. -+ Sets *patch_bytes to the number of bytes that need to be copied from that -+ location. If no patching is required (ie. the return is the last insn) -+ *patch_bytes will be set to -1. *plen is the number of code bytes to copy. -+ */ -+static int trace_i386_op(const char * name, uint8_t *start_p, int *plen, -+ int *patch_bytes, int *exit_addrs) -+{ -+ char *flags; -+ int more; -+ int insn; -+ int retpos; -+ int bytes; -+ int num_exits; -+ int len; -+ int last_insn; -+ -+ len = *plen; -+ flags = malloc(len + 1); -+ memset(flags, 0, len + 1); -+ flags[0] |= FLAG_INSN; -+ more = 1; -+ while (more) { -+ more = 0; -+ for (insn = 0; insn < len; insn++) { -+ if ((flags[insn] & (FLAG_INSN | FLAG_SCANNED)) == FLAG_INSN) { -+ trace_i386_insn(name, start_p, flags, insn, len); -+ more = 1; -+ } -+ } -+ } -+ -+ /* Strip any unused code at the end of the function. */ -+ while (len > 0 && flags[len - 1] == 0) -+ len--; -+ -+ retpos = -1; -+ num_exits = 0; -+ last_insn = 0; -+ for (insn = 0; insn < len; insn++) { -+ if (flags[insn] & FLAG_RET) { -+ /* ??? In theory it should be possible to handle multiple return -+ points. In practice it's not worth the effort. */ -+ if (retpos != -1) -+ error("Multiple return instructions in %s", name); -+ retpos = insn; -+ } -+ if (flags[insn] & FLAG_EXIT) { -+ if (num_exits == MAX_EXITS) -+ error("Too many block exits in %s", name); -+ exit_addrs[num_exits] = insn; -+ num_exits++; -+ } -+ if (flags[insn] & FLAG_INSN) -+ last_insn = insn; -+ } -+ -+ exit_addrs[num_exits] = -1; -+ if (retpos == -1) { -+ if (num_exits == 0) { -+ error ("No return instruction found in %s", name); -+ } else { -+ retpos = len; -+ last_insn = len; -+ } -+ } -+ -+ /* If the return instruction is the last instruction we can just -+ remove it. */ -+ if (retpos == last_insn) -+ *patch_bytes = -1; -+ else -+ *patch_bytes = 0; -+ -+ /* Back up over any nop instructions. */ -+ while (retpos > 0 -+ && (flags[retpos] & FLAG_TARGET) == 0 -+ && (flags[retpos - 1] & FLAG_INSN) != 0 -+ && start_p[retpos - 1] == 0x90) { -+ retpos--; -+ } -+ -+ if (*patch_bytes == -1) { -+ *plen = retpos; -+ free (flags); -+ return retpos; -+ } -+ *plen = len; -+ -+ /* The ret is in the middle of the function. Find four more bytes that -+ so the ret can be replaced by a jmp. */ -+ /* ??? Use a short jump where possible. */ -+ bytes = 4; -+ insn = retpos + 1; -+ /* We can clobber everything up to the next jump target. */ -+ while (insn < len && bytes > 0 && (flags[insn] & FLAG_TARGET) == 0) { -+ insn++; -+ bytes--; -+ } -+ if (bytes > 0) { -+ /* ???: Strip out nop blocks. */ -+ /* We can't do the replacement without clobbering anything important. -+ Copy preceeding instructions(s) to give us some space. */ -+ while (retpos > 0) { -+ /* If this byte is the target of a jmp we can't move it. */ -+ if (flags[retpos] & FLAG_TARGET) -+ break; -+ -+ (*patch_bytes)++; -+ bytes--; -+ retpos--; -+ -+ /* Break out of the loop if we have enough space and this is either -+ the first byte of an instruction or a pad byte. */ -+ if ((flags[retpos] & (FLAG_INSN | FLAG_SCANNED)) != FLAG_SCANNED -+ && bytes <= 0) { -+ break; -+ } -+ } -+ } -+ -+ if (bytes > 0) -+ error("Unable to replace ret with jmp in %s\n", name); -+ -+ free(flags); -+ return retpos; -+} -+ -+#endif -+ - #define MAX_ARGS 3 - - /* generate op code */ -@@ -1442,6 +2082,11 @@ - uint8_t args_present[MAX_ARGS]; - const char *sym_name, *p; - EXE_RELOC *rel; -+#if defined(HOST_I386) || defined(HOST_X86_64) -+ int patch_bytes; -+ int retpos; -+ int exit_addrs[MAX_EXITS]; -+#endif - - /* Compute exact size excluding prologue and epilogue instructions. - * Increment start_offset to skip epilogue instructions, then compute -@@ -1452,33 +2097,12 @@ - p_end = p_start + size; - start_offset = offset; - #if defined(HOST_I386) || defined(HOST_X86_64) --#ifdef CONFIG_FORMAT_COFF -- { -- uint8_t *p; -- p = p_end - 1; -- if (p == p_start) -- error("empty code for %s", name); -- while (*p != 0xc3) { -- p--; -- if (p <= p_start) -- error("ret or jmp expected at the end of %s", name); -- } -- copy_size = p - p_start; -- } --#else - { - int len; - len = p_end - p_start; -- if (len == 0) -- error("empty code for %s", name); -- if (p_end[-1] == 0xc3) { -- len--; -- } else { -- error("ret or jmp expected at the end of %s", name); -- } -+ retpos = trace_i386_op(name, p_start, &len, &patch_bytes, exit_addrs); - copy_size = len; - } --#endif - #elif defined(HOST_PPC) - { - uint8_t *p; -@@ -1710,6 +2334,13 @@ - } - - if (gen_switch == 2) { -+#if defined(HOST_I386) || defined(HOST_X86_64) -+ if (patch_bytes != -1) -+ copy_size += patch_bytes; -+#ifdef DEBUG_OP -+ copy_size += 2; -+#endif -+#endif - fprintf(outfile, "DEF(%s, %d, %d)\n", name + 3, nb_args, copy_size); - } else if (gen_switch == 1) { - -@@ -1915,7 +2546,43 @@ - #error unsupport object format - #endif - } -+ } -+ /* Replace the marker instructions with the actual opcodes. */ -+ for (i = 0; exit_addrs[i] != -1; i++) { -+ int op; -+ switch (p_start[exit_addrs[i]]) -+ { -+ case 0xf4: op = 0xc3; break; /* hlt -> ret */ -+ case 0xfa: op = 0xe9; break; /* cli -> jmp */ -+ case 0xfb: op = 0xe9; break; /* sti -> jmp */ -+ default: error("Internal error"); -+ } -+ fprintf(outfile, -+ " *(uint8_t *)(gen_code_ptr + %d) = 0x%x;\n", -+ exit_addrs[i], op); - } -+ /* Fix up the return instruction. */ -+ if (patch_bytes != -1) { -+ if (patch_bytes) { -+ fprintf(outfile, " memcpy(gen_code_ptr + %d," -+ "gen_code_ptr + %d, %d);\n", -+ copy_size, retpos, patch_bytes); -+ } -+ fprintf(outfile, -+ " *(uint8_t *)(gen_code_ptr + %d) = 0xe9;\n", -+ retpos); -+ fprintf(outfile, -+ " *(uint32_t *)(gen_code_ptr + %d) = 0x%x;\n", -+ retpos + 1, copy_size - (retpos + 5)); -+ -+ copy_size += patch_bytes; -+ } -+#ifdef DEBUG_OP -+ fprintf(outfile, -+ " *(uint16_t *)(gen_code_ptr + %d) = 0x9090;\n", -+ copy_size); -+ copy_size += 2; -+#endif - } - #elif defined(HOST_X86_64) - { -@@ -1949,6 +2616,42 @@ - } - } - } -+ /* Replace the marker instructions with the actual opcodes. */ -+ for (i = 0; exit_addrs[i] != -1; i++) { -+ int op; -+ switch (p_start[exit_addrs[i]]) -+ { -+ case 0xf4: op = 0xc3; break; /* hlt -> ret */ -+ case 0xfa: op = 0xe9; break; /* cli -> jmp */ -+ case 0xfb: op = 0xe9; break; /* sti -> jmp */ -+ default: error("Internal error"); -+ } -+ fprintf(outfile, -+ " *(uint8_t *)(gen_code_ptr + %d) = 0x%x;\n", -+ exit_addrs[i], op); -+ } -+ /* Fix up the return instruction. */ -+ if (patch_bytes != -1) { -+ if (patch_bytes) { -+ fprintf(outfile, " memcpy(gen_code_ptr + %d," -+ "gen_code_ptr + %d, %d);\n", -+ copy_size, retpos, patch_bytes); -+ } -+ fprintf(outfile, -+ " *(uint8_t *)(gen_code_ptr + %d) = 0xe9;\n", -+ retpos); -+ fprintf(outfile, -+ " *(uint32_t *)(gen_code_ptr + %d) = 0x%x;\n", -+ retpos + 1, copy_size - (retpos + 5)); -+ -+ copy_size += patch_bytes; -+ } -+#ifdef DEBUG_OP -+ fprintf(outfile, -+ " *(uint16_t *)(gen_code_ptr + %d) = 0x9090;\n", -+ copy_size); -+ copy_size += 2; -+#endif - } - #elif defined(HOST_PPC) - { -diff -Naru qemu-neo1973.orig/dyngen-exec.h qemu-neo1973/dyngen-exec.h ---- qemu-neo1973.orig/dyngen-exec.h 2007-06-24 13:56:38.000000000 +0200 -+++ qemu-neo1973/dyngen-exec.h 2007-06-24 14:35:52.000000000 +0200 -@@ -194,7 +194,12 @@ - #endif - - /* force GCC to generate only one epilog at the end of the function */ -+#if defined(__i386__) || defined(__x86_64__) -+/* Also add 4 bytes of padding so that we can replace the ret with a jmp. */ -+#define FORCE_RET() asm volatile ("nop;nop;nop;nop"); -+#else - #define FORCE_RET() __asm__ __volatile__("" : : : "memory"); -+#endif - - #ifndef OPPROTO - #define OPPROTO -@@ -244,11 +249,18 @@ - #endif - - #if defined(__i386__) --#define EXIT_TB() asm volatile ("ret") --#define GOTO_LABEL_PARAM(n) asm volatile ("jmp " ASM_NAME(__op_gen_label) #n) -+/* Dyngen will replace hlt instructions with a ret instruction. Inserting a -+ ret directly would confuse dyngen. */ -+#define EXIT_TB() asm volatile ("hlt") -+/* Dyngen will replace cli with 0x9e (jmp). -+ We generate the offset manually. */ -+#define GOTO_LABEL_PARAM(n) \ -+ asm volatile ("cli;.long " ASM_NAME(__op_gen_label) #n " - 1f;1:") - #elif defined(__x86_64__) --#define EXIT_TB() asm volatile ("ret") --#define GOTO_LABEL_PARAM(n) asm volatile ("jmp " ASM_NAME(__op_gen_label) #n) -+/* The same as i386. */ -+#define EXIT_TB() asm volatile ("hlt") -+#define GOTO_LABEL_PARAM(n) \ -+ asm volatile ("cli;.long " ASM_NAME(__op_gen_label) #n " - 1f;1:") - #elif defined(__powerpc__) - #define EXIT_TB() asm volatile ("blr") - #define GOTO_LABEL_PARAM(n) asm volatile ("b " ASM_NAME(__op_gen_label) #n) -diff -Naru qemu-neo1973.orig/exec-all.h qemu-neo1973/exec-all.h ---- qemu-neo1973.orig/exec-all.h 2007-06-24 14:31:58.000000000 +0200 -+++ qemu-neo1973/exec-all.h 2007-06-24 14:33:11.000000000 +0200 -@@ -329,14 +329,15 @@ - - #elif defined(__i386__) && defined(USE_DIRECT_JUMP) - --/* we patch the jump instruction directly */ -+/* we patch the jump instruction directly. Use sti in place of the actual -+ jmp instruction so that dyngen can patch in the correct result. */ - #define GOTO_TB(opname, tbparam, n)\ - do {\ - asm volatile (".section .data\n"\ - ASM_OP_LABEL_NAME(n, opname) ":\n"\ - ".long 1f\n"\ - ASM_PREVIOUS_SECTION \ -- "jmp " ASM_NAME(__op_jmp) #n "\n"\ -+ "sti;.long " ASM_NAME(__op_jmp) #n " - 1f\n"\ - "1:\n");\ - } while (0) - -diff -Naru qemu-neo1973.orig/target-ppc/exec.h qemu-neo1973/target-ppc/exec.h ---- qemu-neo1973.orig/target-ppc/exec.h 2007-06-24 13:56:32.000000000 +0200 -+++ qemu-neo1973/target-ppc/exec.h 2007-06-24 14:33:11.000000000 +0200 -@@ -66,11 +66,7 @@ - #define FT1 (env->ft1) - #define FT2 (env->ft2) - --#if defined (DEBUG_OP) --# define RETURN() __asm__ __volatile__("nop" : : : "memory"); --#else --# define RETURN() __asm__ __volatile__("" : : : "memory"); --#endif -+#define RETURN() FORCE_RET() - - static inline target_ulong rotl8 (target_ulong i, int n) - { diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/qemu-amd64-32b-mapping-0.9.0.patch b/packages/qemu/qemu-0.9.0+cvs20070701/qemu-amd64-32b-mapping-0.9.0.patch deleted file mode 100644 index 8f5e9d8b4b..0000000000 --- a/packages/qemu/qemu-0.9.0+cvs20070701/qemu-amd64-32b-mapping-0.9.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naru qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c qemu-snapshot-2007-07-01_05/linux-user/mmap.c ---- qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c 2007-06-03 17:31:32.000000000 +0200 -+++ qemu-snapshot-2007-07-01_05/linux-user/mmap.c 2007-07-02 14:00:30.000000000 +0200 -@@ -234,7 +234,7 @@ - host_offset = offset & qemu_host_page_mask; - host_len = len + offset - host_offset; - host_start = (long)mmap(real_start ? g2h(real_start) : NULL, -- host_len, prot, flags, fd, host_offset); -+ host_len, prot, (flags | MAP_32BIT), fd, host_offset); - if (host_start == -1) - return host_start; - /* update start so that it points to the file position at 'offset' */ -@@ -388,7 +388,7 @@ - int prot; - - /* XXX: use 5 args syscall */ -- new_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags); -+ new_addr = (long)mremap(g2h(old_addr), old_size, new_size, (flags | MAP_32BIT)); - if (new_addr == -1) - return new_addr; - new_addr = h2g(new_addr); diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/qemu-sdl-cursor-0.9.0.patch b/packages/qemu/qemu-0.9.0+cvs20070701/qemu-sdl-cursor-0.9.0.patch deleted file mode 100644 index 08d5513f36..0000000000 --- a/packages/qemu/qemu-0.9.0+cvs20070701/qemu-sdl-cursor-0.9.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru qemu-snapshot-2007-06-24_05.orig/sdl.c qemu-snapshot-2007-06-24_05/sdl.c ---- qemu-snapshot-2007-06-24_05.orig/sdl.c 2007-06-21 23:08:02.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/sdl.c 2007-06-24 16:33:20.000000000 +0200 -@@ -245,7 +245,7 @@ - - if (kbd_mouse_is_absolute()) { - SDL_ShowCursor(1); -- SDL_SetCursor(sdl_cursor_hidden); -+ /* SDL_SetCursor(sdl_cursor_hidden); */ - } else { - SDL_ShowCursor(0); - } diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/.mtn2git_empty b/packages/qemu/qemu-0.9.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/.mtn2git_empty +++ b/packages/qemu/qemu-0.9.1/.mtn2git_empty diff --git a/packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch b/packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch new file mode 100644 index 0000000000..40264ed443 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/02_snapshot_use_tmpdir.patch @@ -0,0 +1,23 @@ +#DPATCHLEVEL=0 +--- +# block.c | 6 +++++- +# 1 file changed, 5 insertions(+), 1 deletion(-) +# +Index: block.c +=================================================================== +--- block.c.orig 2007-12-03 23:47:25.000000000 +0000 ++++ block.c 2007-12-03 23:47:31.000000000 +0000 +@@ -191,8 +191,12 @@ void get_tmp_filename(char *filename, in + void get_tmp_filename(char *filename, int size) + { + int fd; ++ char *tmpdir; + /* XXX: race condition possible */ +- pstrcpy(filename, size, "/tmp/vl.XXXXXX"); ++ tmpdir = getenv("TMPDIR"); ++ if (!tmpdir) ++ tmpdir = "/tmp"; ++ snprintf(filename, size, "%s/vl.XXXXXX", tmpdir); + fd = mkstemp(filename); + close(fd); + } diff --git a/packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch b/packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch new file mode 100644 index 0000000000..31c9da491d --- /dev/null +++ b/packages/qemu/qemu-0.9.1/04_do_not_print_rtc_freq_if_ok.patch @@ -0,0 +1,26 @@ +#DPATCHLEVEL=1 +--- +# vl.c | 5 ++++- +# 1 file changed, 4 insertions(+), 1 deletion(-) +# +Index: qemu/vl.c +=================================================================== +--- qemu.orig/vl.c 2007-12-03 15:44:35.000000000 +0000 ++++ qemu/vl.c 2007-12-03 15:51:03.000000000 +0000 +@@ -1289,12 +1289,15 @@ static void hpet_stop_timer(struct qemu_ + + static int rtc_start_timer(struct qemu_alarm_timer *t) + { ++ unsigned long current_rtc_freq = 0; + int rtc_fd; + + TFR(rtc_fd = open("/dev/rtc", O_RDONLY)); + if (rtc_fd < 0) + return -1; +- if (ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { ++ ioctl(rtc_fd, RTC_IRQP_READ, ¤t_rtc_freq); ++ if (current_rtc_freq != RTC_FREQ && ++ ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) { + fprintf(stderr, "Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal\n" + "error, but for better emulation accuracy either use a 2.6 host Linux kernel or\n" + "type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root.\n"); diff --git a/packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch b/packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch new file mode 100644 index 0000000000..fdd922605e --- /dev/null +++ b/packages/qemu/qemu-0.9.1/05_non-fatal_if_linux_hd_missing.patch @@ -0,0 +1,17 @@ +#DPATCHLEVEL=1 +--- +# hw/pc.c | 1 - +# 1 file changed, 1 deletion(-) +# +Index: qemu/hw/pc.c +=================================================================== +--- qemu.orig/hw/pc.c 2007-12-03 23:47:25.000000000 +0000 ++++ qemu/hw/pc.c 2007-12-03 23:47:38.000000000 +0000 +@@ -385,7 +385,6 @@ static void generate_bootsect(uint32_t g + if (bs_table[0] == NULL) { + fprintf(stderr, "A disk image must be given for 'hda' when booting " + "a Linux kernel\n"); +- exit(1); + } + + memset(bootsect, 0, sizeof(bootsect)); diff --git a/packages/qemu/qemu-0.9.1/06_exit_segfault.patch b/packages/qemu/qemu-0.9.1/06_exit_segfault.patch new file mode 100644 index 0000000000..06123d0626 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/06_exit_segfault.patch @@ -0,0 +1,45 @@ +#DPATCHLEVEL=0 +--- +# linux-user/main.c | 8 ++++---- +# 1 file changed, 4 insertions(+), 4 deletions(-) +# +Index: linux-user/main.c +=================================================================== +--- linux-user/main.c.orig 2007-12-03 23:47:25.000000000 +0000 ++++ linux-user/main.c 2007-12-03 23:47:41.000000000 +0000 +@@ -714,7 +714,7 @@ void cpu_loop (CPUSPARCState *env) + default: + printf ("Unhandled trap: 0x%x\n", trapnr); + cpu_dump_state(env, stderr, fprintf, 0); +- exit (1); ++ _exit (1); + } + process_pending_signals (env); + } +@@ -1634,7 +1634,7 @@ void cpu_loop (CPUState *env) + default: + printf ("Unhandled trap: 0x%x\n", trapnr); + cpu_dump_state(env, stderr, fprintf, 0); +- exit (1); ++ _exit (1); + } + process_pending_signals (env); + } +@@ -1954,7 +1954,7 @@ int main(int argc, char **argv) + for(item = cpu_log_items; item->mask != 0; item++) { + printf("%-10s %s\n", item->name, item->help); + } +- exit(1); ++ _exit(1); + } + cpu_set_log(mask); + } else if (!strcmp(r, "s")) { +@@ -1973,7 +1973,7 @@ int main(int argc, char **argv) + if (qemu_host_page_size == 0 || + (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) { + fprintf(stderr, "page size must be a power of two\n"); +- exit(1); ++ _exit(1); + } + } else if (!strcmp(r, "g")) { + gdbstub_port = atoi(argv[optind++]); diff --git a/packages/qemu/qemu-0.9.1/10_signal_jobs.patch b/packages/qemu/qemu-0.9.1/10_signal_jobs.patch new file mode 100644 index 0000000000..34282adc9d --- /dev/null +++ b/packages/qemu/qemu-0.9.1/10_signal_jobs.patch @@ -0,0 +1,26 @@ +#DPATCHLEVEL=0 +--- +# linux-user/signal.c | 7 ++++++- +# 1 file changed, 6 insertions(+), 1 deletion(-) +# +Index: linux-user/signal.c +=================================================================== +--- linux-user/signal.c.orig 2007-12-03 15:40:26.000000000 +0000 ++++ linux-user/signal.c 2007-12-03 15:55:49.000000000 +0000 +@@ -364,10 +364,15 @@ int queue_signal(int sig, target_siginfo + k = &sigact_table[sig - 1]; + handler = k->sa._sa_handler; + if (handler == TARGET_SIG_DFL) { ++ if (sig == TARGET_SIGTSTP || sig == TARGET_SIGTTIN || sig == TARGET_SIGTTOU) { ++ kill(getpid(),SIGSTOP); ++ return 0; ++ } else + /* default handler : ignore some signal. The other are fatal */ + if (sig != TARGET_SIGCHLD && + sig != TARGET_SIGURG && +- sig != TARGET_SIGWINCH) { ++ sig != TARGET_SIGWINCH && ++ sig != TARGET_SIGCONT) { + force_sig(sig); + } else { + return 0; /* indicate ignored */ diff --git a/packages/qemu/qemu-0.9.1/11_signal_sigaction.patch b/packages/qemu/qemu-0.9.1/11_signal_sigaction.patch new file mode 100644 index 0000000000..33c5e8b12d --- /dev/null +++ b/packages/qemu/qemu-0.9.1/11_signal_sigaction.patch @@ -0,0 +1,21 @@ +#DPATCHLEVEL=0 +--- +# linux-user/signal.c | 5 +++++ +# 1 file changed, 5 insertions(+) +# +Index: linux-user/signal.c +=================================================================== +--- linux-user/signal.c.orig 2007-12-03 23:47:44.000000000 +0000 ++++ linux-user/signal.c 2007-12-03 23:47:46.000000000 +0000 +@@ -512,6 +512,11 @@ int do_sigaction(int sig, const struct t + + if (sig < 1 || sig > TARGET_NSIG || sig == SIGKILL || sig == SIGSTOP) + return -EINVAL; ++ ++ /* no point doing the stuff as those are not allowed for sigaction */ ++ if ((sig == TARGET_SIGKILL) || (sig == TARGET_SIGSTOP)) ++ return -EINVAL; ++ + k = &sigact_table[sig - 1]; + #if defined(DEBUG_SIGNAL) + fprintf(stderr, "sigaction sig=%d act=0x%08x, oact=0x%08x\n", diff --git a/packages/qemu/qemu-0.9.1/22_net_tuntap_stall.patch b/packages/qemu/qemu-0.9.1/22_net_tuntap_stall.patch new file mode 100644 index 0000000000..6017df0f6d --- /dev/null +++ b/packages/qemu/qemu-0.9.1/22_net_tuntap_stall.patch @@ -0,0 +1,18 @@ +#DPATCHLEVEL=0 +--- +# vl.c | 2 +- +# 1 file changed, 1 insertion(+), 1 deletion(-) +# +Index: vl.c +=================================================================== +--- vl.c.orig 2007-12-03 23:47:36.000000000 +0000 ++++ vl.c 2007-12-03 23:47:48.000000000 +0000 +@@ -4023,7 +4023,7 @@ static int tap_open(char *ifname, int if + return -1; + } + memset(&ifr, 0, sizeof(ifr)); +- ifr.ifr_flags = IFF_TAP | IFF_NO_PI; ++ ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE; + if (ifname[0] != '\0') + pstrcpy(ifr.ifr_name, IFNAMSIZ, ifname); + else diff --git a/packages/qemu/qemu-0.9.1/31_syscalls.patch b/packages/qemu/qemu-0.9.1/31_syscalls.patch new file mode 100644 index 0000000000..95a7332ee8 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/31_syscalls.patch @@ -0,0 +1,48 @@ +#DPATCHLEVEL=0 +--- +# linux-user/syscall.c | 11 ++++++++--- +# 1 file changed, 8 insertions(+), 3 deletions(-) +# +Index: linux-user/syscall.c +=================================================================== +--- linux-user/syscall.c.orig 2007-12-03 19:32:56.000000000 +0000 ++++ linux-user/syscall.c 2007-12-03 19:33:41.000000000 +0000 +@@ -250,6 +250,7 @@ extern int getresuid(uid_t *, uid_t *, u + extern int setresgid(gid_t, gid_t, gid_t); + extern int getresgid(gid_t *, gid_t *, gid_t *); + extern int setgroups(int, gid_t *); ++extern int uselib(const char*); + + #define ERRNO_TABLE_SIZE 1200 + +@@ -4024,7 +4025,8 @@ abi_long do_syscall(void *cpu_env, int n + #endif + #ifdef TARGET_NR_uselib + case TARGET_NR_uselib: +- goto unimplemented; ++ ret = get_errno(uselib(path((const char*)arg1))); ++ break; + #endif + #ifdef TARGET_NR_swapon + case TARGET_NR_swapon: +@@ -5289,7 +5291,9 @@ abi_long do_syscall(void *cpu_env, int n + goto unimplemented; + #ifdef TARGET_NR_mincore + case TARGET_NR_mincore: +- goto unimplemented; ++ /*page_unprotect_range((void*)arg3, ((size_t)arg2 + TARGET_PAGE_SIZE - 1) / TARGET_PAGE_SIZE);*/ ++ ret = get_errno(mincore((void*)arg1, (size_t)arg2, (unsigned char*)arg3)); ++ break; + #endif + #ifdef TARGET_NR_madvise + case TARGET_NR_madvise: +@@ -5429,7 +5433,8 @@ abi_long do_syscall(void *cpu_env, int n + break; + #ifdef TARGET_NR_readahead + case TARGET_NR_readahead: +- goto unimplemented; ++ ret = get_errno(readahead((int)arg1, (off64_t)arg2, (size_t)arg3)); ++ break; + #endif + #ifdef TARGET_NR_setxattr + case TARGET_NR_setxattr: diff --git a/packages/qemu/qemu-0.9.1/32_syscall_sysctl.patch b/packages/qemu/qemu-0.9.1/32_syscall_sysctl.patch new file mode 100644 index 0000000000..5e8dd75b0e --- /dev/null +++ b/packages/qemu/qemu-0.9.1/32_syscall_sysctl.patch @@ -0,0 +1,55 @@ +#DPATCHLEVEL=0 +--- +# linux-user/syscall.c | 32 +++++++++++++++++++++++++++++--- +# 1 file changed, 29 insertions(+), 3 deletions(-) +# +Index: linux-user/syscall.c +=================================================================== +--- linux-user/syscall.c.orig 2007-12-03 15:56:24.000000000 +0000 ++++ linux-user/syscall.c 2007-12-03 15:57:36.000000000 +0000 +@@ -52,6 +52,7 @@ + //#include <sys/user.h> + #include <netinet/ip.h> + #include <netinet/tcp.h> ++#include <sys/sysctl.h> + + #define termios host_termios + #define winsize host_winsize +@@ -4739,9 +4740,34 @@ abi_long do_syscall(void *cpu_env, int n + break; + #endif + case TARGET_NR__sysctl: +- /* We don't implement this, but ENOTDIR is always a safe +- return value. */ +- ret = -TARGET_ENOTDIR; ++ { ++ struct __sysctl_args *args = (struct __sysctl_args *) arg1; ++ int *name_target, *name, nlen, *oldlenp, oldlen, newlen, i; ++ void *oldval, *newval; ++ ++ name_target = (int *) tswapl((long) args->name); ++ nlen = tswapl(args->nlen); ++ oldval = (void *) tswapl((long) args->oldval); ++ oldlenp = (int *) tswapl((long) args->oldlenp); ++ oldlen = tswapl(*oldlenp); ++ newval = (void *) tswapl((long) args->newval); ++ newlen = tswapl(args->newlen); ++ ++ name = alloca(nlen * sizeof (int)); ++ for (i = 0; i < nlen; i++) ++ name[i] = tswapl(name_target[i]); ++ ++ if (nlen == 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION) { ++ ret = get_errno( ++ sysctl(name, nlen, oldval, &oldlen, newval, newlen)); ++ if (!is_error(ret)) { ++ *oldlenp = tswapl(oldlen); ++ } ++ } else { ++ gemu_log("qemu: Unsupported sysctl name\n"); ++ ret = -ENOSYS; ++ } ++ } + break; + case TARGET_NR_sched_setparam: + { diff --git a/packages/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch b/packages/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch new file mode 100644 index 0000000000..3f733b6ab8 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/33_syscall_ppc_clone.patch @@ -0,0 +1,22 @@ +#DPATCHLEVEL=0 +--- +# linux-user/syscall.c | 6 +----- +# 1 file changed, 1 insertion(+), 5 deletions(-) +# +Index: linux-user/syscall.c +=================================================================== +--- linux-user/syscall.c.orig 2007-12-03 15:58:11.000000000 +0000 ++++ linux-user/syscall.c 2007-12-03 15:58:46.000000000 +0000 +@@ -2750,11 +2750,7 @@ int do_fork(CPUState *env, unsigned int + if (!newsp) + newsp = env->gpr[1]; + new_env->gpr[1] = newsp; +- { +- int i; +- for (i = 7; i < 32; i++) +- new_env->gpr[i] = 0; +- } ++ new_env->gpr[3] = 0; + #elif defined(TARGET_SH4) + if (!newsp) + newsp = env->gregs[15]; diff --git a/packages/qemu/qemu-0.9.1/39_syscall_fadvise64.patch b/packages/qemu/qemu-0.9.1/39_syscall_fadvise64.patch new file mode 100644 index 0000000000..54ee3e0948 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/39_syscall_fadvise64.patch @@ -0,0 +1,21 @@ +--- + linux-user/syscall.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: linux-user/syscall.c +=================================================================== +--- linux-user/syscall.c.orig 2007-12-03 19:33:47.000000000 +0000 ++++ linux-user/syscall.c 2007-12-03 19:33:48.000000000 +0000 +@@ -5317,6 +5317,12 @@ abi_long do_syscall(void *cpu_env, int n + ret = get_errno(mincore((void*)arg1, (size_t)arg2, (unsigned char*)arg3)); + break; + #endif ++#ifdef TARGET_NR_fadvise64_64 ++ case TARGET_NR_fadvise64_64: ++ /* Just return success */ ++ ret = get_errno(0); ++ break; ++#endif + #ifdef TARGET_NR_madvise + case TARGET_NR_madvise: + /* A straight passthrough may not be safe because qemu sometimes diff --git a/packages/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch b/packages/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch new file mode 100644 index 0000000000..cea3afc7ff --- /dev/null +++ b/packages/qemu/qemu-0.9.1/41_arm_fpa_sigfpe.patch @@ -0,0 +1,104 @@ +#DPATCHLEVEL=0 +--- +# linux-user/main.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++- +# target-arm/nwfpe/fpa11.c | 7 ++++++ +# 2 files changed, 57 insertions(+), 1 deletion(-) +# +Index: linux-user/main.c +=================================================================== +--- linux-user/main.c.orig 2007-12-03 15:59:10.000000000 +0000 ++++ linux-user/main.c 2007-12-03 16:01:27.000000000 +0000 +@@ -377,18 +377,67 @@ void cpu_loop(CPUARMState *env) + { + TaskState *ts = env->opaque; + uint32_t opcode; ++ int rc; + + /* we handle the FPU emulation here, as Linux */ + /* we get the opcode */ + /* FIXME - what to do if get_user() fails? */ + get_user_u32(opcode, env->regs[15]); + +- if (EmulateAll(opcode, &ts->fpa, env) == 0) { ++ rc = EmulateAll(opcode, &ts->fpa, env); ++ if (rc == 0) { /* illegal instruction */ + info.si_signo = SIGILL; + info.si_errno = 0; + info.si_code = TARGET_ILL_ILLOPN; + info._sifields._sigfault._addr = env->regs[15]; + queue_signal(info.si_signo, &info); ++ } else if (rc < 0) { /* FP exception */ ++ int arm_fpe=0; ++ ++ /* translate softfloat flags to FPSR flags */ ++ if (-rc & float_flag_invalid) ++ arm_fpe |= BIT_IOC; ++ if (-rc & float_flag_divbyzero) ++ arm_fpe |= BIT_DZC; ++ if (-rc & float_flag_overflow) ++ arm_fpe |= BIT_OFC; ++ if (-rc & float_flag_underflow) ++ arm_fpe |= BIT_UFC; ++ if (-rc & float_flag_inexact) ++ arm_fpe |= BIT_IXC; ++ ++ FPSR fpsr = ts->fpa.fpsr; ++ //printf("fpsr 0x%x, arm_fpe 0x%x\n",fpsr,arm_fpe); ++ ++ if (fpsr & (arm_fpe << 16)) { /* exception enabled? */ ++ info.si_signo = SIGFPE; ++ info.si_errno = 0; ++ ++ /* ordered by priority, least first */ ++ if (arm_fpe & BIT_IXC) info.si_code = TARGET_FPE_FLTRES; ++ if (arm_fpe & BIT_UFC) info.si_code = TARGET_FPE_FLTUND; ++ if (arm_fpe & BIT_OFC) info.si_code = TARGET_FPE_FLTOVF; ++ if (arm_fpe & BIT_DZC) info.si_code = TARGET_FPE_FLTDIV; ++ if (arm_fpe & BIT_IOC) info.si_code = TARGET_FPE_FLTINV; ++ ++ info._sifields._sigfault._addr = env->regs[15]; ++ queue_signal(info.si_signo, &info); ++ } else { ++ env->regs[15] += 4; ++ } ++ ++ /* accumulate unenabled exceptions */ ++ if ((!(fpsr & BIT_IXE)) && (arm_fpe & BIT_IXC)) ++ fpsr |= BIT_IXC; ++ if ((!(fpsr & BIT_UFE)) && (arm_fpe & BIT_UFC)) ++ fpsr |= BIT_UFC; ++ if ((!(fpsr & BIT_OFE)) && (arm_fpe & BIT_OFC)) ++ fpsr |= BIT_OFC; ++ if ((!(fpsr & BIT_DZE)) && (arm_fpe & BIT_DZC)) ++ fpsr |= BIT_DZC; ++ if ((!(fpsr & BIT_IOE)) && (arm_fpe & BIT_IOC)) ++ fpsr |= BIT_IOC; ++ ts->fpa.fpsr=fpsr; + } else { + /* increment PC */ + env->regs[15] += 4; +Index: target-arm/nwfpe/fpa11.c +=================================================================== +--- target-arm/nwfpe/fpa11.c.orig 2007-12-03 15:40:26.000000000 +0000 ++++ target-arm/nwfpe/fpa11.c 2007-12-03 15:59:11.000000000 +0000 +@@ -162,6 +162,8 @@ unsigned int EmulateAll(unsigned int opc + fpa11->initflag = 1; + } + ++ set_float_exception_flags(0, &fpa11->fp_status); ++ + if (TEST_OPCODE(opcode,MASK_CPRT)) + { + //fprintf(stderr,"emulating CPRT\n"); +@@ -191,6 +193,11 @@ unsigned int EmulateAll(unsigned int opc + } + + // restore_flags(flags); ++ if(nRc == 1 && get_float_exception_flags(&fpa11->fp_status)) ++ { ++ //printf("fef 0x%x\n",float_exception_flags); ++ nRc=-get_float_exception_flags(&fpa11->fp_status); ++ } + + //printf("returning %d\n",nRc); + return(nRc); diff --git a/packages/qemu/qemu-0.9.1/52_ne2000_return.patch b/packages/qemu/qemu-0.9.1/52_ne2000_return.patch new file mode 100644 index 0000000000..e4ea33f2c6 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/52_ne2000_return.patch @@ -0,0 +1,17 @@ +--- + hw/ne2000.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: qemu/hw/ne2000.c +=================================================================== +--- qemu.orig/hw/ne2000.c 2007-12-03 19:32:52.000000000 +0000 ++++ qemu/hw/ne2000.c 2007-12-03 19:33:55.000000000 +0000 +@@ -217,7 +217,7 @@ static int ne2000_can_receive(void *opaq + NE2000State *s = opaque; + + if (s->cmd & E8390_STOP) +- return 1; ++ return 0; + return !ne2000_buffer_full(s); + } + diff --git a/packages/qemu/qemu-0.9.1/61_safe_64bit_int.patch b/packages/qemu/qemu-0.9.1/61_safe_64bit_int.patch new file mode 100644 index 0000000000..9b1ace81a5 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/61_safe_64bit_int.patch @@ -0,0 +1,27 @@ +#DPATCHLEVEL=0 +--- +# dyngen-exec.h | 4 ++-- +# 1 file changed, 2 insertions(+), 2 deletions(-) +# +Index: dyngen-exec.h +=================================================================== +--- dyngen-exec.h.orig 2007-12-31 13:06:21.000000000 +0000 ++++ dyngen-exec.h 2007-12-31 13:08:54.000000000 +0000 +@@ -38,7 +38,7 @@ + // Linux/Sparc64 defines uint64_t + #if !(defined (__sparc_v9__) && defined(__linux__)) + /* XXX may be done for all 64 bits targets ? */ +-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) ++#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(__sparc__) + typedef unsigned long uint64_t; + #else + typedef unsigned long long uint64_t; +@@ -55,7 +55,7 @@ + typedef signed int int32_t; + // Linux/Sparc64 defines int64_t + #if !(defined (__sparc_v9__) && defined(__linux__)) +-#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) ++#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) || defined(__alpha__) || defined(__sparc__) + typedef signed long int64_t; + #else + typedef signed long long int64_t; diff --git a/packages/qemu/qemu-0.9.1/63_sparc_build.patch b/packages/qemu/qemu-0.9.1/63_sparc_build.patch new file mode 100644 index 0000000000..37b38f641b --- /dev/null +++ b/packages/qemu/qemu-0.9.1/63_sparc_build.patch @@ -0,0 +1,18 @@ +#DPATCHLEVEL=0 +--- +# sparc.ld | 2 +- +# 1 file changed, 1 insertion(+), 1 deletion(-) +# +Index: sparc.ld +=================================================================== +--- sparc.ld.orig 2007-12-03 15:40:26.000000000 +0000 ++++ sparc.ld 2007-12-03 16:05:06.000000000 +0000 +@@ -6,7 +6,7 @@ ENTRY(_start) + SECTIONS + { + /* Read-only sections, merged into text segment: */ +- . = 0x60000000 + SIZEOF_HEADERS; ++ . = 0x60000000 + 0x400; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } diff --git a/packages/qemu/qemu-0.9.1/64_ppc_asm_constraints.patch b/packages/qemu/qemu-0.9.1/64_ppc_asm_constraints.patch new file mode 100644 index 0000000000..e4858b79d7 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/64_ppc_asm_constraints.patch @@ -0,0 +1,18 @@ +#DPATCHLEVEL=1 +--- +# cpu-all.h | 2 +- +# 1 file changed, 1 insertion(+), 1 deletion(-) +# +Index: qemu/cpu-all.h +=================================================================== +--- qemu.orig/cpu-all.h 2007-06-13 11:48:22.000000000 +0100 ++++ qemu/cpu-all.h 2007-06-13 11:51:56.000000000 +0100 +@@ -250,7 +250,7 @@ static inline void stw_le_p(void *ptr, i + static inline void stl_le_p(void *ptr, int v) + { + #ifdef __powerpc__ +- __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*(uint32_t *)ptr) : "r" (v), "r" (ptr)); ++ __asm__ __volatile__ ("stwbrx %0,0,%1" : : "r" (v), "r" (ptr) : "memory"); + #else + uint8_t *p = ptr; + p[0] = v; diff --git a/packages/qemu/qemu-0.9.1/65_kfreebsd.patch b/packages/qemu/qemu-0.9.1/65_kfreebsd.patch new file mode 100644 index 0000000000..dfece800ac --- /dev/null +++ b/packages/qemu/qemu-0.9.1/65_kfreebsd.patch @@ -0,0 +1,35 @@ +--- + configure | 6 ++++++ + vl.c | 2 ++ + 2 files changed, 8 insertions(+) + +Index: configure +=================================================================== +--- configure.orig 2007-12-03 15:40:26.000000000 +0000 ++++ configure 2007-12-03 16:05:34.000000000 +0000 +@@ -129,6 +129,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64 + kqemu="yes" + fi + ;; ++GNU/kFreeBSD) ++oss="yes" ++if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then ++ kqemu="yes" ++fi ++;; + FreeBSD) + bsd="yes" + oss="yes" +Index: vl.c +=================================================================== +--- vl.c.orig 2007-12-03 16:05:32.000000000 +0000 ++++ vl.c 2007-12-03 16:05:34.000000000 +0000 +@@ -97,6 +97,8 @@ + #include <stropts.h> + #endif + #endif ++#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) ++#include <freebsd/stdlib.h> + #else + #include <winsock2.h> + int inet_aton(const char *cp, struct in_addr *ia); diff --git a/packages/qemu/qemu-0.9.1/66_tls_ld.patch b/packages/qemu/qemu-0.9.1/66_tls_ld.patch new file mode 100644 index 0000000000..54e02eff8b --- /dev/null +++ b/packages/qemu/qemu-0.9.1/66_tls_ld.patch @@ -0,0 +1,55 @@ +--- + arm.ld | 7 +++++++ + i386.ld | 7 +++++++ + 2 files changed, 14 insertions(+) + +Index: arm.ld +=================================================================== +--- arm.ld.orig 2007-06-13 11:48:22.000000000 +0100 ++++ arm.ld 2007-06-13 11:51:56.000000000 +0100 +@@ -26,6 +26,10 @@ SECTIONS + { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } ++ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } ++ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } ++ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } ++ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } +@@ -58,6 +62,9 @@ SECTIONS + .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } + __exidx_end = .; + .reginfo : { *(.reginfo) } ++ /* Thread Local Storage sections */ ++ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } ++ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. */ + . = ALIGN(0x100000) + (. & (0x100000 - 1)); +Index: i386.ld +=================================================================== +--- i386.ld.orig 2007-06-13 11:48:22.000000000 +0100 ++++ i386.ld 2007-06-13 11:51:56.000000000 +0100 +@@ -28,6 +28,10 @@ SECTIONS + { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } ++ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } ++ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } ++ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } ++ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.ctors : { *(.rel.ctors) } +@@ -53,6 +57,9 @@ SECTIONS + _etext = .; + PROVIDE (etext = .); + .fini : { *(.fini) } =0x47ff041f ++ /* Thread Local Storage sections */ ++ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } ++ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + . = ALIGN(32 / 8); + PROVIDE (__preinit_array_start = .); + .preinit_array : { *(.preinit_array) } diff --git a/packages/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch b/packages/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch new file mode 100644 index 0000000000..0d60c1c306 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/91-oh-sdl-cursor.patch @@ -0,0 +1,18 @@ +=== modified file 'sdl.c' +--- + sdl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: sdl.c +=================================================================== +--- sdl.c.orig 2007-12-03 19:32:15.000000000 +0000 ++++ sdl.c 2007-12-03 19:34:04.000000000 +0000 +@@ -247,7 +247,7 @@ static void sdl_hide_cursor(void) + + if (kbd_mouse_is_absolute()) { + SDL_ShowCursor(1); +- SDL_SetCursor(sdl_cursor_hidden); ++ /* SDL_SetCursor(sdl_cursor_hidden); */ + } else { + SDL_ShowCursor(0); + } diff --git a/packages/qemu/qemu-0.9.1/configure_symlinkpath_fix.patch b/packages/qemu/qemu-0.9.1/configure_symlinkpath_fix.patch new file mode 100644 index 0000000000..3ec304a38c --- /dev/null +++ b/packages/qemu/qemu-0.9.1/configure_symlinkpath_fix.patch @@ -0,0 +1,28 @@ +Index: qemu-0.9.1/configure +=================================================================== +--- qemu-0.9.1.orig/configure 2008-01-24 15:33:13.000000000 +0000 ++++ qemu-0.9.1/configure 2008-01-24 15:45:50.000000000 +0000 +@@ -209,15 +209,17 @@ + + # find source path + source_path=`dirname "$0"` ++source_path_used="no" ++workdir=`pwd` ++workdir=`readlink -f $workdir` + if [ -z "$source_path" ]; then +- source_path=`pwd` ++ source_path=$workdir + else + source_path=`cd "$source_path"; pwd` +-fi +-if test "$source_path" = `pwd` ; then +- source_path_used="no" +-else +- source_path_used="yes" ++ source_path=`readlink -f $source_path` ++ if test "$source_path" != "$workdir" ; then ++ source_path_used="yes" ++ fi + fi + + werror="no" diff --git a/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch b/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch new file mode 100644 index 0000000000..017f9f6355 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/disable-error-in-configure.patch @@ -0,0 +1,17 @@ +--- + configure | 2 -- + 1 file changed, 2 deletions(-) + +Index: qemu/configure +=================================================================== +--- qemu.orig/configure 2007-12-03 16:38:38.000000000 +0000 ++++ qemu/configure 2007-12-03 16:38:39.000000000 +0000 +@@ -323,8 +323,6 @@ for opt do + ;; + --disable-werror) werror="no" + ;; +- *) echo "ERROR: unknown option $opt"; show_help="yes" +- ;; + --disable-nptl) nptl="no" + ;; + esac diff --git a/packages/qemu/qemu-0.9.1/fix_segfault.patch b/packages/qemu/qemu-0.9.1/fix_segfault.patch new file mode 100644 index 0000000000..443c330650 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/fix_segfault.patch @@ -0,0 +1,37 @@ +--- + linux-user/syscall.c | 22 ---------------------- + 1 file changed, 22 deletions(-) + +Index: qemu/linux-user/syscall.c +=================================================================== +--- qemu.orig/linux-user/syscall.c 2007-12-03 23:40:11.000000000 +0000 ++++ qemu/linux-user/syscall.c 2007-12-03 23:40:21.000000000 +0000 +@@ -5695,28 +5695,6 @@ abi_long do_syscall(void *cpu_env, int n + goto unimplemented_nowarn; + #endif + +-#ifdef TARGET_NR_clock_gettime +- case TARGET_NR_clock_gettime: +- { +- struct timespec ts; +- ret = get_errno(clock_gettime(arg1, &ts)); +- if (!is_error(ret)) { +- host_to_target_timespec(arg2, &ts); +- } +- break; +- } +-#endif +-#ifdef TARGET_NR_clock_getres +- case TARGET_NR_clock_getres: +- { +- struct timespec ts; +- ret = get_errno(clock_getres(arg1, &ts)); +- if (!is_error(ret)) { +- host_to_target_timespec(arg2, &ts); +- } +- break; +- } +-#endif + + #if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address) + case TARGET_NR_set_tid_address: diff --git a/packages/qemu/qemu-0.9.1/no-strip.patch b/packages/qemu/qemu-0.9.1/no-strip.patch new file mode 100644 index 0000000000..fc69b37e16 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/no-strip.patch @@ -0,0 +1,22 @@ +--- qemu.orig/Makefile 2008-01-29 23:16:27.000000000 -0800 ++++ qemu-0.9.1/Makefile 2008-01-29 23:16:38.000000000 -0800 +@@ -174,7 +174,7 @@ + install: all $(if $(BUILD_DOCS),install-doc) + mkdir -p "$(DESTDIR)$(bindir)" + ifneq ($(TOOLS),) +- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" + endif + mkdir -p "$(DESTDIR)$(datadir)" + for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ +--- qemu.orig/Makefile.target 2008-01-29 23:16:27.000000000 -0800 ++++ qemu-0.9.1/Makefile.target 2008-01-29 23:17:33.000000000 -0800 +@@ -632,7 +632,7 @@ + + install: all + ifneq ($(PROGS),) +- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" + endif + + ifneq ($(wildcard .depend),) diff --git a/packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch b/packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch new file mode 100644 index 0000000000..ebc996e873 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl-update.patch @@ -0,0 +1,219 @@ +--- + linux-user/main.c | 7 ++- + linux-user/syscall.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++----- + 2 files changed, 111 insertions(+), 10 deletions(-) + +Index: qemu/linux-user/main.c +=================================================================== +--- qemu.orig/linux-user/main.c 2007-12-03 19:34:09.000000000 +0000 ++++ qemu/linux-user/main.c 2007-12-03 23:44:45.000000000 +0000 +@@ -391,7 +391,7 @@ do_kernel_trap(CPUARMState *env) + cpu_unlock(); + break; + case 0xffff0fe0: /* __kernel_get_tls */ +- env->regs[0] = env->cp15.c13_tls; ++ env->regs[0] = env->cp15.c13_tls2; + break; + default: + return 1; +@@ -2037,6 +2037,11 @@ int main(int argc, char **argv) + int drop_ld_preload = 0, environ_count = 0; + char **target_environ, **wrk, **dst; + ++ char *assume_kernel = getenv("QEMU_ASSUME_KERNEL"); ++ ++ if (assume_kernel) ++ setenv("LD_ASSUME_KERNEL", assume_kernel, 1); ++ + if (argc <= 1) + usage(); + +Index: qemu/linux-user/syscall.c +=================================================================== +--- qemu.orig/linux-user/syscall.c 2007-12-03 19:34:09.000000000 +0000 ++++ qemu/linux-user/syscall.c 2007-12-03 23:46:54.000000000 +0000 +@@ -61,6 +61,7 @@ + #define tchars host_tchars /* same as target */ + #define ltchars host_ltchars /* same as target */ + ++#include <linux/futex.h> + #include <linux/termios.h> + #include <linux/unistd.h> + #include <linux/utsname.h> +@@ -2694,7 +2695,6 @@ abi_long do_arch_prctl(CPUX86State *env, + return 0; + } + #endif +- + #endif /* defined(TARGET_I386) */ + + /* this stack is the equivalent of the kernel stack associated with a +@@ -2729,16 +2729,19 @@ int do_fork(CPUState *env, unsigned int + TaskState *ts; + uint8_t *new_stack; + CPUState *new_env; +- ++#if defined(TARGET_I386) ++ uint64_t *new_gdt_table; ++#endif + #ifdef USE_NPTL + unsigned int nptl_flags; + + if (flags & CLONE_PARENT_SETTID) + *parent_tidptr = gettid(); + #endif +- + if (flags & CLONE_VM) { + ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE); ++ if (!ts) ++ return -ENOMEM; + memset(ts, 0, sizeof(TaskState)); + new_stack = ts->stack; + ts->used = 1; +@@ -2750,6 +2753,29 @@ int do_fork(CPUState *env, unsigned int + #if defined(TARGET_I386) + if (!newsp) + newsp = env->regs[R_ESP]; ++ new_gdt_table = malloc(9 * 8); ++ if (!new_gdt_table) { ++ free(new_env); ++ return -ENOMEM; ++ } ++ /* Copy main GDT table from parent, but clear TLS entries */ ++ memcpy(new_gdt_table, g2h(env->gdt.base), 6 * 8); ++ memset(&new_gdt_table[6], 0, 3 * 8); ++ new_env->gdt.base = h2g(new_gdt_table); ++ if (flags & 0x00080000 /* CLONE_SETTLS */) { ++ ret = do_set_thread_area(new_env, new_env->regs[R_ESI]); ++ if (ret) { ++ free(new_gdt_table); ++ free(new_env); ++ return ret; ++ } ++ } ++ cpu_x86_load_seg(env, R_CS, new_env->regs[R_CS]); ++ cpu_x86_load_seg(env, R_DS, new_env->regs[R_DS]); ++ cpu_x86_load_seg(env, R_ES, new_env->regs[R_ES]); ++ cpu_x86_load_seg(env, R_SS, new_env->regs[R_SS]); ++ cpu_x86_load_seg(env, R_FS, new_env->regs[R_FS]); ++ cpu_x86_load_seg(env, R_GS, new_env->regs[R_GS]); + new_env->regs[R_ESP] = newsp; + new_env->regs[R_EAX] = 0; + #elif defined(TARGET_ARM) +@@ -3121,6 +3147,68 @@ static inline abi_long host_to_target_ti + unlock_user_struct(target_ts, target_addr, 1); + } + ++static long do_futex(target_ulong uaddr, int op, uint32_t val, ++ target_ulong utime, target_ulong uaddr2, ++ uint32_t val3) ++{ ++ struct timespec host_utime; ++ unsigned long val2 = utime; ++ ++ if (utime && (op == FUTEX_WAIT || op == FUTEX_LOCK_PI)) { ++ target_to_host_timespec(&host_utime, utime); ++ val2 = (unsigned long)&host_utime; ++ } ++ ++#ifdef BSWAP_NEEDED ++ switch(op) { ++ case FUTEX_CMP_REQUEUE: ++ val3 = tswap32(val3); ++ case FUTEX_REQUEUE: ++ val2 = tswap32(val2); ++ case FUTEX_WAIT: ++ case FUTEX_WAKE: ++ val = tswap32(val); ++ case FUTEX_LOCK_PI: /* This one's icky, but comes out OK */ ++ case FUTEX_UNLOCK_PI: ++ break; ++ default: ++ gemu_log("qemu: Unsupported futex op %d\n", op); ++ return -ENOSYS; ++ } ++#if 0 /* No, it's worse than this */ ++ if (op == FUTEX_WAKE_OP) { ++ /* Need to munge the secondary operation (val3) */ ++ val3 = tswap32(val3); ++ int op2 = (val3 >> 28) & 7; ++ int cmp = (val3 >> 24) & 15; ++ int oparg = (val3 << 8) >> 20; ++ int cmparg = (val3 << 20) >> 20; ++ int shift = val3 & (FUTEX_OP_OPARG_SHIFT << 28); ++ ++ if (shift) ++ oparg = (oparg & 7) + 24 - (oparg & 24); ++ else oparg = ++ if (op2 == FUTEX_OP_ADD) { ++ gemu_log("qemu: Unsupported wrong-endian FUTEX_OP_ADD\n"); ++ return -ENOSYS; ++ } ++ if (cmparg == FUTEX_OP_CMP_LT || cmparg == FUTEX_OP_CMP_GE || ++ cmparg == FUTEX_OP_CMP_LE || cmparg == FUTEX_OP_CMP_GT) { ++ gemu_log("qemu: Unsupported wrong-endian futex cmparg %d\n", cmparg); ++ return -ENOSYS; ++ } ++ val3 = shift | (op2<<28) | (cmp<<24) | (oparg<<12) | cmparg; ++ } ++#endif ++#endif ++ return syscall(__NR_futex, g2h(uaddr), op, val, val2, g2h(uaddr2), val3); ++} ++ ++int do_set_tid_address(target_ulong tidptr) ++{ ++ return syscall(__NR_set_tid_address, g2h(tidptr)); ++} ++ + /* do_syscall() should always have a single exit point at the end so + that actions, such as logging of syscall results, can be performed. + All errnos that do_syscall() returns must be -TARGET_<errcode>. */ +@@ -3145,7 +3233,7 @@ abi_long do_syscall(void *cpu_env, int n + _mcleanup(); + #endif + gdb_exit(cpu_env, arg1); +- /* XXX: should free thread stack and CPU env */ ++ /* XXX: should free thread stack, GDT and CPU env */ + _exit(arg1); + ret = 0; /* avoid warning */ + break; +@@ -5569,6 +5657,9 @@ abi_long do_syscall(void *cpu_env, int n + #elif defined(TARGET_I386) && defined(TARGET_ABI32) + ret = do_set_thread_area(cpu_env, arg1); + break; ++#elif TARGET_i386 ++ ret = get_errno(do_set_thread_area(cpu_env, arg1)); ++ break; + #else + goto unimplemented_nowarn; + #endif +@@ -5586,6 +5677,16 @@ abi_long do_syscall(void *cpu_env, int n + goto unimplemented_nowarn; + #endif + ++#ifdef TARGET_NR_futex ++ case TARGET_NR_futex: ++ ret = get_errno(do_futex(arg1, arg2, arg3, arg4, arg5, arg6)); ++ break; ++#endif ++#ifdef TARGET_NR_set_robust_list ++ case TARGET_NR_set_robust_list: ++ goto unimplemented_nowarn; ++#endif ++ + #ifdef TARGET_NR_clock_gettime + case TARGET_NR_clock_gettime: + { +@@ -5627,11 +5728,6 @@ abi_long do_syscall(void *cpu_env, int n + break; + #endif + +-#ifdef TARGET_NR_set_robust_list +- case TARGET_NR_set_robust_list: +- goto unimplemented_nowarn; +-#endif +- + #if defined(TARGET_NR_utimensat) && defined(__NR_utimensat) + case TARGET_NR_utimensat: + { diff --git a/packages/qemu/qemu-0.9.0+cvs20070701/arm_nptl-0.9.0.patch b/packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl.patch index fe1f0945b6..10e3cc04a5 100644 --- a/packages/qemu/qemu-0.9.0+cvs20070701/arm_nptl-0.9.0.patch +++ b/packages/qemu/qemu-0.9.1/qemu-0.9.0-nptl.patch @@ -1,7 +1,37 @@ -diff -Naru qemu-snapshot-2007-06-24_05.orig/configure qemu-snapshot-2007-06-24_05/configure ---- qemu-snapshot-2007-06-24_05.orig/configure 2007-06-24 16:31:54.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/configure 2007-06-24 16:33:58.000000000 +0200 -@@ -101,6 +101,7 @@ +These are Paul Brook's patches to QEMU-0.8.2 to enable the running of single +ARM binaries under QEMU's user-emulation mode. Without them, QEMU-0.8.1 +immediately dies saying: + Error: f0005 + qemu: uncaught target signal 6 (Aborted) - exiting +while qemu-0.8.2 dies saying: + qemu: Unsupported syscall: 983045 + cannot set up thread-local storage: unknown error + +This file is a rediffing of the patches visible at +https://nowt.dyndns.org/patch.qemu_nptl on 27 Sept 2006 +which "patch" fails to apply automatically. +See also http://lists.gnu.org/archive/html/qemu-devel/2006-09/msg00194.html + + Martin Guy, 27 Sept 2006 + +--- + configure | 25 ++++++ + exec-all.h | 165 ------------------------------------------ + linux-user/arm/syscall.h | 4 - + linux-user/main.c | 94 +++++++++++++++++++++--- + linux-user/qemu.h | 3 + linux-user/syscall.c | 91 ++++++++++++++++++++++- + qemu_spinlock.h | 181 +++++++++++++++++++++++++++++++++++++++++++++++ + target-arm/cpu.h | 10 ++ + target-arm/op.c | 6 + + target-arm/translate.c | 9 ++ + 10 files changed, 405 insertions(+), 183 deletions(-) + +--- qemu.orig/configure ++++ qemu/configure +@@ -103,10 +103,11 @@ check_gcc="yes" + softmmu="yes" + linux_user="no" darwin_user="no" build_docs="no" uname_release="" @@ -9,16 +39,36 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/configure qemu-snapshot-2007-06-24_0 # OS specific targetos=`uname -s` -@@ -287,6 +288,8 @@ - *) echo "undefined SPARC architecture. Exiting";exit 1;; - esac + case $targetos in + CYGWIN*) +@@ -322,10 +323,12 @@ for opt do + ;; + --disable-werror) werror="no" + ;; + *) echo "ERROR: unknown option $opt"; show_help="yes" ;; + --disable-nptl) nptl="no" + ;; esac done -@@ -530,6 +533,23 @@ + if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$mingw32" = "yes" ] ; then + AIOLIBS= +@@ -417,10 +420,11 @@ echo " --enable-system enable + echo " --disable-system disable all system emulation targets" + echo " --enable-linux-user enable all linux usermode emulation targets" + echo " --disable-linux-user disable all linux usermode emulation targets" + echo " --enable-darwin-user enable all darwin usermode emulation targets" + echo " --disable-darwin-user disable all darwin usermode emulation targets" ++echo " --disable-nptl disable usermode NPTL guest support" + echo " --fmod-lib path to FMOD library" + echo " --fmod-inc path to FMOD includes" + echo " --enable-uname-release=R Return R for uname -r in usermode emulation" + echo " --sparc_cpu=V Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9" + echo "" +@@ -583,10 +587,27 @@ fi + cat > $TMPC <<EOF + int main(void) { } EOF @@ -42,33 +92,39 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/configure qemu-snapshot-2007-06-24_0 ########################################## # SDL probe -@@ -681,6 +701,7 @@ - echo "Target Sparc Arch $sparc_cpu" + sdl_too_old=no + +@@ -747,10 +768,11 @@ if test -n "$sparc_cpu"; then fi echo "kqemu support $kqemu" -+echo "NPTL support $nptl" echo "Documentation $build_docs" [ ! -z "$uname_release" ] && \ echo "uname -r $uname_release" -@@ -1063,6 +1084,14 @@ - echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak - fi - fi -+else -+ if test "$nptl" = "yes" ; then -+ case "$target_cpu" in -+ arm | armeb) -+ echo "#define USE_NPTL 1" >> $config_h -+ ;; -+ esac -+ fi ++echo "NPTL support $nptl" + + if test $sdl_too_old = "yes"; then + echo "-> Your SDL version is too old - please upgrade to have SDL support" fi + if [ -s /tmp/qemu-$$-sdl-config.log ]; then +@@ -1063,10 +1085,13 @@ if test "$target_cpu" = "i386" ; then + fi + elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then + echo "TARGET_ARCH=arm" >> $config_mak + echo "#define TARGET_ARCH \"arm\"" >> $config_h + echo "#define TARGET_ARM 1" >> $config_h ++ if test "$nptl" = "yes" ; then ++ echo "#define USE_NPTL 1" >> $config_h ++ fi + bflt="yes" + elif test "$target_cpu" = "sparc" ; then + echo "TARGET_ARCH=sparc" >> $config_mak + echo "#define TARGET_ARCH \"sparc\"" >> $config_h + echo "#define TARGET_SPARC 1" >> $config_h +--- qemu.orig/exec-all.h ++++ qemu/exec-all.h +@@ -338,174 +338,11 @@ dummy_label ## n: ;\ - if test "$cocoa" = "yes" ; then -diff -Naru qemu-snapshot-2007-06-24_05.orig/exec-all.h qemu-snapshot-2007-06-24_05/exec-all.h ---- qemu-snapshot-2007-06-24_05.orig/exec-all.h 2007-05-23 21:58:10.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/exec-all.h 2007-06-24 16:33:58.000000000 +0200 -@@ -360,170 +360,7 @@ + extern CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4]; extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4]; extern void *io_mem_opaque[IO_MEM_NB_ENTRIES]; @@ -92,7 +148,7 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/exec-all.h qemu-snapshot-2007-06-24_ -static inline int testandset (int *p) -{ - long int readval = 0; -- +- - __asm__ __volatile__ ("lock; cmpxchgl %2, %0" - : "+m" (*p), "+a" (readval) - : "r" (1) @@ -103,7 +159,7 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/exec-all.h qemu-snapshot-2007-06-24_ -static inline int testandset (int *p) -{ - long int readval = 0; -- +- - __asm__ __volatile__ ("lock; cmpxchgl %2, %0" - : "+m" (*p), "+a" (readval) - : "r" (1) @@ -118,7 +174,7 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/exec-all.h qemu-snapshot-2007-06-24_ - __asm__ __volatile__ ("0: cs %0,%1,0(%2)\n" - " jl 0b" - : "=&d" (ret) -- : "r" (1), "a" (p), "0" (*p) +- : "r" (1), "a" (p), "0" (*p) - : "cc", "memory" ); - return ret; -} @@ -158,7 +214,7 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/exec-all.h qemu-snapshot-2007-06-24_ - __asm__ __volatile__("swp %0, %1, [%2]" - : "=r"(ret) - : "0"(1), "r"(spinlock)); -- +- - return ret; -} -#elif defined(__mc68000) @@ -240,10 +296,13 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/exec-all.h qemu-snapshot-2007-06-24_ extern spinlock_t tb_lock; -diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/arm/syscall.h qemu-snapshot-2007-06-24_05/linux-user/arm/syscall.h ---- qemu-snapshot-2007-06-24_05.orig/linux-user/arm/syscall.h 2005-04-27 22:11:21.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/linux-user/arm/syscall.h 2007-06-24 16:33:58.000000000 +0200 -@@ -28,7 +28,9 @@ + extern int tb_invalidated_flag; + +--- qemu.orig/linux-user/arm/syscall.h ++++ qemu/linux-user/arm/syscall.h +@@ -26,11 +26,13 @@ struct target_pt_regs { + #define ARM_ORIG_r0 uregs[17] + #define ARM_SYSCALL_BASE 0x900000 #define ARM_THUMB_SYSCALL 0 @@ -254,10 +313,13 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/arm/syscall.h qemu-snapsh #define ARM_NR_semihosting 0x123456 #define ARM_NR_thumb_semihosting 0xAB -diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007-06-24_05/linux-user/main.c ---- qemu-snapshot-2007-06-24_05.orig/linux-user/main.c 2007-06-22 00:55:02.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/linux-user/main.c 2007-06-24 16:33:58.000000000 +0200 -@@ -325,6 +325,50 @@ + + #if defined(TARGET_WORDS_BIGENDIAN) +--- qemu.orig/linux-user/main.c ++++ qemu/linux-user/main.c +@@ -361,10 +361,54 @@ static void arm_cache_flush(abi_ulong st + break; + addr = last1 + 1; } } @@ -308,7 +370,11 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007 void cpu_loop(CPUARMState *env) { int trapnr; -@@ -381,10 +425,8 @@ + unsigned int n, insn; + target_siginfo_t info; +@@ -471,32 +515,50 @@ void cpu_loop(CPUARMState *env) + get_user_u32(insn, env->regs[15] - 4); + n = insn & 0xffffff; } } @@ -321,12 +387,15 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007 env->regs[0] = do_arm_semihosting (env); } else if (n == 0 || n >= ARM_SYSCALL_BASE || (env->thumb && n == ARM_THUMB_SYSCALL)) { -@@ -395,14 +437,34 @@ + /* linux syscall */ + if (env->thumb || n == 0) { + n = env->regs[7]; + } else { n -= ARM_SYSCALL_BASE; env->eabi = 0; } -- env->regs[0] = do_syscall(env, -- n, +- env->regs[0] = do_syscall(env, +- n, - env->regs[0], - env->regs[1], - env->regs[2], @@ -352,8 +421,8 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007 + } + else + { -+ env->regs[0] = do_syscall(env, -+ n, ++ env->regs[0] = do_syscall(env, ++ n, + env->regs[0], + env->regs[1], + env->regs[2], @@ -364,7 +433,11 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007 } else { goto error; } -@@ -441,6 +503,10 @@ + } + break; +@@ -531,10 +593,14 @@ void cpu_loop(CPUARMState *env) + info.si_code = TARGET_TRAP_BRKPT; + queue_signal(info.si_signo, &info); } } break; @@ -374,8 +447,12 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007 + break; default: error: - fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", -@@ -2074,6 +2140,10 @@ + fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", + trapnr); + cpu_dump_state(env, stderr, fprintf, 0); +@@ -2378,10 +2444,14 @@ int main(int argc, char **argv) + #if defined(TARGET_ARM) || defined(TARGET_M68K) + ts->stack_base = info->start_stack; ts->heap_base = info->brk; /* This will be filled in on the first SYS_HEAPINFO call. */ ts->heap_limit = 0; @@ -386,23 +463,29 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/main.c qemu-snapshot-2007 #endif if (gdbstub_port) { -diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/qemu.h qemu-snapshot-2007-06-24_05/linux-user/qemu.h ---- qemu-snapshot-2007-06-24_05.orig/linux-user/qemu.h 2007-05-26 17:09:38.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/linux-user/qemu.h 2007-06-24 16:33:58.000000000 +0200 -@@ -81,6 +81,9 @@ + gdbserver_start (gdbstub_port); + gdb_handlesig(env, 0); +--- qemu.orig/linux-user/qemu.h ++++ qemu/linux-user/qemu.h +@@ -100,10 +100,13 @@ typedef struct TaskState { + /* Extra fields for semihosted binaries. */ + uint32_t stack_base; + uint32_t heap_base; uint32_t heap_limit; #endif - int used; /* non zero if used */ +#ifdef USE_NPTL + uint32_t *child_tidptr; +#endif + int used; /* non zero if used */ struct image_info *info; uint8_t stack[0]; } __attribute__((aligned(16))) TaskState; -diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2007-06-24_05/linux-user/syscall.c ---- qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c 2007-06-21 23:57:11.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/linux-user/syscall.c 2007-06-24 16:33:58.000000000 +0200 -@@ -70,9 +70,18 @@ + +--- qemu.orig/linux-user/syscall.c ++++ qemu/linux-user/syscall.c +@@ -69,13 +69,22 @@ + #include <linux/soundcard.h> + #include <linux/dirent.h> #include <linux/kd.h> #include "qemu.h" @@ -419,9 +502,13 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2 +#endif + #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \ - || defined(TARGET_M68K) || defined(TARGET_SH4) + || defined(TARGET_M68K) || defined(TARGET_SH4) || defined(TARGET_CRIS) /* 16 bit uid wrappers emulation */ -@@ -2121,20 +2130,38 @@ + #define USE_UID16 + #endif +@@ -2690,27 +2699,46 @@ abi_long do_arch_prctl(CPUX86State *env, + + /* this stack is the equivalent of the kernel stack associated with a thread/process */ #define NEW_STACK_SIZE 8192 @@ -443,7 +530,9 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2 return 0; } --int do_fork(CPUState *env, unsigned int flags, unsigned long newsp) + /* do_fork() Must return host values and target errnos (unlike most + do_*() functions). */ +-int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp) +int do_fork(CPUState *env, unsigned int flags, unsigned long newsp, + uint32_t *parent_tidptr, void *newtls, + uint32_t *child_tidptr) @@ -452,81 +541,95 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2 TaskState *ts; uint8_t *new_stack; CPUState *new_env; + +#ifdef USE_NPTL + unsigned int nptl_flags; + + if (flags & CLONE_PARENT_SETTID) + *parent_tidptr = gettid(); +#endif - ++ if (flags & CLONE_VM) { ts = malloc(sizeof(TaskState) + NEW_STACK_SIZE); -@@ -2201,16 +2228,60 @@ + memset(ts, 0, sizeof(TaskState)); + new_stack = ts->stack; + ts->used = 1; +@@ -2772,20 +2800,71 @@ int do_fork(CPUState *env, unsigned int + new_env->regs[14] = newsp; + #else #error unsupported target CPU #endif new_env->opaque = ts; +#ifdef USE_NPTL -+ nptl_flags = flags; -+ flags &= ~CLONE_NPTL_FLAGS2; -+ if (nptl_flags & CLONE_CHILD_CLEARTID) { -+ ts->child_tidptr = child_tidptr; -+ } -+ if (nptl_flags & CLONE_SETTLS) -+ cpu_set_tls (new_env, newtls); -+ /* Grab the global cpu lock so that the thread setup appears -+ atomic. */ -+ if (nptl_flags & CLONE_CHILD_SETTID) -+ spin_lock(&nptl_lock); ++ nptl_flags = flags; ++ flags &= ~CLONE_NPTL_FLAGS2; ++ ++ if (nptl_flags & CLONE_CHILD_CLEARTID) { ++ ts->child_tidptr = child_tidptr; ++ } ++ ++ if (nptl_flags & CLONE_SETTLS) ++ cpu_set_tls (new_env, newtls); ++ ++ /* Grab the global cpu lock so that the thread setup appears ++ atomic. */ ++ if (nptl_flags & CLONE_CHILD_SETTID) ++ spin_lock(&nptl_lock); ++ +#else -+ if (flags & CLONE_NPTL_FLAGS2) -+ return -EINVAL; ++ if (flags & CLONE_NPTL_FLAGS2) ++ return -EINVAL; +#endif + ++ if (CLONE_VFORK & flags) ++ flags ^= CLONE_VM; #ifdef __ia64__ ret = __clone2(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env); #else ret = clone(clone_func, new_stack + NEW_STACK_SIZE, flags, new_env); #endif +#ifdef USE_NPTL -+ if (ret != -1) { -+ if (nptl_flags & CLONE_CHILD_SETTID) -+ *child_tidptr = ret; -+ } -+ /* Allow the child to continue. */ -+ if (nptl_flags & CLONE_CHILD_SETTID) -+ spin_unlock(&nptl_lock); ++ if (ret != -1) { ++ if (nptl_flags & CLONE_CHILD_SETTID) ++ *child_tidptr = ret; ++ } ++ ++ /* Allow the child to continue. */ ++ if (nptl_flags & CLONE_CHILD_SETTID) ++ spin_unlock(&nptl_lock); +#endif } else { -- /* if no CLONE_VM, we consider it is a fork */ + /* if no CLONE_VM, we consider it is a fork */ - if ((flags & ~CSIGNAL) != 0) -- return -EINVAL; -- ret = fork(); -+ /* if no CLONE_VM, we consider it is a fork */ -+ if ((flags & ~(CSIGNAL | CLONE_NPTL_FLAGS2)) != 0) -+ return -EINVAL; -+ ret = fork(); ++ if ((flags & ~(CSIGNAL | CLONE_NPTL_FLAGS2)) != 0) + return -EINVAL; + ret = fork(); +#ifdef USE_NPTL -+ /* There is a race condition here. The parent process could -+ theoretically read the TID in the child process before the child -+ tid is set. This would require using either ptrace -+ (not implemented) or having *_tidptr to point at a shared memory -+ mapping. We can't repeat the spinlock hack used above because -+ the child process gets its own copy of the lock. */ -+ if (ret == 0) { -+ /* Child Process. */ -+ if (flags & CLONE_CHILD_SETTID) -+ *child_tidptr = gettid(); -+ ts = (TaskState *)env->opaque; -+ if (flags & CLONE_CHILD_CLEARTID) -+ ts->child_tidptr = child_tidptr; -+ if (flags & CLONE_SETTLS) -+ cpu_set_tls (env, newtls); -+ } ++ /* There is a race condition here. The parent process could ++ theoretically read the TID in the child process before the child ++ tid is set. This would require using either ptrace ++ (not implemented) or having *_tidptr to point at a shared memory ++ mapping. We can't repeat the spinlock hack used above because ++ the child process gets its own copy of the lock. */ ++ if (ret == 0) { ++ /* Child Process. */ ++ if (flags & CLONE_CHILD_SETTID) ++ *child_tidptr = gettid(); ++ ts = (TaskState *)env->opaque; ++ if (flags & CLONE_CHILD_CLEARTID) ++ ts->child_tidptr = child_tidptr; ++ if (flags & CLONE_SETTLS) ++ cpu_set_tls (env, newtls); ++ } +#endif } return ret; } -@@ -2487,7 +2558,7 @@ + + static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) +@@ -3106,11 +3185,11 @@ abi_long do_syscall(void *cpu_env, int n + break; + case TARGET_NR_brk: ret = do_brk(arg1); break; case TARGET_NR_fork: @@ -535,7 +638,11 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2 break; #ifdef TARGET_NR_waitpid case TARGET_NR_waitpid: -@@ -3651,7 +3722,8 @@ + { + int status; +@@ -4463,11 +4542,12 @@ abi_long do_syscall(void *cpu_env, int n + #endif + case TARGET_NR_fsync: ret = get_errno(fsync(arg1)); break; case TARGET_NR_clone: @@ -545,7 +652,11 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2 break; #ifdef __NR_exit_group /* new thread calls */ -@@ -4039,7 +4111,8 @@ + case TARGET_NR_exit_group: + gdb_exit(cpu_env, arg1); +@@ -4908,11 +4988,12 @@ abi_long do_syscall(void *cpu_env, int n + case TARGET_NR_putpmsg: + goto unimplemented; #endif #ifdef TARGET_NR_vfork case TARGET_NR_vfork: @@ -555,19 +666,15 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/linux-user/syscall.c qemu-snapshot-2 break; #endif #ifdef TARGET_NR_ugetrlimit -@@ -4632,4 +4705,3 @@ - #endif - return ret; - } -- -diff -Naru qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h qemu-snapshot-2007-06-24_05/qemu_spinlock.h ---- qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h 1970-01-01 01:00:00.000000000 +0100 -+++ qemu-snapshot-2007-06-24_05/qemu_spinlock.h 2007-06-24 16:33:58.000000000 +0200 -@@ -0,0 +1,182 @@ + case TARGET_NR_ugetrlimit: + { +--- /dev/null ++++ qemu/qemu_spinlock.h +@@ -0,0 +1,181 @@ +/* -+ * internal execution defines for qemu ++ * Atomic operation helper include + * -+ * Copyright (c) 2003 Fabrice Bellard ++ * Copyright (c) 2005 Fabrice Bellard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public @@ -583,9 +690,8 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h qemu-snapshot-2007-0 + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ -+ -+#ifndef _QEMU_SPINLOCK_H -+#define _QEMU_SPINLOCK_H ++#ifndef QEMU_SPINLOCK_H ++#define QEMU_SPINLOCK_H + +#ifdef __powerpc__ +static inline int testandset (int *p) @@ -637,10 +743,10 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h qemu-snapshot-2007-0 + int ret; + + __asm__ __volatile__ ("0: cs %0,%1,0(%2)\n" -+ " jl 0b" -+ : "=&d" (ret) -+ : "r" (1), "a" (p), "0" (*p) -+ : "cc", "memory" ); ++ " jl 0b" ++ : "=&d" (ret) ++ : "r" (1), "a" (p), "0" (*p) ++ : "cc", "memory" ); + return ret; +} +#endif @@ -651,15 +757,15 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h qemu-snapshot-2007-0 + int ret; + unsigned long one; + -+ __asm__ __volatile__ ("0: mov 1,%2\n" -+ " ldl_l %0,%1\n" -+ " stl_c %2,%1\n" -+ " beq %2,1f\n" -+ ".subsection 2\n" -+ "1: br 0b\n" -+ ".previous" -+ : "=r" (ret), "=m" (*p), "=r" (one) -+ : "m" (*p)); ++ __asm__ __volatile__ ("0: mov 1,%2\n" ++ " ldl_l %0,%1\n" ++ " stl_c %2,%1\n" ++ " beq %2,1f\n" ++ ".subsection 2\n" ++ "1: br 0b\n" ++ ".previous" ++ : "=r" (ret), "=m" (*p), "=r" (one) ++ : "m" (*p)); + return ret; +} +#endif @@ -667,14 +773,14 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h qemu-snapshot-2007-0 +#ifdef __sparc__ +static inline int testandset (int *p) +{ -+ int ret; ++ int ret; + -+ __asm__ __volatile__("ldstub [%1], %0" -+ : "=r" (ret) -+ : "r" (p) -+ : "memory"); ++ __asm__ __volatile__("ldstub [%1], %0" ++ : "=r" (ret) ++ : "r" (p) ++ : "memory"); + -+ return (ret ? 1 : 0); ++ return (ret ? 1 : 0); +} +#endif + @@ -745,73 +851,46 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/qemu_spinlock.h qemu-snapshot-2007-0 +} +#endif + -+#endif /* ! _QEMU_SPINLOCK_H */ -diff -Naru qemu-snapshot-2007-06-24_05.orig/target-arm/cpu.h qemu-snapshot-2007-06-24_05/target-arm/cpu.h ---- qemu-snapshot-2007-06-24_05.orig/target-arm/cpu.h 2007-06-03 23:02:37.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/target-arm/cpu.h 2007-06-24 16:33:58.000000000 +0200 -@@ -37,6 +37,9 @@ ++#endif +--- qemu.orig/target-arm/cpu.h ++++ qemu/target-arm/cpu.h +@@ -36,10 +36,11 @@ + #define EXCP_DATA_ABORT 4 #define EXCP_IRQ 5 #define EXCP_FIQ 6 #define EXCP_BKPT 7 -+#define EXCP_KERNEL_TRAP 8 /* Jumped to kernel code page. */ -+ -+ - - typedef void ARMWriteCPFunc(void *opaque, int cp_info, - int srcreg, int operand, uint32_t value); -@@ -97,6 +100,7 @@ - uint32_t c9_data; - uint32_t c13_fcse; /* FCSE PID. */ - uint32_t c13_context; /* Context ID. */ -+ uint32_t c13_tls; /* Paul Brook told me to just add this ;) */ - uint32_t c15_cpar; /* XScale Coprocessor Access Register */ - } cp15; + #define EXCP_EXCEPTION_EXIT 8 /* Return from v7M exception. */ ++#define EXCP_KERNEL_TRAP 9 /* Jumped to kernel code page. */ -@@ -169,6 +173,15 @@ - int cpu_arm_signal_handler(int host_signum, void *pinfo, + #define ARMV7M_EXCP_RESET 1 + #define ARMV7M_EXCP_NMI 2 + #define ARMV7M_EXCP_HARD 3 + #define ARMV7M_EXCP_MEM 4 +@@ -220,10 +221,19 @@ int cpu_arm_signal_handler(int host_sign void *puc); + void cpu_lock(void); + void cpu_unlock(void); + +void cpu_lock(void); +void cpu_unlock(void); +#if defined(USE_NPTL) +static inline void cpu_set_tls(CPUARMState *env, void *newtls) +{ -+ env->cp15.c13_tls = (uint32_t)newtls; ++ env->cp15.c13_tls2 = (uint32_t)(long)newtls; +} +#endif + #define CPSR_M (0x1f) #define CPSR_T (1 << 5) #define CPSR_F (1 << 6) -@@ -180,7 +193,11 @@ - #define CPSR_J (1 << 24) - #define CPSR_IT_0_1 (3 << 25) - #define CPSR_Q (1 << 27) --#define CPSR_NZCV (0xf << 28) -+#define CPSR_V (1 << 28) -+#define CPSR_C (1 << 29) -+#define CPSR_Z (1 << 30) -+#define CPSR_N (1 << 31) -+#define CPSR_NZCV (CPSR_N | CPSR_Z | CPSR_C | CPSR_V) - - #define CACHED_CPSR_BITS (CPSR_T | CPSR_Q | CPSR_NZCV) - /* Return the current CPSR value. */ -diff -Naru qemu-snapshot-2007-06-24_05.orig/target-arm/exec.h qemu-snapshot-2007-06-24_05/target-arm/exec.h ---- qemu-snapshot-2007-06-24_05.orig/target-arm/exec.h 2007-06-03 19:44:36.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/target-arm/exec.h 2007-06-24 16:33:58.000000000 +0200 -@@ -68,8 +68,6 @@ - - /* In op_helper.c */ - --void cpu_lock(void); --void cpu_unlock(void); - void helper_set_cp(CPUState *, uint32_t, uint32_t); - uint32_t helper_get_cp(CPUState *, uint32_t); - void helper_set_cp15(CPUState *, uint32_t, uint32_t); -diff -Naru qemu-snapshot-2007-06-24_05.orig/target-arm/op.c qemu-snapshot-2007-06-24_05/target-arm/op.c ---- qemu-snapshot-2007-06-24_05.orig/target-arm/op.c 2007-05-21 19:48:01.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/target-arm/op.c 2007-06-24 16:33:58.000000000 +0200 -@@ -891,6 +891,12 @@ + #define CPSR_I (1 << 7) + #define CPSR_A (1 << 8) +--- qemu.orig/target-arm/op.c ++++ qemu/target-arm/op.c +@@ -1007,10 +1007,16 @@ void OPPROTO op_exception_exit(void) + { + env->exception_index = EXCP_EXCEPTION_EXIT; cpu_loop_exit(); } @@ -824,21 +903,17 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/target-arm/op.c qemu-snapshot-2007-0 /* VFP support. We follow the convention used for VFP instrunctions: Single precition routines have a "s" suffix, double precision a "d" suffix. */ -diff -Naru qemu-snapshot-2007-06-24_05.orig/target-arm/translate.c qemu-snapshot-2007-06-24_05/target-arm/translate.c ---- qemu-snapshot-2007-06-24_05.orig/target-arm/translate.c 2007-06-11 20:59:35.000000000 +0200 -+++ qemu-snapshot-2007-06-24_05/target-arm/translate.c 2007-06-24 16:33:58.000000000 +0200 -@@ -3513,6 +3513,7 @@ - s->is_jmp = DISAS_JUMP; - } -+ - /* generate intermediate code in gen_opc_buf and gen_opparam_buf for - basic block 'tb'. If search_pc is TRUE, also generate PC - information for each intermediate instruction. */ -@@ -3548,6 +3549,15 @@ - nb_gen_labels = 0; - lj = -1; - do { + #define VFP_OP(name, p) void OPPROTO op_vfp_##name##p(void) +--- qemu.orig/target-arm/translate.c ++++ qemu/target-arm/translate.c +@@ -7518,11 +7518,18 @@ static inline int gen_intermediate_code_ + /* We always get here via a jump, so know we are not in a + conditional execution block. */ + gen_op_exception_exit(); + } + #endif +- +#ifdef CONFIG_USER_ONLY + /* Intercept jump to the magic kernel page. */ + if (dc->pc > 0xffff0000) { @@ -847,7 +922,8 @@ diff -Naru qemu-snapshot-2007-06-24_05.orig/target-arm/translate.c qemu-snapshot + break; + } +#endif -+ if (env->nb_breakpoints > 0) { for(j = 0; j < env->nb_breakpoints; j++) { if (env->breakpoints[j] == dc->pc) { + gen_set_condexec(dc); + gen_op_movl_T0_im((long)dc->pc); diff --git a/packages/qemu/qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch b/packages/qemu/qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch new file mode 100644 index 0000000000..c7f36d8110 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/qemu-amd64-32b-mapping-0.9.0.patch @@ -0,0 +1,37 @@ +--- + linux-user/mmap.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: qemu/linux-user/mmap.c +=================================================================== +--- qemu.orig/linux-user/mmap.c 2007-12-03 15:40:25.000000000 +0000 ++++ qemu/linux-user/mmap.c 2007-12-03 16:37:21.000000000 +0000 +@@ -29,6 +29,10 @@ + + //#define DEBUG_MMAP + ++#ifndef MAP_32BIT ++#define MAP_32BIT 0 ++#endif ++ + /* NOTE: all the constants are the HOST ones, but addresses are target. */ + int target_mprotect(abi_ulong start, abi_ulong len, int prot) + { +@@ -251,7 +255,7 @@ abi_long target_mmap(abi_ulong start, ab + especially important if qemu_host_page_size > + qemu_real_host_page_size */ + p = mmap(g2h(mmap_start), +- host_len, prot, flags | MAP_FIXED, fd, host_offset); ++ host_len, prot, flags | MAP_FIXED | MAP_32BIT, fd, host_offset); + if (p == MAP_FAILED) + return -1; + /* update start so that it points to the file position at 'offset' */ +@@ -406,7 +410,7 @@ abi_long target_mremap(abi_ulong old_add + unsigned long host_addr; + + /* XXX: use 5 args syscall */ +- host_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags); ++ host_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags | MAP_32BIT); + if (host_addr == -1) + return -1; + new_addr = h2g(host_addr); diff --git a/packages/qemu/qemu-0.9.1/series b/packages/qemu/qemu-0.9.1/series new file mode 100644 index 0000000000..e6ffdcc6bd --- /dev/null +++ b/packages/qemu/qemu-0.9.1/series @@ -0,0 +1,25 @@ +02_snapshot_use_tmpdir.patch -p0 +04_do_not_print_rtc_freq_if_ok.patch -p1 +05_non-fatal_if_linux_hd_missing.patch -p1 +06_exit_segfault.patch -p0 +10_signal_jobs.patch -p0 +11_signal_sigaction.patch -p0 +22_net_tuntap_stall.patch -p0 +31_syscalls.patch -p0 +32_syscall_sysctl.patch -p0 +33_syscall_ppc_clone.patch -p0 +39_syscall_fadvise64.patch -p0 +41_arm_fpa_sigfpe.patch -p0 +52_ne2000_return.patch -p1 +61_safe_64bit_int.patch -p0 +63_sparc_build.patch -p0 +64_ppc_asm_constraints.patch -p1 +65_kfreebsd.patch -p0 +66_tls_ld.patch -p0 +91-oh-sdl-cursor.patch -p0 +qemu-0.9.0-nptl.patch -p1 +qemu-0.9.0-nptl-update.patch -p1 +qemu-amd64-32b-mapping-0.9.0.patch -p1 +workaround_bad_futex_headers.patch -p1 +fix_segfault.patch -p1 +disable-error-in-configure.patch -p1 diff --git a/packages/qemu/qemu-0.9.1/workaround_bad_futex_headers.patch b/packages/qemu/qemu-0.9.1/workaround_bad_futex_headers.patch new file mode 100644 index 0000000000..cc122ebdba --- /dev/null +++ b/packages/qemu/qemu-0.9.1/workaround_bad_futex_headers.patch @@ -0,0 +1,25 @@ +--- + linux-user/syscall.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +Index: qemu/linux-user/syscall.c +=================================================================== +--- qemu.orig/linux-user/syscall.c 2007-08-09 20:28:06.000000000 +0100 ++++ qemu/linux-user/syscall.c 2007-08-09 20:28:41.000000000 +0100 +@@ -61,7 +61,15 @@ + #define tchars host_tchars /* same as target */ + #define ltchars host_ltchars /* same as target */ + +-#include <linux/futex.h> ++#define FUTEX_WAIT 0 ++#define FUTEX_WAKE 1 ++#define FUTEX_FD 2 ++#define FUTEX_REQUEUE 3 ++#define FUTEX_CMP_REQUEUE 4 ++#define FUTEX_WAKE_OP 5 ++#define FUTEX_LOCK_PI 6 ++#define FUTEX_UNLOCK_PI 7 ++ + #include <linux/termios.h> + #include <linux/unistd.h> + #include <linux/utsname.h> diff --git a/packages/qemu/qemu-0.9.1/writev_fix.patch b/packages/qemu/qemu-0.9.1/writev_fix.patch new file mode 100644 index 0000000000..e0ed4af972 --- /dev/null +++ b/packages/qemu/qemu-0.9.1/writev_fix.patch @@ -0,0 +1,17 @@ +--- + linux-user/syscall.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: qemu-0.9.1/linux-user/syscall.c +=================================================================== +--- qemu-0.9.1.orig/linux-user/syscall.c 2008-02-03 00:00:00.000000000 +0000 ++++ qemu-0.9.1/linux-user/syscall.c 2008-02-03 00:00:38.000000000 +0000 +@@ -1048,7 +1048,7 @@ static abi_long lock_iovec(int type, str + base = tswapl(target_vec[i].iov_base); + vec[i].iov_len = tswapl(target_vec[i].iov_len); + vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy); +- if (!vec[i].iov_base) ++ if (!vec[i].iov_base && vec[i].iov_len) + goto fail; + } + unlock_user (target_vec, target_addr, 0); diff --git a/packages/qemu/qemu-gcc3-check.inc b/packages/qemu/qemu-gcc3-check.inc index 96b79fdf14..81c3555b48 100644 --- a/packages/qemu/qemu-gcc3-check.inc +++ b/packages/qemu/qemu-gcc3-check.inc @@ -1,20 +1,11 @@ python __anonymous() { from bb import which, data - path = data.getVar('PATH', d) - oldOeConf = data.getVar('EXTRA_OECONF', d) + path = data.getVar('PATH', d, 1) + oldOeConf = data.getVar('EXTRA_OECONF', d, 1) if not oldOeConf: oldOeConf = "" - if len(which(path, 'gcc-3.4')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d) - elif len(which(path, 'gcc34')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d) - elif len(which(path, 'gcc33')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d) - elif len(which(path, 'gcc-3.3')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d) - elif len(which(path, 'gcc-3.3.6')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d) - elif len(which(path, 'gcc-3.4.6')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d) + gcc3 = check_gcc3(d) + if gcc3: + data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d) } diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc index a20f5056b5..f1da2d9d1f 100644 --- a/packages/qemu/qemu-native.inc +++ b/packages/qemu/qemu-native.inc @@ -1,8 +1,9 @@ -FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:" -DEPENDS = "libsdl-native zlib-native" +inherit native + +DEPENDS = "libsdl-native zlib-native gcc3-native" require qemu-gcc3-check.inc do_stage() { - find . -name "qemu-*" -type f -perm -755 -exec install -m 0755 {} ${STAGING_BINDIR} \; + find . -name "qemu-*" -type f -perm -755 -exec install -m 0755 {} ${STAGING_BINDIR} \; } diff --git a/packages/qemu/qemu-native_0.9.0+cvs.bb b/packages/qemu/qemu-native_0.9.0+cvs.bb deleted file mode 100644 index 65a7908a5c..0000000000 --- a/packages/qemu/qemu-native_0.9.0+cvs.bb +++ /dev/null @@ -1,3 +0,0 @@ -require qemu_0.9.0+cvs.bb -inherit native -require qemu-native.inc diff --git a/packages/qemu/qemu-native_0.9.1.bb b/packages/qemu/qemu-native_0.9.1.bb new file mode 100644 index 0000000000..16984a3f6a --- /dev/null +++ b/packages/qemu/qemu-native_0.9.1.bb @@ -0,0 +1,2 @@ +require qemu_${PV}.bb +require qemu-native.inc diff --git a/packages/qemu/qemu-native_20070613.bb b/packages/qemu/qemu-native_20070613.bb index d440d560e8..2cbae8a783 100644 --- a/packages/qemu/qemu-native_20070613.bb +++ b/packages/qemu/qemu-native_20070613.bb @@ -1,7 +1,4 @@ require qemu_${PV}.bb -inherit native -DEPENDS = "zlib-native" -prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" - -require qemu-gcc3-check.inc +require qemu-native.inc +prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" diff --git a/packages/qemu/qemu-native_cvs.bb b/packages/qemu/qemu-native_cvs.bb index 639f9a6a7c..c9db5e35b9 100644 --- a/packages/qemu/qemu-native_cvs.bb +++ b/packages/qemu/qemu-native_cvs.bb @@ -1,3 +1,2 @@ require qemu_cvs.bb -inherit native require qemu-native.inc diff --git a/packages/qemu/qemu_0.9.0+cvs.bb b/packages/qemu/qemu_0.9.0+cvs.bb deleted file mode 100644 index 8a89b805a2..0000000000 --- a/packages/qemu/qemu_0.9.0+cvs.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Qemu is an open source processor emulator." -HOMEPAGE = "http://fabrice.bellard.free.fr/qemu/" -SECTION = "devel" -LICENSE = "GPL" -SRCDATE="20070701" -PV = "0.9.0+cvs${SRCDATE}" -PR = "r1" - -SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu;date=${SRCDATE} \ - file://configure-0.9.0.patch;patch=1 \ - file://qemu-sdl-cursor-0.9.0.patch;patch=1 \ - file://arm_nptl-0.9.0.patch;patch=1 \ - file://pl110_rgb-r0-0.9.0.patch;patch=1 \ - file://qemu-0.9.0-gcc4.patch;patch=1 \ - file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1" -S = "${WORKDIR}/qemu" - -EXTRA_OECONF="--disable-gcc-check" - -inherit autotools - -DEFAULT_PREFERENCE = "-1" diff --git a/packages/qemu/qemu_0.9.1.bb b/packages/qemu/qemu_0.9.1.bb new file mode 100644 index 0000000000..164296b0d4 --- /dev/null +++ b/packages/qemu/qemu_0.9.1.bb @@ -0,0 +1,49 @@ +LICENSE = "GPL" +DEPENDS = "zlib" +PR = "r7" + +FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" +FILESDIR = "${WORKDIR}" + +SRC_URI = "\ + http://fabrice.bellard.free.fr/qemu/qemu-0.9.1.tar.gz \ + file://02_snapshot_use_tmpdir.patch;patch=1;pnum=0 \ + file://04_do_not_print_rtc_freq_if_ok.patch;patch=1;pnum=1 \ + file://05_non-fatal_if_linux_hd_missing.patch;patch=1;pnum=1 \ + file://06_exit_segfault.patch;patch=1;pnum=0 \ + file://10_signal_jobs.patch;patch=1;pnum=0 \ + file://11_signal_sigaction.patch;patch=1;pnum=0 \ + file://22_net_tuntap_stall.patch;patch=1;pnum=0 \ + file://31_syscalls.patch;patch=1;pnum=0 \ + file://32_syscall_sysctl.patch;patch=1;pnum=0 \ + file://33_syscall_ppc_clone.patch;patch=1;pnum=0 \ + file://39_syscall_fadvise64.patch;patch=1;pnum=0 \ + file://41_arm_fpa_sigfpe.patch;patch=1;pnum=0 \ + file://52_ne2000_return.patch;patch=1;pnum=1 \ + file://61_safe_64bit_int.patch;patch=1;pnum=0 \ + file://63_sparc_build.patch;patch=1;pnum=0 \ + file://64_ppc_asm_constraints.patch;patch=1;pnum=1 \ + file://65_kfreebsd.patch;patch=1;pnum=0 \ + file://66_tls_ld.patch;patch=1;pnum=0 \ + file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \ + file://qemu-0.9.0-nptl.patch;patch=1 \ + file://qemu-0.9.0-nptl-update.patch;patch=1 \ + file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \ + file://workaround_bad_futex_headers.patch;patch=1 \ + file://fix_segfault.patch;patch=1 \ + file://writev_fix.patch;patch=1 \ + file://configure_symlinkpath_fix.patch;patch=1 \ + file://disable-error-in-configure.patch;patch=1 \ + file://no-strip.patch;patch=1" + +S = "${WORKDIR}/qemu-${PV}" + +#EXTRA_OECONF += "--disable-sdl" +#EXTRA_OECONF += "--target-list=arm-linux-user,arm-softmmu" +EXTRA_OECONF += "--disable-gfx-check" + +inherit autotools + +do_configure() { + oe_runconf +} diff --git a/packages/qemu/qemu_20070613.bb b/packages/qemu/qemu_20070613.bb index 6584bcc3ed..533848963b 100644 --- a/packages/qemu/qemu_20070613.bb +++ b/packages/qemu/qemu_20070613.bb @@ -4,6 +4,7 @@ SRCDATE = "20070613" PV = "0.9.0+cvs${SRCDATE}" PR = "r5" +FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}" SRC_URI = "\ @@ -37,15 +38,6 @@ SRC_URI = "\ file://fix_segfault.patch;patch=1 \ file://no-strip.patch;patch=1" -# svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \ -# file://debian/patches/21_net_soopts.patch;patch=1;pnum=0 \ -# file://debian/patches/35_syscall_sockaddr.patch;patch=1;pnum=0 \ -# file://debian/patches/43_arm_cpustate.patch;patch=1;pnum=0 \ -# file://debian/patches/62_linux_boot_nasm.patch;patch=1;pnum=0 \ -# file://debian/patches/67_ppc_ftbfs.patch;patch=1;pnum=0 \ -# file://debian/patches/80_ui_curses.patch;patch=1;pnum=0 \ -# file://debian/patches/96-x.patch;patch=1" - S = "${WORKDIR}/qemu" #EXTRA_OECONF = "--disable-sdl" diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb index d76bfa2834..137262ca2d 100644 --- a/packages/qemu/qemu_cvs.bb +++ b/packages/qemu/qemu_cvs.bb @@ -1,26 +1,55 @@ -DESCRIPTION = "Qemu is an open source processor emulator." -HOMEPAGE = "http://fabrice.bellard.free.fr/qemu/" -SECTION = "devel" LICENSE = "GPL" -PV = "0.8.2+cvs${SRCDATE}" -PR = "r2" +DEPENDS = "zlib" +PV = "0.9.0+cvs${SRCDATE}" +PR = "r4" + +DEFAULT_PREFERENCE = "-1" +FILESDIR = "${WORKDIR}" + +SRC_URI = "\ + cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \ + file://02_snapshot_use_tmpdir.patch;patch=1;pnum=0 \ + file://03_machines_list_no_error.patch;patch=1;pnum=0 \ + file://04_do_not_print_rtc_freq_if_ok.patch;patch=1;pnum=1 \ + file://05_non-fatal_if_linux_hd_missing.patch;patch=1;pnum=1 \ + file://06_exit_segfault.patch;patch=1;pnum=0 \ + file://10_signal_jobs.patch;patch=1;pnum=0 \ + file://11_signal_sigaction.patch;patch=1;pnum=0 \ + file://12_signal_powerpc_support.patch;patch=1;pnum=1 \ + file://22_net_tuntap_stall.patch;patch=1;pnum=0 \ + file://31_syscalls.patch;patch=1;pnum=0 \ + file://32_syscall_sysctl.patch;patch=1;pnum=0 \ + file://33_syscall_ppc_clone.patch;patch=1;pnum=0 \ + file://39_syscall_fadvise64.patch;patch=1;pnum=0 \ + file://41_arm_fpa_sigfpe.patch;patch=1;pnum=0 \ + file://52_ne2000_return.patch;patch=1;pnum=1 \ + file://61_safe_64bit_int.patch;patch=1;pnum=0 \ + file://63_sparc_build.patch;patch=1;pnum=0 \ + file://64_ppc_asm_constraints.patch;patch=1;pnum=1 \ + file://65_kfreebsd.patch;patch=1;pnum=0 \ + file://66_tls_ld.patch;patch=1;pnum=0 \ + file://91-oh-sdl-cursor.patch;patch=1;pnum=0 \ + file://93-oh-pl110-rgb.patch;patch=1;pnum=0 \ + file://qemu-0.9.0-nptl.patch;patch=1 \ + file://qemu-0.9.0-nptl-update.patch;patch=1 \ + file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \ + file://workaround_bad_futex_headers.patch;patch=1 \ + file://fix_segfault.patch;patch=1" + +# svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \ +# file://debian/patches/21_net_soopts.patch;patch=1;pnum=0 \ +# file://debian/patches/35_syscall_sockaddr.patch;patch=1;pnum=0 \ +# file://debian/patches/43_arm_cpustate.patch;patch=1;pnum=0 \ +# file://debian/patches/62_linux_boot_nasm.patch;patch=1;pnum=0 \ +# file://debian/patches/67_ppc_ftbfs.patch;patch=1;pnum=0 \ +# file://debian/patches/80_ui_curses.patch;patch=1;pnum=0 \ +# file://debian/patches/96-x.patch;patch=1" -SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \ - file://configure.patch;patch=1 \ - file://makefile.patch;patch=1 \ - file://qemu-sdl-cursor.patch;patch=1 \ - file://arm_nptl.patch;patch=1 \ - file://pl110_rgb-r0.patch;patch=1 \ - file://qemu-pci-irq-sharing.patch;patch=1 \ - file://compiler.patch;patch=1 \ - file://qemu-usb-wacom-0.8.2.patch;patch=1 \ - file://qemu-usb-wacom-pressure.patch;patch=1 \ - file://qemu-usb-wacom-buttons.patch;patch=1 \ - http://www.busybox.net/downloads/qemu/qemu-gcc-4-all.patch;patch=1" S = "${WORKDIR}/qemu" -EXTRA_OECONF="--disable-gcc-check" +#EXTRA_OECONF += "--disable-sdl" +#EXTRA_OECONF += "--target-list=arm-linux-user" +EXTRA_OECONF += "--disable-gfx-check" inherit autotools -DEFAULT_PREFERENCE = "-1" diff --git a/packages/rdesktop/rdesktop.inc b/packages/rdesktop/rdesktop.inc new file mode 100644 index 0000000000..4c832cae3f --- /dev/null +++ b/packages/rdesktop/rdesktop.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "Rdesktop rdp client for X" +HOMEPAGE = "http://www.rdesktop.org" +DEPENDS = "virtual/libx11 openssl" +SECTION = "x11/network" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb index 12ff1c5bcd..d50a0c1e8c 100644 --- a/packages/rdesktop/rdesktop_1.3.1.bb +++ b/packages/rdesktop/rdesktop_1.3.1.bb @@ -1,16 +1,6 @@ -# rdesktop OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +require rdesktop.inc -DESCRIPTION = "RDesktop is a X11 based RDP client" -HOMEPAGE = "http://www.rdesktop.org/" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 openssl" -RDEPENDS= "openssl" -SECTION = "x11/network" - -SRC_URI="${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ - file://configure.patch;patch=1" +SRC_URI +="file://configure.patch;patch=1" # Note - rdesktop 1.3.1 doesn't use autotools - don't make the same # mistakes I did.. :) @@ -22,8 +12,8 @@ do_configure() { --bindir=${bindir} \ --mandir=${mandir} \ --sharedir=${datadir} \ - --with-x=${STAGING_DIR}/${HOST_SYS} \ - --with-openssl=${STAGING_DIR}/${HOST_SYS} \ + --with-x=${STAGING_EXECPREFIXDIR} \ + --with-openssl=${STAGING_EXECPREFIXDIR} \ --with-oss \ --without-debug } diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb index 7581647a57..8682c8ee98 100644 --- a/packages/rdesktop/rdesktop_1.4.1.bb +++ b/packages/rdesktop/rdesktop_1.4.1.bb @@ -1,14 +1,9 @@ -DESCRIPTION = "Rdesktop rdp client for X" -DEPENDS = "virtual/libx11 openssl" -HOMEPAGE = "http://www.rdesktop.org" -SECTION = "x11/network" -LICENSE = "GPL" -PV = "1.4.1" +require rdesktop.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ - file://strip.patch;patch=1" +SRC_URI += "file://strip.patch;patch=1" inherit autotools -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb index de270e1025..12385c127f 100644 --- a/packages/rdesktop/rdesktop_1.5.0.bb +++ b/packages/rdesktop/rdesktop_1.5.0.bb @@ -10,4 +10,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" inherit autotools -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/rdesktop/rdesktop_1.6.0.bb b/packages/rdesktop/rdesktop_1.6.0.bb new file mode 100644 index 0000000000..d652dfe633 --- /dev/null +++ b/packages/rdesktop/rdesktop_1.6.0.bb @@ -0,0 +1,7 @@ +require rdesktop.inc + +PR = "r0" + +inherit autotools + +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb index 63d082be0c..0b76ee7535 100644 --- a/packages/rdesktop/rdesktop_cvs.bb +++ b/packages/rdesktop/rdesktop_cvs.bb @@ -1,10 +1,7 @@ -DESCRIPTION = "Rdesktop rdp client for X" -DEPENDS = "virtual/libx11 openssl" -HOMEPAGE = "http://www.rdesktop.org" -SECTION = "x11/network" -LICENSE = "GPL" -PV = "1.5.0+cvs${SRCDATE}" -PR = "r3" +require rdesktop.inc + +PV = "1.6.0+cvs${SRCDATE}" +PR = "r0" DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anonymous@rdesktop.cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop" S = "${WORKDIR}/rdesktop" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index bb89ac0c2b..3fd87de1b5 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r61" +PR = "r64" inherit task @@ -345,6 +345,8 @@ RRECOMMENDS_task-base-wifi = "\ kernel-module-ieee80211-crypt-wep \ kernel-module-ecb \ kernel-module-arc4 \ + kernel-module-crypto_algapi \ + kernel-module-cryptomgr \ kernel-module-michael-mic \ kernel-module-aes" diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 5663ff5a3d..cb4db34e64 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r43" +PR = "r44" inherit task diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007k.bb index 2fbe9ac884..76bbfe9ca3 100644 --- a/packages/tzdata/tzdata_2007e.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -3,12 +3,8 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r1" +PR = "r3" -PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -RPROVIDES = "tzdata" RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ timezone-australia timezone-europe timezone-indian \ @@ -46,6 +42,8 @@ PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +ALLOW_EMPTY_${PN}-dbg = "1" + FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" RPROVIDES_tzdata-africa = "tzdata-africa" @@ -126,6 +124,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/Asia/Bankok \ ${datadir}/zoneinfo/Asia/Hong_Kong \ ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Perth \ ${datadir}/zoneinfo/Australia/Darwin \ ${datadir}/zoneinfo/Australia/Adelaide \ ${datadir}/zoneinfo/Australia/Brisbane \ diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in deleted file mode 100644 index 5b9b7c780c..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=1 -WLAN_EXTRAVERSION=-pre26 -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch deleted file mode 100644 index 4f59f0fa5d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h~no-compat -+++ linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h -@@ -351,14 +351,14 @@ - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) - #ifdef _LINUX_LIST_H -- -+/* - static inline void list_move_tail(struct list_head *list, - struct list_head *head) - { - __list_del(list->prev, list->next); - list_add_tail(list, head); - } -- -+*/ - static inline void __list_splice(struct list_head *list, - struct list_head *head) - { -@@ -372,13 +372,13 @@ - last->next = at; - at->prev = last; - } -- -+/* - static inline void list_move(struct list_head *list, struct list_head *head) - { - __list_del(list->prev, list->next); - list_add(list, head); - } -- -+*/ - static inline void list_splice_init(struct list_head *list, - struct list_head *head) - { -@@ -388,7 +388,6 @@ - } - } - -- - #endif // LIST_H - #endif diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch deleted file mode 100644 index a119460a1d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -44,10 +44,8 @@ - - include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=p80211 prism2 shared mkmeta -+ALL_DIRS=mkmeta p80211 prism2 shared - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in deleted file mode 100644 index 27baca26fb..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=3 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=n -PRISM2_PCMCIA=n -PRISM2_PCI=n -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch deleted file mode 100644 index 93d0c01bdd..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c -=================================================================== ---- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2_cs.c 2005-09-30 18:19:26.000000000 +0200 -+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c 2006-02-06 20:23:23.902133136 +0100 -@@ -22,12 +22,16 @@ - * says. - */ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) ) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8)) - static int numlist = 4; - module_param_array(irq_list, int, numlist, 0444); - #else - module_param_array(irq_list, int, NULL, 0444); - #endif -+#else -+MODULE_PARM( irq_list, "1-4i" ); -+#endif - module_param( irq_mask, int, 0644); - #endif - diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch deleted file mode 100644 index 77b33e6573..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: Configure -=================================================================== ---- linux-wlan-ng-devel.orig/Configure (revision 1772) -+++ linux-wlan-ng-devel/Configure (working copy) -@@ -269,6 +269,12 @@ - write_bool KERN_25 - fi - -+# flag to indicate new kbuild for modules in 2-6-17 -+if [ $VERSION_CODE -gt `version 2 6 16` ] ; then -+ KERN_26=y -+ write_bool KERN_26 -+fi -+ - if [ "$SRC_RELEASE" != "$CUR_RELEASE" ] ; then - $ECHO "WARNING: the current running kernel is actually version $CUR_RELEASE." - fi -Index: src/p80211/Makefile -=================================================================== ---- linux-wlan-ng-devel.orig/src/p80211/Makefile (revision 1772) -+++ linux-wlan-ng-devel/src/p80211/Makefile (working copy) -@@ -72,15 +72,18 @@ - - PWD := $(shell pwd) - default: -- -+ifeq ($(KERN_26),y) -+ $(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC) -+ cp Modules.symvers ../prism2/driver -+else - ifeq ($(KERN_25), y) - $(MAKE) -C $(LINUX_SRC) M='$(PWD)/.. $(PWD)' WLAN_SRC=$(WLAN_SRC) modules - else - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) modules - endif # KERN_25 -- -+endif # KERN_26 - clean: -- rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags -+ rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags Modules.symvers - - install: - mkdir -p $(TARGET_MODDIR) -Index: src/prism2/driver/Makefile -=================================================================== ---- linux-wlan-ng-devel.orig/src/prism2/driver/Makefile (revision 1772) -+++ linux-wlan-ng-devel/src/prism2/driver/Makefile (working copy) -@@ -83,19 +83,26 @@ - PWD := $(shell pwd) - - default: -+#if new kbuild in 2.6.17 or later -+ifeq ($(KERN_26), y) -+ $(MAKE) -C $(LINUX_SRC) M='$(PWD)' WLAN_SRC=$(WLAN_SRC) -+ -+else - ifeq ($(KERN_25), y) - $(MAKE) -C $(LINUX_SRC) M='$(PWD)/../.. $(PWD)' WLAN_SRC=$(WLAN_SRC) \ - modules -+ - else # kbuild 2.4 - $(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(WLAN_SRC) \ - modules - - endif # kbuild switch -+endif # KERN_26 - - endif #KERNELRELEASE - - clean: -- rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags -+ rm -f *.o *.ko .*.cmd *.mod.c *.flags .*.flags Modules.symvers - - install: - ifeq ($(KERN_25), y) diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch deleted file mode 100644 index a119460a1d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -44,10 +44,8 @@ - - include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=p80211 prism2 shared mkmeta -+ALL_DIRS=mkmeta p80211 prism2 shared - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch b/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch deleted file mode 100644 index 65e34a326b..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: linux-wlan-ng-0.2.3/src/prism2/driver/prism2sta.c -=================================================================== ---- linux-wlan-ng-0.2.3.orig/src/prism2/driver/prism2sta.c 2005-10-07 23:32:44.000000000 +0200 -+++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2sta.c 2006-02-21 09:02:21.338239744 +0100 -@@ -2427,11 +2427,7 @@ - hfa384x2host_16(hw->qual.ANL_currFC)); - - /* Reschedule timer */ -- //if (!hw->timer_running) { -- hw->commsqual_timer.expires = jiffies + HZ; -- add_timer(&hw->commsqual_timer); -- hw->timer_running = 1; -- //} -+ mod_timer(&hw->commsqual_timer, jiffies + HZ); - - done: - DBFEXIT; diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch deleted file mode 100644 index abb3b137da..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared p80211 prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch deleted file mode 100644 index abb3b137da..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared p80211 prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.3/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.3/.mtn2git_empty +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/.mtn2git_empty diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in index a2bc086629..a2bc086629 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/config.in diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch index abb3b137da..abb3b137da 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch +++ b/packages/wlan-ng/wlan-ng-modules-0.2.8+svnr1859/only-the-modules.patch diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc index 4cf0733e7a..6dbadceca8 100644 --- a/packages/wlan-ng/wlan-ng-modules.inc +++ b/packages/wlan-ng/wlan-ng-modules.inc @@ -2,8 +2,6 @@ DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11M HOMEPAGE = "http://www.linux-wlan.org" SECTION = "kernel/modules" DEPENDS = "virtual/kernel" -RRECOMMENDS = "wlan-ng-utils" -RPROVIDES += "wlan-ng-modules-usb" LICENSE = "GPL" SRC_URI = "file://no-compat.patch;patch=1 \ @@ -55,15 +53,22 @@ do_install() { # Listen closely... sssshhh... can you hear the wlan-ng build system suck? rm -f ${KERNEL_SOURCE}/../config.mk rm -f ${KERNEL_SOURCE}/../../config.mk + + # man page and configure scripts are shipped by wlan-ng-utils + rm -rf ${D}/usr/local/man + rm -rf ${D}/etc } -PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-ng-modules-pci wlan-ng-modules-p80211" -FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}" -FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}" -FILES_wlan-ng-modules-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}" -FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \ +PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}" +FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}" +FILES_${PN}-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}" +FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \ /lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx${KERNEL_OBJECT_SUFFIX}" -RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils" -RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211" -RDEPENDS_wlan-ng-modules-cs = "wlan-ng-modules-p80211" -RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211" + +RDEPENDS_${PN}-p80211 = "wlan-ng-utils" +RDEPENDS_${PN} = "${PN}-p80211" +RDEPENDS_${PN}-usb = "${PN}-p80211" +RDEPENDS_${PN}-cs = "${PN}-p80211" +RDEPENDS_${PN}-pci = "${PN}-p80211" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb deleted file mode 100644 index 60b29999ef..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/modules" -DEPENDS = "virtual/kernel" -RRECOMMENDS = "wlan-ng-utils" -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://no-compat.patch;patch=1 \ - file://only-the-modules.patch;patch=1 \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -inherit module - -PARALLEL_MAKE = "" - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "CC=${KERNEL_CC}" >> config.mk - echo "LD=${KERNEL_LD}" >> config.mk - - # Listen closely... sssshhh... can you hear the wlan-ng build system suck? - rm -f ${KERNEL_SOURCE}/../config.mk - rm -f ${KERNEL_SOURCE}/../../config.mk - ln -sf ${S}/config.mk ${KERNEL_SOURCE}/.. - ln -sf ${S}/config.mk ${KERNEL_SOURCE}/../.. - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake -C src all -} - -do_install() { - oe_runmake install DESTDIR=${D} - - # Listen closely... sssshhh... can you hear the wlan-ng build system suck? - rm -f ${KERNEL_SOURCE}/../config.mk - rm -f ${KERNEL_SOURCE}/../../config.mk -} - -FILES_${PN} = "/lib" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb deleted file mode 100644 index 2157a29fa2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -require wlan-ng-modules.inc -PR = "r3" - -SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://prism2sta_commsqual_defer.patch;patch=1 \ - file://modules-symvers.patch;patch=1 \ - file://usb-owner.patch;patch=1 " -S = "${WORKDIR}/linux-wlan-ng-${PV}" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb deleted file mode 100644 index ade99ac50d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb +++ /dev/null @@ -1,8 +0,0 @@ -require wlan-ng-modules.inc - -SRCDATE = "20060823" -PV = "0.2.4+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " -S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb deleted file mode 100644 index dd320276f5..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb +++ /dev/null @@ -1,8 +0,0 @@ -require wlan-ng-modules.inc - -SRCDATE = "20061109" -PV = "0.2.5+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " -S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb index bacd662680..a0113e9ae4 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb @@ -1,6 +1,6 @@ require wlan-ng-modules.inc -PR = "r1" +PR = "r2" SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ file://2.6.22-fixes.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb deleted file mode 100644 index 8e885b5ad2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb +++ /dev/null @@ -1,9 +0,0 @@ -require wlan-ng-modules.inc - -SRCDATE = "20071030" -PV = "0.2.8+svn${SRCDATE}" - -SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " - -S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb index a1826a36f3..c455181c6b 100644 --- a/packages/wlan-ng/wlan-ng-modules_svn.bb +++ b/packages/wlan-ng/wlan-ng-modules_svn.bb @@ -1,10 +1,9 @@ require wlan-ng-modules.inc + PR = "r0" -PV = "0.2.4+svn${SRCDATE}" + +PV = "0.2.8+svnr${SRCREV}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " + S = "${WORKDIR}/trunk" - -DEFAULT_PREFERENCE = "-1" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-modules' ], d)}" diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in deleted file mode 100644 index 5b9b7c780c..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=1 -WLAN_EXTRAVERSION=-pre26 -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch deleted file mode 100644 index 43c9c1320d..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch +++ /dev/null @@ -1,37 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -42,12 +42,10 @@ - # - # -------------------------------------------------------------------- - --include ../config.mk -+include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=prism2 shared wlanctl wland nwepgen mkmeta wlancfg -+ALL_DIRS=mkmeta prism2 shared wlanctl wland nwepgen wlancfg - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -42,9 +42,9 @@ - # - # -------------------------------------------------------------------- - --include ../../config.mk -+include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.2/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in deleted file mode 100644 index 1fadad5560..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.2/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=2 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC=. -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch deleted file mode 100644 index 2a4369b931..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/Makefile -@@ -44,9 +44,9 @@ - - -include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -+DIRS=prism2 shared wlanctl wland nwepgen \ - mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -+ALL_DIRS=mkmeta prism2 shared wlanctl wland \ - nwepgen wlancfg - - ifneq ($(wildcard *.addon),) ---- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.3/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in deleted file mode 100644 index be01488a92..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.3/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=3 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC=. -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch deleted file mode 100644 index 2a4369b931..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/src/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/Makefile -@@ -44,9 +44,9 @@ - - -include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -+DIRS=prism2 shared wlanctl wland nwepgen \ - mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -+ALL_DIRS=mkmeta prism2 shared wlanctl wland \ - nwepgen wlancfg - - ifneq ($(wildcard *.addon),) ---- linux-wlan-ng-0.2.2/src/prism2/Makefile~only-the-utils -+++ linux-wlan-ng-0.2.2/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in deleted file mode 100644 index be01488a92..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=3 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC=. -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch deleted file mode 100644 index af1f442a4c..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/.mtn2git_empty +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/.mtn2git_empty diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in index 298935770d..298935770d 100644 --- a/packages/wlan-ng/wlan-ng-utils-0.2.8/config.in +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/config.in diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch new file mode 100644 index 0000000000..b6156da921 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.8+svnr1859/only-the-utils.patch @@ -0,0 +1,22 @@ +--- trunk/src/Makefile.old 2008-06-05 14:52:31.000000000 -0500 ++++ trunk/src/Makefile 2008-06-05 14:53:02.000000000 -0500 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +--- trunk/src/prism2/Makefile.old 2008-06-05 14:52:47.000000000 -0500 ++++ trunk/src/prism2/Makefile 2008-06-05 14:53:10.000000000 -0500 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=ridlist download + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.8/.mtn2git_empty +++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch deleted file mode 100644 index af1f442a4c..0000000000 --- a/packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: trunk/src/Makefile -=================================================================== ---- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 -+++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../config.mk - --DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 -+DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` -Index: trunk/src/prism2/Makefile -=================================================================== ---- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 -+++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 -@@ -44,7 +44,7 @@ - - -include ../../config.mk - --DIRS=driver ridlist download -+DIRS=ridlist download - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc index fe00e161d3..72976ce292 100644 --- a/packages/wlan-ng/wlan-ng-utils.inc +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -3,10 +3,8 @@ HOMEPAGE = "http://www.linux-wlan.org" SECTION = "kernel/userland" LICENSE = "GPL" DEPENDS = "virtual/kernel" -S = "${WORKDIR}/linux-wlan-ng-${PV}" -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ +SRC_URI = "file://only-the-utils.patch;patch=1 \ file://wlan-ng.modutils \ file://wlan.agent \ file://usbctl \ @@ -61,8 +59,8 @@ do_install() { install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl install -d ${D}${mandir}/man1 install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ + rm -rf ${D}/usr/local/man } -FILES_${PN}-doc += "/usr/local/man" FILES_${PN}-dbg += "/sbin/.debug" FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb deleted file mode 100644 index 9ac5348a98..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb +++ /dev/null @@ -1,3 +0,0 @@ -require wlan-ng-utils.inc - -PR = "r1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb deleted file mode 100644 index d4e0a39c70..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require wlan-ng-utils.inc - -PR = "r2" - -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb deleted file mode 100644 index f71a2ee34a..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb +++ /dev/null @@ -1,18 +0,0 @@ -require wlan-ng-utils.inc - -SRCDATE = "20060823" -PV = "0.2.4+svn${SRCDATE}" - -SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/trunk" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb index 0b6f33e380..9946a4b670 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -1,7 +1,10 @@ require wlan-ng-utils.inc -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ + file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ file://hostldflags.patch;patch=1" -PR = "r1" +S = "${WORKDIR}/linux-wlan-ng-${PV}" + +PR = "r3" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb deleted file mode 100644 index e37d548a9f..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb +++ /dev/null @@ -1,7 +0,0 @@ -require wlan-ng-utils.inc - -SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1" - -PR = "r0" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb index fae48545ff..096ac22055 100644 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -1,24 +1,12 @@ require wlan-ng-utils.inc -PR = "r2" -PV = "0.2.4+svn${SRCDATE}" +PR = "r0" -SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://hostldflags.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/trunk" - -FILES_${PN} = "/etc /sbin" +PV = "0.2.8+svnr${SRCREV}" -DEFAULT_PREFERENCE = "-1" +SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ + file://scripts-makefile-hostcc.patch;patch=1 \ + file://pcmciasrc.patch;patch=1 \ + file://hostldflags.patch;patch=1" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN}-0.2.4+svn20060823', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}/wlan-ng-utils' ], d)}" +S = "${WORKDIR}/trunk" diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc index b5e53e3f56..80ec42e0dd 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/packages/wpa-supplicant/wpa-supplicant-0.5.inc @@ -12,7 +12,6 @@ DEFAULT_PREFERENCE = "-2" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ - file://gnutlsfix.patch;patch=1 \ file://ifupdown.sh \ file://functions.sh" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb new file mode 100644 index 0000000000..67a5b99b0f --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -0,0 +1,3 @@ +require wpa-supplicant-0.5.inc + +PR = "r1" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb index ce744b3fe7..527f6ae3e7 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb @@ -1,3 +1,5 @@ require wpa-supplicant-0.5.inc -PR = "r3" +SRC_URI += "file://gnutlsfix.patch;patch=1" + +PR = "r4" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb index 2aa871bb74..bac1edb466 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb @@ -1,3 +1,5 @@ require wpa-supplicant-0.5.inc -PR = "r1"
\ No newline at end of file +SRC_URI += "file://gnutlsfix.patch;patch=1" + +PR = "r2" diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb deleted file mode 100644 index 772ea4e27f..0000000000 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "wxBase is a library for programming \ -non-GUI (console) applications using the base wxWidgets functionality." -HOMEPAGE = "http://www.wxwidgets.org/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "jpeg libpng zlib" - - -SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2" -#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" - -S = "${WORKDIR}/wxGTK" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gui --enable-largefile" - -LEAD_SONAME = "libwx_base-2.7*" - -do_configure() { - oe_runconf -} - -do_stage() { - install -d ${STAGING_INCDIR}/wx-2.7/wx - cp -pR include/wx ${STAGING_INCDIR}/wx-2.7 - cp -pR lib/libwx* ${STAGING_LIBDIR} - cp -pR lib/wx ${STAGING_LIBDIR} - cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile - cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal - ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config - sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ - -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ - -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ - -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ - -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 -} - -FILES_${PN} += " \ - ${libdir}/wx/config" - -FILES_${PN}-dev += " \ - ${libdir}/wx/include \ - ${datadir}/bakefile" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config - install -d ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV} -} diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty b/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/.mtn2git_empty +++ b/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty diff --git a/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch b/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch new file mode 100644 index 0000000000..4081212bc5 --- /dev/null +++ b/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch @@ -0,0 +1,18 @@ +--- wxBase-2.8.9/Makefile.in.old 2008-09-22 10:13:30.000000000 -0500 ++++ wxBase-2.8.9/Makefile.in 2008-09-22 10:17:44.000000000 -0500 +@@ -11339,13 +11339,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = + + ### Targets: ### + +-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) ++all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + +-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) ++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal + (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ + if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ diff --git a/packages/wxwidgets/wxbase.inc b/packages/wxwidgets/wxbase.inc new file mode 100644 index 0000000000..2976dec289 --- /dev/null +++ b/packages/wxwidgets/wxbase.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "wxBase is a library for programming \ +non-GUI (console) applications using the base wxWidgets functionality." +HOMEPAGE = "http://www.wxwidgets.org/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "zlib expat" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" + +S = "${WORKDIR}/wxBase-${PV}" + +inherit autotools pkgconfig + +do_configure() { + oe_runconf +} diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.4.bb index 07d9199ae1..c8350d8aa5 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxwidgets/wxbase_2.6.4.bb @@ -1,25 +1,10 @@ -DESCRIPTION = "wxBase is a library for programming \ -non-GUI (console) applications using the base wxWidgets functionality." -HOMEPAGE = "http://www.wxwidgets.org/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "jpeg libpng zlib" +require wxbase.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" - -S = "${WORKDIR}/wxBase-${PV}" - -inherit autotools pkgconfig +PR = "r0" EXTRA_OECONF = "--enable-largefile" -LEAD_SONAME = "libwx_base-2.6.so*" - -do_configure() { - oe_runconf -} +LEAD_SONAME = "libwx_base-2.6.so" do_stage() { install -d ${STAGING_INCDIR}/wx-2.6/wx @@ -36,12 +21,8 @@ do_stage() { -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 } -FILES_${PN} += " \ - ${libdir}/wx/config" - -FILES_${PN}-dev += " \ - ${libdir}/wx/include \ - ${datadir}/bakefile" +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile" do_install() { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/wxwidgets/wxbase_2.8.9.bb b/packages/wxwidgets/wxbase_2.8.9.bb new file mode 100644 index 0000000000..bb46a52a88 --- /dev/null +++ b/packages/wxwidgets/wxbase_2.8.9.bb @@ -0,0 +1,36 @@ +require wxbase.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +SRC_URI += "file://Makefile.in.patch;patch=1" + +EXTRA_OECONF = " --disable-gui \ + --enable-largefile \ + --enable-gpe \ + --without-subdirs" + +LEAD_SONAME = "libwx_base-2.8.so" + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.8/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.8 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 +} + +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${D}${bindir}/wx-config +} diff --git a/packages/wxwidgets/wxwidgets_2.6.3.bb b/packages/wxwidgets/wxwidgets.inc index 0cd88334b3..1e4cd0b6bb 100644 --- a/packages/wxwidgets/wxwidgets_2.6.3.bb +++ b/packages/wxwidgets/wxwidgets.inc @@ -2,16 +2,19 @@ DESCRIPTION = "wxWidgets is a cross platform application framework utilizing nat HOMEPAGE = "http://www.wxwidgets.org" SECTION = "x11/libs" LICENSE = "GPL" -DEPENDS = "gtk+" -PR = "r0" +DEPENDS = "gtk+ jpeg tiff libpng zlib expat" SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz" + S = "${WORKDIR}/wxWidgets-${PV}" inherit autotools pkgconfig +EXTRA_OECONF = " --enable-gpe " + do_configure() { - oe_runconf + oe_runconf } -#FIXME add sane packaging +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile" diff --git a/packages/wxwidgets/wxwidgets_2.6.4.bb b/packages/wxwidgets/wxwidgets_2.6.4.bb new file mode 100644 index 0000000000..775cf90587 --- /dev/null +++ b/packages/wxwidgets/wxwidgets_2.6.4.bb @@ -0,0 +1,30 @@ +require wxwidgets.inc + +PR = "r0" + +LEAD_SONAME = "libwx_gtk2_core-2.6.so" + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.6/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.6 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${D}${bindir}/wx-config + install -d ${D}${docdir}/${PN}-${PV} + install -m 644 -p CHANGES.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p COPYING.LIB ${D}${docdir}/${PN}-${PV} + install -m 644 -p LICENCE.txt ${D}${docdir}/${PN}-${PV} + install -m 644 -p README.txt ${D}${docdir}/${PN}-${PV} +} diff --git a/packages/wxwidgets/wxwidgets_2.8.9.bb b/packages/wxwidgets/wxwidgets_2.8.9.bb new file mode 100644 index 0000000000..8e8d3565fd --- /dev/null +++ b/packages/wxwidgets/wxwidgets_2.8.9.bb @@ -0,0 +1,25 @@ +require wxwidgets.inc + +PR = "r0" + +LEAD_SONAME = "libwx_gtk2_core-2.8.so" + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.8/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.8 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${D}${bindir}/wx-config +} diff --git a/packages/x11vnc/x11vnc_0.9.3.bb b/packages/x11vnc/x11vnc_0.9.4.bb index 04ac87b444..400abc8904 100644 --- a/packages/x11vnc/x11vnc_0.9.3.bb +++ b/packages/x11vnc/x11vnc_0.9.4.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Export your X session on-the-fly via VNC" -SECTION = "x11/utils" HOMEPAGE = "http://www.karlrunge.com/x11vnc/" AUTHOR = "Karl Runge" +SECTION = "x11/utils" LICENSE = "GPL" -DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" +DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" -SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz" +PR = "r0" -inherit autotools +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" +inherit autotools diff --git a/packages/zaurusd/files/alsa-6000x-default.state.patch b/packages/zaurusd/files/alsa-6000x-default.state.patch index e019f3a117..857b8c8b62 100644 --- a/packages/zaurusd/files/alsa-6000x-default.state.patch +++ b/packages/zaurusd/files/alsa-6000x-default.state.patch @@ -1,5 +1,5 @@ ---- zaurusd/config/alsa/6000x-default.state.old 2007-12-22 04:31:38.000000000 -0600 -+++ zaurusd/config/alsa/6000x-default.state 2007-12-26 00:06:02.000000000 -0600 +--- zaurusd/config/alsa/6000x-default.state.old 2008-03-21 02:21:47.000000000 -0500 ++++ zaurusd/config/alsa/6000x-default.state 2008-03-30 07:48:06.000000000 -0500 @@ -37,13 +37,23 @@ state.Tosa { } control.5 { @@ -701,9 +701,12 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -661,7 +719,7 @@ state.Tosa { +@@ -659,9 +717,9 @@ state.Tosa { + comment.item.1 'Headphone Mix' + iface MIXER name 'Speaker Mux' - value 'Headphone Mix' +- value 'Headphone Mix' ++ value 'Speaker Mix' } - control.75 { + control.82 { @@ -728,9 +731,12 @@ comment.access 'read write' comment.type ENUMERATED comment.count 1 -@@ -698,15 +756,14 @@ state.Tosa { +@@ -696,17 +754,16 @@ state.Tosa { + comment.item.4 Off + iface MIXER name 'Jack Function' - value Headphone +- value Headphone ++ value Off } - control.78 { + control.85 { diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index be9379eced..2ad405e419 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r17" +PR = "r18" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ |