diff options
34 files changed, 889 insertions, 257 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index c638792cb8..3d3005a14d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1786,6 +1786,10 @@ sha256=85331e63c90370c305121f134358e76cbb06846a12c04a7825d5869f331ee00d md5=3b416557d2c395a36b97a819812e99b0 sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259 +[http://downloads.digium.com/pub/asterisk/releases/asterisk-1.4.23.1.tar.gz] +md5=4788954a93f5fbf78e55e2aa6e03329f +sha256=03e2cf43ffe9935d56fa0ea3663fc9bd23ce9720682c79d6269e78a9a1629d63 + [http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.8.tar.gz] md5=e708a5510a61217725b6ad663287dfa0 sha256=5d5c305079eb9918d271fad28ac73248a7d2962347dbd80d16aac66fe35e2729 @@ -14862,7 +14866,11 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380 md5=64921b5ff5cdadbccfcd3820f03be7d8 sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f -[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] +[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2] +md5=05daeda25430fd13bbdb47b3481f7320 +sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2 + +[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] md5=e921200f074ca97184e150ef5a4af825 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 diff --git a/packages/asterisk/asterisk-1.4.23.1/Makefile.patch b/packages/asterisk/asterisk-1.4.23.1/Makefile.patch new file mode 100644 index 0000000000..98345f4dce --- /dev/null +++ b/packages/asterisk/asterisk-1.4.23.1/Makefile.patch @@ -0,0 +1,21 @@ +diff -Nurd asterisk-1.4.23.1.orig/Makefile asterisk-1.4.23.1/Makefile +--- asterisk-1.4.23.1.orig/Makefile 2008-11-29 17:58:29.000000000 +0100 ++++ asterisk-1.4.23.1/Makefile 2009-02-25 11:17:22.000000000 +0100 +@@ -125,7 +125,7 @@ + ASTSBINDIR=$(sbindir) + ASTSPOOLDIR=$(localstatedir)/spool/asterisk + ASTLOGDIR=$(localstatedir)/log/asterisk +- ASTVARRUNDIR=$(localstatedir)/run ++ ASTVARRUNDIR=$(localstatedir)/run/asterisk + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +@@ -513,7 +513,7 @@ + @exit 1 + endif + +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi diff --git a/packages/asterisk/asterisk-1.4.23.1/init b/packages/asterisk/asterisk-1.4.23.1/init new file mode 100644 index 0000000000..d53a9a1e5e --- /dev/null +++ b/packages/asterisk/asterisk-1.4.23.1/init @@ -0,0 +1,77 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/callweaver and type +# > update-rc.d asterisk defaults 60 +# +asterisk=/usr/sbin/asterisk +pidfile=/var/run/asterisk/asterisk.pid +asterisk_args="-npqT -U asterisk -G asterisk" + +test -x "$asterisk" || exit 0 + +case "$1" in + start) + echo -n "Starting Asterisk" + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + echo "." + ;; + stop) + echo -n "Stopping Asterisk" + $asterisk -rx "stop gracefully" + sleep 4 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + force-stop) + echo -n "Stopping Asterisk" + $asterisk -rx "stop now" + sleep 2 + if [ -f $pidfile ]; then + start-stop-daemon --stop --quiet --pidfile $pidfile + fi + echo "." + ;; + restart) + echo -n "Restarting Asterisk" + if [ -f $pidfile ]; then + $asterisk -rx "restart gracefully" + sleep 2 + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + force-restart) + echo -n "Forcibly Restarting Asterisk" + if [ -f $pidfile ]; then + $asterisk -rx "restart now" + sleep 2 + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + reload) + echo -n "Reloading Asterisk Configuration" + if [ -f $pidfile ]; then + $asterisk -rx "reload" + else + start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args + fi + echo "." + ;; + logger-reload) + if [ -f $pidfile ]; then + $asterisk -rx "logger reload" + fi + ;; + *) + echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}" + exit 1 +esac + +exit 0 + diff --git a/packages/asterisk/asterisk-1.4.23.1/logrotate b/packages/asterisk/asterisk-1.4.23.1/logrotate new file mode 100644 index 0000000000..dfd25ee55c --- /dev/null +++ b/packages/asterisk/asterisk-1.4.23.1/logrotate @@ -0,0 +1,12 @@ +/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages { + daily + missingok + compress + delaycompress + rotate 30 + sharedscripts + postrotate + /etc/init.d/asterisk logger-reload + endscript +} + diff --git a/packages/asterisk/asterisk-1.4.23.1/sounds.xml.patch b/packages/asterisk/asterisk-1.4.23.1/sounds.xml.patch new file mode 100644 index 0000000000..2a02bf6b38 --- /dev/null +++ b/packages/asterisk/asterisk-1.4.23.1/sounds.xml.patch @@ -0,0 +1,19 @@ +diff -Nurd asterisk-1.4.23.1.orig/sounds/sounds.xml asterisk-1.4.23.1/sounds/sounds.xml +--- asterisk-1.4.23.1.orig/sounds/sounds.xml 2006-10-25 19:08:58.000000000 +0200 ++++ asterisk-1.4.23.1/sounds/sounds.xml 2009-02-25 11:19:13.000000000 +0100 +@@ -6,7 +6,6 @@ + <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> + </member> + <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > +- <defaultenabled>yes</defaultenabled> + </member> + <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> + </member> +@@ -39,7 +38,6 @@ + </category> + <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> + <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" > +- <defaultenabled>yes</defaultenabled> + </member> + <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" > + </member> diff --git a/packages/asterisk/asterisk-1.4.23.1/volatiles b/packages/asterisk/asterisk-1.4.23.1/volatiles new file mode 100644 index 0000000000..c68e786c90 --- /dev/null +++ b/packages/asterisk/asterisk-1.4.23.1/volatiles @@ -0,0 +1,7 @@ +d asterisk asterisk 0775 /var/run/asterisk none +d asterisk asterisk 0775 /var/lib/asterisk none +d asterisk asterisk 0775 /var/log/asterisk none +d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none +d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none +d asterisk asterisk 0775 /var/spool/asterisk/outgoing none +d asterisk asterisk 0775 /var/spool/asterisk/voicemail none diff --git a/packages/asterisk/asterisk_1.4.23.1.bb b/packages/asterisk/asterisk_1.4.23.1.bb new file mode 100644 index 0000000000..f9f8399021 --- /dev/null +++ b/packages/asterisk/asterisk_1.4.23.1.bb @@ -0,0 +1,165 @@ +# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +DESCRIPTION = "The Asterisk open source software PBX" +HOMEPAGE = "http://www.asterisk.org" +LICENSE = "GPLv2" +PRIORITY = "optional" +SECTION = "console/telephony" +DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" +#RRECOMMENDS_${PN} = "logrotate" + +SRC_URI="http://downloads.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://sounds.xml.patch;patch=1 \ + file://Makefile.patch;patch=1 \ + file://logrotate \ + file://volatiles \ + file://init" + +ARCH_efika="powerpc" +ARCH_dht-walnut="powerpc" +ARCH_magicbox="powerpc" +ARCH_sequoia="powerpc" + +INITSCRIPT_NAME = "asterisk" +INITSCRIPT_PARAMS = "defaults 60" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + --with-z=${STAGING_EXECPREFIXDIR} \ + --with-curl=${STAGING_EXECPREFIXDIR} \ + --with-termcap=${STAGING_EXECPREFIXDIR} \ + --with-ogg=${STAGING_EXECPREFIXDIR} \ + --with-vorbis=${STAGING_EXECPREFIXDIR} \ + --with-sqlite=${STAGING_EXECPREFIXDIR} \ + --with-popt=${STAGING_EXECPREFIXDIR} \ + --with-gnutls=${STAGING_EXECPREFIXDIR} \ + --without-curses\ + --with-ncurses=${STAGING_EXECPREFIXDIR} \ + --without-imap\ + --without-netsnmp\ + --without-odbc\ + --without-osptk\ + --without-nbs\ + --without-pwlib\ + --without-radius\ + --without-tds\ + --without-postgres\ + --without-zaptel\ + " + +#export NOISY_BUILD=yes + +export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096" +export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv " +export PROC="${ARCH}" + +do_configure_prepend () { + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate + sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate + sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles +} + +do_configure () { + # Looks like rebuilding configure doesn't work, so we are skipping + # that and are just using the shipped one + # gnu-configize + # libtoolize --force + oe_runconf +} + + +do_compile() { + ( + #make sure that menuselect gets build using host toolchain + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB + cd menuselect + ./configure + oe_runmake + cd ../ + ) || exit 1 + oe_runmake +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk + install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk + install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk +} + +pkg_postinst_prepend() { + grep -q asterisk ${sysconfdir}/group || addgroup --system asterisk + grep -q asterisk ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/asterisk --no-create-home --disabled-password --ingroup asterisk -s ${base_bindir}/false asterisk + chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/asterisk/modules/*" +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \ + ${localstatedir}/lib/asterisk/*/.debug" + +CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/agents.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/alarmreceiver.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/alsa.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/amd.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.adsi" +CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_custom.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_manager.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_pgsql.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/dnsmgr.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/dundi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/enum.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extconfig.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.ael" +CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/features.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/festival.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/followme.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/func_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/gtalk.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/h323.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/http.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/iax.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/iaxprov.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/indications.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/jabber.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/logger.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/osp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/oss.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/phone.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/privacy.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/res_snmp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/rpt.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/rtp.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/say.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sip.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sip_notify.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/skinny.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/sla.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/smdi.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/telcordia-1.adsi" +CONFFILES_${PN} += "${sysconfdir}/asterisk/udptl.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf" +CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf" +CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk" diff --git a/recipes/aircrack/aircrack-ng-0.9.3/makefile-ldflags.patch b/recipes/aircrack/aircrack-ng-0.9.3/makefile-ldflags.patch new file mode 100644 index 0000000000..c064d8052c --- /dev/null +++ b/recipes/aircrack/aircrack-ng-0.9.3/makefile-ldflags.patch @@ -0,0 +1,12 @@ +diff -urN aircrack-ng-0.9.3.orig/Makefile aircrack-ng-0.9.3/Makefile +--- aircrack-ng-0.9.3.orig/Makefile 2008-02-24 20:22:35.000000000 +0100 ++++ aircrack-ng-0.9.3/Makefile 2009-04-09 07:53:12.000000000 +0200 +@@ -3,7 +3,7 @@ + + CC = gcc + CFLAGS ?= -g -W -Wall -O3 +-OPTFLAGS = -D_FILE_OFFSET_BITS=64 ++OPTFLAGS = -D_FILE_OFFSET_BITS=64 $(LDFLAGS) + + iCC = /opt/intel/cc/9.0/bin/icc + iCFLAGS = -w -mcpu=pentiumpro -march=pentiumpro diff --git a/recipes/aircrack/aircrack-ng_0.9.3.bb b/recipes/aircrack/aircrack-ng_0.9.3.bb index 1452a64bc1..ae91314349 100644 --- a/recipes/aircrack/aircrack-ng_0.9.3.bb +++ b/recipes/aircrack/aircrack-ng_0.9.3.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking" HOMEPAGE = "http://www.aircrack-ng.org/" SECTION = "console/network" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" -SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz" +SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz \ + file://makefile-ldflags.patch;patch=1" SBINFILES = "airodump-ng aireplay-ng airmon-ng airtun-ng" BINFILES = "aircrack-ng airdecap-ng packetforge-ng ivstools kstats makeivs" diff --git a/recipes/curl/curl.inc b/recipes/curl/curl-common.inc index d3edaef20a..ce4f5f2a8e 100644 --- a/recipes/curl/curl.inc +++ b/recipes/curl/curl-common.inc @@ -55,26 +55,3 @@ do_stage () { install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} } - -PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" - -FILES_${PN} = "${bindir}/curl" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_${PN}-doc = "${mandir}/man1/curl.1" - -FILES_lib${PN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${PN} += "${PN}-certs" -FILES_lib${PN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.a \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" - -FILES_lib${PN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" - diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb index f0e2b8940e..c95591b70b 100644 --- a/recipes/curl/curl-native_7.18.2.bb +++ b/recipes/curl/curl-native_7.18.2.bb @@ -1,6 +1,7 @@ -require curl_${PV}.bb +require curl-common.inc inherit native DEPENDS = "zlib-native" +PR = "r1" do_stage () { autotools_stage_all @@ -9,4 +10,3 @@ do_stage () { do_install() { : } - diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb index 816fe645bc..35b0d8883f 100644 --- a/recipes/curl/curl-sdk_7.18.2.bb +++ b/recipes/curl/curl-sdk_7.18.2.bb @@ -1,6 +1,7 @@ -require curl_${PV}.bb +require curl-common.inc inherit sdk DEPENDS = "zlib-sdk" +PR = "r1" do_stage () { install -d ${STAGING_INCDIR}/curl @@ -11,4 +12,3 @@ do_stage () { do_install() { : } - diff --git a/recipes/curl/curl-target.inc b/recipes/curl/curl-target.inc new file mode 100644 index 0000000000..88877e51a0 --- /dev/null +++ b/recipes/curl/curl-target.inc @@ -0,0 +1,22 @@ +PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" + +FILES_${PN} = "${bindir}/curl" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_${PN}-doc = "${mandir}/man1/curl.1" + +FILES_lib${PN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${PN} += "${PN}-certs" +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" + +FILES_lib${PN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + diff --git a/recipes/curl/curl_7.18.2.bb b/recipes/curl/curl_7.18.2.bb index 2c3ec415f5..3de6da4fec 100644 --- a/recipes/curl/curl_7.18.2.bb +++ b/recipes/curl/curl_7.18.2.bb @@ -1,2 +1,4 @@ -require curl.inc +require curl-common.inc +require curl-target.inc +PR = "r1" diff --git a/recipes/curl/curl_7.19.0.bb b/recipes/curl/curl_7.19.0.bb index a99a68bcb1..1944efe240 100644 --- a/recipes/curl/curl_7.19.0.bb +++ b/recipes/curl/curl_7.19.0.bb @@ -1,5 +1,5 @@ -require curl.inc +require curl-common.inc +require curl-target.inc SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0" -PR = "r1" - +PR = "r2" diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch new file mode 100644 index 0000000000..759e84edb0 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch @@ -0,0 +1,289 @@ +This patch is based on the following: + +http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch + +Index: e2fsprogs-1.41.4/configure.in +=================================================================== +--- e2fsprogs-1.41.4.orig/configure.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/configure.in 2009-04-09 21:19:28.000000000 +0100 +@@ -577,6 +577,7 @@ + fi + AC_SUBST(MAKEINFO) + AC_PROG_INSTALL ++AC_PROG_MKDIR_P + # See if we need a separate native compiler. + if test $cross_compiling = no; then + BUILD_CC="$CC" +Index: e2fsprogs-1.41.4/debugfs/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 04:53:42.000000000 +0100 ++++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -47,8 +47,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs +Index: e2fsprogs-1.41.4/doc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/doc/Makefile.in 2008-05-26 00:52:27.000000000 +0100 ++++ e2fsprogs-1.41.4/doc/Makefile.in 2009-04-09 21:20:09.000000000 +0100 +@@ -20,8 +20,8 @@ + + install-doc-libs: libext2fs.info libext2fs.dvi + @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* +- @echo " MKINSTALLDIRS $(infodir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir) ++ @echo " MKDIR_P $(infodir)" ++ @$(MKDIR_P) $(DESTDIR)$(infodir) + -@for i in libext2fs.info* ; do \ + echo " INSTALL_DATA $(infodir)/$$i" ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ +Index: e2fsprogs-1.41.4/e2fsck/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2008-11-15 04:19:57.000000000 +0000 ++++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-04-09 21:20:44.000000000 +0100 +@@ -185,8 +185,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) + + install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs +Index: e2fsprogs-1.41.4/intl/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/intl/Makefile.in 2007-06-30 13:58:34.000000000 +0100 ++++ e2fsprogs-1.41.4/intl/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -40,8 +40,8 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++MKDIR_P = @MKDIR_P@ ++mkdir_p = @MKDIR_P@ + + l = @INTL_LIBTOOL_SUFFIX_PREFIX@ + +Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -142,8 +142,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/blkid" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig + + install:: all installdirs +Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -79,8 +79,8 @@ + ./tst_feature + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/e2p" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig + + install:: all installdirs +Index: e2fsprogs-1.41.4/lib/et/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/et/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -74,8 +74,8 @@ + $(TAGS) $(SRCS) + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \ + $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \ + $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig +Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -330,8 +330,8 @@ + LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/ext2fs" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig + + install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc +Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib 2009-04-09 21:19:28.000000000 +0100 +@@ -33,8 +33,8 @@ + @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME) + + installdirs-elf-lib:: +- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ ++ @echo " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)" ++ @$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \ + $(DESTDIR)$(libdir) + + installdirs:: installdirs-elf-lib +Index: e2fsprogs-1.41.4/lib/ss/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/ss/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -129,8 +129,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ + $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig + +Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in 2008-02-19 04:33:10.000000000 +0000 ++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -126,8 +126,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \ + $(DESTDIR)$(libdir)/pkgconfig + +Index: e2fsprogs-1.41.4/MCONFIG.in +=================================================================== +--- e2fsprogs-1.41.4.orig/MCONFIG.in 2008-11-15 17:17:22.000000000 +0000 ++++ e2fsprogs-1.41.4/MCONFIG.in 2009-04-09 21:19:28.000000000 +0100 +@@ -64,7 +64,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKDIR_P = @MKDIR_P@ + + # + # Library definitions +Index: e2fsprogs-1.41.4/misc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/misc/Makefile.in 2008-11-15 17:33:33.000000000 +0000 ++++ e2fsprogs-1.41.4/misc/Makefile.in 2009-04-09 21:21:22.000000000 +0100 +@@ -366,8 +366,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 + + installdirs: +- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ ++ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" ++ @$(MKDIR_P) $(DESTDIR)$(sbindir) \ + $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ +Index: e2fsprogs-1.41.4/po/Makefile.in.in +=================================================================== +--- e2fsprogs-1.41.4.orig/po/Makefile.in.in 2007-06-30 13:58:34.000000000 +0100 ++++ e2fsprogs-1.41.4/po/Makefile.in.in 2009-04-09 21:19:28.000000000 +0100 +@@ -26,11 +26,10 @@ + datadir = @datadir@ + localedir = $(datadir)/locale + gettextsrcdir = $(datadir)/gettext/po ++mkdir_p = @MKDIR_P@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ +@@ -148,7 +147,7 @@ + install-exec: + install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ +@@ -161,13 +160,13 @@ + fi + install-data-no: all + install-data-yes: all +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ +@@ -207,19 +206,19 @@ + installdirs-exec: + installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi + installdirs-data-no: + installdirs-data-yes: +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ +Index: e2fsprogs-1.41.4/resize/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/resize/Makefile.in 2007-06-30 13:58:35.000000000 +0100 ++++ e2fsprogs-1.41.4/resize/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -57,8 +57,8 @@ + @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb index dda4b81582..177d9af2f8 100644 --- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb +++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb @@ -1,15 +1,8 @@ require e2fsprogs.inc -PR = "r1" +SRC_URI += "file://mkinstalldirs.patch;patch=1" -#SRC_URI += "file://no-hardlinks.patch;patch=1 \ -# file://mkinstalldirs.patch;patch=1 \ -# " - -do_configure() { - # avoid autoreconf - oe_runconf $@ -} +PR = "r2" do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/gimp/gegl/gegl-resilience.patch b/recipes/gimp/gegl/gegl-resilience.patch index 0e35dd50f6..70424ecbd2 100644 --- a/recipes/gimp/gegl/gegl-resilience.patch +++ b/recipes/gimp/gegl/gegl-resilience.patch @@ -1,11 +1,11 @@ ---- trunk/operations/external/ff-load.c 2008-12-20 13:37:05.000000000 -0800
-+++ trunk/operations/external/ff-load.c 2008-12-20 13:37:22.000000000 -0800
-@@ -278,7 +278,7 @@
- p->enc = p->video_st->codec;
- p->codec = avcodec_find_decoder (p->enc->codec_id);
-
-- p->enc->error_resilience = 2;
-+ p->enc->error_recognition = 2;
- p->enc->error_concealment = 3;
- p->enc->workaround_bugs = FF_BUG_AUTODETECT;
-
+--- trunk/operations/external/ff-load.c 2008-12-20 13:37:05.000000000 -0800 ++++ trunk/operations/external/ff-load.c 2008-12-20 13:37:22.000000000 -0800 +@@ -278,7 +278,7 @@ + p->enc = p->video_st->codec; + p->codec = avcodec_find_decoder (p->enc->codec_id); + +- p->enc->error_resilience = 2; ++ p->enc->error_recognition = 2; + p->enc->error_concealment = 3; + p->enc->workaround_bugs = FF_BUG_AUTODETECT; + diff --git a/recipes/gnome/gnome-panel/idl-sysroot.patch b/recipes/gnome/gnome-panel/idl-sysroot.patch new file mode 100644 index 0000000000..07e5ded6ec --- /dev/null +++ b/recipes/gnome/gnome-panel/idl-sysroot.patch @@ -0,0 +1,26 @@ +Index: gnome-panel-2.26.0/gnome-panel/Makefile.am +=================================================================== +--- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am 2009-03-16 22:37:12.000000000 +0000 ++++ gnome-panel-2.26.0/gnome-panel/Makefile.am 2009-04-09 14:39:02.000000000 +0000 +@@ -43,7 +43,7 @@ + $(NULL) + + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) +- $(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl ++ $(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl + + BUILT_SOURCES = \ + $(CORBA_SRCLIST) \ +Index: gnome-panel-2.26.0/libpanel-applet/Makefile.am +=================================================================== +--- gnome-panel-2.26.0.orig/libpanel-applet/Makefile.am 2009-03-16 22:37:13.000000000 +0000 ++++ gnome-panel-2.26.0/libpanel-applet/Makefile.am 2009-04-09 14:51:18.000000000 +0000 +@@ -45,7 +45,7 @@ + GNOME_Panel.h + + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) +- $(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl ++ $(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl + + noinst_PROGRAMS = test-bonobo-applet + diff --git a/recipes/gnome/gnome-panel_2.26.0.bb b/recipes/gnome/gnome-panel_2.26.0.bb index b2d615a750..c744a44af7 100644 --- a/recipes/gnome/gnome-panel_2.26.0.bb +++ b/recipes/gnome/gnome-panel_2.26.0.bb @@ -1,8 +1,10 @@ LICENSE = "GPL" -DEPENDS = "librsvg libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" +DEPENDS = "gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" inherit gnome pkgconfig +SRC_URI += "file://idl-sysroot.patch;patch=1" + do_configure_prepend() { sed -i -e s:help:: ${S}/Makefile.am } @@ -14,7 +16,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/icons" -EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" +export SYSROOT = "${STAGING_DIR_HOST}" +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}" EXTRA_OECONF = "--disable-scrollkeeper \ --disable-eds \ " diff --git a/recipes/gnome/libart-lgpl/x86_64/art_config.h b/recipes/gnome/libart-lgpl/x86_64/art_config.h new file mode 100644 index 0000000000..500ffc38f1 --- /dev/null +++ b/recipes/gnome/libart-lgpl/x86_64/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 8 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; diff --git a/recipes/libidl/libidl-native_0.8.10.bb b/recipes/libidl/libidl-native_0.8.10.bb index ce59fd4b86..e4109b26fa 100644 --- a/recipes/libidl/libidl-native_0.8.10.bb +++ b/recipes/libidl/libidl-native_0.8.10.bb @@ -2,4 +2,4 @@ SECTION = "libs" require libidl_${PV}.bb inherit native -DEPENDS = "glib-2.0-native" +DEPENDS = "flex-native glib-2.0-native" diff --git a/recipes/libidl/libidl_0.8.10.bb b/recipes/libidl/libidl_0.8.10.bb index c6664acb23..8865734d91 100644 --- a/recipes/libidl/libidl_0.8.10.bb +++ b/recipes/libidl/libidl_0.8.10.bb @@ -1,6 +1,6 @@ require libidl.inc -DEPENDS = "glib-2.0 libidl-native" +DEPENDS = "glib-2.0 flex-native libidl-native" PR = "r0" diff --git a/recipes/linux/linux-msm7xxxx/htckaiser/defconfig b/recipes/linux/linux-msm7xxxx/htckaiser/defconfig index eb0979cf79..c1f3084120 100644 --- a/recipes/linux/linux-msm7xxxx/htckaiser/defconfig +++ b/recipes/linux/linux-msm7xxxx/htckaiser/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Wed Feb 25 00:39:08 2009 +# Thu Apr 9 20:12:53 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -46,20 +46,16 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set -CONFIG_GROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_USER_SCHED=y -# CONFIG_CGROUP_SCHED is not set +# CONFIG_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y -CONFIG_PANIC_TIMEOUT=0 +CONFIG_PANIC_TIMEOUT=3 CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -97,8 +93,8 @@ CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_MODVERSIONS=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_KMOD is not set CONFIG_BLOCK=y @@ -177,7 +173,7 @@ CONFIG_MACH_HTCVOGUE=y CONFIG_MACH_HTCKAISER=y CONFIG_MACH_HTCPOLARIS=y CONFIG_MACH_HTCNIKE=y -# CONFIG_HTCTITAN is not set +CONFIG_MACH_HTCTITAN=y CONFIG_VOGUE_TS=y CONFIG_MSM_VOGUESMD=y # CONFIG_MSM_LL_DEBUG_UART1 is not set @@ -185,8 +181,8 @@ CONFIG_MSM_VOGUESMD=y # CONFIG_MSM_LL_DEBUG_UART3 is not set CONFIG_MSM_LL_DEBUG_NONE=y CONFIG_MSM7X00A_IDLE=y -# CONFIG_MSM7X00A_USE_GP_TIMER is not set -CONFIG_MSM7X00A_USE_DG_TIMER=y +CONFIG_MSM7X00A_USE_GP_TIMER=y +# CONFIG_MSM7X00A_USE_DG_TIMER is not set # CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND is not set CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE=y # CONFIG_MSM7X00A_SLEEP_MODE_APPS_SLEEP is not set @@ -304,9 +300,7 @@ CONFIG_BINFMT_ELF=y # CONFIG_PM=y # CONFIG_PM_LEGACY is not set -CONFIG_PM_DEBUG=y -# CONFIG_PM_VERBOSE is not set -CONFIG_CAN_PM_TRACE=y +# CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y @@ -321,7 +315,8 @@ CONFIG_NET=y # # Networking options # -# CONFIG_PACKET is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y @@ -386,8 +381,8 @@ CONFIG_BT=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y # CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_HCIUART_LL is not set -# CONFIG_BT_HCIUART_LL_USE_MSM_SERIAL_CLOCK_CONTROL is not set +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_LL_USE_MSM_SERIAL_CLOCK_CONTROL=y # CONFIG_BT_HCIVHCI is not set # CONFIG_AF_RXRPC is not set @@ -398,7 +393,9 @@ CONFIG_BT_HCIUART_H4=y # CONFIG_WIRELESS_EXT is not set # CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y +# CONFIG_RFKILL_INPUT is not set +CONFIG_RFKILL_LEDS=y # CONFIG_NET_9P is not set # @@ -408,7 +405,7 @@ CONFIG_BT_HCIUART_H4=y # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_UEVENT_HELPER_PATH="" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -444,15 +441,26 @@ CONFIG_KERNEL_DEBUGGER_CORE=y # CONFIG_MD is not set CONFIG_NETDEVICES=y # CONFIG_NETDEVICES_MULTIQUEUE is not set -# CONFIG_DUMMY is not set +CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_NET_ETHERNET is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_B44 is not set +CONFIG_NETDEV_1000=y +# CONFIG_E1000E_ENABLED is not set +CONFIG_NETDEV_10000=y # # Wireless LAN @@ -512,6 +520,11 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN 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_UINPUT is not set CONFIG_INPUT_GPIO=y @@ -543,7 +556,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_MSM_CLOCK_CONTROL=y -# CONFIG_SERIAL_MSM_RX_WAKEUP is not set +CONFIG_SERIAL_MSM_RX_WAKEUP=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set @@ -656,7 +669,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_GOLDFISH is not set CONFIG_FB_MSM=y # CONFIG_FB_MSM_LOGO is not set -# CONFIG_FB_MSM_REFRESH is not set +CONFIG_FB_MSM_REFRESH=y # CONFIG_FB_VIRTUAL is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -674,27 +687,50 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y -CONFIG_FONT_8x8=y +# CONFIG_FONT_8x8 is not set # CONFIG_FONT_8x16 is not set # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_MINI_4x6=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound # # CONFIG_SOUND is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# +# CONFIG_USB_GADGET is not set + +# +# USB Function Support +# +CONFIG_USB_FUNCTION=y +CONFIG_USB_FUNCTION_MSM_HSUSB=y +# CONFIG_USB_FUNCTION_NULL is not set +# CONFIG_USB_FUNCTION_ZERO is not set +# CONFIG_USB_FUNCTION_LOOPBACK is not set +CONFIG_USB_FUNCTION_ADB=y +# CONFIG_USB_FUNCTION_UMS is not set +CONFIG_USB_FUNCTION_MASS_STORAGE=y +# CONFIG_USB_FUNCTION_DIAG is not set +CONFIG_USB_FUNCTION_ETHER=y CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -722,8 +758,10 @@ CONFIG_LEDS_CLASS=y # # LED Triggers # -# CONFIG_LEDS_TRIGGERS is not set -# CONFIG_SWITCH is not set +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_SWITCH=y CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -780,17 +818,12 @@ CONFIG_RTC_DRV_MSM7X00=y # # Android # -CONFIG_ANDROID_BINDER_IPC=y +# CONFIG_ANDROID_BINDER_IPC is not set # CONFIG_ANDROID_PMEM is not set -CONFIG_ANDROID_POWER=y -CONFIG_ANDROID_POWER_STAT=y -CONFIG_ANDROID_POWER_ALARM=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y -# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set -# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set -CONFIG_ANDROID_PARANOID_NETWORK=y +# CONFIG_ANDROID_POWER is not set +# CONFIG_ANDROID_LOGGER is not set +# CONFIG_ANDROID_RAM_CONSOLE is not set +# CONFIG_ANDROID_PARANOID_NETWORK is not set # # File systems @@ -878,24 +911,8 @@ CONFIG_NETWORK_FILESYSTEMS=y # # Partition Types # -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set +# CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -# CONFIG_EFI_PARTITION is not set -# CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y @@ -921,7 +938,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set -CONFIG_NLS_ASCII=y +# CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set @@ -952,22 +969,22 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_DETECT_SOFTLOCKUP=y CONFIG_SCHED_DEBUG=y -# CONFIG_SCHEDSTATS is not set +CONFIG_SCHEDSTATS=y # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set +CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set # CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set @@ -978,7 +995,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set # CONFIG_SAMPLES is not set -CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_ERRORS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_LL is not set diff --git a/recipes/linux/linux-msm7xxxx/htcvogue/defconfig b/recipes/linux/linux-msm7xxxx/htcvogue/defconfig index 7e2145f67d..c1f3084120 100644 --- a/recipes/linux/linux-msm7xxxx/htcvogue/defconfig +++ b/recipes/linux/linux-msm7xxxx/htcvogue/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Fri Mar 6 08:51:47 2009 +# Thu Apr 9 20:12:53 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -173,7 +173,7 @@ CONFIG_MACH_HTCVOGUE=y CONFIG_MACH_HTCKAISER=y CONFIG_MACH_HTCPOLARIS=y CONFIG_MACH_HTCNIKE=y -# CONFIG_HTCTITAN is not set +CONFIG_MACH_HTCTITAN=y CONFIG_VOGUE_TS=y CONFIG_MSM_VOGUESMD=y # CONFIG_MSM_LL_DEBUG_UART1 is not set @@ -342,106 +342,11 @@ CONFIG_IP_FIB_HASH=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IP_VS is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y - -# -# Core Netfilter Configuration -# -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -# CONFIG_NETFILTER_NETLINK_LOG is not set -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CT_ACCT=y -CONFIG_NF_CONNTRACK_MARK=y -# CONFIG_NF_CONNTRACK_EVENTS is not set -# CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set -# CONFIG_NF_CONNTRACK_AMANDA is not set -# CONFIG_NF_CONNTRACK_FTP is not set -# CONFIG_NF_CONNTRACK_H323 is not set -# CONFIG_NF_CONNTRACK_IRC is not set -# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set -# CONFIG_NF_CONNTRACK_PPTP is not set -# CONFIG_NF_CONNTRACK_SANE is not set -# CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_NF_CONNTRACK_TFTP is not set -# CONFIG_NF_CT_NETLINK is not set -CONFIG_NETFILTER_XTABLES=y -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -CONFIG_NETFILTER_XT_TARGET_RATEEST=y -# CONFIG_NETFILTER_XT_TARGET_TRACE is not set -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -CONFIG_NETFILTER_XT_MATCH_COMMENT=y -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y -CONFIG_NETFILTER_XT_MATCH_CONNMARK=y -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -CONFIG_NETFILTER_XT_MATCH_DCCP=y -CONFIG_NETFILTER_XT_MATCH_DSCP=y -CONFIG_NETFILTER_XT_MATCH_ESP=y -CONFIG_NETFILTER_XT_MATCH_HELPER=y -CONFIG_NETFILTER_XT_MATCH_IPRANGE=y -CONFIG_NETFILTER_XT_MATCH_LENGTH=y -CONFIG_NETFILTER_XT_MATCH_LIMIT=y -CONFIG_NETFILTER_XT_MATCH_MAC=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -CONFIG_NETFILTER_XT_MATCH_OWNER=y -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QUOTA=y -CONFIG_NETFILTER_XT_MATCH_RATEEST=y -CONFIG_NETFILTER_XT_MATCH_REALM=y -CONFIG_NETFILTER_XT_MATCH_SCTP=y -CONFIG_NETFILTER_XT_MATCH_STATE=y -CONFIG_NETFILTER_XT_MATCH_STATISTIC=y -CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TCPMSS=y -CONFIG_NETFILTER_XT_MATCH_TIME=y -CONFIG_NETFILTER_XT_MATCH_U32=y -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y - -# -# IP: Netfilter Configuration -# -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -# CONFIG_IP_NF_QUEUE is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_MATCH_RECENT=y -CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_AH=y -CONFIG_IP_NF_MATCH_TTL=y -CONFIG_IP_NF_MATCH_ADDRTYPE=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -# CONFIG_IP_NF_TARGET_ULOG is not set -CONFIG_NF_NAT=y -CONFIG_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_TARGET_NETMAP=y -# CONFIG_NF_NAT_SNMP_BASIC is not set -# CONFIG_NF_NAT_FTP is not set -# CONFIG_NF_NAT_IRC is not set -# CONFIG_NF_NAT_TFTP is not set -# CONFIG_NF_NAT_AMANDA is not set -# CONFIG_NF_NAT_PPTP is not set -# CONFIG_NF_NAT_H323 is not set -# CONFIG_NF_NAT_SIP is not set -# CONFIG_IP_NF_MANGLE is not set -CONFIG_IP_NF_RAW=y -# CONFIG_IP_NF_ARPTABLES is not set +# CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set @@ -457,7 +362,6 @@ CONFIG_IP_NF_RAW=y # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set -CONFIG_NET_CLS_ROUTE=y # # Network testing @@ -543,9 +447,20 @@ CONFIG_DUMMY=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_NET_ETHERNET is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_B44 is not set +CONFIG_NETDEV_1000=y +# CONFIG_E1000E_ENABLED is not set +CONFIG_NETDEV_10000=y # # Wireless LAN @@ -605,6 +520,11 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN 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_UINPUT is not set CONFIG_INPUT_GPIO=y @@ -749,7 +669,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_GOLDFISH is not set CONFIG_FB_MSM=y # CONFIG_FB_MSM_LOGO is not set -# CONFIG_FB_MSM_REFRESH is not set +CONFIG_FB_MSM_REFRESH=y # CONFIG_FB_VIRTUAL is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -769,18 +689,15 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set # CONFIG_FONT_8x16 is not set -CONFIG_FONT_6x11=y +# CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_MINI_4x6=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound @@ -790,7 +707,30 @@ CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set # CONFIG_HIDRAW is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# +# CONFIG_USB_GADGET is not set + +# +# USB Function Support +# +CONFIG_USB_FUNCTION=y +CONFIG_USB_FUNCTION_MSM_HSUSB=y +# CONFIG_USB_FUNCTION_NULL is not set +# CONFIG_USB_FUNCTION_ZERO is not set +# CONFIG_USB_FUNCTION_LOOPBACK is not set +CONFIG_USB_FUNCTION_ADB=y +# CONFIG_USB_FUNCTION_UMS is not set +CONFIG_USB_FUNCTION_MASS_STORAGE=y +# CONFIG_USB_FUNCTION_DIAG is not set +CONFIG_USB_FUNCTION_ETHER=y CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -821,8 +761,7 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_SLEEP=y -# CONFIG_SWITCH is not set +CONFIG_SWITCH=y CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -879,17 +818,12 @@ CONFIG_RTC_DRV_MSM7X00=y # # Android # -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_PMEM=y -CONFIG_ANDROID_POWER=y -CONFIG_ANDROID_POWER_STAT=y -CONFIG_ANDROID_POWER_ALARM=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y -# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set -# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set -CONFIG_ANDROID_PARANOID_NETWORK=y +# CONFIG_ANDROID_BINDER_IPC is not set +# CONFIG_ANDROID_PMEM is not set +# CONFIG_ANDROID_POWER is not set +# CONFIG_ANDROID_LOGGER is not set +# CONFIG_ANDROID_RAM_CONSOLE is not set +# CONFIG_ANDROID_PARANOID_NETWORK is not set # # File systems @@ -1086,10 +1020,6 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=y -CONFIG_TEXTSEARCH_BM=y -CONFIG_TEXTSEARCH_FSM=y CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb index f124d7a874..33a0652dfb 100644 --- a/recipes/linux/linux-msm7xxxx_git.bb +++ b/recipes/linux/linux-msm7xxxx_git.bb @@ -7,7 +7,7 @@ PR = "r8" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone" -SRCREV = "f89edc3bf353407bd1dd6c2683f539a7c2603191" +SRCREV = "d2fc2471ba384dabad1c9a4126e2e2372349d34c" SRCREV_htcraphael = "1e936f767872234a9b299e209a5e33212de473fa" SRCREV_htcdiamond = "12008ce2c5c1ab657c46fdc6f6129ccf6730760a" SRCREV_htcblackstone = "12008ce2c5c1ab657c46fdc6f6129ccf6730760a" diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb index d625d15ebe..c7e5e614fc 100644 --- a/recipes/linux/linux_2.6.14.bb +++ b/recipes/linux/linux_2.6.14.bb @@ -2,6 +2,9 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_acern30 = "1" + SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" diff --git a/recipes/linux/linux_2.6.18.bb b/recipes/linux/linux_2.6.18.bb index 91a89c31f1..b445325f2d 100644 --- a/recipes/linux/linux_2.6.18.bb +++ b/recipes/linux/linux_2.6.18.bb @@ -3,6 +3,7 @@ require linux.inc +DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_avr32 = "1" PR = "r0" diff --git a/recipes/linux/linux_2.6.20.bb b/recipes/linux/linux_2.6.20.bb index 81033e09ee..1614c9da45 100644 --- a/recipes/linux/linux_2.6.20.bb +++ b/recipes/linux/linux_2.6.20.bb @@ -1,5 +1,6 @@ require linux.inc +DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_at91sam9263ek = "20" DEFAULT_PREFERENCE_at91sam9261ek = "20" DEFAULT_PREFERENCE_at91sam9260ek = "20" diff --git a/recipes/linux/linux_2.6.21.bb b/recipes/linux/linux_2.6.21.bb index 265a35a4b3..c4c7297f1c 100644 --- a/recipes/linux/linux_2.6.21.bb +++ b/recipes/linux/linux_2.6.21.bb @@ -1,5 +1,6 @@ require linux.inc +DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_at91sam9263ek = "-1" DEFAULT_PREFERENCE_gumstix-connex = "1" DEFAULT_PREFERENCE_gumstix-verdex = "1" diff --git a/recipes/linux/linux_2.6.25.20.bb b/recipes/linux/linux_2.6.25.20.bb index 7b9308cf1d..6440e0650b 100644 --- a/recipes/linux/linux_2.6.25.20.bb +++ b/recipes/linux/linux_2.6.25.20.bb @@ -8,6 +8,7 @@ require linux.inc PR = "r2" +DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_ronetix-pm9263 = "1" DEFAULT_PREFERENCE_ronetix-pm9261 = "1" diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc1.bb b/recipes/linux/linux_2.6.29+2.6.30-rc1.bb new file mode 100644 index 0000000000..96871e733b --- /dev/null +++ b/recipes/linux/linux_2.6.29+2.6.30-rc1.bb @@ -0,0 +1,24 @@ +require linux.inc + +KERNEL_RELEASE = "2.6.30-rc1" +OLD_KERNEL_RELEASE = "2.6.29" +PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" +PR = "r1" + +S = "${WORKDIR}/linux-${OLD_KERNEL_RELEASE}" + +# Mark archs/machines that this kernel supports +DEFAULT_PREFERENCE = "-1" + +# Zaurus +DEFAULT_PREFERENCE_akita = "-1" +DEFAULT_PREFERENCE_c7x0 = "-1" +DEFAULT_PREFERENCE_collie = "-1" +DEFAULT_PREFERENCE_poodle = "-1" +DEFAULT_PREFERENCE_spitz = "-1" +DEFAULT_PREFERENCE_tosa = "-1" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + file://defconfig" + diff --git a/recipes/nautilus/nautilus/idl-sysroot.patch b/recipes/nautilus/nautilus/idl-sysroot.patch new file mode 100644 index 0000000000..0062cfb11a --- /dev/null +++ b/recipes/nautilus/nautilus/idl-sysroot.patch @@ -0,0 +1,7 @@ +Index: nautilus-2.24.2/add-include-prefix +=================================================================== +--- nautilus-2.24.2.orig/add-include-prefix 2008-10-06 17:22:21.000000000 +0000 ++++ nautilus-2.24.2/add-include-prefix 2009-04-09 16:00:05.000000000 +0000 +@@ -1 +1 @@ +-sed -e 's/^/ /' -e 's/ */ /g' -e 's/ / -I /g' -e 's/ -I $//' ++sed -e 's:^: :' -e 's: *: :g' -e 's: : -I '"$SYSROOT"':g' -e 's: -I '"$SYSROOT"'$::' diff --git a/recipes/nautilus/nautilus_2.24.2.bb b/recipes/nautilus/nautilus_2.24.2.bb index 30915b75fc..58cb015ba5 100644 --- a/recipes/nautilus/nautilus_2.24.2.bb +++ b/recipes/nautilus/nautilus_2.24.2.bb @@ -4,6 +4,9 @@ inherit gnome +SRC_URI += "file://idl-sysroot.patch;patch=1" +export SYSROOT = "${STAGING_DIR_HOST}" + LICENSE="GPL" PR = "r1" |