diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-11-11 09:12:43 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-11-11 09:12:43 +0100 |
| commit | e29d9570bbee5d8d721517a413b9dbf1f9b6892e (patch) | |
| tree | e0040ffa4135e1b65bbdcd462b12d49ddab6a5c9 /recipes | |
| parent | 87df1cab8dd6ca28ec1fccf67e0f77f426e25e25 (diff) | |
| parent | caec0ee3d05082277c1af4863b6d653109f5714e (diff) | |
Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
72 files changed, 337 insertions, 372 deletions
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 006e6a3250..db4475cd5c 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -61,15 +61,17 @@ do_stage () { python do_package_append() { # Change permissions back the way they were, they probably had a reason... - workdir = bb.data.getVar('WORKDIR', d, 1) - os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) + pkgdest = bb.data.getVar('PKGDEST', d, 1) + os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle" + +cups_config_mangle() { # Undo mangle of cups_datadir and cups_serverbin sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \ -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \ - -i ${STAGING_BINDIR_CROSS}/cups-config + -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config } PACKAGES =+ "${PN}-lib ${PN}-libimage" diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index 17da17cb08..bfc461edbc 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -3,9 +3,9 @@ AUTHOR = "Team FSO" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee" -DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics misc-vapi'.split())]}" +DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" PV = "invalid, please override" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" S = "${WORKDIR}/git/${PN}" diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 4a14b25aef..002624fc2b 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.0.1.0+gitr${SRCREV}" +DEPENDS += "libnl2" +PV = "0.1.0.0+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 5c4867a699..3a268105d7 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,6 +1,5 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "misc-vapi" PV = "0.8.2.0+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index 7c70da4fb9..fd2eb2e19f 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "misc-vapi libfsobasics" +DEPENDS += "libfsobasics" PV = "0.2.0.0+gitr${SRCREV}" PR = "${INC_PR}.1" diff --git a/recipes/freesmartphone/libfsotransport_git.bb b/recipes/freesmartphone/libfsotransport_git.bb index c23896ee24..a87fe6cf49 100644 --- a/recipes/freesmartphone/libfsotransport_git.bb +++ b/recipes/freesmartphone/libfsotransport_git.bb @@ -1,5 +1,4 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org transport library" -DEPENDS += "misc-vapi" PV = "0.9.4+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/misc-vapi_git.bb b/recipes/freesmartphone/misc-vapi_git.bb deleted file mode 100644 index 8c4a22f5d9..0000000000 --- a/recipes/freesmartphone/misc-vapi_git.bb +++ /dev/null @@ -1,4 +0,0 @@ -require cornucopia.inc -DEPENDS = "alsa-lib" -PV = "0.2.0+git${SRCREV}" -PR = "${INC_PR}.0" diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index a0a7dfab74..efe8ee8787 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -83,12 +83,12 @@ do_configure () { if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world - echo "NATIVE_SYSTEM_HEADER_DIR = ${layout_includedir}" > ${T}/t-oe + echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe sed 's%^tmake_file=.*$%& ${T}/t-oe%' < ${S}/gcc/Makefile.in >${S}/gcc/Makefile.in.new mv ${S}/gcc/Makefile.in.new ${S}/gcc/Makefile.in cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${S}/gcc/defaults.h.new echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new - echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h.new + echo "#define STANDARD_INCLUDE_DIR \"${target_includedir}\"" >> ${S}/gcc/defaults.h.new echo "#endif" >> ${S}/gcc/defaults.h.new echo "#endif /* ! GCC_DEFAULTS_H */" >> ${S}/gcc/defaults.h.new mv ${S}/gcc/defaults.h.new ${S}/gcc/defaults.h diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index b526ff3cc4..980f7929ff 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -2,8 +2,8 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc index 15e5fa62fc..a2c4445578 100644 --- a/recipes/gcc/gcc-cross-initial.inc +++ b/recipes/gcc/gcc-cross-initial.inc @@ -4,7 +4,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --with-newlib \ --without-headers \ --disable-shared \ diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc index 4746140346..ccfa2b44b8 100644 --- a/recipes/gcc/gcc-cross-intermediate.inc +++ b/recipes/gcc/gcc-cross-intermediate.inc @@ -5,7 +5,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --enable-shared \ --disable-multilib \ --disable-threads \ @@ -18,8 +18,8 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ do_stage_append () { # get rid of dummy libc.so - if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then - rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so + if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then + rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so fi } diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 9a9eb8ca56..6a7460664f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -7,4 +7,4 @@ require gcc-package-sdk.inc DEPENDS += "gmp-native mpfr-native" -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index ab52a9ae04..9c67c7e119 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \ --enable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 6be2538cd5..ed39d3176d 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb index 081b3c0aab..88e26c509b 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 3352e41dcb..2e4fcf25a6 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " \ --disable-libgomp \ --disable-libunwind-exceptions \ --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ " #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 29ee187785..22937da3c4 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc index 3fa6f61f0d..3485824b8a 100644 --- a/recipes/gcc/gcc-cross.inc +++ b/recipes/gcc/gcc-cross.inc @@ -5,6 +5,7 @@ target_libdir := "${libdir}" target_includedir := "${includedir}" target_base_libdir := "${base_libdir}" +target_prefix := "${prefix}" inherit cross diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index 9513c657f3..def05869d8 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -5,4 +5,4 @@ require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index 08ae7a552c..e96867e682 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -7,4 +7,4 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index 85f90b31a1..2367d196c9 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/ |