diff options
49 files changed, 898 insertions, 493 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 445ecbaa6a..f72e06b6eb 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -2,15 +2,16 @@ DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4- inherit qmake2 QT_DIR_NAME = "qtopia" +QT_LIBINFIX = "E" # override variables set by qmake-base to compile Qt/Embedded apps # -export QMAKESPEC = "${STAGING_DATADIR}/qtopia/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" +export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" -EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E " +EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " # Qt4 uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" diff --git a/conf/checksums.ini b/conf/checksums.ini index ee360377e0..974b076c1d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -10154,6 +10154,10 @@ sha256=1f7667c30228737e3cea58ff2b384bcc0eed8cb679392de827821e4d540c760e md5=a3f8216544509a74a4441f689a0410d2 sha256=e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289 +[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.6.tar.gz] +md5=9e23d3dbea0e89bab8a9acc6880150de +sha256=69a2f9491480ff756d1cc4c8ea2bdc13d40ea8ddc8f93f26957bade8219a1d86 + [http://gupnp.org/sources/gupnp/gupnp-0.12.2.tar.gz] md5=5350f5f28fb3742779702a496ab75d72 sha256=9e4edb3ca6d11e397d9f98537fa8954851dc044d13ecafd4f4547117cefbdd28 @@ -18026,6 +18030,10 @@ sha256=4ba757d6c933e7d075b6424124d92d197eb5d91e4a58794596b67f5f0ca21d4f md5=6a7fa99f44d9e1b5b04d15256e1405bb sha256=7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a +[ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.2p1.tar.gz] +md5=ada79c7328a8551bdf55c95e631e7dad +sha256=4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae + [http://www.openssl.org/source/openssl-0.9.7e.tar.gz] md5=a8777164bca38d84e5eb2b1535223474 sha256=25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c diff --git a/recipes/guile/guile-native.inc b/recipes/guile/guile-native.inc new file mode 100644 index 0000000000..28cb2e0f15 --- /dev/null +++ b/recipes/guile/guile-native.inc @@ -0,0 +1,132 @@ +SECTION = "unknown" +LICENSE = "GPL" +DEPENDS = "gettext-native gmp-native" + +inherit autotools native + +S="${WORKDIR}/guile-${PV}" + +OE_LT_RPATH_ALLOW = "any" +LDFLAGS += " -L${STAGING_LIBDIR} " + +LIBGUILE_HEADERS = "\ +__scm.h \ +alist.h \ +arbiters.h \ +async.h \ +backtrace.h \ +boolean.h \ +chars.h \ +continuations.h \ +debug-malloc.h \ +debug.h \ +deprecation.h \ +dynl.h \ +dynwind.h \ +environments.h \ +eq.h \ +error.h \ +eval.h \ +evalext.h \ +extensions.h \ +feature.h \ +filesys.h \ +fluids.h \ +fports.h \ +gc.h \ +gdb_interface.h \ +gdbint.h \ +goops.h \ +gsubr.h \ +guardians.h \ +hash.h \ +hashtab.h \ +hooks.h \ +init.h \ +ioext.h \ +iselect.h \ +keywords.h \ +lang.h \ +list.h \ +load.h \ +macros.h \ +mallocs.h \ +modules.h \ +net_db.h \ +numbers.h \ +objects.h \ +objprop.h \ +options.h \ +pairs.h \ +ports.h \ +posix.h \ +print.h \ +procprop.h \ +procs.h \ +properties.h \ +ramap.h \ +random.h \ +rdelim.h \ +read.h \ +regex-posix.h \ +root.h \ +rw.h \ +scmconfig.h \ +scmsigs.h \ +script.h \ +simpos.h \ +smob.h \ +snarf.h \ +socket.h \ +sort.h \ +srcprop.h \ +stackchk.h \ +stacks.h \ +stime.h \ +strings.h \ +strorder.h \ +strports.h \ +struct.h \ +symbols.h \ +tags.h \ +threads.h \ +throw.h \ +unif.h \ +validate.h \ +values.h \ +variable.h \ +vectors.h \ +version.h \ +vports.h \ +weaks.h \ +" + +do_stage() { + install -d ${STAGING_INCDIR}/libguile + for i in ${LIBGUILE_HEADERS}; do + install -m 0644 libguile/$i ${STAGING_INCDIR}/libguile/$i + done + + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/libguile/.libs/guile ${STAGING_BINDIR_NATIVE}/ + + install -m 0644 libguile.h ${STAGING_INCDIR}/libguile.h + install -d ${STAGING_INCDIR}/guile + install -m 0644 libguile/gh.h ${STAGING_INCDIR}/guile/ + install -d ${STAGING_INCDIR}/guile/srfi + install -d ${STAGING_INCDIR}/guile-readline + install -m 0644 guile-readline/readline.h ${STAGING_INCDIR}/guile-readline/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 guile-config/guile.m4 ${STAGING_DATADIR}/aclocal + + install -d ${STAGING_DATADIR}/guile/1.8 + cp -pPr ${S}/ice-9 ${STAGING_DATADIR}/guile/1.8/ + + oe_libinstall -C guile-readline -so -a libguilereadline-v-17 ${STAGING_LIBDIR} + oe_libinstall -C libguile -so -a libguile ${STAGING_LIBDIR} +} + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-Werror':'':g +} + diff --git a/recipes/guile/guile-native_1.8.2.bb b/recipes/guile/guile-native_1.8.2.bb index ac2b189d37..7c4b26e873 100644 --- a/recipes/guile/guile-native_1.8.2.bb +++ b/recipes/guile/guile-native_1.8.2.bb @@ -1,6 +1,6 @@ SECTION = "unknown" LICENSE = "GPL" -DEPENDS = "gmp-native" +DEPENDS = "gmp-native libtool (< 2)" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ " diff --git a/recipes/guile/guile-native_1.8.5.bb b/recipes/guile/guile-native_1.8.5.bb index 1b6a4f51bc..9c2eb13d8d 100644 --- a/recipes/guile/guile-native_1.8.5.bb +++ b/recipes/guile/guile-native_1.8.5.bb @@ -1,137 +1,10 @@ -SECTION = "unknown" -LICENSE = "GPL" -DEPENDS = "gettext-native gmp-native" +require guile-native.inc + +DEPENDS = "libtool (< 2)" + SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ file://configure-fix.patch;patch=1 \ -" + " PR = "r1" -inherit autotools native - -S="${WORKDIR}/guile-${PV}" - -OE_LT_RPATH_ALLOW = "any" -LDFLAGS += " -L${STAGING_LIBDIR} " - -LIBGUILE_HEADERS = "\ -__scm.h \ -alist.h \ -arbiters.h \ -async.h \ -backtrace.h \ -boolean.h \ -chars.h \ -continuations.h \ -debug-malloc.h \ -debug.h \ -deprecation.h \ -dynl.h \ -dynwind.h \ -environments.h \ -eq.h \ -error.h \ -eval.h \ -evalext.h \ -extensions.h \ -feature.h \ -filesys.h \ -fluids.h \ -fports.h \ -gc.h \ -gdb_interface.h \ -gdbint.h \ -goops.h \ -gsubr.h \ -guardians.h \ -hash.h \ -hashtab.h \ -hooks.h \ -init.h \ -ioext.h \ -iselect.h \ -keywords.h \ -lang.h \ -list.h \ -load.h \ -macros.h \ -mallocs.h \ -modules.h \ -net_db.h \ -numbers.h \ -objects.h \ -objprop.h \ -options.h \ -pairs.h \ -ports.h \ -posix.h \ -print.h \ -procprop.h \ -procs.h \ -properties.h \ -ramap.h \ -random.h \ -rdelim.h \ -read.h \ -regex-posix.h \ -root.h \ -rw.h \ -scmconfig.h \ -scmsigs.h \ -script.h \ -simpos.h \ -smob.h \ -snarf.h \ -socket.h \ -sort.h \ -srcprop.h \ -stackchk.h \ -stacks.h \ -stime.h \ -strings.h \ -strorder.h \ -strports.h \ -struct.h \ -symbols.h \ -tags.h \ -threads.h \ -throw.h \ -unif.h \ -validate.h \ -values.h \ -variable.h \ -vectors.h \ -version.h \ -vports.h \ -weaks.h \ -" - -do_stage() { - install -d ${STAGING_INCDIR}/libguile - for i in ${LIBGUILE_HEADERS}; do - install -m 0644 libguile/$i ${STAGING_INCDIR}/libguile/$i - done - - install -d ${STAGING_BINDIR_NATIVE} - install -m 0755 ${S}/libguile/.libs/guile ${STAGING_BINDIR_NATIVE}/ - - install -m 0644 libguile.h ${STAGING_INCDIR}/libguile.h - install -d ${STAGING_INCDIR}/guile - install -m 0644 libguile/gh.h ${STAGING_INCDIR}/guile/ - install -d ${STAGING_INCDIR}/guile/srfi - install -d ${STAGING_INCDIR}/guile-readline - install -m 0644 guile-readline/readline.h ${STAGING_INCDIR}/guile-readline/ - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 guile-config/guile.m4 ${STAGING_DATADIR}/aclocal - - install -d ${STAGING_DATADIR}/guile/1.8 - cp -pPr ${S}/ice-9 ${STAGING_DATADIR}/guile/1.8/ - - oe_libinstall -C guile-readline -so -a libguilereadline-v-17 ${STAGING_LIBDIR} - oe_libinstall -C libguile -so -a libguile ${STAGING_LIBDIR} -} - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-Werror':'':g -} - diff --git a/recipes/guile/guile-native_1.8.6.bb b/recipes/guile/guile-native_1.8.6.bb new file mode 100644 index 0000000000..d511807e09 --- /dev/null +++ b/recipes/guile/guile-native_1.8.6.bb @@ -0,0 +1,4 @@ +require guile-native.inc +SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ + file://configure-fix.patch;patch=1 \ + " diff --git a/recipes/guile/guile.inc b/recipes/guile/guile.inc new file mode 100644 index 0000000000..b2d6833c94 --- /dev/null +++ b/recipes/guile/guile.inc @@ -0,0 +1,45 @@ +DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \ +packaged as a library which can be incorporated into your programs." +HOMEPAGE = "http://www.gnu.org/software/guile/guile.html" +SECTION = "devel/scheme" +DEPENDS = "guile-native gmp libtool" +LICENSE = "GPL" +PACKAGES =+ "${PN}-el" +FILES_${PN}-el = "${datadir}/emacs" +DESCRIPTION_${PN}-el = "Emacs lisp files for Guile" + +inherit autotools + +acpaths = "-I ${S}/guile-config" + +EXTRA_OECONF = " \ + --without-threads \ + --without-included-ltdl \ + " + +do_compile() { + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:-Werror::g $i + done + + (cd libguile; oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" guile_filter_doc_snarfage) + oe_runmake preinstguile="`which guile`" + + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + -e s:-L/usr/lib::g \ + -e s:-isystem/usr/include::g \ + -e s:,/usr/lib:,\$\{libdir\}:g \ + guile-1.8.pc +} + +do_stage() { + autotools_stage_all + # Create guile-config returning target values instead of native values + install -d ${STAGING_BINDIR_CROSS} + echo '#!'`which guile`$' \\\n-e main -s\n!#\n(define %guile-build-info '\'\( >guile-config.cross + sed -n $'s:-isystem[^ ]* ::;s:-Wl,-rpath-link,[^ ]* ::;s:^[ \t]*{[ \t]*": (:;s:",[ \t]*": . ":;s:" *}, *\\\\:"):;/^ (/p' <libguile/libpath.h >>guile-config.cross + echo '))' >>guile-config.cross + cat guile-config/guile-config >>guile-config.cross + install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config +} diff --git a/recipes/guile/guile_1.8.5.bb b/recipes/guile/guile_1.8.5.bb index 86eefa04c6..e16cabd91d 100644 --- a/recipes/guile/guile_1.8.5.bb +++ b/recipes/guile/guile_1.8.5.bb @@ -1,50 +1,10 @@ -DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \ -packaged as a library which can be incorporated into your programs." -HOMEPAGE = "http://www.gnu.org/software/guile/guile.html" -SECTION = "devel/scheme" -DEPENDS = "guile-native gmp libtool" -LICENSE = "GPL" -PACKAGES =+ "${PN}-el" -FILES_${PN}-el = "${datadir}/emacs" -DESCRIPTION_${PN}-el = "Emacs lisp files for Guile" +require guile.inc -PR = "r4" +DEPENDS = "libtool (< 2)" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ - file://configure-fix.patch;patch=1 " - -inherit autotools - -acpaths = "-I ${S}/guile-config" + file://configure-fix.patch;patch=1 \ + " -EXTRA_OECONF = " \ - --without-threads \ - --without-included-ltdl \ - " - -do_compile() { - for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:-Werror::g $i - done - - (cd libguile; oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" guile_filter_doc_snarfage) - oe_runmake preinstguile="`which guile`" - - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - -e s:-L/usr/lib::g \ - -e s:-isystem/usr/include::g \ - -e s:,/usr/lib:,\$\{libdir\}:g \ - guile-1.8.pc -} +PR = "r4" -do_stage() { - autotools_stage_all - # Create guile-config returning target values instead of native values - install -d ${STAGING_BINDIR_CROSS} - echo '#!'`which guile`$' \\\n-e main -s\n!#\n(define %guile-build-info '\'\( >guile-config.cross - sed -n $'s:-isystem[^ ]* ::;s:-Wl,-rpath-link,[^ ]* ::;s:^[ \t]*{[ \t]*": (:;s:",[ \t]*": . ":;s:" *}, *\\\\:"):;/^ (/p' <libguile/libpath.h >>guile-config.cross - echo '))' >>guile-config.cross - cat guile-config/guile-config >>guile-config.cross - install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config -} diff --git a/recipes/guile/guile_1.8.6.bb b/recipes/guile/guile_1.8.6.bb new file mode 100644 index 0000000000..6889f33042 --- /dev/null +++ b/recipes/guile/guile_1.8.6.bb @@ -0,0 +1,6 @@ +require guile.inc + +SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ + file://configure-fix.patch;patch=1 \ + " + diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb new file mode 100644 index 0000000000..49ed35ee0f --- /dev/null +++ b/recipes/meta/meta-toolchain-qte.bb @@ -0,0 +1,25 @@ +# Qt Embedded toolchain + +require meta-toolchain.bb + +TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host" +TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" + +SDK_SUFFIX = "toolchain-qte" +QT_DIR_NAME = "qtopia" + +do_populate_sdk_append() { + script = "${SDK_OUTPUT}/${prefix}/environment-setup" + touch $script + echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script + echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script + echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script + echo 'export OE_QMAKE_LIBDIR_QT=${prefix}/${TARGET_SYS}/${layout_libdir}' >> $script + echo 'export OE_QMAKE_INCDIR_QT=${prefix}/${TARGET_SYS}/${layout_includedir}/${QT_DIR_NAME}' >> $script + echo 'export OE_QMAKE_MOC=${prefix}/${layout_bindir}/moc4' >> $script + echo 'export OE_QMAKE_UIC=${prefix}/${layout_bindir}/uic4' >> $script + + # Repack SDK with new environment-setup + cd ${SDK_OUTPUT} + fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . +} diff --git a/recipes/openssh/openssh-5.2p1/openssh-5.2-sftp-server-nolibcrypto.patch b/recipes/openssh/openssh-5.2p1/openssh-5.2-sftp-server-nolibcrypto.patch new file mode 100644 index 0000000000..2d0cdd5cca --- /dev/null +++ b/recipes/openssh/openssh-5.2p1/openssh-5.2-sftp-server-nolibcrypto.patch @@ -0,0 +1,13 @@ +Index: openssh-5.2p1/Makefile.in +=================================================================== +--- openssh-5.2p1.orig/Makefile.in ++++ openssh-5.2p1/Makefile.in +@@ -158,7 +158,7 @@ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libss + $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) + + sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o +- $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ++ $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat + + sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o + $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) diff --git a/recipes/openssh/openssh-5.2p1/ssh_config b/recipes/openssh/openssh-5.2p1/ssh_config new file mode 100644 index 0000000000..4a4a649ba8 --- /dev/null +++ b/recipes/openssh/openssh-5.2p1/ssh_config @@ -0,0 +1,46 @@ +# $OpenBSD: ssh_config,v 1.25 2009/02/17 01:28:32 djm Exp $ + +# This is the ssh client system-wide configuration file. See +# ssh_config(5) for more information. This file provides defaults for +# users, and the values can be changed in per-user configuration files +# or on the command line. + +# Configuration data is parsed as follows: +# 1. command line options +# 2. user-specific file +# 3. system-wide file +# Any configuration value is only changed the first time it is set. +# Thus, host-specific definitions should be at the beginning of the +# configuration file, and defaults at the end. + +# Site-wide defaults for some commonly used options. For a comprehensive +# list of available options, their meanings and defaults, please see the +# ssh_config(5) man page. + +Host * + ForwardAgent yes + ForwardX11 yes +# RhostsRSAAuthentication no +# RSAAuthentication yes +# PasswordAuthentication yes +# HostbasedAuthentication no +# GSSAPIAuthentication no +# GSSAPIDelegateCredentials no +# BatchMode no +# CheckHostIP yes +# AddressFamily any +# ConnectTimeout 0 +# StrictHostKeyChecking ask +# IdentityFile ~/.ssh/identity +# IdentityFile ~/.ssh/id_rsa +# IdentityFile ~/.ssh/id_dsa +# Port 22 +# Protocol 2,1 +# Cipher 3des +# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc +# MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160 +# EscapeChar ~ +# Tunnel no +# TunnelDevice any:any +# PermitLocalCommand no +# VisualHostKey no diff --git a/recipes/openssh/openssh-5.2p1/sshd_config b/recipes/openssh/openssh-5.2p1/sshd_config new file mode 100644 index 0000000000..4f9b626fbd --- /dev/null +++ b/recipes/openssh/openssh-5.2p1/sshd_config @@ -0,0 +1,119 @@ +# $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# Disable legacy (protocol version 1) support in the server for new +# installations. In future the default will change to require explicit +# activation of protocol 1 +Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +UsePrivilegeSeparation yes +#PermitUserEnvironment no +Compression no +ClientAliveInterval 15 +ClientAliveCountMax 4 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc new file mode 100644 index 0000000000..6c33142f0b --- /dev/null +++ b/recipes/openssh/openssh.inc @@ -0,0 +1,106 @@ +DEPENDS = "zlib openssl" + +RCONFLICTS_openssh = "dropbear" +RCONFLICTS_openssh-sshd = "dropbear" + +SECTION = "console/network" +DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ +Ssh (Secure Shell) is a program for logging into a remote machine \ +and for executing commands on a remote machine. \ +It provides secure encrypted communications between two untrusted \ +hosts over an insecure network. X11 connections and arbitrary TCP/IP \ +ports can also be forwarded over the secure channel. \ +It is intended as a replacement for rlogin, rsh and rcp, and can be \ +used to provide applications with a secure communication channel." +HOMEPAGE = "http://www.openssh.org/" +LICENSE = "BSD" + +inherit autotools + +export ASKPASS_PROGRAM = "${bindir}/ssh-askpass" +export LD = "${CC}" +CFLAGS_prepend = "-I${S} " +CFLAGS_append = " -D__FILE_OFFSET_BITS=64" +LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " +EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ + --with-rand-helper=no --without-pam \ + --without-zlib-version-check \ + --with-privsep-path=/var/run/sshd \ + --sysconfdir=${sysconfdir}/ssh \ + --with-xauth=/usr/bin/xauth" + +EXTRA_OEMAKE = "'STRIP_OPT='" + +do_configure_prepend () { + if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_compile_append () { + install -m 0644 ${WORKDIR}/sshd_config ${S}/ + install -m 0644 ${WORKDIR}/ssh_config ${S}/ +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd + mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh + mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh + rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var +} + +PACKAGES =+ " ssh-keygen openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server" +FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug" +FILES_openssh-scp = "${bindir}/scp.${PN}" +FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" +FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd" +FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config" +FILES_openssh-sftp = "${bindir}/sftp" +FILES_openssh-sftp-server = "${libdir}exec/sftp-server" +FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*" +FILES_ssh-keygen = "${bindir}/ssh-keygen" + +RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd ssh-keygen " +DEPENDS_openssh-sshd += " update-rc.d" +RDEPENDS_openssh-sshd += " update-rc.d ssh-keygen " + +pkg_postinst_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + addgroup sshd + adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd + update-rc.d sshd defaults 9 +fi +} + +pkg_postinst_openssh-scp() { + update-alternatives --install ${bindir}/scp scp scp.${PN} 90 +} + +pkg_postinst_openssh-ssh() { + update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 +} + +pkg_postrm_openssh-ssh() { + update-alternatives --remove ${bindir}/ssh ssh.${PN} +} + +pkg_postrm_openssh-scp() { + update-alternatives --remove ${bindir}/scp scp.${PN} +} + +pkg_postrm_openssh-sshd() { +if test "x$D" != "x"; then + exit 1 +else + ${sysconfdir}/init.d/sshd stop + deluser sshd + delgroup sshd + update-rc.d -f sshd remove +fi +} + +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/recipes/openssh/openssh_4.6p1.bb b/recipes/openssh/openssh_4.6p1.bb index b1957bebac..f5ca4de159 100644 --- a/recipes/openssh/openssh_4.6p1.bb +++ b/recipes/openssh/openssh_4.6p1.bb @@ -1,113 +1,8 @@ -DEPENDS = "zlib openssl" - -RCONFLICTS_openssh = "dropbear" -RCONFLICTS_openssh-sshd = "dropbear" - -SECTION = "console/network" -DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ -Ssh (Secure Shell) is a program for logging into a remote machine \ -and for executing commands on a remote machine. \ -It provides secure encrypted communications between two untrusted \ -hosts over an insecure network. X11 connections and arbitrary TCP/IP \ -ports can also be forwarded over the secure channel. \ -It is intended as a replacement for rlogin, rsh and rcp, and can be \ -used to provide applications with a secure communication channel." -HOMEPAGE = "http://www.openssh.org/" -LICENSE = "BSD" -PR = "r6" - +require openssh.inc SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://sftp-server-nolibcrypto.patch;patch=1 \ file://sshd_config \ - file://ssh_config \ - file://init" - -inherit autotools - -export ASKPASS_PROGRAM = "${bindir}/ssh-askpass" -export LD = "${CC}" -CFLAGS_prepend = "-I${S} " -CFLAGS_append = " -D__FILE_OFFSET_BITS=64" -LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat " -EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \ - --with-rand-helper=no --without-pam \ - --without-zlib-version-check \ - --with-privsep-path=/var/run/sshd \ - --sysconfdir=${sysconfdir}/ssh \ - --with-xauth=/usr/bin/xauth" - -EXTRA_OEMAKE = "'STRIP_OPT='" - -do_configure_prepend () { - if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_compile_append () { - install -m 0644 ${WORKDIR}/sshd_config ${S}/ - install -m 0644 ${WORKDIR}/ssh_config ${S}/ -} - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd - mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh - mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh - rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var -} - -PACKAGES =+ " ssh-keygen openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server" -FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug" -FILES_openssh-scp = "${bindir}/scp.${PN}" -FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" -FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd" -FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config" -FILES_openssh-sftp = "${bindir}/sftp" -FILES_openssh-sftp-server = "${libdir}exec/sftp-server" -FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*" -FILES_ssh-keygen = "${bindir}/ssh-keygen" - -RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd ssh-keygen " -DEPENDS_openssh-sshd += " update-rc.d" -RDEPENDS_openssh-sshd += " update-rc.d ssh-keygen " - -pkg_postinst_openssh-sshd() { -if test "x$D" != "x"; then - exit 1 -else - addgroup sshd - adduser --system --home /var/run/sshd --no-create-home --disabled-password --ingroup sshd -s /bin/false sshd - update-rc.d sshd defaults 9 -fi -} - -pkg_postinst_openssh-scp() { - update-alternatives --install ${bindir}/scp scp scp.${PN} 90 -} - -pkg_postinst_openssh-ssh() { - update-alternatives --install ${bindir}/ssh ssh ssh.${PN} 90 -} - -pkg_postrm_openssh-ssh() { - update-alternatives --remove ${bindir}/ssh ssh.${PN} -} - -pkg_postrm_openssh-scp() { - update-alternatives --remove ${bindir}/scp scp.${PN} -} - -pkg_postrm_openssh-sshd() { -if test "x$D" != "x"; then - exit 1 -else - ${sysconfdir}/init.d/sshd stop - deluser sshd - delgroup sshd - update-rc.d -f sshd remove -fi -} - -CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" -CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" + file://ssh_config \ + file://init \ + " +PR = "r6" diff --git a/recipes/openssh/openssh_5.2p1.bb b/recipes/openssh/openssh_5.2p1.bb new file mode 100644 index 0000000000..55227ca8ee --- /dev/null +++ b/recipes/openssh/openssh_5.2p1.bb @@ -0,0 +1,9 @@ +require openssh.inc +DEFAULT_PREFERENCE = "-1" +#not tested extensively(I tested only ssh) and it's an important recipe I'm afraid to broke +SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ + file://sshd_config \ + file://ssh_config \ + file://init \ + file://openssh-5.2-sftp-server-nolibcrypto.patch;patch=1 \ + " diff --git a/recipes/pkgconfig/pkgconfig-native_0.23.bb b/recipes/pkgconfig/pkgconfig-native_0.23.bb index 24497a9866..da728d3c22 100644 --- a/recipes/pkgconfig/pkgconfig-native_0.23.bb +++ b/recipes/pkgconfig/pkgconfig-native_0.23.bb @@ -1,6 +1,8 @@ require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" +PR = "${INC_PR}.1" + S = "${WORKDIR}/pkg-config-${PV}/" inherit native DEPENDS = "" diff --git a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb index 3b20371777..47a5b46f0a 100644 --- a/recipes/pkgconfig/pkgconfig-sdk_0.23.bb +++ b/recipes/pkgconfig/pkgconfig-sdk_0.23.bb @@ -1,6 +1,8 @@ require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" +PR = "${INC_PR}.1" + S = "${WORKDIR}/pkg-config-${PV}/" inherit sdk DEPENDS = "" diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc index 939199bc37..495403eaf5 100644 --- a/recipes/pkgconfig/pkgconfig.inc +++ b/recipes/pkgconfig/pkgconfig.inc @@ -5,7 +5,7 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" LICENSE = "GPL" -PR = "r7" +INC_PR = "r7" SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ diff --git a/recipes/pkgconfig/pkgconfig_0.23.bb b/recipes/pkgconfig/pkgconfig_0.23.bb index 10ce0fc9c3..8e75adc6cf 100644 --- a/recipes/pkgconfig/pkgconfig_0.23.bb +++ b/recipes/pkgconfig/pkgconfig_0.23.bb @@ -1,4 +1,6 @@ require pkgconfig.inc +PR = "${INC_PR}.1" + DEPENDS += "glib-2.0" EXTRA_OECONF = "--with-installed-glib" diff --git a/recipes/qt4/files/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch index bb36444f80..bb36444f80 100644 --- a/recipes/qt4/files/0003-no-tools.patch +++ b/recipes/qt4/qt4-embedded-4.4.3/0003-no-tools.patch diff --git a/recipes/qt4/files/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/recipes/qt4/files/0006-freetype-host-includes.patch +++ b/recipes/qt4/qt4-embedded-4.4.3/0006-freetype-host-includes.patch diff --git a/recipes/qt4/files/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/recipes/qt4/files/0007-openssl-host-includes.patch +++ b/recipes/qt4/qt4-embedded-4.4.3/0007-openssl-host-includes.patch diff --git a/recipes/qt4/files/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch index b1a443f24c..b1a443f24c 100644 --- a/recipes/qt4/files/0008-qt-lib-infix.patch +++ b/recipes/qt4/qt4-embedded-4.4.3/0008-qt-lib-infix.patch diff --git a/recipes/qt4/files/4.5.1/0003-no-tools.patch b/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch index 3829ffcdc5..3829ffcdc5 100644 --- a/recipes/qt4/files/4.5.1/0003-no-tools.patch +++ b/recipes/qt4/qt4-embedded-4.5.1/0003-no-tools.patch diff --git a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch index 987c425138..987c425138 100644 --- a/recipes/qt4/files/4.5.1/0006-freetype-host-includes.patch +++ b/recipes/qt4/qt4-embedded-4.5.1/0006-freetype-host-includes.patch diff --git a/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch b/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch index 3409cc0bf2..3409cc0bf2 100644 --- a/recipes/qt4/files/4.5.1/0007-openssl-host-includes.patch +++ b/recipes/qt4/qt4-embedded-4.5.1/0007-openssl-host-includes.patch diff --git a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch index 3efaff37d3..3efaff37d3 100644 --- a/recipes/qt4/files/4.5.1/0008-qt-lib-infix.patch +++ b/recipes/qt4/qt4-embedded-4.5.1/0008-qt-lib-infix.patch diff --git a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch index 070b4ac9c1..070b4ac9c1 100644 --- a/recipes/qt4/files/4.5.1/0010-no-simpledecoration-example.patch +++ b/recipes/qt4/qt4-embedded-4.5.1/0010-no-simpledecoration-example.patch diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc new file mode 100644 index 0000000000..26b4116f40 --- /dev/null +++ b/recipes/qt4/qt4-embedded.inc @@ -0,0 +1,40 @@ +SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." +SECTION = "libs" +LICENSE = "GPL QPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS += "directfb tslib" +INC_PR = "r11" + +QT_BASE_NAME = "qt4-embedded" +QT_BASE_LIB = "libqt-embedded" +QT_DIR_NAME = "qtopia" +QT_LIBINFIX = "E" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://0009-support-2bpp.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" + +QT_CONFIG_FLAGS += " \ + -qtlibinfix ${QT_LIBINFIX} \ + -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ + -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ + -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ + -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ + -DQT_KEYPAD_NAVIGATION \ + " + +require qt4.inc + +inherit qt4e + diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb index c7685c3770..f5358a069e 100644 --- a/recipes/qt4/qt4-embedded_4.4.3.bb +++ b/recipes/qt4/qt4-embedded_4.4.3.bb @@ -1,39 +1,3 @@ -SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." -SECTION = "libs" -LICENSE = "GPL QPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS += "tslib" -PR = "r11" +include qt4-embedded.inc -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://0009-support-2bpp.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" - -QT_CONFIG_FLAGS += " \ - -qtlibinfix E \ - -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ - -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \ - -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ - -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ - -DQT_KEYPAD_NAVIGATION \ - " - -QT_BASE_NAME = "qt4-embedded" -QT_BASE_LIB = "libqt-embedded" -QT_DIR_NAME = "qtopia" -QT_LIBINFIX="E" - -require qt4.inc - -inherit qt4e +PR = "${INC_PR}.1" diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb index 3ec4b9aeb5..dff754c68c 100644 --- a/recipes/qt4/qt4-embedded_4.5.1.bb +++ b/recipes/qt4/qt4-embedded_4.5.1.bb @@ -1,39 +1,6 @@ -SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version." -SECTION = "libs" -LICENSE = "GPL LGPL QPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS += "tslib" +include qt4-embedded.inc -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://${PV}/0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://${PV}/0006-freetype-host-includes.patch;patch=1 \ - file://${PV}/0007-openssl-host-includes.patch;patch=1 \ - file://${PV}/0008-qt-lib-infix.patch;patch=1 \ - file://0009-support-2bpp.patch;patch=1 \ - file://${PV}/0010-no-simpledecoration-example.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" +PR = "${INC_PR}.1" -QT_CONFIG_FLAGS += " \ - -qtlibinfix E \ - -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ - -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc \ - -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ - -qt-kbd-tty -qt-kbd-usb -qt-kbd-qvfb \ - -DQT_KEYPAD_NAVIGATION \ - " - -QT_BASE_NAME = "qt4-embedded" -QT_BASE_LIB = "libqt-embedded" -QT_DIR_NAME = "qtopia" -QT_LIBINFIX="E" - -require qt4.inc - -inherit qt4e +LICENSE += "LGPL" +SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1" diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc index a79eed4810..0fd4f9246f 100644 --- a/recipes/qt4/qt4-tools-native.inc +++ b/recipes/qt4/qt4-tools-native.inc @@ -5,6 +5,8 @@ HOMEPAGE = "http://www.trolltech.com" PRIORITY = "optional" LICENSE = "GPL" +INC_PR = "r4" + inherit native SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ @@ -22,8 +24,8 @@ EXTRA_OECONF = "-prefix ${prefix} \ -no-exceptions \ -no-nas-sound \ -no-nis \ - -verbose -release -fast -static \ - -qt3support " + -verbose -release -fast -static \ + -qt3support" # yank default -e, otherwise we get the following error: # moc_qbuffer.cpp: No such file or directory @@ -57,7 +59,7 @@ do_compile() { } do_stage() { - install -d ${STAGING_BINDIR_NATIVE}/ + install -d ${STAGING_BINDIR_NATIVE}/ install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4 diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb index e8fc316145..a734b6b936 100644 --- a/recipes/qt4/qt4-tools-native_4.4.3.bb +++ b/recipes/qt4/qt4-tools-native_4.4.3.bb @@ -1,2 +1,2 @@ require qt4-tools-native.inc -PR = "r4" +PR = "${INC_PR}.1" diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb index adb341d465..d1962bf98f 100644 --- a/recipes/qt4/qt4-tools-native_4.5.1.bb +++ b/recipes/qt4/qt4-tools-native_4.5.1.bb @@ -1,4 +1,4 @@ require qt4-tools-native.inc -PR = "r1" +PR = "${INC_PR}.1" TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-tools-sdk_4.5.1.bb b/recipes/qt4/qt4-tools-sdk_4.5.1.bb new file mode 100644 index 0000000000..db919fd6df --- /dev/null +++ b/recipes/qt4/qt4-tools-sdk_4.5.1.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x" +DEPENDS = "zlib-native dbus-native" +SECTION = "libs" +HOMEPAGE = "http://www.trolltech.com" +PRIORITY = "optional" +LICENSE = "GPL" + +inherit sdk + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ + file://configure-lflags.patch;patch=1 \ + file://qt-config.patch;patch=1 \ + file://g++.conf \ + file://linux.conf" +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" + +# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" +EXTRA_OECONF = "-prefix ${prefix} \ + -qt-libjpeg -qt-gif -system-zlib \ + -no-libjpeg -no-libpng \ + -no-accessibility \ + -no-cups \ + -no-exceptions \ + -no-nas-sound \ + -no-nis \ + -verbose -release -fast -static \ + -qt3support \ + -I${STAGING_DIR_NATIVE}/usr/include \ + -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \ + -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include" + +# yank default -e, otherwise we get the following error: +# moc_qbuffer.cpp: No such file or directory +EXTRA_OEMAKE = " " + +do_configure() { + (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +TOBUILD = "\ + src/tools/bootstrap \ + src/tools/moc \ + src/corelib \ + src/sql \ + src/dbus \ + src/qt3support \ + src/xml \ + src/tools/uic \ + src/tools/rcc \ + src/network \ + src/gui \ + src/tools/uic3 \ + tools/linguist/lrelease \ + tools/linguist/lupdate \ + tools/qdbus \ +" + +do_compile() { + for i in ${TOBUILD}; do + cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" + done +} + +do_stage() { + install -d ${STAGING_BINDIR_NATIVE}/ + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 + for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do + install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4 + done +} + + diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc new file mode 100644 index 0000000000..23fa33f118 --- /dev/null +++ b/recipes/qt4/qt4-x11-free.inc @@ -0,0 +1,34 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" + +INC_PR = "r10" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + + +QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl" +QT_BASE_NAME = "qt4" +QT_BASE_LIB = "libqt" +QT_DIR_NAME = "qt4" +QT_LIBINFIX = "" + +require qt4.inc + +inherit qt4x11 + diff --git a/recipes/qt4/qt4-x11-free/0003-no-tools.patch b/recipes/qt4/qt4-x11-free/0003-no-tools.patch new file mode 100644 index 0000000000..3829ffcdc5 --- /dev/null +++ b/recipes/qt4/qt4-x11-free/0003-no-tools.patch @@ -0,0 +1,18 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/src/src.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/src/src.pro 2009-02-25 22:32:41.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/src/src.pro 2009-03-26 17:11:07.000000000 +0100 +@@ -6,12 +6,9 @@ + wince*:{ + SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib + } else { +- SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib ++ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib + contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support + contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus +- !cross_compile { +- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 +- } + } + win32:!contains(QT_EDITION, OpenSource|Console): { + SRC_SUBDIRS += src_activeqt diff --git a/recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch b/recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..987c425138 --- /dev/null +++ b/recipes/qt4/qt4-x11-free/0006-freetype-host-includes.patch @@ -0,0 +1,20 @@ +From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Mon, 4 Jun 2007 14:48:50 +0200 +Subject: [PATCH] freetype host includes + +--- + config.tests/unix/freetype/freetype.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch b/recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch new file mode 100644 index 0000000000..3409cc0bf2 --- /dev/null +++ b/recipes/qt4/qt4-x11-free/0007-openssl-host-includes.patch @@ -0,0 +1,20 @@ +From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Mon, 4 Jun 2007 14:58:34 +0200 +Subject: [PATCH] openssl host includes + +--- + config.tests/unix/openssl/openssl.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/openssl/openssl.pri 2009-02-25 22:32:32.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/openssl/openssl.pri 2009-03-26 17:16:28.000000000 +0100 +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + # LSB doesn't allow using headers from /include or /usr/include + linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { diff --git a/recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch b/recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch new file mode 100644 index 0000000000..3efaff37d3 --- /dev/null +++ b/recipes/qt4/qt4-x11-free/0008-qt-lib-infix.patch @@ -0,0 +1,34 @@ +Index: qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/mkspecs/features/uitools.prf 2009-02-25 22:32:34.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/mkspecs/features/uitools.prf 2009-03-26 17:17:27.000000000 +0100 +@@ -2,10 +2,10 @@ + qt:load(qt) + + # Include the correct version of the UiLoader library +-QTUITOOLS_LINKAGE = -lQtUiTools ++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} + CONFIG(debug, debug|release) { +- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug +- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd ++ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug ++ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d + } + LIBS += $$QTUITOOLS_LINKAGE + +Index: qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro +=================================================================== +--- qt-embedded-linux-opensource-src-4.5.0.orig/tools/designer/src/uitools/uitools.pro 2009-02-25 22:32:42.000000000 +0100 ++++ qt-embedded-linux-opensource-src-4.5.0/tools/designer/src/uitools/uitools.pro 2009-03-26 17:17:27.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = QtUiTools + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +@@ -39,3 +39,4 @@ + QMAKE_PKGCONFIG_REQUIRES += QtXml + } + ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/recipes/qt4/qt4-x11-free_4.4.3.bb b/recipes/qt4/qt4-x11-free_4.4.3.bb index 08a56a47c3..a3538c9199 100644 --- a/recipes/qt4/qt4-x11-free_4.4.3.bb +++ b/recipes/qt4/qt4-x11-free_4.4.3.bb @@ -1,32 +1,3 @@ -DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL QPL" -DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -PROVIDES = "qt4x11" -PR = "r10" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - - -QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" -QT_BASE_NAME = "qt4" -QT_BASE_LIB = "libqt" -QT_DIR_NAME = "qt4" -QT_LIBINFIX = "" - -require qt4.inc - -inherit qt4x11 +include qt4-x11-free.inc +PR = "${INC_PR}.1" +QT_CONFIG_FLAGS += "-no-tablet" diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb index af3a7c702c..1cc637a548 100644 --- a/recipes/qt4/qt4-x11-free_4.5.1.bb +++ b/recipes/qt4/qt4-x11-free_4.5.1.bb @@ -1,31 +1,4 @@ -DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL LGPL QPL" -DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -PROVIDES = "qt4x11" +include qt4-x11-free.inc +LICENSE += "LGPL" +PR = "${INC_PR}.1" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://${PV}/0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://${PV}/0006-freetype-host-includes.patch;patch=1 \ - file://${PV}/0007-openssl-host-includes.patch;patch=1 \ - file://${PV}/0008-qt-lib-infix.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - - -QT_CONFIG_FLAGS += "-no-xinerama -no-xkb -no-opengl" -QT_BASE_NAME = "qt4" -QT_BASE_LIB = "libqt" -QT_DIR_NAME = "qt4" -QT_LIBINFIX = "" - -require qt4.inc - -inherit qt4x11 diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 3deffa6617..f5da6527f0 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -1,6 +1,6 @@ inherit qmake_base -DEPENDS += " qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base" +DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base" require qt4_arch.inc QT_ARCH := "${@qt_arch(d)}" @@ -31,10 +31,10 @@ python __anonymous () { dev_packages = [] dbg_packages = [] for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split(): - pkg = "${QT_BASE_LIB}"+ name.lower().replace("qt", "") + "4" + pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4" # NOTE: the headers for QtAssistantClient are different incname = name.replace("QtAssistantClient", "QtAssistant") - bb.data.setVar("FILES_%s" % pkg, "%(pkg)s ${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) + bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl ${libdir}/lib%(name)s${QT_LIBINFIX}.a ${libdir}/lib%(name)s${QT_LIBINFIX}.la @@ -45,6 +45,9 @@ python __anonymous () { lib_packages.append(pkg) dev_packages.append("%s-dev" % pkg) dbg_packages.append("%s-dbg" % pkg) + for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split(): + dbg_packages.append("%s-dbg" % name) + bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d) bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d) bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d) @@ -59,28 +62,44 @@ OTHER_PACKAGES = "\ ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-fonts \ ${QT_BASE_NAME}-linguist \ - ${QT_BASE_NAME}-pixeltool" + ${QT_BASE_NAME}-makeqpf \ + ${QT_BASE_NAME}-mkspecs \ + ${QT_BASE_NAME}-pixeltool \ + ${QT_BASE_NAME}-qt3to4" PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-*" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" -FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" -FILES_${PN}-dbg = "${bindir}/*/.debug " +FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*" +FILES_${PN}-dbg = "" RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" -FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" +FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" +FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" +FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig" FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" +FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer" FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*" +FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo ${bindir}/${QT_DIR_NAME}/demos/.debug/*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" +FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*" FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" +FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug/*" FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" -FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" +FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" +FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" +FILES_${QT_BASE_NAME}-pixeltool-dbg = "${bindir}/.debug/pixeltool" +FILES_${QT_BASE_NAME}-qt3to4 = "${bindir}/qt3to4 ${datadir}/${QT_DIR_NAME}/q3porting.xml" +FILES_${QT_BASE_NAME}-qt3to4-dbg = "${bindir}/.debug/qt3to4" +FILES_${QT_BASE_NAME}-makeqpf = "${bindir}/makeqpf" +FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf" +FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/*" do_configure() { @@ -134,54 +153,54 @@ do_compile() { } python populate_packages_prepend() { - translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) - translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) - do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) - - phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) - phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) - do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) - - # Package all the plugins and their -dbg version and create a meta package - import os - def qtopia_split(path, name, glob): - """ - Split the package into a normal and -dbg package and then add the - new packages to the meta package. - """ - plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) - if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): - bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) - return - - plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) - dev_packages = [] - dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) - do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) - # Create a -dbg package as well - plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) - packages = bb.data.getVar('PACKAGES',d) - for (file,package) in dev_packages: - packages = "%s %s-dbg" % (packages, package) - file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) - bb.data.setVar("FILES_%s-dbg" % package, file_name, d) - bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d) - - bb.data.setVar('PACKAGES', packages, d) - - qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') - qtopia_split('codecs', 'codec', '^libq(.*)\.so$') - qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') - qtopia_split('designer', 'designer', '^lib(.*)\.so$') - qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$') - qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$') - qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') - qtopia_split('imageformats','imageformat', '^libq(.*)\.so$') - qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$') - qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') - qtopia_split('script', 'script', '^libqtscript(.*)\.so$') - qtopia_split('styles', 'style', '^libq(.*)\.so$') - qtopia_split('phonon_backend', 'phonon-backend', '^libphonon_(.*)\.so$') + translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) + do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) + + phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) + phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) + + # Package all the plugins and their -dbg version and create a meta package + import os + def qtopia_split(path, name, glob): + """ + Split the package into a normal and -dbg package and then add the + new packages to the meta package. + """ + plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) + if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): + bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) + return + + plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) + dev_packages = [] + dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) + do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + # Create a -dbg package as well + plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) + packages = bb.data.getVar('PACKAGES',d) + for (file,package) in dev_packages: + packages = "%s %s-dbg" % (packages, package) + file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) + bb.data.setVar("FILES_%s-dbg" % package, file_name, d) + bb.data.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package), d) + + bb.data.setVar('PACKAGES', packages, d) + + qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') + qtopia_split('codecs', 'codec', '^libq(.*)\.so$') + qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') + qtopia_split('designer', 'designer', '^lib(.*)\.so$') + qtopia_split('gfxdrivers', 'gfxdriver', '^libq(.*)\.so$') + qtopia_split('mousedrivers', 'mousedriver', '^libq(.*)mousedriver\.so$') + qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') + qtopia_split('imageformats', 'imageformat', '^libq(.*)\.so$') + qtopia_split('inputmethods', 'inputmethod', '^libq(.*)\.so$') + qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') + qtopia_split('script', 'script', '^libqtscript(.*)\.so$') + qtopia_split('styles', 'style', '^libq(.*)\.so$') + qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$') } do_install() { @@ -192,7 +211,6 @@ do_install() { # XXX, FIXME, TODO: package the demos and examples properly rm -rf ${D}/${bindir}/${QT_DIR_NAME} - rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs # fix pkgconfig, libtool and prl files sed -i -e s#-L${S}/lib##g \ @@ -205,6 +223,9 @@ do_install() { sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \ -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ ${D}${libdir}/pkgconfig/*.pc + for name in ${QT_LIB_NAMES}; do + sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc + done install -d ${D}/${libdir}/fonts touch ${D}/${libdir}/fonts/fontdir @@ -227,6 +248,9 @@ do_stage() { sed -i -e s#"moc_location=.*$"## \ -e s#"uic_location=.*$"## \ ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc + for name in ${QT_LIB_NAMES}; do + sed -i -e "/Requires/s#${name}#${name}${QT_LIBINFIX}#"g ${D}${libdir}/pkgconfig/*.pc + done # fix libtool files sed -i -e s#installed=yes#installed=no#g ${STAGE_TEMP}/${libdir}/*.la diff --git a/recipes/tasks/task-qte-toolchain-host.bb b/recipes/tasks/task-qte-toolchain-host.bb new file mode 100644 index 0000000000..02c95a3cdf --- /dev/null +++ b/recipes/tasks/task-qte-toolchain-host.bb @@ -0,0 +1,7 @@ +require task-sdk-host.bb + +DESCRIPTION = "Host packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_${PN} += "qt4-tools-sdk" diff --git a/recipes/tasks/task-qte-toolchain-target.bb b/recipes/tasks/task-qte-toolchain-target.bb new file mode 100644 index 0000000000..82fa5d81d5 --- /dev/null +++ b/recipes/tasks/task-qte-toolchain-target.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Target packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_${PN} += " \ + task-sdk-bare \ + qt4-embedded \ + qt4-embedded-dev" diff --git a/recipes/tslib/tslib.inc b/recipes/tslib/tslib.inc index 14576166a3..e10351b817 100644 --- a/recipes/tslib/tslib.inc +++ b/recipes/tslib/tslib.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://tslib.berlios.de/" AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" +INC_PR = "r22" SRC_URI += "\ file://ts.conf \ @@ -69,7 +70,7 @@ DEBIAN_NOAUTONAME_tslib-calibrate = "1" RDEPENDS_${PN} = "tslib-conf" # Ship calibration data if it exists -RRECOMMENDS_angstrom = " pointercal " +RRECOMMENDS = " pointercal " FILES_${PN}-dbg += "${libdir}/ts/.debug*" FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb index 8b3c35a9f7..c22256f4d2 100644 --- a/recipes/tslib/tslib_1.0.bb +++ b/recipes/tslib/tslib_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "http://download.berlios.de/tslib/${BP}.tar.bz2 \ file://fix_version.patch;patch=1" -PR = "r20" +PR = "${INC_PR}.1" include tslib.inc diff --git a/recipes/tslib/tslib_svn.bb b/recipes/tslib/tslib_svn.bb index ff4446ba7c..e65f715110 100644 --- a/recipes/tslib/tslib_svn.bb +++ b/recipes/tslib/tslib_svn.bb @@ -1,6 +1,8 @@ SRC_URI = "svn://svn.berlios.de/tslib/trunk;module=tslib" S = "${WORKDIR}/tslib" PV = "1.0+svnr${SRCREV}" +PR = "${INC_PR}.1" + DEFAULT_PREFERENCE = "-1" include tslib.inc |