diff options
54 files changed, 343 insertions, 143 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index f7ef05b30e..c3c91e2dbf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,7 @@ +[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip] +md5=30e2fe5edd143f347e03a8baf5d60f8a +sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad + [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 @@ -5350,6 +5354,10 @@ sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc md5=f100632e67f94ef4fffa4da32d25427a sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8 +[http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz] +md5=5eb8d1b02cdd99d0681e946768e529db +sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03 + [http://enlightenment.freedesktop.org/files/esmart-0.9.0.007.tar.gz] md5=a65b4a08818ac9ef9de3dd9d4f20f148 sha256=5df5b02c568f5e4b744252fbd62f5fae71bf0eddecc423d2b396a0ffbfe94465 @@ -6910,15 +6918,15 @@ sha256=38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc md5=a659b8388cac9db2b13e056e574ceeb0 sha256=37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61 -[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2] md5=88785071f29ed0e0b6b61057a1079442 sha256=1159457a0e4c054b709547ae21ff624aebab2033e0d9e5bf46c9cf88b1970606 -[http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2] md5=ad9f97a4d04982ccf4fd67cb464879f3 sha256=985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7 -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2] md5=a4a3eb15c96030906d8494959eeda23c sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc @@ -6926,23 +6934,23 @@ sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc md5=ac6d19831220c4aeef4475492725486f sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.1/gcc-4.2.1.tar.bz2] md5=cba410e6ff70f7d7f4be7a0267707fd0 sha256=ca0a12695b3bccfa8628509e08cb9ed7d8ed48deff0a299e4cb8de87d2c1fced -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] md5=7ae33781417a35a2eb03ee098a9f4490 sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.3/gcc-4.2.3.tar.bz2] md5=ef2a4d9991b3644115456ea05b2b8163 sha256=5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80 -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2] md5=d79f553e7916ea21c556329eacfeaa16 sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.1/gcc-4.3.1.tar.bz2] md5=4afa0290cc3a41ac8822666f1110de98 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 @@ -6950,11 +6958,7 @@ sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5 md5=5dfac5da961ecd5f227c3175859a486d sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2] -md5=5dfac5da961ecd5f227c3175859a486d -sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165 - -[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] +[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.3/gcc-4.3.3.tar.bz2] md5=cc3c5565fdb9ab87a05ddb106ba0bd1f sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de @@ -20382,6 +20386,10 @@ sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed md5=797ea136fe43e4286c9362ee4516674e sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed +[http://trac.luon.net/data/ruby-dbus/releases/ruby-dbus-0.2.1.tar.gz] +md5=1f6398d8bbafa272c0b43878fec43276 +sha256=cfcadc4ae860f2de3d6aa1a1230a410b1dedf783148a27a20205bb3b54e3c3ac + [http://rxtx.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip] md5=9290b4832d46199f8d798a531209640b sha256=31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fc341f3726..bb9b75bece 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -19,6 +19,7 @@ SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-bootchart-lite ?= "4" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" @@ -98,6 +99,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" +SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 3fdfeae292..6fe6a830e6 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "i486" -require conf/machine/include/tune-x86.inc +require conf/machine/include/tune-geodegx.inc PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf index 37ea17e734..de4d9ca16e 100644 --- a/conf/machine/geodelx.conf +++ b/conf/machine/geodelx.conf @@ -1,6 +1,6 @@ TARGET_ARCH = "i486" -require conf/machine/include/tune-x86.inc +require conf/machine/include/tune-geodelx.inc PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" diff --git a/conf/machine/include/tune-geodegx.inc b/conf/machine/include/tune-geodegx.inc new file mode 100644 index 0000000000..cae285a91c --- /dev/null +++ b/conf/machine/include/tune-geodegx.inc @@ -0,0 +1,6 @@ +TARGET_CC_ARCH = "-march=geode" +BASE_PACKAGE_ARCH = "geode" +PACKAGE_EXTRA_ARCHS += "x86 i386 geode" + +FEED_ARCH = "geode" + diff --git a/conf/machine/include/tune-geodelx.inc b/conf/machine/include/tune-geodelx.inc index 4e146f4c04..63e6678947 100644 --- a/conf/machine/include/tune-geodelx.inc +++ b/conf/machine/include/tune-geodelx.inc @@ -1,9 +1,9 @@ # Geode CPU has it's own target in GCC 4.3 # in older versions k6-2 is closest # -TARGET_CC_ARCH = "-march=k6-2" +TARGET_CC_ARCH = "-march=geode" BASE_PACKAGE_ARCH = "geode" -PACKAGE_EXTRA_ARCHS += "x86 i386 i486 geode" +PACKAGE_EXTRA_ARCHS += "x86 i386 geode" FEED_ARCH = "geode" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index ad1138f422..c25121659c 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -2,11 +2,8 @@ #@NAME: qemu x86 Emulator setup #@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation -TARGET_ARCH = "i586" -TARGET_CC_ARCH = "-march=i586" -PACKAGE_EXTRA_ARCHS = "x86" - require conf/machine/include/qemu.inc +require conf/machine/i686-generic.conf MACHINE_FEATURES += "x86" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d" diff --git a/recipes/alsa/alsa-state.bb b/recipes/alsa/alsa-state.bb index 09cf22b3c8..9bb22e2aa7 100644 --- a/recipes/alsa/alsa-state.bb +++ b/recipes/alsa/alsa-state.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Alsa Scenario Files" LICENSE = "MIT" PV = "0.2.0" -PR = "r7" +PR = "r8" SRC_URI = "\ file://asound.conf \ @@ -22,7 +22,7 @@ SRC_URI_append_a780 = "file://gsmhandset.state \ inherit update-rc.d INITSCRIPT_NAME = "alsa-state" -INITSCRIPT_PARAMS = "start 39 S ." +INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." do_install() { install -d ${D}${sysconfdir}/init.d diff --git a/recipes/eel/eel_2.12.2.bb b/recipes/eel/eel_2.12.2.bb index 92bfc88f46..88682b5b35 100644 --- a/recipes/eel/eel_2.12.2.bb +++ b/recipes/eel/eel_2.12.2.bb @@ -3,11 +3,12 @@ # Released under the MIT license (see packages/COPYING) inherit gnome +PR = "r2" LICENSE="GPL" SRC_URI += "file://configure.patch;patch=1" -DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail" +DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/recipes/eel/eel_2.22.2.bb b/recipes/eel/eel_2.22.2.bb index 04353795c3..0c7a6de42c 100644 --- a/recipes/eel/eel_2.22.2.bb +++ b/recipes/eel/eel_2.22.2.bb @@ -3,12 +3,13 @@ # Released under the MIT license (see packages/COPYING) inherit gnome +PR = "r2" LICENSE="GPL" SRC_URI += "file://eel-no-strftime.patch;patch=1" -DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail" +DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail" EXTRA_OECONF = "--disable-gtk-doc" do_stage() { diff --git a/recipes/eel/eel_2.24.1.bb b/recipes/eel/eel_2.24.1.bb index 04353795c3..0c7a6de42c 100644 --- a/recipes/eel/eel_2.24.1.bb +++ b/recipes/eel/eel_2.24.1.bb @@ -3,12 +3,13 @@ # Released under the MIT license (see packages/COPYING) inherit gnome +PR = "r2" LICENSE="GPL" SRC_URI += "file://eel-no-strftime.patch;patch=1" -DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail" +DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui virtual/gail" EXTRA_OECONF = "--disable-gtk-doc" do_stage() { diff --git a/recipes/eel/eel_2.6.1.bb b/recipes/eel/eel_2.6.1.bb index f123a4aa93..d93aab1e61 100644 --- a/recipes/eel/eel_2.6.1.bb +++ b/recipes/eel/eel_2.6.1.bb @@ -3,11 +3,12 @@ # Released under the MIT license (see packages/COPYING) inherit gnome +PR = "r2" LICENSE="GPL" SRC_URI += "file://configure.patch;patch=1" -DEPENDS="libgnomeui gail" +DEPENDS="libgnomeui virtual/gail" EXTRA_OECONF = "--disable-gtk-doc" edir="${STAGING_INCDIR}/eel-2/eel" diff --git a/recipes/esekeyd/esekeyd_1.2.4.bb b/recipes/esekeyd/esekeyd_1.2.4.bb new file mode 100644 index 0000000000..5a9deb6c55 --- /dev/null +++ b/recipes/esekeyd/esekeyd_1.2.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "ESE Key Daemon" +LICENSE = "GPL" +SECTION = "base" +HOMEPAGE = "http://www.burghardt.pl" + +SRC_URI = "http://www.burghardt.pl/files/esekeyd-${PV}.tar.gz" + +inherit autotools + diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc index e12f93c800..5cf2687873 100644 --- a/recipes/gcc/gcc-4.1.0.inc +++ b/recipes/gcc/gcc-4.1.0.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEFAULT_PREFERENCE = "-1" -SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc index ac8a4a8a71..22c20ce9a2 100644 --- a/recipes/gcc/gcc-4.1.1.inc +++ b/recipes/gcc/gcc-4.1.1.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://110-arm-eabi.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 614e2bb421..7ffb9ce738 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://110-arm-eabi.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc index 16e5b8f5bc..920805bedc 100644 --- a/recipes/gcc/gcc-4.2.1.inc +++ b/recipes/gcc/gcc-4.2.1.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index 0f4de3cdc7..f5878123ed 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index 7726030f20..35d8cc6f1b 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index b21569b270..085f241558 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -2,7 +2,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index cdab6dc215..132bbe788d 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -6,7 +6,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index aeb3477e3b..e053ba2231 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -6,7 +6,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 4bed0e4740..860c96cadb 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -6,7 +6,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -SRC_URI = "http://gcc.releasenotes.org/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ diff --git a/recipes/gnome/gail_1.20.0.bb b/recipes/gnome/gail_1.20.0.bb index 58168a04d5..13346f34b0 100644 --- a/recipes/gnome/gail_1.20.0.bb +++ b/recipes/gnome/gail_1.20.0.bb @@ -3,6 +3,7 @@ SECTION = "x11/libs" PR = "r0" DESCRIPTION = "GNOME Accessibility Implementation Library" DEPENDS = "gtk+" +PROVIDES = "virtual/gail" inherit gnome diff --git a/recipes/gnome/gnome-keyring_2.24.1.bb b/recipes/gnome/gnome-keyring_2.24.1.bb index 105ee16d11..9d2b5234a5 100644 --- a/recipes/gnome/gnome-keyring_2.24.1.bb +++ b/recipes/gnome/gnome-keyring_2.24.1.bb @@ -3,7 +3,9 @@ SECTION = "x11/gnome" inherit autotools gnome pkgconfig -DEPENDS = "gtk+ libtasn1 libgcrypt" +PR = "r1" + +DEPENDS = "gtk+ libtasn1 libgcrypt gconf" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/recipes/gnome/libgnomecanvas_2.20.0.bb b/recipes/gnome/libgnomecanvas_2.20.0.bb index 8e13c9562b..16391cb6f4 100644 --- a/recipes/gnome/libgnomecanvas_2.20.0.bb +++ b/recipes/gnome/libgnomecanvas_2.20.0.bb @@ -1,10 +1,11 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" DESCRIPTION = "A powerful object-oriented display" +PR = "r2" inherit gnome -DEPENDS = "libglade libart-lgpl gail" +DEPENDS = "libglade libart-lgpl virtual/gail" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index e17a91dcc4..c0b9ed5c80 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -44,6 +44,9 @@ do_stage () { oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + if test -d modules/other/gail/libgail-util ; then + oe_libinstall -so -C modules/other/gail/libgail-util libgailutil ${STAGING_LIBDIR} + fi autotools_stage_includes diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb index 259c0ac672..eb6cc536b9 100644 --- a/recipes/gtk+/gtk+_2.14.2.bb +++ b/recipes/gtk+/gtk+_2.14.2.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r3" +PR = "r4" DEPENDS += "cairo jasper" @@ -39,6 +39,8 @@ python populate_packages_prepend () { bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } +# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): +PROVIDES = "virtual/gail" RPROVIDES_${PN} = "libgailutil18" RCONFLICTS_${PN} = "libgailutil18" RREPLACES_${PN} = "libgailutil18" diff --git a/recipes/gtk+/gtk+_2.16.0.bb b/recipes/gtk+/gtk+_2.16.0.bb index b5f7c71afb..0b4e24eea7 100644 --- a/recipes/gtk+/gtk+_2.16.0.bb +++ b/recipes/gtk+/gtk+_2.16.0.bb @@ -1,7 +1,7 @@ require gtk+.inc DEPENDS += "cairo jasper" -PR = "r1" +PR = "r2" # disabled per default - this uses as little patches as possible DEFAULT_PREFERENCE = "-1" @@ -40,6 +40,8 @@ python populate_packages_prepend () { bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) } +# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): +PROVIDES = "virtual/gail" RPROVIDES_${PN} = "libgailutil18" RCONFLICTS_${PN} = "libgailutil18" RREPLACES_${PN} = "libgailutil18" diff --git a/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb b/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb index f44e8b57a6..21d1a6bab6 100644 --- a/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/recipes/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -1,7 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" -PR = "r0" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0" +PR = "r1" SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz" diff --git a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb index 66993cec74..c45b9f7ade 100644 --- a/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb +++ b/recipes/gtkhtml/gtkhtml-3.0_3.0.10.bb @@ -1,7 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" -PR = "r2" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui gal-2.0" +PR = "r3" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \ file://fix-missing-colormap.patch;patch=1" diff --git a/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb b/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb index 1e389dabe0..18d77d8e49 100644 --- a/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb +++ b/recipes/gtkhtml/gtkhtml-3.1_3.1.16.bb @@ -1,6 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" +PR = "r2" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.1" diff --git a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb index cb2b8b2acc..e63bc4c72e 100644 --- a/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb +++ b/recipes/gtkhtml/gtkhtml-3.6_3.6.2.bb @@ -1,6 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" +PR = "r2" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2 \ file://cross-includedir.patch;patch=1" diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb index e8727bd0dc..6a48e837a6 100644 --- a/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb +++ b/recipes/gtkhtml/gtkhtml-3.8_3.12.3.bb @@ -2,7 +2,8 @@ DESCRIPTION = "HTML rendering/editing library" SECTION = "x11/libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" +PR = "r2" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \ file://60_glib-2.15-g-gnuc-function.patch;patch=1" diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb b/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb index e678bc3134..6b8bffdf94 100644 --- a/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb +++ b/recipes/gtkhtml/gtkhtml-3.8_3.18.0.bb @@ -1,6 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" +PR = "r2" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.18/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8" diff --git a/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb b/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb index cc177de08f..204d925e3a 100644 --- a/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb +++ b/recipes/gtkhtml/gtkhtml-3.8_3.8.2.bb @@ -1,6 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +DEPENDS = "gtk+ virtual/gail libbonoboui libgnomeprintui libgnomeui" +PR = "r2" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8" diff --git a/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index 44a96d6d64..cec898e7eb 100644 --- a/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/recipes/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -1,7 +1,7 @@ require gtkhtml.inc -DEPENDS = "gtk+ gail libgnomeprint orbit2-native" -PR = "r1" +DEPENDS = "gtk+ virtual/gail libgnomeprint orbit2-native" +PR = "r2" SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index 2292ae23b4..a86cd5bed8 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Tue Mar 24 13:33:16 2009 +# Thu Apr 2 20:45:56 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -77,7 +77,7 @@ CONFIG_EMBEDDED=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -288,7 +288,7 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_UNEVICTABLE_LRU=y CONFIG_LEDS=y -CONFIG_ALIGNMENT_TRAP=n +CONFIG_ALIGNMENT_TRAP=y # # Boot options @@ -492,7 +492,8 @@ CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set -# CONFIG_WIMAX is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -733,7 +734,9 @@ CONFIG_P54_USB=y CONFIG_HOSTAP=y CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y -# CONFIG_B43 is not set +CONFIG_B43=y +CONFIG_B43_LEDS=y +# CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set CONFIG_ZD1211RW=y # CONFIG_ZD1211RW_DEBUG is not set @@ -748,27 +751,29 @@ CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # -# Enable WiMAX (Networking options) to see the WiMAX drivers +# WiMAX Wireless Broadband devices # +# CONFIG_WIMAX_I2400M_USB is not set +# CONFIG_WIMAX_I2400M_SDIO is not set # # USB Network Adapters # -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m +CONFIG_USB_CATC=y +CONFIG_USB_KAWETH=y +CONFIG_USB_PEGASUS=y +CONFIG_USB_RTL8150=y CONFIG_USB_USBNET=y CONFIG_USB_NET_AX8817X=y CONFIG_USB_NET_CDCETHER=y -CONFIG_USB_NET_DM9601=m -# CONFIG_USB_NET_SMSC95XX is not set -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_DM9601=y +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_GL620A=y +CONFIG_USB_NET_NET1080=y +CONFIG_USB_NET_PLUSB=y CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=y -CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_NET_CDC_SUBSET=y CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y @@ -798,7 +803,7 @@ CONFIG_SLHC=m # Input device support # CONFIG_INPUT=y -# CONFIG_INPUT_FF_MEMLESS is not set +CONFIG_INPUT_FF_MEMLESS=y # CONFIG_INPUT_POLLDEV is not set # @@ -841,7 +846,15 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +CONFIG_INPUT_TWL4030_PWRBUTTON=y +CONFIG_INPUT_UINPUT=y # # Hardware I/O ports @@ -1066,7 +1079,9 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -# CONFIG_SSB is not set +CONFIG_SSB=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set # # Multifunction device drivers @@ -1148,13 +1163,13 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m CONFIG_USB_M5602=m -# CONFIG_USB_STV06XX is not set +CONFIG_USB_STV06XX=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_MARS=m CONFIG_USB_GSPCA_OV519=m -# CONFIG_USB_GSPCA_OV534 is not set +CONFIG_USB_GSPCA_OV534=m CONFIG_USB_GSPCA_PAC207=m CONFIG_USB_GSPCA_PAC7311=m CONFIG_USB_GSPCA_SONIXB=m @@ -1269,10 +1284,10 @@ CONFIG_DVB_STB6000=m CONFIG_DVB_STV0299=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m -# CONFIG_DVB_TDA8261 is not set +CONFIG_DVB_TDA8261=m CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m -# CONFIG_DVB_TUNER_CX24113 is not set +CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m @@ -1313,7 +1328,7 @@ CONFIG_DVB_NXT200X=m # CONFIG_DVB_OR51132 is not set CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m -# CONFIG_DVB_LGDT3304 is not set +CONFIG_DVB_LGDT3304=m CONFIG_DVB_S5H1409=m CONFIG_DVB_AU8522=m CONFIG_DVB_S5H1411=m @@ -1321,7 +1336,7 @@ CONFIG_DVB_S5H1411=m # # ISDB-T (terrestrial) frontends # -# CONFIG_DVB_S921 is not set +CONFIG_DVB_S921=m # # Digital terrestrial only tuners/PLL @@ -1377,7 +1392,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set CONFIG_OMAP2_DSS=y -CONFIG_OMAP2_DSS_VRAM_SIZE=14 +CONFIG_OMAP2_DSS_VRAM_SIZE=4 CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y # CONFIG_OMAP2_DSS_RFBI is not set CONFIG_OMAP2_DSS_VENC=y @@ -1391,7 +1406,7 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1 # OMAP2/3 Display Device Drivers # CONFIG_PANEL_GENERIC=y -# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set +CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C=m # CONFIG_PANEL_SHARP_LS037V7DW01 is not set # CONFIG_PANEL_N800 is not set # CONFIG_CTRL_BLIZZARD is not set @@ -1439,7 +1454,8 @@ CONFIG_SND_MIXER_OSS=y CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y -# CONFIG_SND_HRTIMER is not set +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y @@ -1491,15 +1507,15 @@ CONFIG_HID_LOGITECH=y # CONFIG_LOGIRUMBLEPAD2_FF is not set CONFIG_HID_MICROSOFT=y CONFIG_HID_MONTEREY=y -# CONFIG_HID_NTRIG is not set +CONFIG_HID_NTRIG=y CONFIG_HID_PANTHERLORD=y # CONFIG_PANTHERLORD_FF is not set CONFIG_HID_PETALYNX=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y CONFIG_HID_SUNPLUS=y -# CONFIG_GREENASIA_FF is not set -# CONFIG_HID_TOPSEED is not set +CONFIG_GREENASIA_FF=y +CONFIG_HID_TOPSEED=y # CONFIG_THRUSTMASTER_FF is not set # CONFIG_ZEROPLUS_FF is not set CONFIG_USB_SUPPORT=y @@ -1533,7 +1549,7 @@ CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set -# CONFIG_USB_OXU210HP_HCD is not set +CONFIG_USB_OXU210HP_HCD=y # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set @@ -1643,14 +1659,14 @@ CONFIG_USB_SERIAL_SPCP8X5=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set -# CONFIG_USB_SERIAL_SIEMENS_MPI is not set +CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m -# CONFIG_USB_SERIAL_OPTICON is not set +CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_DEBUG=m # @@ -1702,14 +1718,13 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y -CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_ETH is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set -# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_CDC_COMPOSITE=y # # OTG and related infrastructure @@ -1943,7 +1958,9 @@ CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_DEBUG is not set # CONFIG_CRAMFS is not set -# CONFIG_SQUASHFS is not set +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set @@ -2040,7 +2057,7 @@ CONFIG_NLS_ISO8859_1=y # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 @@ -2084,7 +2101,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FAULT_INJECTION is not set -CONFIG_LATENCYTOP=y +# CONFIG_LATENCYTOP is not set CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_RING_BUFFER=y diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 59f97f11ae..ded981cb8a 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -7,9 +7,9 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| DEFAULT_PREFERENCE = "-1" -SRCREV = "90e758af52ba803cba233fabee81176d99589f09" +SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022" -PR = "r5+gitr${SRCREV}" +PR = "r6+gitr${SRCREV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" diff --git a/recipes/linux/linux-rp-2.6.26/defconfig-qemux86 b/recipes/linux/linux-rp-2.6.26/defconfig-qemux86 index 9cd3d89f0e..57f7c0d15a 100644 --- a/recipes/linux/linux-rp-2.6.26/defconfig-qemux86 +++ b/recipes/linux/linux-rp-2.6.26/defconfig-qemux86 @@ -1,12 +1,13 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Thu Apr 2 19:13:29 2009 +# Fri Apr 3 08:05:50 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y # CONFIG_X86_64 is not set CONFIG_X86=y +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" # CONFIG_GENERIC_LOCKBREAK is not set CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -428,6 +429,7 @@ CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y # # Core Netfilter Configuration @@ -442,17 +444,17 @@ CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CT_PROTO_DCCP is not set CONFIG_NF_CT_PROTO_GRE=m # CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NF_CT_PROTO_UDPLITE=m CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m -# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IRC=m -# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m # CONFIG_NF_CONNTRACK_SANE is not set -# CONFIG_NF_CONNTRACK_SIP is not set +CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m -# CONFIG_NF_CT_NETLINK is not set +CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -461,7 +463,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set @@ -474,17 +476,18 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HELPER=m -# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m # CONFIG_NETFILTER_XT_MATCH_SCTP is not set CONFIG_NETFILTER_XT_MATCH_STATE=m @@ -516,19 +519,20 @@ CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m -# CONFIG_NF_NAT_SNMP_BASIC is not set +CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_TFTP=m CONFIG_NF_NAT_AMANDA=m CONFIG_NF_NAT_PPTP=m -# CONFIG_NF_NAT_H323 is not set -# CONFIG_NF_NAT_SIP is not set +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m -# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m @@ -537,16 +541,56 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # -# CONFIG_NF_CONNTRACK_IPV6 is not set +CONFIG_NF_CONNTRACK_IPV6=m # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set +CONFIG_BRIDGE_EBT_NFLOG=m # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -1032,6 +1076,7 @@ CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m CONFIG_R8169_NAPI=y +CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m CONFIG_SKY2=m @@ -1201,7 +1246,7 @@ CONFIG_DEVKMEM=y # Serial drivers # CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_CONSOLE is not set +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y @@ -1213,6 +1258,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # Non-8250 serial port support # CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set diff --git a/recipes/linux/linux-rp_2.6.26.bb b/recipes/linux/linux-rp_2.6.26.bb index c082f379e3..2d6c9f6742 100644 --- a/recipes/linux/linux-rp_2.6.26.bb +++ b/recipes/linux/linux-rp_2.6.26.bb @@ -1,10 +1,10 @@ require linux-rp.inc -PR = "r10" +PR = "r11" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" -DEFAULT_PREFERENCE_qemux86 = "-1" +DEFAULT_PREFERENCE_qemux86 = "1" DEFAULT_PREFERENCE_spitz = "1" DEFAULT_PREFERENCE_collie = "1" DEFAULT_PREFERENCE_akita = "1" diff --git a/recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb b/recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb new file mode 100644 index 0000000000..a79c96dc00 --- /dev/null +++ b/recipes/mozilla/firefox-l10n-pt-br_3.0.4.bb @@ -0,0 +1,6 @@ +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require firefox-l10n.inc + +PR = "${INC_PR}.1" diff --git a/recipes/mozilla/firefox-l10n.inc b/recipes/mozilla/firefox-l10n.inc new file mode 100644 index 0000000000..31555e3d0d --- /dev/null +++ b/recipes/mozilla/firefox-l10n.inc @@ -0,0 +1,46 @@ +# Copyright (C) 2009, O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +def get_language_name(package): + lang = package.replace('firefox-l10n-', '') + + if lang.find('-'): + lang = lang.split('-') + lang[1] = lang[1].upper() + lang = '-'.join(lang) + + return lang + +DEPENDS = "unzip-native" +RDEPENDS = "firefox" +LANGUAGE = "${@get_language_name('${PN}')}" + +SRC_URI = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/${LANGUAGE}.xpi" +S = "${WORKDIR}" + +do_configure() { + unzip -o -q -d ${LANGUAGE} ${LANGUAGE}.xpi +} + +INC_PR = "r1" + +do_install() { + cd ${S}/${LANGUAGE} + + # Get extension UUID + EXTENSION=`cat install.rdf | sed --posix '/em:id=/!d;s/[ ]*em:id="//;s/".*//'` + + mkdir -p ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/chrome + mkdir -p ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/uninstall + install -m 644 chrome/*.jar ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/chrome + install -m 644 install.rdf ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION} + install -m 644 chrome.manifest ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION} + + cat install.rdf \ + | sed --posix '/<em:locale>/!d' \ + | sed --posix "s/.*/register global locale ${LANGUAGE}/" \ + > ${D}/usr/lib/firefox-${PV}/extensions/${EXTENSION}/uninstall/Uninstall +} + +FILES_${PN} += "/usr/lib/firefox-${PV}" +PACKAGE_ARCH = "all" diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc index c00dfd4ef4..1be9c4da8f 100644 --- a/recipes/mozilla/firefox.inc +++ b/recipes/mozilla/firefox.inc @@ -37,6 +37,17 @@ do_install() { install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ rm -f ${D}${libdir}/${PN}-*/TestGtkEmbed + rm -f ${D}${libdir}/${PN}-*/defaults/pref/firefox-l10n.js + + # use locale settings + grep -Rl intl.locale.matchOS ${D}${libdir}/${PN}-*/ \ + | grep '.js$' \ + | xargs -n 1 sed -i 's/\(pref("intl.locale.matchOS",\s*\)false)/\1true)/g' + + # disable application updating + grep -Rl app.update.enabled ${D}${libdir}/${PN}-*/ \ + | grep '.js$' \ + | xargs -n 1 sed -i 's/\(pref("app.update.enabled",\s*\)true)/\1false)/g' } pkg_postinst_${PN}() { diff --git a/recipes/nonworking/sword/gnomesword_2.1.2.bb b/recipes/nonworking/sword/gnomesword_2.1.2.bb index a4ec60d040..6fe172af88 100644 --- a/recipes/nonworking/sword/gnomesword_2.1.2.bb +++ b/recipes/nonworking/sword/gnomesword_2.1.2.bb @@ -1,8 +1,8 @@ DESCRIPTION = "GUI frontend for sword" HOMEPAGE = "http://gnomesword.sf.net" LICENSE = "GPLv3" -DEPENDS = "gail libgnomeui gtkhtml-3.6 gail sword" - +DEPENDS = "libgnomeui gtkhtml-3.6 virtual/gail sword" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" diff --git a/recipes/openssl/openssl-native_0.9.7g.bb b/recipes/openssl/openssl-native_0.9.7g.bb index 14f6d92f09..dfe3ab5eae 100644 --- a/recipes/openssl/openssl-native_0.9.7g.bb +++ b/recipes/openssl/openssl-native_0.9.7g.bb @@ -8,8 +8,6 @@ SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ file://gnueabi-arm.patch;patch=1" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/openssl/openssl-native_0.9.7m.bb b/recipes/openssl/openssl-native_0.9.7m.bb index b00dc5e73b..445b6e9161 100644 --- a/recipes/openssl/openssl-native_0.9.7m.bb +++ b/recipes/openssl/openssl-native_0.9.7m.bb @@ -12,8 +12,6 @@ SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ file://gnueabi-arm.patch;patch=1" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/openssl/openssl-native_0.9.8g.bb b/recipes/openssl/openssl-native_0.9.8g.bb index 4975cf5b1d..27f0169cf9 100644 --- a/recipes/openssl/openssl-native_0.9.8g.bb +++ b/recipes/openssl/openssl-native_0.9.8g.bb @@ -14,8 +14,6 @@ SRC_URI += "file://debian.patch;patch=1 \ PARALLEL_MAKE = "" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/openssl/openssl-native_0.9.8j.bb b/recipes/openssl/openssl-native_0.9.8j.bb index 2a69855eb6..ffbd5ea8a9 100644 --- a/recipes/openssl/openssl-native_0.9.8j.bb +++ b/recipes/openssl/openssl-native_0.9.8j.bb @@ -14,8 +14,6 @@ SRC_URI += "file://configure-targets.patch;patch=1 \ PARALLEL_MAKE = "" -FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - do_install() { : } diff --git a/recipes/ruby/ruby-dbus_0.2.1.bb b/recipes/ruby/ruby-dbus_0.2.1.bb new file mode 100644 index 0000000000..40627d347b --- /dev/null +++ b/recipes/ruby/ruby-dbus_0.2.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "${PN} bindings" +SECTION = "devel/ruby" +LICENSE = "LGPL" +RDEPENDS = "dbus ruby" + +SRC_URI = "http://trac.luon.net/data/${PN}/releases/${PN}-0.2.1.tar.gz" + +RUBY_DIR = "/usr/lib/ruby/1.8" + +S = "${WORKDIR}/${PN}-${PV}" + +FILES_${PN} += "${RUBY_DIR}" + +do_install() { + install -d ${D}${RUBY_DIR} + cp -r lib/* ${D}${RUBY_DIR} +} + diff --git a/recipes/sg3-utils/files/Makefile.patch b/recipes/sg3-utils/files/Makefile-r1.patch index cc5babfa26..d43b51d63c 100644 --- a/recipes/sg3-utils/files/Makefile.patch +++ b/recipes/sg3-utils/files/Makefile-r1.patch @@ -1,8 +1,8 @@ Index: sg3-utils-1.24/Makefile =================================================================== ---- sg3-utils-1.24.orig/Makefile 2009-01-27 16:29:26.000000000 -0800 -+++ sg3-utils-1.24/Makefile 2009-01-27 22:31:04.000000000 -0800 -@@ -1,6 +1,6 @@ +--- sg3-utils-1.24.orig/Makefile 2007-05-07 11:59:19.000000000 -0700 ++++ sg3-utils-1.24/Makefile 2009-02-02 16:37:35.000000000 -0800 +@@ -1,13 +1,15 @@ SHELL = /bin/sh -PREFIX=/usr/local @@ -10,15 +10,32 @@ Index: sg3-utils-1.24/Makefile LIBDIR=$(DESTDIR)/$(PREFIX)/lib INSTDIR=$(DESTDIR)/$(PREFIX)/bin MANDIR=$(DESTDIR)/$(PREFIX)/share/man -@@ -8,6 +8,8 @@ + INCLUDEDIR=$(DESTDIR)/$(PREFIX)/include - CC = gcc - LD = gcc -+LIBTOOL = libtool +-CC = gcc +-LD = gcc ++CC ?= gcc ++LD = ${CC} ++LIBTOOL ?= libtool +LT_EXTRA = --tag=CC EXECS = sg_dd sgp_dd sgm_dd sg_read sg_map sg_scan sg_rbuf \ sginfo sg_readcap sg_turs sg_inq sg_test_rwbuf \ +@@ -37,12 +39,12 @@ + S_CFLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS) + + # CFLAGS = -O2 -Wall -W +-CFLAGS = -g -O2 -Wall -W ++CFLAGS ?= -g -O2 -Wall -W + # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99 + + CFLAGS_PTHREADS = -D_REENTRANT + +-LDFLAGS = ++LDFLAGS ?= + # LDFLAGS = -v -lm + + LIB_VINFO = 1:0:0 @@ -64,164 +66,164 @@ $(CC) $(INCLUDES) $(CFLAGS) $(S_CFLAGS) -c -o $@ $< diff --git a/recipes/sg3-utils/sg3-utils_1.24.bb b/recipes/sg3-utils/sg3-utils_1.24.bb index 135ba0f817..4a2c378676 100644 --- a/recipes/sg3-utils/sg3-utils_1.24.bb +++ b/recipes/sg3-utils/sg3-utils_1.24.bb @@ -3,11 +3,14 @@ AUTHOR = "Eric Schwartz (Skif) <emschwar@debian.org>" HOMEPAGE = "http://packages.qa.debian.org/s/sg3-utils.html" SECTION = "console/admin" LICENSE = "GPLv2" -PR = "r0" +AUTHOR = "Eric Schwartz (Skif) <emschwar@debian.org>" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/s/sg3-utils/sg3-utils_${PV}.orig.tar.gz \ - file://Makefile.patch;patch=1" + file://Makefile-r1.patch;patch=1" S = "${WORKDIR}/sg3-utils-${PV}" inherit autotools + +EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"' diff --git a/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch index e936f81c72..914422f1df 100644 --- a/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch +++ b/recipes/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch @@ -1,6 +1,6 @@ -diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk ---- sqlite-2.8.17~orig/main.mk 2005-04-23 17:43:23.000000000 -0500 -+++ sqlite-2.8.17/main.mk 2006-02-13 03:31:03.000000000 -0600 +diff -urN sqlite-2.8.17.orig/main.mk sqlite-2.8.17/main.mk +--- sqlite-2.8.17.orig/main.mk 2005-04-23 22:43:23.000000000 +0000 ++++ sqlite-2.8.17/main.mk 2009-04-02 20:10:36.000000000 +0000 @@ -139,7 +139,7 @@ # This is the default Makefile target. The objects listed here # are what get build when you type just "make" with no arguments. @@ -17,13 +17,15 @@ diff -bur sqlite-2.8.17~orig/main.mk sqlite-2.8.17/main.mk -libsqlite.a: $(LIBOBJ) - $(AR) libsqlite.a $(LIBOBJ) - $(RANLIB) libsqlite.a -+libsqlite.so: $(LIBOBJ) -+ $(CC) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) - +- -sqlite$(EXE): $(TOP)/src/shell.c libsqlite.a sqlite.h -+sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h - $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ +- $(TCCX) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ - libsqlite.a $(LIBREADLINE) $(THREADLIB) ++libsqlite.so: $(LIBOBJ) ++ $(CC) $(LDFLAGS) -shared -o libsqlite.so -Wl,-soname,libsqlite.so.0 $(LIBOBJ) ++ ++sqlite$(EXE): $(TOP)/src/shell.c libsqlite.so sqlite.h ++ $(TCCX) $(LDFLAGS) $(READLINE_FLAGS) -o sqlite$(EXE) $(TOP)/src/shell.c \ + -lsqlite $(LIBREADLINE) $(THREADLIB) sqlite_analyzer$(EXE): $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC) \ diff --git a/recipes/sqlite/sqlite_2.8.17.bb b/recipes/sqlite/sqlite_2.8.17.bb index b5939d9848..9f6ec7efe2 100644 --- a/recipes/sqlite/sqlite_2.8.17.bb +++ b/recipes/sqlite/sqlite_2.8.17.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "readline ncurses" LICENSE = "PD" -PR = "r2" +PR = "r3" SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ file://mainmk_build_dynamic.patch;patch=1 \ |