diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-07 14:30:23 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-07 14:30:23 +0200 |
| commit | 5d82a069f6c51036e79f8b7deeec3e439dae63cc (patch) | |
| tree | cf6fbb9ac663bf286fff1e3b264a1a03ddcbf000 /recipes | |
| parent | 635c84b62fca2013fe29b9e387c01a498808e3e9 (diff) | |
| parent | e1d669119346c6fe36373873ab364716b9a941af (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
66 files changed, 484 insertions, 119 deletions
diff --git a/recipes/binutils/binutils-cross-sdk.inc b/recipes/binutils/binutils-cross-sdk.inc index 5da1d4fa8f..6e9cda09b8 100644 --- a/recipes/binutils/binutils-cross-sdk.inc +++ b/recipes/binutils/binutils-cross-sdk.inc @@ -17,7 +17,7 @@ do_install () { rm ${D}${prefix}/${TARGET_SYS}/bin/.debug -Rf rm ${D}${prefix}/${TARGET_SYS}/bin/* for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" done # Install the libiberty header diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb index f50956680d..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb +++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb index f50956680d..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb index f84a61d1f5..40e9889691 100644 --- a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb +++ b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r1" +PR = "r2" diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb index f50956680d..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb +++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb +++ b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.bb b/recipes/binutils/binutils-cross-sdk_2.18.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.19.1.bb b/recipes/binutils/binutils-cross-sdk_2.19.1.bb index 76dff5449f..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.19.1.bb +++ b/recipes/binutils/binutils-cross-sdk_2.19.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.19.bb b/recipes/binutils/binutils-cross-sdk_2.19.bb index 76dff5449f..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.19.bb +++ b/recipes/binutils/binutils-cross-sdk_2.19.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_cvs.bb b/recipes/binutils/binutils-cross-sdk_cvs.bb index 6886255c7f..94d2704a6f 100644 --- a/recipes/binutils/binutils-cross-sdk_cvs.bb +++ b/recipes/binutils/binutils-cross-sdk_cvs.bb @@ -1,4 +1,4 @@ require binutils_cvs.bb require binutils-cross-sdk.inc -PR = "r4" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" +PR = "r5" +FILESPATHPKG .= ":binutils-cvs" diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index e82cf6904e..c9694fce80 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.050+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit e update-alternatives @@ -108,6 +108,7 @@ FILES_${PN} = "\ ${bindir}/* \ ${libdir}/enlightenment/modules/*/*.* \ ${libdir}/enlightenment/modules/*/*/* \ + ${libdir}/enlightenment/preload/e_precache.so \ ${datadir}/locale \ ${datadir}/enlightenment/data/icons \ ${datadir}/enlightenment/data/input_methods \ diff --git a/recipes/e17/systray_svn.bb b/recipes/e17/systray_svn.bb new file mode 100644 index 0000000000..3c0a8c7e71 --- /dev/null +++ b/recipes/e17/systray_svn.bb @@ -0,0 +1,8 @@ +LICENSE = "MIT" +PV = "0.0.1+svnr${SRCREV}" + +require e-module.inc + + + + diff --git a/recipes/gabriel/gabriel-native_svn.bb b/recipes/gabriel/gabriel-native_svn.bb new file mode 100644 index 0000000000..a98abb028e --- /dev/null +++ b/recipes/gabriel/gabriel-native_svn.bb @@ -0,0 +1,13 @@ +require gabriel_svn.bb +inherit native +DEPENDS = "libssh-native glib-2.0-native dbus-native dbus-glib-native" + +do_deploy() { + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/gabriel ${DEPLOY_DIR_TOOLS}/gabriel-${PV} + rm -f ${DEPLOY_DIR_TOOLS}/gabriel + ln -sf ./gabriel-${PV} ${DEPLOY_DIR_TOOLS}/gabriel +} + + +addtask deploy before do_package after do_install diff --git a/recipes/gabriel/gabriel_svn.bb b/recipes/gabriel/gabriel_svn.bb new file mode 100644 index 0000000000..1449311f90 --- /dev/null +++ b/recipes/gabriel/gabriel_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Gabriel is a small utility to enable D-Bus clients to connect to a D-Bus \ +daemon running on a remote machine, through SSH. In simple words, gabriel is a proxy for \ +a dbus daemon running on a remote machine." +LICENSE = "GPL" +DEPENDS = "libssh glib-2.0 dbus glib-dbus" +SECTION = "console/network" +PV = "0.0.0+svnr${SRCREV}" + +SRC_URI = "svn://gabriel.svn.sourceforge.net/svnroot/gabriel;module=gabriel;proto=https" +S = "${WORKDIR}/gabriel" + +inherit autotools_stage + +RDEPENDS = "socat" diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc index 75080302ff..d04f6080ee 100644 --- a/recipes/gcc/gcc-configure-sdk.inc +++ b/recipes/gcc/gcc-configure-sdk.inc @@ -4,8 +4,7 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${prefix}/${TARGET_SYS}/${layout_includedir}/c++ \ - --with-sysroot=${prefix}/${TARGET_SYS} \ +EXTRA_OECONF_PATHS = "--with-sysroot=${prefix}/${TARGET_SYS} \ --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-sdk_3.3.4.bb b/recipes/gcc/gcc-cross-sdk_3.3.4.bb index f53c5d321a..ed9c18c557 100644 --- a/recipes/gcc/gcc-cross-sdk_3.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.3.4.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_3.4.3.bb b/recipes/gcc/gcc-cross-sdk_3.4.3.bb index 48a7ecd645..0b1f6613bf 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.3.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.3.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_3.4.4.bb b/recipes/gcc/gcc-cross-sdk_3.4.4.bb index f6dd0532e3..e3346590d5 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb index 5caec0b5a5..6b6097fb00 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb index 461008d2d5..a6418f6404 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 55c9ceef70..7bc24806bb 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 297bd8ece8..a326263c06 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index ee4ce855af..297bd8ece8 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 3b66660d9b..0a3af9e469 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 13d395833e..876c65c369 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 8057608e0d..ee4ce855af 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 29ee187785..7f3e1466ce 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 361b0c10aa..3352e41dcb 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" inherit sdk diff --git a/recipes/gcc/gcc-package-sdk.inc b/recipes/gcc/gcc-package-sdk.inc index 0dc19c70b4..3d9cc0c53a 100644 --- a/recipes/gcc/gcc-package-sdk.inc +++ b/recipes/gcc/gcc-package-sdk.inc @@ -48,7 +48,8 @@ do_install () { # Create the ${prefix}/${TARGET_SYS}/bin/* symlinks install -d ${D}${prefix}/${TARGET_SYS}/bin/ for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + echo $l + ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" done ln -sf "${bindir}/${TARGET_PREFIX}gcc${EXEEXT}" "${D}${prefix}/${TARGET_SYS}/bin/cc${EXEEXT}" diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 1aacceaa30..0284f691a7 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,8 +10,10 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" -#EXTRA_IMAGEDEPENDS = "" -EXTRA_IMAGEDEPENDS = "${LEGACY_IMAGEDEPENDS}" +KEXECBOOT_IMAGEDEPENDS ?= "" + +# avoid to depend from kexecboot +EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" IMAGE_LINGUAS = "" diff --git a/recipes/libssh/libssh-native_0.2.bb b/recipes/libssh/libssh-native_0.2.bb new file mode 100644 index 0000000000..289161d329 --- /dev/null +++ b/recipes/libssh/libssh-native_0.2.bb @@ -0,0 +1,4 @@ +require libssh_${PV}.bb +inherit native +DEPENDS = "" + diff --git a/recipes/libssh/libssh_0.11.bb b/recipes/libssh/libssh_0.11.bb deleted file mode 100644 index 833567ebb0..0000000000 --- a/recipes/libssh/libssh_0.11.bb +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "The SSH library is a C library to authenticate in a \ -simple manner to one or more SSH servers. The goal of this project \ -is to provide a library much simpler to use than OpenSSHs one. It \ -includes SFTP support, and a sample SSH client is provided." -DEPENDS = "openssl" -LICENSE = "LGPL" - -DEFAULT_PREFERENCE="-1" - -SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz" - -inherit autotools - -EXTRA_OECONF = "--cache-file=${S}/config.cache" - -do_stage () { - set -x - install -d ${STAGING_INCDIR}/libssh - for i in crypto.h libssh.h sftp.h ssh2.h; do - install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/ - done - oe_libinsta |
