diff options
Diffstat (limited to 'meta-oe/recipes-support')
82 files changed, 706 insertions, 710 deletions
diff --git a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb index bd11f0da1c..5ab92fce7e 100644 --- a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb +++ b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb @@ -15,25 +15,25 @@ EXTRA_OECONF = "--enable-usb \ --with-distname=${DISTRO}" do_configure() { - export topdir=${S} - cp -a ${S}/autoconf/configure.in ${S} + export topdir=${S} + cp -a ${S}/autoconf/configure.in ${S} - if ! [ -d ${S}/platforms/${DISTRO} ] ; then - cp -a ${S}/platforms/unknown ${S}/platforms/${DISTRO} - fi + if ! [ -d ${S}/platforms/${DISTRO} ] ; then + cp -a ${S}/platforms/unknown ${S}/platforms/${DISTRO} + fi - gnu-configize --force - # install --help says '-c' is an ignored option, but it turns out that the argument to -c isn't ignored, so drop the complete '-c path/to/strip' line - sed -i -e 's:$(INSTALL_PROGRAM) $(STRIP):$(INSTALL_PROGRAM):g' ${S}/autoconf/targets.mak - # Searching in host dirs triggers the QA checks - sed -i -e 's:-I/usr/local/include::g' -e 's:-L/usr/local/lib64::g' -e 's:-L/usr/local/lib::g' ${S}/configure + gnu-configize --force + # install --help says '-c' is an ignored option, but it turns out that the argument to -c isn't ignored, so drop the complete '-c path/to/strip' line + sed -i -e 's:$(INSTALL_PROGRAM) $(STRIP):$(INSTALL_PROGRAM):g' ${S}/autoconf/targets.mak + # Searching in host dirs triggers the QA checks + sed -i -e 's:-I/usr/local/include::g' -e 's:-L/usr/local/lib64::g' -e 's:-L/usr/local/lib::g' ${S}/configure - # m4 macros are missing, using autotools_do_configure leads to linking errors with gethostname_re - oe_runconf + # m4 macros are missing, using autotools_do_configure leads to linking errors with gethostname_re + oe_runconf } do_install_append() { - rm ${D}${datadir}/hal -rf + rm ${D}${datadir}/hal -rf } diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb index 8e344fd78d..171d6a07cf 100644 --- a/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb +++ b/meta-oe/recipes-support/ca-certificates/ca-certificates-cross_20130119.bb @@ -1,12 +1,12 @@ require ca-certificates-${PV}.inc do_install() { - install -d ${D}${bindir_crossscripts} - install -m755 ${S}/sbin/update-ca-certificates ${D}${bindir_crossscripts} + install -d ${D}${bindir_crossscripts} + install -m755 ${S}/sbin/update-ca-certificates ${D}${bindir_crossscripts} } SYSROOT_PREPROCESS_FUNCS += "ca_certificates_sysroot_preprocess" ca_certificates_sysroot_preprocess() { - sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} + sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} } diff --git a/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb b/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb index a1eb1c478e..504190fd59 100644 --- a/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb +++ b/meta-oe/recipes-support/ca-certificates/ca-certificates_20130119.bb @@ -5,22 +5,22 @@ require ca-certificates-${PV}.inc inherit autotools do_install_prepend() { - mkdir -p ${D}/usr/share/ca-certificates - mkdir -p ${D}/usr/sbin - mkdir -p ${D}/etc/ssl/certs - mkdir -p ${D}/etc/ca-certificates/update.d + mkdir -p ${D}/usr/share/ca-certificates + mkdir -p ${D}/usr/sbin + mkdir -p ${D}/etc/ssl/certs + mkdir -p ${D}/etc/ca-certificates/update.d } do_install_append() { - cd ${D}/usr/share/ca-certificates - echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf - echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf - echo "#" >> ${D}/etc/ca-certificates.conf - for crt in $(find . -type f -name '*.crt' -print) - do - crt=$(echo $crt | sed -e 's/\.\///') - echo $crt >> ${D}/etc/ca-certificates.conf - done + cd ${D}/usr/share/ca-certificates + echo "# Lines starting with # will be ignored" > ${D}/etc/ca-certificates.conf + echo "# Lines starting with ! will remove certificate on next update" >> ${D}/etc/ca-certificates.conf + echo "#" >> ${D}/etc/ca-certificates.conf + for crt in $(find . -type f -name '*.crt' -print) + do + crt=$(echo $crt | sed -e 's/\.\///') + echo $crt >> ${D}/etc/ca-certificates.conf + done } pkg_postinst_${PN} () { diff --git a/meta-oe/recipes-support/ckermit/ckermit_301.bb b/meta-oe/recipes-support/ckermit/ckermit_301.bb index 4074cf09f7..c46369fe91 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_301.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_301.bb @@ -23,35 +23,35 @@ CKERMIT_ADDITIONAL_libc-uclibc = "-DNOARROWKEYS" TARGET_CC_ARCH += "${LDFLAGS}" do_compile () { - # The original makefile doesn't differentiate between CC and CC_FOR_BUILD, - # so we build wart manually. Note that you need a ckwart.o with the proper - # timestamp to make this hack work: - ${BUILD_CC} -c ckwart.c - ${BUILD_CC} -o wart ckwart.o - ./wart ckcpro.w ckcpro.c + # The original makefile doesn't differentiate between CC and CC_FOR_BUILD, + # so we build wart manually. Note that you need a ckwart.o with the proper + # timestamp to make this hack work: + ${BUILD_CC} -c ckwart.c + ${BUILD_CC} -o wart ckwart.o + ./wart ckcpro.w ckcpro.c - # read ${S}/ckccfg.txt to understand this :-) - oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \ - -DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \ - -DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \ - -DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \ - -DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \ - -DNOB_460K -DNOB_921K \ - -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \ - -DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \ - -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \ - -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ - -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ - -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ - ${CKERMIT_ADDITIONAL}" + # read ${S}/ckccfg.txt to understand this :-) + oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \ + -DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \ + -DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \ + -DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \ + -DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \ + -DNOB_460K -DNOB_921K \ + -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \ + -DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \ + -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \ + -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ + -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ + -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ + ${CKERMIT_ADDITIONAL}" } do_install () { - install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR} - oe_runmake 'DESTDIR=${D}' install - # Fix up dangling symlink - rm ${D}${BINDIR}/kermit-sshsub - (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) + install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR} + oe_runmake 'DESTDIR=${D}' install + # Fix up dangling symlink + rm ${D}${BINDIR}/kermit-sshsub + (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) } SRC_URI[md5sum] = "59e80f909edf305933af8e0348dcc5d7" diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb index 809a8a285e..bd631af8e6 100644 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb @@ -10,7 +10,7 @@ SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" SRC_URI = "git://github.com/emagii/cpufrequtils.git \ file://0001-dont-unset-cflags.patch \ - " +" CFLAGS_append_libc-uclibc = " ${@['-DNLS', '-UNLS']['${USE_NLS}' == 'no']} " @@ -23,10 +23,10 @@ TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo" do_compile() { - oe_runmake + oe_runmake } do_install() { - oe_runmake -e install DESTDIR=${D} + oe_runmake -e install DESTDIR=${D} } diff --git a/meta-oe/recipes-support/cramfs/cramfs_1.1.bb b/meta-oe/recipes-support/cramfs/cramfs_1.1.bb index aa397a9c4e..14d9754560 100644 --- a/meta-oe/recipes-support/cramfs/cramfs_1.1.bb +++ b/meta-oe/recipes-support/cramfs/cramfs_1.1.bb @@ -17,13 +17,13 @@ EXTRA_OEMAKE = "\ " do_compile_prepend() { - ln -sf GNUmakefile Makefile + ln -sf GNUmakefile Makefile } do_install() { - install -d ${D}${bindir} - install mkcramfs ${D}${bindir} - install cramfsck ${D}${bindir} + install -d ${D}${bindir} + install mkcramfs ${D}${bindir} + install cramfsck ${D}${bindir} } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb index 438d394e28..17ac2ad462 100644 --- a/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb +++ b/meta-oe/recipes-support/cryptsetup/cryptsetup_1.6.1.bb @@ -28,4 +28,4 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ kernel-module-md5 \ kernel-module-cbc \ kernel-module-sha256-generic \ - " +" diff --git a/meta-oe/recipes-support/debianutils/debianutils_2.30.bb b/meta-oe/recipes-support/debianutils/debianutils_2.30.bb index 0a532e93bf..e6c03eb557 100644 --- a/meta-oe/recipes-support/debianutils/debianutils_2.30.bb +++ b/meta-oe/recipes-support/debianutils/debianutils_2.30.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f inherit autotools do_configure_prepend() { - sed -i -e 's:tempfile.1 which.1:which.1:g' Makefile.am + sed -i -e 's:tempfile.1 which.1:which.1:g' Makefile.am } do_install_append() { @@ -30,11 +30,9 @@ pkg_prerm_${PN} () { if [ "x$D" != "x" ]; then echo "can't do u-a offline" ; exit 1 else - for app in add-shell installkernel mkboot remove-shell run-parts savelog sensible-browser sensible-editor sensible-pager tempfile which ; do update-alternatives --remove $app $app.${PN} done - fi } @@ -42,7 +40,6 @@ pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then echo "can't do u-a offline" ; exit 1 else - for app in add-shell installkernel mkboot remove-shell ; do update-alternatives --install ${sbindir}/$app $app $app.${PN} 100 done @@ -54,7 +51,6 @@ else for app in run-parts tempfile ; do update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100 done - fi } diff --git a/meta-oe/recipes-support/devicekit/devicekit-power_014.bb b/meta-oe/recipes-support/devicekit/devicekit-power_014.bb index 069a5985fb..daf76d34d6 100644 --- a/meta-oe/recipes-support/devicekit/devicekit-power_014.bb +++ b/meta-oe/recipes-support/devicekit/devicekit-power_014.bb @@ -15,14 +15,14 @@ inherit autotools pkgconfig EXTRA_OECONF = " --with-backend=linux" do_configure_prepend() { - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} + sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am + sed -i -e 's: doc : :g' ${S}/Makefile.am +} FILES_${PN} += "${datadir}/dbus-1/ \ ${datadir}/polkit-1/ \ ${base_libdir}/udev/* \ - " +" FILES_${PN}-dbg += "${base_libdir}/udev/.debug" diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb index b99752d478..0b45412269 100644 --- a/meta-oe/recipes-support/devmem2/devmem2.bb +++ b/meta-oe/recipes-support/devmem2/devmem2.bb @@ -10,12 +10,12 @@ S = "${WORKDIR}" CFLAGS += "-DFORCE_STRICT_ALIGNMENT" do_compile() { - ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} + ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} } do_install() { - install -d ${D}${bindir} - install devmem2 ${D}${bindir} + install -d ${D}${bindir} + install devmem2 ${D}${bindir} } SRC_URI[md5sum] = "be12c0132a1ae118cbf5e79d98427c1d" diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb index 4a830a36b2..ce6e566fa7 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.4.bb @@ -9,10 +9,10 @@ FILESPATH =. "${FILE_DIRNAME}/${BPN}-${PV}:" SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch" do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} - rm -f ${DEPLOY_DIR_TOOLS}/dfu-util - ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} + rm -f ${DEPLOY_DIR_TOOLS}/dfu-util + ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util } diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb index c103509d13..4bed46aa70 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_svn.bb @@ -6,10 +6,10 @@ do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" DEPENDS = "libusb-compat usbpath-native" do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} - rm -f ${DEPLOY_DIR_TOOLS}/dfu-util - ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV} + rm -f ${DEPLOY_DIR_TOOLS}/dfu-util + ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util } diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb b/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb index 0ac8fa3281..26ab3b6e01 100644 --- a/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb +++ b/meta-oe/recipes-support/digitemp/digitemp_3.6.0.bb @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "14cfc584cd3714fe8c9a2cdc8388be49e08b5e395d95e6bcd11d4410e2 EXTRA_OEMAKE = "ds9097 ds9097u \ SYSTYPE='Linux' \ - " +" # Fix GNU_HASH QA errors TARGET_CC_ARCH += "${CFLAGS} ${LDFLAGS}" diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc index a82371338a..5068596a16 100644 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ b/meta-oe/recipes-support/emacs/emacs.inc @@ -9,11 +9,11 @@ DEPENDS += "qemu-native" DEPENDS +=" liblockfile" X11DEPENDS = " \ - libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ - jpeg xz pixman libpng librsvg tiff libcroco \ - libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ - libxft libxpm libxrandr libxrender \ - gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \ + libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ + jpeg xz pixman libpng librsvg tiff libcroco \ + libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ + libxft libxpm libxrandr libxrender \ + gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \ " EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " @@ -45,100 +45,100 @@ QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} " export LOGNAME = "$(whoami)" do_compile_prepend() { - sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib" + sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib" # Ugly hack, see files/use-qemu.patch for more: - ln -sf ../src/emacs lisp/emacs - ln -sf ../src/emacs lib-src/emacs - ln -sf ../src/emacs leim/emacs + ln -sf ../src/emacs lisp/emacs + ln -sf ../src/emacs lib-src/emacs + ln -sf ../src/emacs leim/emacs #copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass - treedir=${TREEDIR} - if [ -e $treedir ];then - rm -rf $treedir - fi - - mkdir -p $treedir/${base_libdir} - - if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then - cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} - fi - if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then - cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} - fi - # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails - # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one - if [ ! -f $treedir/${base_libdir}/libc.so ]; then - ln -s libc.so.6 $treedir/${base_libdir}/libc.so - fi - - # copy only as much stuff as we need - # before: 5.5G ../../qemu-treedir/ - # after: 17M ../../qemu-treedir/ - cp -pPR \ - ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ - ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ - - if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then - echo "X11 build enabled" - # copy only as much stuff as we need - # before: 5.5G ../../qemu-treedir/ - # after: 86M ../../qemu-treedir/ - cp -pPR \ - ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/ - - # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ - - # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ - - # pango pangocairo pangoft2 - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ - - # xcb-render xcb-shm xcb - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ - fi + treedir=${TREEDIR} + if [ -e $treedir ];then + rm -rf $treedir + fi + + mkdir -p $treedir/${base_libdir} + + if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then + cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} + fi + if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then + cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} + fi + # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails + # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one + if [ ! -f $treedir/${base_libdir}/libc.so ]; then + ln -s libc.so.6 $treedir/${base_libdir}/libc.so + fi + + # copy only as much stuff as we need + # before: 5.5G ../../qemu-treedir/ + # after: 17M ../../qemu-treedir/ + cp -pPR \ + ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ + ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ + ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ + + if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then + echo "X11 build enabled" + # copy only as much stuff as we need + # before: 5.5G ../../qemu-treedir/ + # after: 86M ../../qemu-treedir/ + cp -pPR \ + ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \ + ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/ + + # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender + cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ + + # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 + cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ + + # pango pangocairo pangoft2 + cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ + + # xcb-render xcb-shm xcb + cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ + fi } do_install_append() { - # freaks package.bbclass and whole bitbake call returns error code - # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed - mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO + # freaks package.bbclass and whole bitbake call returns error code + # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed + mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO } EXTRA_OEMAKE += 'QEMU="${QEMU}"' diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.9.bb index 5472af4e59..ba6d70df4c 100644 --- a/meta-oe/recipes-support/enca/enca_1.9.bb +++ b/meta-oe/recipes-support/enca/enca_1.9.bb @@ -6,10 +6,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ - file://configure-hack.patch \ - file://dont-run-tests.patch \ - file://configure-remove-dumbness.patch \ - file://makefile-remove-tools.patch " + file://configure-hack.patch \ + file://dont-run-tests.patch \ + file://configure-remove-dumbness.patch \ + file://makefile-remove-tools.patch " SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" @@ -19,13 +19,13 @@ inherit autotools EXTRA_OECONF = "--with-libiconv-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" do_configure_prepend() { - # remove failing test which checks for something that isn't even used - sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac + # remove failing test which checks for something that isn't even used + sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' configure.ac } do_configure_append() { - sed -i s:-I/usr/include::g Makefile - sed -i s:-I/usr/include::g */Makefile + sed -i s:-I/usr/include::g Makefile + sed -i s:-I/usr/include::g */Makefile } do_compile() { diff --git a/meta-oe/recipes-support/espeak/espeak-data_1.37.bb b/meta-oe/recipes-support/espeak/espeak-data_1.37.bb index d15d49690b..914bf36013 100644 --- a/meta-oe/recipes-support/espeak/espeak-data_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak-data_1.37.bb @@ -9,18 +9,18 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" TARGET_ARCH = "${MACHINE_ARCH}" do_compile() { - # Fixing byte order of phoneme data files - cd "${S}/platforms/big_endian" - sed -i '/^ *CC *=/d' Makefile - sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c - oe_runmake - ./espeak-phoneme-data "${S}/espeak-data" - cp -f phondata phonindex phontab "${S}/espeak-data" + # Fixing byte order of phoneme data files + cd "${S}/platforms/big_endian" + sed -i '/^ *CC *=/d' Makefile + sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c + oe_runmake + ./espeak-phoneme-data "${S}/espeak-data" + cp -f phondata phonindex phontab "${S}/espeak-data" } do_install() { - install -d ${D}${layout_datadir}/espeak-data - install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data + install -d ${D}${layout_datadir}/espeak-data + install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data } SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02" diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb index 6cc4cd4107..c7f4b521c3 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.37.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb @@ -13,30 +13,30 @@ TARGET_CC_ARCH += "${LDFLAGS}" FILES_${PN} += "${datadir}/espeak-data" do_configure() { - # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19 - cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h" + # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19 + cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h" } do_compile() { - cd src - oe_runmake + cd src + oe_runmake } do_install() { - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${includedir} - install -d ${D}${datadir}/espeak-data - - # we do not ship "speak" binary though. - install -m 0755 ${S}/src/espeak ${D}${bindir} - install -m 0644 ${S}/src/speak_lib.h ${D}${includedir} - oe_libinstall -so -C src libespeak ${D}${libdir} - - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - # the big-endian phon* files are provided by the package espeak-data - rm -f ${S}/espeak-data/phon* - fi - - cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data + install -d ${D}${bindir} + install -d ${D}${libdir} + install -d ${D}${includedir} + install -d ${D}${datadir}/espeak-data + + # we do not ship "speak" binary though. + install -m 0755 ${S}/src/espeak ${D}${bindir} + install -m 0644 ${S}/src/speak_lib.h ${D}${includedir} + oe_libinstall -so -C src libespeak ${D}${libdir} + + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + # the big-endian phon* files are provided by the package espeak-data + rm -f ${S}/espeak-data/phon* + fi + + cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data } diff --git a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb index fe94fc4b19..5abf1d7d22 100644 --- a/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb +++ b/meta-oe/recipes-support/farsight/farsight2_0.0.22.bb @@ -12,9 +12,9 @@ DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" inherit autotools EXTRA_OECONF = " \ - --disable-debug \ - --disable-gtk-doc \ - --disable-python \ + --disable-debug \ + --disable-gtk-doc \ + --disable-python \ " FILES_${PN} += "${libdir}/*/*.so" diff --git a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb index 48ca0a58fd..94ec9a2128 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.0.13.bb +++ b/meta-oe/recipes-support/farsight/libnice_0.0.13.bb @@ -21,11 +21,11 @@ FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" do_compile_append() { - for i in $(find ${S} -name "*.pc") ; do - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done + for i in $(find ${S} -name "*.pc") ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done } diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb index 9fe2728d20..88d4f5eeae 100644 --- a/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb @@ -21,10 +21,10 @@ inherit autotools update-alternatives PARALLEL_MAKE = "" do_install() { - install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5 - install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real - install -m 0644 ${WORKDIR}/${P}/*.5 ${D}${datadir}/man/man5 - install -m 0644 ${WORKDIR}/${P}/*.8 ${D}${datadir}/man/man8 + install -d ${D}${sbindir} ${D}${datadir}/man/man8 ${D}${datadir}/man/man5 + install -m 0755 ${WORKDIR}/${P}/fbset ${D}${sbindir}/fbset.real + install -m 0644 ${WORKDIR}/${P}/*.5 ${D}${datadir}/man/man5 + install -m 0644 ${WORKDIR}/${P}/*.8 ${D}${datadir}/man/man8 } ALTERNATIVE_fbset = "fbset" diff --git a/meta-oe/recipes-support/fbtest/fb-test_git.bb b/meta-oe/recipes-support/fbtest/fb-test_git.bb index 43acfd6b89..eea1be4d8b 100644 --- a/meta-oe/recipes-support/fbtest/fb-test_git.bb +++ b/meta-oe/recipes-support/fbtest/fb-test_git.bb @@ -11,9 +11,9 @@ SRC_URI = "git://github.com/prpplague/fb-test-app.git" S = "${WORKDIR}/git" do_install() { - install -d ${D}${bindir} - for prog in perf rect fb-test offset ; do - install -m 0755 $prog ${D}${bindir} - done + install -d ${D}${bindir} + for prog in perf rect fb-test offset ; do + install -m 0755 $prog ${D}${bindir} + done } diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc index 80fc656abb..074a53b36f 100644 --- a/meta-oe/recipes-support/fftw/fftw.inc +++ b/meta-oe/recipes-support/fftw/fftw.inc @@ -12,7 +12,7 @@ S = "${WORKDIR}/fftw-${PV}" inherit autotools pkgconfig do_configure_prepend() { - echo 'AM_PROG_AS' >> ${S}/configure.ac + echo 'AM_PROG_AS' >> ${S}/configure.ac } PACKAGES =+ "lib${PN}" diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb index a7b8b6789f..e2989d6e34 100644 --- a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb +++ b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb @@ -1,8 +1,8 @@ require fftw.inc EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared \ - --enable-threads \ - ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ + --enable-threads \ + ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ " SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2" diff --git a/meta-oe/recipes-support/flite/flite.inc b/meta-oe/recipes-support/flite/flite.inc index a0d718cb49..b9d5e5aa62 100644 --- a/meta-oe/recipes-support/flite/flite.inc +++ b/meta-oe/recipes-support/flite/flite.inc @@ -18,9 +18,9 @@ PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16" FILES_${PN} = "${bindir}" FILES_lib${PN} ="${libdir}/libflite.so.* \ - ${libdir}/libflite_cmu_time_awb.so.* \ - ${libdir}/libflite_cmulex.so.* \ - ${libdir}/libflite_usenglish.so.*" + ${libdir}/libflite_cmu_time_awb.so.* \ + ${libdir}/libflite_cmulex.so.* \ + ${libdir}/libflite_usenglish.so.*" FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*" @@ -29,5 +29,5 @@ FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*" LEAD_SONAME = "libflite.so" do_install() { - oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install + oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install } diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb index bf218ee6e5..6b7a1afefa 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl file://disable_test.patch \ file://dso-fix.patch \ file://libpng15.patch \ - " +" S = "${WORKDIR}/fltk-${PV}" diff --git a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb index b558c4dcfb..b6c2a9e53f 100644 --- a/meta-oe/recipes-support/fuse/fuse_2.9.2.bb +++ b/meta-oe/recipes-support/fuse/fuse_2.9.2.bb @@ -10,7 +10,7 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \ file://gold-unversioned-symbol.patch \ file://aarch64.patch \ - " +" SRC_URI[md5sum] = "7d80d0dc9cc2b9199a0c53787c151205" SRC_URI[sha256sum] = "81a728fb3f87da33063068735e2fb7e2cd89df207d32687d3d3278385279cefc" @@ -36,5 +36,5 @@ DEBIAN_NOAUTONAME_fuse-utils = "1" DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" do_install_append() { - rm -rf ${D}${base_prefix}/dev + rm -rf ${D}${base_prefix}/dev } diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb index 5db2e61e54..ba8b6195ff 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb @@ -3,11 +3,11 @@ require gsoap_${PV}.inc DEPENDS = "gsoap-native openssl" do_install_append() { - install -d ${D}${libdir} - for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck - do - oe_libinstall -C gsoap $lib ${D}${libdir} - done + install -d ${D}${libdir} + for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck + do + oe_libinstall -C gsoap $lib ${D}${libdir} + done } FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc index 30cf9a6d41..9e2a7825f6 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b338b08b1b61e028e0f399a4de25e58f" SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.zip \ - " +" inherit autotools diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index 9483b5c17b..9da2ee0df9 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb @@ -10,7 +10,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta file://hddtemp-0.3-beta15-autodetect-717479.patch \ file://hddtemp.db \ file://init \ - " +" SRC_URI[md5sum] = "8b829339e1ae9df701684ec239021bb8" SRC_URI[sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b" @@ -22,10 +22,10 @@ inherit autotools gettext update-rc.d FILES_${PN} += "/usr/share/misc/hddtemp.db" do_install_append() { - install -d ${D}/usr/share/misc/ - install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db - install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp + install -d ${D}/usr/share/misc/ + install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db + install -d ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp } INITSCRIPT_NAME = "hddtemp" diff --git a/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb b/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb index e504f61851..3d76f8b3cf 100644 --- a/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb +++ b/meta-oe/recipes-support/i2c-tools/i2c-tools_3.1.0.bb @@ -7,20 +7,20 @@ RDEPENDS_${PN} += "perl" SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/i2c-tools/i2c-tools-3.1.0.tar.bz2/f15019e559e378c6e9d5d6299a00df21/i2c-tools-${PV}.tar.bz2 \ file://Module.mk \ - " +" SRC_URI[md5sum] = "f15019e559e378c6e9d5d6299a00df21" SRC_URI[sha256sum] = "960023f61de292c6dd757fcedec4bffa7dd036e8594e24b26a706094ca4c142a" inherit autotools do_compile_prepend() { - cp ${WORKDIR}/Module.mk ${S}/eepromer/ - sed -i 's#/usr/local#/usr#' Makefile - echo "include eepromer/Module.mk" >> Makefile + cp ${WORKDIR}/Module.mk ${S}/eepromer/ + sed -i 's#/usr/local#/usr#' Makefile + echo "include eepromer/Module.mk" >> Makefile } do_install_append() { - install -d ${D}${includedir}/linux - install -m 0644 include/linux/i2c-dev.h ${D}${includedir}/linux/i2c-dev-user.h - rm -f ${D}${includedir}/linux/i2c-dev.h + install -d ${D}${includedir}/linux + install -m 0644 include/linux/i2c-dev.h ${D}${includedir}/linux/i2c-dev-user.h + rm -f ${D}${includedir}/linux/i2c-dev.h } diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb index 9f3d4eac4e..2f0fad5ea5 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb @@ -10,8 +10,8 @@ PR = "r5" PATCHSET = "6" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ file://PerlMagic_MakePatch.patch \ - file://remove.dist-lzip.patch \ - " + file://remove.dist-lzip.patch \ +" SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" diff --git a/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc b/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc index caf2b0b71e..264b49a538 100644 --- a/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc +++ b/meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc @@ -40,7 +40,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ --without-libradius \ --without-gssapi \ --without-libpam \ - --disable-security-context" + --disable-security-context" # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 CFLAGS += "-fno-strict-aliasing" diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 9e7d2fcd8c..e1e5ff28f7 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" inherit autotools lib_package do_install_append() { - sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la + sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la } PACKAGES =+ "${PN}-dev-vala" diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb index a6d68d4eb5..89cbce00ff 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb @@ -14,15 +14,15 @@ SRC_URI[md5sum] = "2594093a5d61047bd9cc87e955f86df8" SRC_URI[sha256sum] = "127a5ef07805856d63758e5180ebfb241d1f80094fd301c287591a15b8cfcd72" EXTRA_OECONF = "\ - --enable-null \ - --enable-alsa \ - --enable-gstreamer \ - --enable-pulse \ - --disable-oss \ - --enable-gtk \ - --enable-gtk3 \ - --disable-tdb \ - --disable-lynx \ + --enable-null \ + --enable-alsa \ + --enable-gstreamer \ + --enable-pulse \ + --disable-oss \ + --enable-gtk \ + --enable-gtk3 \ + --disable-tdb \ + --disable-lynx \ " python populate_packages_prepend() { diff --git a/meta-oe/recipes-support/libftdi/libftdi_0.19.bb b/meta-oe/recipes-support/libftdi/libftdi_0.19.bb index 0bfbe2212d..2b8068bf56 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_0.19.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_0.19.bb @@ -9,14 +9,14 @@ PR = "r1" LICENSE = "LGPLv2.1 GPLv2" LIC_FILES_CHKSUM= "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LIB;md5=db979804f025cf55aabec7129cb671ed \ - " +" DEPENDS = "virtual/libusb0" DEPENDS_virtclass-native = "virtual/libusb0-native" SRC_URI = "http://www.intra2net.com/en/developer/libftdi/download/libftdi-${PV}.tar.gz \ file://libtool-m4.patch \ - " +" SRC_URI[md5sum] = "e6e25f33b4327b1b7aa1156947da45f3" SRC_URI[sha256sum] = "567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be" diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb index ce4e316c59..09e5ec2b8e 100644 --- a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb @@ -8,7 +8,7 @@ PR = "r1" SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ file://configure.patch \ - " +" S = "${WORKDIR}/SDL_ttf-${PV}" EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config " @@ -19,11 +19,11 @@ TARGET_CC_ARCH += "${LDFLAGS}" do_configure_prepend() { - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do + for i in ${MACROS}; do rm acinclude/$i - done + done } diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb index 4f15535248..60df0c6c73 100644 --- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb +++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb @@ -25,9 +25,9 @@ INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" S = "${WORKDIR}/lm_sensors-${PV}" EXTRA_OEMAKE = 'LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" \ - MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ - LIBDIR=${libdir} \ - CC="${CC}" AR="${AR}"' + MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ + LIBDIR=${libdir} \ + CC="${CC}" AR="${AR}"' do_compile() { oe_runmake user PROG_EXTRA="sensors sensord" diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index b357fd988c..157e11b924 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-user= \ --enable-pkgconfig \ --enable-dmeventd \ --with-udev-prefix= \ - " +" inherit autotools diff --git a/meta-oe/recipes-support/lzma/lzma.inc b/meta-oe/recipes-support/lzma/lzma.inc index 75e6d6780a..912d281187 100644 --- a/meta-oe/recipes-support/lzma/lzma.inc +++ b/meta-oe/recipes-support/lzma/lzma.inc @@ -21,15 +21,15 @@ do_unpack_append() { } do_compile() { - oe_runmake CFLAGS='${CFLAGS} -c' -C C/LzmaUtil - oe_runmake CXX_C='${CC} ${CFLAGS}' CXX='${CXX} ${CXXFLAGS}' \ - -C CPP/7zip/Compress/LZMA_Alone + oe_runmake CFLAGS='${CFLAGS} -c' -C C/LzmaUtil + oe_runmake CXX_C='${CC} ${CFLAGS}' CXX='${CXX} ${CXXFLAGS}' \ + -C CPP/7zip/Compress/LZMA_Alone } do_install() { - install -d ${D}${bindir} ${D}${libdir} - install -m 0755 CPP/7zip/Compress/LZMA_Alone/lzma ${D}${bindir} - oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir} + install -d ${D}${bindir} ${D}${libdir} + install -m 0755 CPP/7zip/Compress/LZMA_Alone/lzma ${D}${bindir} + oe_libinstall -a -C C/LzmaUtil liblzma ${D}${libdir} } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/maliit/maliit-framework_git.bb b/meta-oe/recipes-support/maliit/maliit-framework_git.bb index 2c4b0f8e8b..292856238d 100644 --- a/meta-oe/recipes-support/maliit/maliit-framework_git.bb +++ b/meta-oe/recipes-support/maliit/maliit-framework_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://gitorious.org/maliit/maliit-framework.git;branch=master \ file://0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch \ file://0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch \ file://maliit-server.desktop \ - " +" SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc" PV = "0.92.3+git${SRCPV}" @@ -30,7 +30,7 @@ FILES_${PN} += "\ ${libdir}/maliit/plugins-*/factories/libmaliit-plugins-quick-factory-*.so \ ${libdir}/qt4/plugins/inputmethods/*.so \ ${datadir}/applications/maliit-server.desktop \ - " +" FILES_${PN}-dbg += "\ ${libdir}/maliit-framework-tests \ @@ -38,7 +38,7 @@ FILES_${PN}-dbg += "\ ${libdir}/maliit/plugins-*/factories/.debug \ ${libdir}/qt4/plugins/.debug \ ${libdir}/qt4/plugins/inputmethods/.debug \ - " +" FILES_${PN}-dev += "${datadir}/qt4" @@ -46,7 +46,7 @@ FILES_${PN}-gtk +="\ ${bindir}/maliit-exampleapp-gtk* \ \ ${libdir}/gtk-*/*/immodules/libim-maliit.so\ - " +" EXTRA_QMAKEVARS_PRE = "\ PREFIX=${prefix} \ @@ -58,7 +58,7 @@ EXTRA_QMAKEVARS_PRE = "\ CONFIG+=disable-gtk-cache-update \ CONFIG+=local-install \ CONFIG+=nosdk \ - " +" EXTRA_OEMAKE += "INSTALL_ROOT=${D}" diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb index 7a1a430d07..0fc7c680ea 100644 --- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb +++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb @@ -19,12 +19,12 @@ EXTRA_QMAKEVARS_PRE = "\ PREFIX=${prefix} \ LIBDIR=${libdir} \ CONFIG+=nodoc \ - " +" FILES_${PN} += "\ ${libdir}/maliit \ ${datadir} \ - " +" FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug" diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb index 5dda2fbe58..dcd8a47d2d 100644 --- a/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb +++ b/meta-oe/recipes-support/mbuffer/mbuffer_20091227.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "e708b66f6cec9ba090877e8eb38e5627ac69aea9ebd9bca1360a29c739 inherit autotools do_configure() { - gnu-configize - oe_runconf + gnu-configize + oe_runconf } diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb index f281f6d802..e730102b12 100644 --- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb +++ b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb @@ -15,43 +15,43 @@ inherit allarch docdir_append = "/${PN}" do_install () { - install -d ${D}${sysconfdir} - install -d ${D}${libdir}/mime/packages - install -d ${D}${docdir} - install -d ${D}${sbindir} - install -d ${D}${bindir} - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man5 - install -d ${D}${mandir}/man8 - install -m 644 mime.types ${D}${sysconfdir}/ - install -m 644 mailcap ${D}${libdir}/mime/ - install -m 644 mailcap.order ${D}${sysconfdir}/ - install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 - install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 -# install -m 755 install-mime ${D}${sbindir}/ -# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 - install -m 755 update-mime ${D}${sbindir}/ - install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 - install -m 755 run-mailcap ${D}${bindir}/ - install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 -# install -m 644 rfcs/* ${D}${docdir}/ - install -m 644 debian/changelog ${D}${docdir}/changelog.Debian - install -m 644 debian/README ${D}${docdir}/copyright - install -m 755 debian-view ${D}${libdir}/mime/ - install -m 755 playaudio ${D}${libdir}/mime/ - install -m 755 playdsp ${D}${libdir}/mime/ - install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support - cd ${D}${mandir}; gzip -9fv */* - cd ${D}${docdir}; gzip -9v * - cd ${D}${docdir}; gunzip copyright.gz - cd ${D}${bindir}; ln -s run-mailcap see - cd ${D}${bindir}; ln -s run-mailcap edit - cd ${D}${bindir}; ln -s run-mailcap compose - cd ${D}${bindir}; ln -s run-mailcap print - cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz - cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz - cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz - cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz + install -d ${D}${sysconfdir} + install -d ${D}${libdir}/mime/packages + install -d ${D}${docdir} + install -d ${D}${sbindir} + install -d ${D}${bindir} + install -d ${D}${mandir}/man1 + install -d ${D}${mandir}/man5 + install -d ${D}${mandir}/man8 + install -m 644 mime.types ${D}${sysconfdir}/ + install -m 644 mailcap ${D}${libdir}/mime/ + install -m 644 mailcap.order ${D}${sysconfdir}/ + install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 + install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 +# install -m 755 install-mime ${D}${sbindir}/ +# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 + install -m 755 update-mime ${D}${sbindir}/ + install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 + install -m 755 run-mailcap ${D}${bindir}/ + install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 +# install -m 644 rfcs/* ${D}${docdir}/ + install -m 644 debian/changelog ${D}${docdir}/changelog.Debian + install -m 644 debian/README ${D}${docdir}/copyright + install -m 755 debian-view ${D}${libdir}/mime/ + install -m 755 playaudio ${D}${libdir}/mime/ + install -m 755 playdsp ${D}${libdir}/mime/ + install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support + cd ${D}${mandir}; gzip -9fv */* + cd ${D}${docdir}; gzip -9v * + cd ${D}${docdir}; gunzip copyright.gz + cd ${D}${bindir}; ln -s run-mailcap see + cd ${D}${bindir}; ln -s run-mailcap edit + cd ${D}${bindir}; ln -s run-mailcap compose + cd ${D}${bindir}; ln -s run-mailcap print + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz + cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz } SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" diff --git a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb index 3150013fa3..56260975dc 100644 --- a/meta-oe/recipes-support/mini-iconv/mini-iconv.bb +++ b/meta-oe/recipes-support/mini-iconv/mini-iconv.bb @@ -17,5 +17,5 @@ SRC_URI[sha256sum] = "3552262bf1bcf8e859a2a3a7adfb0367af8593383e730c492e981477aa S = "${WORKDIR}/${PN}" do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir} + oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIB=${base_libdir} } diff --git a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb index b2bbfc4aa6..dcaf0c69c3 100644 --- a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb +++ b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb @@ -12,12 +12,12 @@ EXTRA_OEMAKE = "" EXTRA_OECONF = " --with-embedded-server " do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ } SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index af0ddbb5c0..3d79e193d6 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -35,13 +35,13 @@ EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " do_configure_append() { - sed -i /comp_err/d ${S}/sql/share/Makefile + sed -i /comp_err/d ${S}/sql/share/Makefile - # handle distros with different values of ${libexecdir} - libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` - sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh - sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh - sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh + # handle distros with different values of ${libexecdir} + libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` + sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh + sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh + sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh } SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" @@ -52,45 +52,45 @@ SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" # plugindir is not fixed, but we don't create any plugins. # mysql5_sysroot_preprocess () { - sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config - sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config } do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql - install -d ${D}/etc/init.d - install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ - install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld + install -d ${D}/etc/init.d + install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ + install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld } pkg_postinst_mysql5-server () { - if [ "x$D" != "x" ]; then - exit 1 - fi + if [ "x$D" != "x" ]; then + exit 1 + fi - grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql + grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql - #Install the database - test -d /usr/bin || mkdir -p /usr/bin - test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname - mkdir /var/lib/mysql - chown mysql.nogroup /var/lib/mysql + #Install the database + test -d /usr/bin || mkdir -p /usr/bin + test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname + mkdir /var/lib/mysql + chown mysql.nogroup /var/lib/mysql - mysql_install_db + mysql_install_db } pkg_postrm_mysql5-server () { - grep mysql /etc/passwd && deluser mysql + grep mysql /etc/passwd && deluser mysql } PACKAGES = "${PN}-dbg ${PN} \ -libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ -libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ -${PN}-client ${PN}-server ${PN}-leftovers" + libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ + libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ + ${PN}-client ${PN}-server ${PN}-leftovers" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" FILES_${PN} = " " @@ -98,95 +98,95 @@ RDEPENDS_${PN} = "${PN}-client ${PN}-server" ALLOW_EMPTY_${PN} = "1" FILES_libmysqlclient = "\ -${libdir}/libmysqlclient.so.* \ -${libdir}/plugin/*.so.*" + ${libdir}/libmysqlclient.so.* \ + ${libdir}/plugin/*.so.*" FILES_libmysqlclient-dev = " \ -${includedir}/mysql/ \ -${libdir}/libmysqlclient.so \ -${libdir}/libmysqlclient.la \ -${libdir}/plugin/*.so \ -${libdir}/plugin/*.la \ -${sysconfdir}/aclocal \ -${bindir}/mysql_config" + ${includedir}/mysql/ \ + ${libdir}/libmysqlclient.so \ + ${libdir}/libmysqlclient.la \ + ${libdir}/plugin/*.so \ + ${libdir}/plugin/*.la \ + ${sysconfdir}/aclocal \ + ${bindir}/mysql_config" FILES_libmysqlclient-staticdev = "\ -${libdir}/*.a \ -${libdir}/plugin/*.a" + ${libdir}/*.a \ + ${libdir}/plugin/*.a" FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ -/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" + /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" FILES_libmysqlclient-r-dev = "\ -${libdir}/libmysqlclient_r.so \ -${libdir}/libmysqlclient_r.la" + ${libdir}/libmysqlclient_r.so \ + ${libdir}/libmysqlclient_r.la" FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" FILES_${PN}-client = "\ -${bindir}/myisam_ftdump \ -${bindir}/mysql \ -${bindir}/mysql_client_test \ -${bindir}/mysql_client_test_embedded \ -${bindir}/mysql_find_rows \ -${bindir}/mysql_fix_extensions \ -${bindir}/mysql_waitpid \ -${bindir}/mysqlaccess \ -${bindir}/mysqladmin \ -${bindir}/mysqlbug \ -${bindir}/mysqlcheck \ -${bindir}/mysqldump \ -${bindir}/mysqldumpslow \ -${bindir}/mysqlimport \ -${bindir}/mysqlshow \ -${bindir}/mysqlslap \ -${bindir}/mysqltest_embedded \ -${libexecdir}/mysqlmanager" + ${bindir}/myisam_ftdump \ + ${bindir}/mysql \ + ${bindir}/mysql_client_test \ + ${bindir}/mysql_client_test_embedded \ + ${bindir}/mysql_find_rows \ + ${bindir}/mysql_fix_extensions \ + ${bindir}/mysql_waitpid \ + ${bindir}/mysqlaccess \ + ${bindir}/mysqladmin \ + ${bindir}/mysqlbug \ + ${bindir}/mysqlcheck \ + ${bindir}/mysqldump \ + ${bindir}/mysqldumpslow \ + ${bindir}/mysqlimport \ + ${bindir}/mysqlshow \ + ${bindir}/mysqlslap \ + ${bindir}/mysqltest_embedded \ + ${libexecdir}/mysqlmanager" FILES_${PN}-server = "\ -${bindir}/comp_err \ -${bindir}/isamchk \ -${bindir}/isamlog \ -${bindir}/msql2mysql \ -${bindir}/my_print_defaults \ -${bindir}/myisamchk \ -${bindir}/myisamlog \ -${bindir}/myisampack \ -${bindir}/mysql_convert_table_format \ -${bindir}/mysql_fix_privilege_tables \ -${bindir}/mysql_install_db \ -${bindir}/mysql_secure_installation \ -${bindir}/mysql_setpermission \ -${bindir}/mysql_tzinfo_to_sql \ -${bindir}/mysql_upgrade \ -${bindir}/mysql_zap \ -${bindir}/mysqlbinlog \ -${bindir}/mysqld_multi \ -${bindir}/mysqld_safe \ -${bindir}/mysqlhotcopy \ -${bindir}/mysqltest \ -${bindir}/ndb_delete_all \ -${bindir}/ndb_desc \ -${bindir}/ndb_drop_index \ -${bindir}/ndb_drop_table \ -${bindir}/ndb_mgm \ -${bindir}/ndb_restore \ -${bindir}/ndb_select_all \ -${bindir}/ndb_select_count \ -${bindir}/ndb_show_tables \ -${bindir}/ndb_waiter \ -${bindir}/pack_isam \ -${bindir}/perror \ -${bindir}/replace \ -${bindir}/resolve_stack_dump \ -${bindir}/resolveip \ -${libexecdir}/mysqld \ -${sbindir}/mysqld \ -${sbindir}/ndb_cpcd \ -${sbindir}/ndbd \ -${sbindir}/ndb_mgmd \ -${datadir}/mysql/ \ -${localstatedir}/mysql/ \ -${sysconfdir}/init.d \ -${sysconfdir}/my.cnf" + ${bindir}/comp_err \ + ${bindir}/isamchk \ + ${bindir}/isamlog \ + ${bindir}/msql2mysql \ + ${bindir}/my_print_defaults \ + ${bindir}/myisamchk \ + ${bindir}/myisamlog \ + ${bindir}/myisampack \ + ${bindir}/mysql_convert_table_format \ + ${bindir}/mysql_fix_privilege_tables \ + ${bindir}/mysql_install_db \ + ${bindir}/mysql_secure_installation \ + ${bindir}/mysql_setpermission \ + ${bindir}/mysql_tzinfo_to_sql \ + ${bindir}/mysql_upgrade \ + ${bindir}/mysql_zap \ + ${bindir}/mysqlbinlog \ + ${bindir}/mysqld_multi \ + ${bindir}/mysqld_safe \ + ${bindir}/mysqlhotcopy \ + ${bindir}/mysqltest \ + ${bindir}/ndb_delete_all \ + ${bindir}/ndb_desc \ + ${bindir}/ndb_drop_index \ + ${bindir}/ndb_drop_table \ + ${bindir}/ndb_mgm \ + ${bindir}/ndb_restore \ + ${bindir}/ndb_select_all \ + ${bindir}/ndb_select_count \ + ${bindir}/ndb_show_tables \ + ${bindir}/ndb_waiter \ + ${bindir}/pack_isam \ + ${bindir}/perror \ + ${bindir}/replace \ + ${bindir}/resolve_stack_dump \ + ${bindir}/resolveip \ + ${libexecdir}/mysqld \ + ${sbindir}/mysqld \ + ${sbindir}/ndb_cpcd \ + ${sbindir}/ndbd \ + ${sbindir}/ndb_mgmd \ + ${datadir}/mysql/ \ + ${localstatedir}/mysql/ \ + ${sysconfdir}/init.d \ + ${sysconfdir}/my.cnf" DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" FILES_${PN}-leftovers = "/" diff --git a/meta-oe/recipes-support/nmon/nmon_13g.bb b/meta-oe/recipes-support/nmon/nmon_13g.bb index bc82c0ac67..38ea3e52fe 100644 --- a/meta-oe/recipes-support/nmon/nmon_13g.bb +++ b/meta-oe/recipes-support/nmon/nmon_13g.bb @@ -20,10 +20,10 @@ LDFLAGS += "-ltinfo -lncursesw" ASNEEDED_pn-nmon = "" do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon + ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon } do_install() { - install -d ${D}${bindir} - install -m 0755 nmon ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 nmon ${D}${bindir} } diff --git a/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb b/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb index 52fd1bfc9f..7d85016094 100644 --- a/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb +++ b/meta-oe/recipes-support/nonworking/fftw/benchfft_3.1.bb @@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" inherit autotools pkgconfig do_compile_prepend() { - sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile + sed -i -e 's:all-recursive:$(RECURSIVE_TARGETS):g' ${S}/Makefile } SRC_URI[md5sum] = "9356e5e9dcb3f1481977009720a2ccf8" diff --git a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc index bac1be1698..84846587b0 100644 --- a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc @@ -16,41 +16,41 @@ SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source noipv6 = "${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" EXTRA_OECONF = " \ - --with-libnet=${STAGING_BINDIR_CROSS} \ - --enable-dynamic-linking \ - ${noipv6} \ - --enable-ssl \ - --disable-sub-streams \ - --disable-pacct \ - --disable-linux-caps \ - --disable-pcre \ - --disable-sql \ + --with-libnet=${STAGING_BINDIR_CROSS} \ + --enable-dynamic-linking \ + ${noipv6} \ + --enable-ssl \ + --disable-sub-streams \ + --disable-pacct \ + --disable-linux-caps \ + --disable-pcre \ + --disable-sql \ " EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)}" do_configure_prepend() { - eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" + eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" } # rename modules.conf because it breaks update-modules # see http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-October/035537.html do_install_append() { - mv ${D}/${sysconfdir}/modules.conf ${D}/${sysconfdir}/scl-modules.conf - sed -i "s#@include 'modules.conf'#@include 'scl-modules.conf'#g" ${D}/${sysconfdir}/scl.conf - install -d ${D}/${sysconfdir}/${PN} - install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} + mv ${D}/${sysconfdir}/modules.conf ${D}/${sysconfdir}/scl-modules.conf + sed -i "s#@include 'modules.conf'#@include 'scl-modules.conf'#g" ${D}/${sysconfdir}/scl.conf + install -d ${D}/${sysconfdir}/${PN} + install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} } FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} \ - ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ - ${datadir}/include/scl/ ${datadir}/xsd" + ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + ${base_bindir}/* ${base_sbindir}/* \ + ${base_libdir}/*${SOLIBS} \ + ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ + ${datadir}/include/scl/ ${datadir}/xsd" FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf" @@ -60,39 +60,39 @@ RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "${PN}.service" pkg_postinst_${PN} () { - /etc/init.d/syslog stop - update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200 - - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="-s" - fi - # remove all rc.d-links potentially created from alternative - # syslog packages before creating new ones - update-rc.d $OPT -f syslog remove - update-rc.d $OPT syslog start 20 2 3 4 5 . stop 90 0 1 6 . + /etc/init.d/syslog stop + update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200 + + if test "x$D" != "x"; then + OPT="-r $D" + else + OPT="-s" + fi + # remove all rc.d-links potentially created from alternative + # syslog packages before creating new ones + update-rc.d $OPT -f syslog remove + update-rc.d $OPT syslog start 20 2 3 4 5 . stop 90 0 1 6 . } pkg_prerm_${PN} () { - if test "x$D" = "x"; then - if test "$1" = "upgrade" -o "$1" = "remove"; then - /etc/init.d/syslog stop - fi + if test "x$D" = "x"; then + if test "$1" = "upgrade" -o "$1" = "remove"; then + /etc/init.d/syslog stop fi + fi - update-alternatives --remove syslog-init syslog.${PN} + update-alternatives --remove syslog-init syslog.${PN} } pkg_postrm_${PN} () { - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="" - fi - if test "$1" = "remove" -o "$1" = "purge"; then - if ! test -e "/etc/init.d/syslog"; then - update-rc.d $OPT syslog remove - fi + if test "x$D" != "x"; then + OPT="-r $D" + else + OPT="" + fi + if test "$1" = "remove" -o "$1" = "purge"; then + if ! test -e "/etc/init.d/syslog"; then + update-rc.d $OPT syslog remove fi + fi } diff --git a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb index 62faa83b2b..6d1fee7ae2 100644 --- a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb +++ b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bb @@ -2,8 +2,8 @@ require syslog-ng.inc PR = "${INC_PR}.1" SRC_URI += " \ - file://syslog-ng.conf \ - file://initscript \ + file://syslog-ng.conf \ + file://initscript \ " SRC_URI[md5sum] = "60737452ce898f9dc7170dfdc9bfd732" diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb index 3d76226c23..50efd77bf0 100644 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a " SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ - " +" SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" @@ -18,23 +18,23 @@ S = "${WORKDIR}/OpenCV-${PV}" do_install() { cd samples/c - install -d ${D}/${bindir} - install -d ${D}/${datadir}/opencv/samples + install -d ${D}/${bindir} + install -d ${D}/${datadir}/opencv/samples - cp * ${D}/${datadir}/opencv/samples || true + cp * ${D}/${datadir}/opencv/samples || true for i in *.c; do echo "compiling $i" ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true - install -m 0755 `basename $i .c` ${D}/${bindir} || true - rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true - done + install -m 0755 `basename $i .c` ${D}/${bindir} || true + rm ${D}/${datadir}/opencv/samples/`basename $i .c` || true + done for i in *.cpp; do echo "compiling $i" ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true - install -m 0755 `basename $i .cpp` ${D}/${bindir} || true - rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true - done + install -m 0755 `basename $i .cpp` ${D}/${bindir} || true + rm ${D}/${datadir}/opencv/samples/`basename $i .cpp` || true + done } FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb index 916c8c57e3..39b608a334 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb @@ -11,7 +11,7 @@ DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpe SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ file://opencv-fix-pkgconfig-generation.patch \ - " +" SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" @@ -32,7 +32,7 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR} -DWITH_GTK=ON \ -DCMAKE_SKIP_RPATH=ON \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - " +" inherit distutils-base pkgconfig cmake @@ -81,6 +81,6 @@ FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python-opencv = "python-core python-numpy" do_install_append() { - cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ - sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h + cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ + sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h } diff --git a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb index 98882462f7..f450949412 100644 --- a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb +++ b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb @@ -22,10 +22,10 @@ PACKAGES += "${PN}-bin" FILES_${PN}-bin = "${bindir}" do_compile() { - ( - # HACK: build a native binaries need during the build - unset CC LD CXX CCLD CFLAGS - oe_runmake -C config/util CC="${BUILD_CC}" LD="${BUILD_LD}" CXX="${BUILD_CXX}" LIBS="" makestrs + ( + # HACK: build a native binaries need during the build + unset CC LD CXX CCLD CFLAGS + oe_runmake -C config/util CC="${BUILD_CC}" LD="${BUILD_LD}" CXX="${BUILD_CXX}" LIBS="" makestrs ) if [ "$?" != "0" ]; then exit 1 diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb index 29051475fe..6880e1c9fc 100644 --- a/meta-oe/recipes-support/p910nd/p910nd_0.95.bb +++ b/meta-oe/recipes-support/p910nd/p910nd_0.95.bb @@ -12,10 +12,10 @@ SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491" SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029" do_compile () { - ${CC} ${LDFLAGS} -o p910nd p910nd.c + ${CC} ${LDFLAGS} -o p910nd p910nd.c } do_install () { - install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd - install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf + install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd + install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf } diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb index 04ec03c9a8..266781a528 100644 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb @@ -13,10 +13,10 @@ PR = "r3" inherit autotools systemd EXTRA_OECONF = " \ - --disable-libusb \ - --enable-libudev \ - --enable-usbdropdir=${libdir}/pcsc/drivers \ - " + --disable-libusb \ + --enable-libudev \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ +" S = "${WORKDIR}/pcsc-lite-${PV}" diff --git a/meta-oe/recipes-support/picocom/picocom_1.6.bb b/meta-oe/recipes-support/picocom/picocom_1.6.bb index b7744aa179..9fdd9d682c 100644 --- a/meta-oe/recipes-support/picocom/picocom_1.6.bb +++ b/meta-oe/recipes-support/picocom/picocom_1.6.bb @@ -9,8 +9,8 @@ SRC_URI = "http://picocom.googlecode.com/files/picocom-1.6.tar.gz" CPPFLAGS_append = '-DVERSION_STR=\\"${PV}\\" -DUUCP_LOCK_DIR=\\"/var/lock\\" -DHIGH_BAUD' do_install () { - install -d ${D}${bindir} - install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/ + install -d ${D}${bindir} + install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/ } SRC_URI[md5sum] = "426c3d30b82cbc80b0dafdccd6020c6c" diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin.inc index 340e7f2b05..bdeefa9be8 100644 --- a/meta-oe/recipes-support/pidgin/pidgin.inc +++ b/meta-oe/recipes-support/pidgin/pidgin.inc @@ -8,21 +8,21 @@ INC_PR = "r3" inherit autotools gettext pkgconfig gconf perlnative EXTRA_OECONF = " \ - --enable-vv \ - --disable-perl \ - --disable-tcl \ - --disable-gevolution \ - --disable-schemas-install \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-gnutls=yes \ - --with-ncurses-headers=${STAGING_INCDIR} \ - --with-gnutls-includes=${STAGING_INCDIR} \ - --with-gnutls-libs=${STAGING_LIBDIR} \ - " + --enable-vv \ + --disable-perl \ + --disable-tcl \ + --disable-gevolution \ + --disable-schemas-install \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-gnutls=yes \ + --with-ncurses-headers=${STAGING_INCDIR} \ + --with-gnutls-includes=${STAGING_INCDIR} \ + --with-gnutls-libs=${STAGING_LIBDIR} \ +" do_configure_prepend() { - touch ${S}/po/Makefile + touch ${S}/po/Makefile } OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" @@ -50,7 +50,7 @@ FILES_finch-dbg = "${bindir}/.debug/finch \ ${libdir}/finch/.debug" FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/applications" + ${datadir}/applications" RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb index d229c15015..3ce3cc39a2 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb @@ -4,20 +4,20 @@ PR = "${INC_PR}.3" DEPENDS += "farsight2 libidn" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch \ - file://pidgin.desktop-set-icon.patch \ - file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch \ + file://pidgin.desktop-set-icon.patch \ + file://purple-OE-branding-25.patch \ + file://pidgin-cross-python-265.patch \ " SRC_URI[md5sum] = "9bc6cf953ed7d383b215fa8487bf8829" SRC_URI[sha256sum] = "9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e" EXTRA_OECONF += "\ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ - --enable-nss=no \ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ + --enable-nss=no \ " diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index 59f22df3f1..bec82362f2 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb @@ -10,13 +10,13 @@ SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee" SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" do_compile() { - oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS=${STAGING_DIR_HOST}${libdir}/libz.a + oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS=${STAGING_DIR_HOST}${libdir}/libz.a } do_install() { - install -d ${D}${bindir} - install pngcheck ${D}${bindir} - install png-fix-IDAT-windowsize ${D}${bindir} - install pngsplit ${D}${bindir} + install -d ${D}${bindir} + install pngcheck ${D}${bindir} + install png-fix-IDAT-windowsize ${D}${bindir} + install pngsplit ${D}${bindir} } diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb index cbb02b478f..56a30e4e52 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.5.bb @@ -11,7 +11,7 @@ do_compile() { } do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} } FILES_${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc index a624c1b95e..d0c0074f9c 100644 --- a/meta-oe/recipes-support/poppler/poppler.inc +++ b/meta-oe/recipes-support/poppler/poppler.inc @@ -8,11 +8,11 @@ SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" inherit autotools pkgconfig EXTRA_OECONF = "\ - --enable-xpdf-headers \ - --disable-gtk-test \ - --disable-poppler-qt \ - --disable-poppler-qt4 \ - --enable-zlib \ + --enable-xpdf-headers \ + --disable-gtk-test \ + --disable-poppler-qt \ + --disable-poppler-qt4 \ + --enable-zlib \ " # check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index 4e7aec2e34..4fda67b4b8 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc @@ -22,7 +22,7 @@ EXTRA_OECONF_sh4 = "--disable-spinlocks --disable-rpath" EXTRA_OECONF_aarch64 += "--disable-spinlocks" do_compile_append() { - cp /usr/sbin/zic ${S}/src/timezone/ + cp /usr/sbin/zic ${S}/src/timezone/ } SSTATE_SCAN_FILES += "Makefile.global" diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb index d5a5b4ba9e..3241b83a0b 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb +++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb @@ -17,8 +17,8 @@ do_compile() { } do_install() { - install -d ${D}${sbindir}/ - install -m 0755 pxaregs ${D}${sbindir}/ + install -d ${D}${sbindir}/ + install -m 0755 pxaregs ${D}${sbindir}/ } SRC_URI[md5sum] = "a43baa88842cd5926dbffb6fb87624f6" diff --git a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb index ef753cff8d..cccc6a59d6 100644 --- a/meta-oe/recipes-support/rng-tools/rng-tools_2.bb +++ b/meta-oe/recipes-support/rng-tools/rng-tools_2.bb @@ -13,13 +13,13 @@ SRC_URI[sha256sum] = "1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25 inherit autotools update-rc.d do_install_append() { - install -d "${D}${sysconfdir}/init.d" - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools - sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \ - ${D}${sysconfdir}/init.d/rng-tools + install -d "${D}${sysconfdir}/init.d" + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools + sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir},' \ + ${D}${sysconfdir}/init.d/rng-tools - install -d "${D}${sysconfdir}/default" - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default + install -d "${D}${sysconfdir}/default" + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default } INITSCRIPT_NAME = "rng-tools" diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb index d46580338a..ca98ab5ced 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb @@ -11,10 +11,10 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" S = "${WORKDIR}/gpio" do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c + ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c } do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} + install -d ${D}${sbindir} + install -m 0755 ${PN} ${D}${sbindir} } diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb index 96285e9444..a0dbef4684 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb @@ -11,10 +11,10 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" S = "${WORKDIR}/gpio" do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio-s3c6410.c + ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio-s3c6410.c } do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} + install -d ${D}${sbindir} + install -m 0755 ${PN} ${D}${sbindir} } diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb index 9e0c087d45..a6ec087d01 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb @@ -16,17 +16,17 @@ do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" CFLAGS += "-DLINUX_PPDEV" do_compile() { - oe_runmake + oe_runmake } do_install() { - install -d ${D}/${bindir} - install -m 0755 sjf2410 ${D}/${bindir} + install -d ${D}/${bindir} + install -m 0755 sjf2410 ${D}/${bindir} } do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV} + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV} } addtask deploy before do_build after do_install diff --git a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb index 733bb9e0f7..54b59bf0e6 100644 --- a/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb +++ b/meta-oe/recipes-support/sqlite/sqlite_2.8.17.bb @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=10;md5=e98469a8efa024a PR = "r7" SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \ - file://mainmk_build_dynamic.patch \ - file://mainmk_no_tcl.patch \ - file://sqlite.pc" + file://mainmk_build_dynamic.patch \ + file://mainmk_no_tcl.patch \ + file://sqlite.pc" SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o \ expr.o func.o hash.o insert.o main.o opcodes.o os.o pager.o \ @@ -26,27 +26,27 @@ do_configure() { } do_compile() { - oe_runmake -f Makefile.linux-gcc \ - TOP="${S}" \ - BCC="${BUILD_CC}" \ - TCC="${CC}" \ - OPTS="-fPIC -D'INTPTR_TYPE=int'" \ - TCL_FLAGS= LIBTCL= \ - READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ - LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" + oe_runmake -f Makefile.linux-gcc \ + TOP="${S}" \ + BCC="${BUILD_CC}" \ + TCC="${CC}" \ + OPTS="-fPIC -D'INTPTR_TYPE=int'" \ + TCL_FLAGS= LIBTCL= \ + READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \ + LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses" } do_install() { - install -d ${D}${libdir} ${D}${bindir} - install sqlite ${D}${bindir} - install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 - ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 - install -d ${D}${includedir} - install -m 0644 sqlite.h ${D}${includedir}/sqlite.h - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc + install -d ${D}${libdir} ${D}${bindir} + install sqlite ${D}${bindir} + install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6 + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0 + ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8 + install -d ${D}${includedir} + install -m 0644 sqlite.h ${D}${includedir}/sqlite.h + install -d ${D}${libdir}/pkgconfig + install -m 0644 ${S}/sqlite.pc ${D}${libdir}/pkgconfig/sqlite.pc } PACKAGES += "${PN}-bin" diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb index 9b1084aeb9..f8a1ef48a5 100644 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb +++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb @@ -15,17 +15,17 @@ inherit autotools gettext S = "${WORKDIR}/dpkg-${PV}" EXTRA_OECONF = " \ - --with-start-stop-daemon \ - --without-bz2 \ - --without-deselect \ - --without-install-info \ - --without-selinux \ - --without-update-alternatives \ + --with-start-stop-daemon \ + --without-bz2 \ + --without-deselect \ + --without-install-info \ + --without-selinux \ + --without-update-alternatives \ " do_install_append () { - # remove everything that is not related to start-stop-daemon, since there - # is no explicit rule for only installing ssd - find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; - find ${D} -depth -type d -empty -exec rmdir {} \; + # remove everything that is not related to start-stop-daemon, since there + # is no explicit rule for only installing ssd + find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; + find ${D} -depth -type d -empty -exec rmdir {} \; } diff --git a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb index 2713f5b18c..eb49494eff 100644 --- a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb +++ b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb @@ -12,8 +12,8 @@ SRC_URI[md5sum] = "c8b861305def7c0abae04f7bbefec212" SRC_URI[sha256sum] = "efc13c86e715b5e596d9d8535640c830f83e977fe521afd2c70d68926c4b573e" EXTRA_OECONF = "--disable-curl --disable-soup --disable-ldap \ - --enable-gmp --disable-mysql --disable-sqlite \ - --enable-openssl" + --enable-gmp --disable-mysql --disable-sqlite \ + --enable-openssl" EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" diff --git a/meta-oe/recipes-support/synergy/synergy_1.3.8.bb b/meta-oe/recipes-support/synergy/synergy_1.3.8.bb index b8d1e6c158..02a24b7456 100644 --- a/meta-oe/recipes-support/synergy/synergy_1.3.8.bb +++ b/meta-oe/recipes-support/synergy/synergy_1.3.8.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/${PN}-${PV}-Source" inherit cmake do_install() { - install -d ${D}/usr/bin - install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/ + install -d ${D}/usr/bin + install -m 0755 ${S}/bin/synergy* ${D}/usr/bin/ } diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb index 6aa5a9e80b..83bb0c248b 100644 --- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb +++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb @@ -7,7 +7,7 @@ inherit autotools pkgconfig SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz \ file://install-swig-interface-in-SWINGLIBDIR.patch \ - " +" SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b" SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4" @@ -17,21 +17,21 @@ PR = "r2" # autoreconf doesn't work well while reconfiguring included libreplace do_configure () { - gnu-configize - oe_runconf + gnu-configize + oe_runconf } do_install_prepend() { - # Hack the way swig interface for talloc is installed - # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch - type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" + # Hack the way swig interface for talloc is installed + # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch + type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" } do_install_append() { - install -d ${D}${libdir} - ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 - ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 - ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so + install -d ${D}${libdir} + ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 + ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 + ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so } PACKAGES += "${PN}-swig" diff --git a/meta-oe/recipes-support/tbb/tbb_4.1.bb b/meta-oe/recipes-support/tbb/tbb_4.1.bb index 2337bddaaf..a159321c1f 100644 --- a/meta-oe/recipes-support/tbb/tbb_4.1.bb +++ b/meta-oe/recipes-support/tbb/tbb_4.1.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Parallelism library for C++ - runtime files \ - TBB is a library that helps you leverage multi-core processor \ - performance without having to be a threading expert. It represents a \ - higher-level, task-based parallelism that abstracts platform details \ - and threading mechanism for performance and scalability." + TBB is a library that helps you leverage multi-core processor \ + performance without having to be a threading expert. It represents a \ + higher-level, task-based parallelism that abstracts platform details \ + and threading mechanism for performance and scalability." HOMEPAGE = "http://threadingbuildingblocks.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=2c7f2caf277a3933e3acdf7f89d54cc1" diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb index d3ca24f3e4..1da819412b 100644 --- a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb +++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb @@ -6,11 +6,11 @@ SECTION = "console/network" DEPENDS = "libpcap" SRC_URI = " \ - http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://tcpdump_configure_no_-O2.patch \ - file://0001-minimal-IEEE802.15.4-allowed.patch \ - file://ipv6-cross.patch \ - file://configure.patch \ + http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch \ + file://0001-minimal-IEEE802.15.4-allowed.patch \ + file://ipv6-cross.patch \ + file://configure.patch \ " SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" @@ -19,25 +19,25 @@ inherit autotools CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" EXTRA_OECONF = "--without-crypto --disable-rpath \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" + ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" EXTRA_AUTORECONF += " -I m4" do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi - # AC_CHECK_LIB(dlpi.. was looking to host /lib - sed -i 's:-L/lib::g' ./configure.in + mkdir -p ${S}/m4 + if [ -f aclocal.m4 ]; then + mv aclocal.m4 ${S}/m4 + fi + # AC_CHECK_LIB(dlpi.. was looking to host /lib + sed -i 's:-L/lib::g' ./configure.in } do_configure_append() { - sed -i 's:-L/usr/lib::' ./Makefile - sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile - sed -i 's:-I/usr/include::' ./Makefile + sed -i 's:-L/usr/lib::' ./Makefile + sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile + sed -i 's:-I/usr/include::' ./Makefile } do_install_append() { - # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 - rm -f ${D}${sbindir}/tcpdump.${PV} + # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 + rm -f ${D}${sbindir}/tcpdump.${PV} } diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index baaac2999d..5c5fab9487 100644 --- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -14,14 +14,14 @@ S = "${WORKDIR}/git" inherit gitpkgv pkgconfig do_compile() { - oe_runmake \ - CC="${CC}" \ - CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ - LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" + oe_runmake \ + CC="${CC}" \ + CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ + LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" } do_install() { - oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install + oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install } RDEPENDS_${PN}_append_libc-glibc += "glibc-gconv-ibm437" diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb index 5a33ab92d5..902a9839ac 100644 --- a/meta-oe/recipes-support/upower/upower_0.9.14.bb +++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb @@ -15,16 +15,16 @@ inherit autotools pkgconfig gettext EXTRA_OECONF = " --with-backend=linux" do_configure_prepend() { - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} + sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am + sed -i -e 's: doc : :g' ${S}/Makefile.am +} RRECOMMENDS_${PN} += "pm-utils" FILES_${PN} += "${datadir}/dbus-1/ \ ${datadir}/polkit-1/ \ ${base_libdir}/udev/* \ - " +" FILES_${PN}-dbg += "${base_libdir}/udev/.debug" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb index 8a6fc134d7..de8181245e 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb @@ -9,7 +9,7 @@ SRC_URI[md5sum] = "a7d23a03157871013a0d708ab2b1b6df" SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} } RDEPENDS_${PN} = "usb-modeswitch" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb index b0c9e951d7..fe6ea62903 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb @@ -11,8 +11,8 @@ SRC_URI[md5sum] = "c393603908eceab95444c5bde790f6f0" SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f" do_install() { - sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher - oe_runmake install DESTDIR=${D} + sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher + oe_runmake install DESTDIR=${D} } FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc index 4fa8f7cad7..e288fff287 100644 --- a/meta-oe/recipes-support/vim/vim.inc +++ b/meta-oe/recipes-support/vim/vim.inc @@ -12,10 +12,10 @@ VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[ INC_PR = "r13" SRC_URI = " \ - ftp://ftp.${PN}.org/pub/${PN}/unix/${PN}-${PV_MAJOR}.tar.bz2;name=${VIMDIR} \ - ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-extra.tar.gz;name=${VIMDIR}-extra \ - ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-lang.tar.gz;name=${VIMDIR}-lang \ - file://vimrc \ + ftp://ftp.${PN}.org/pub/${PN}/unix/${PN}-${PV_MAJOR}.tar.bz2;name=${VIMDIR} \ + ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-extra.tar.gz;name=${VIMDIR}-extra \ + ftp://ftp.${PN}.org/pub/${PN}/extra/${PN}-${PV_MAJOR}-lang.tar.gz;name=${VIMDIR}-lang \ + file://vimrc \ " S = "${WORKDIR}/${VIMDIR}/src" @@ -24,13 +24,13 @@ inherit autotools update-alternatives # vim configure.in contains functions which got 'dropped' by autotools.bbclass do_configure () { - rm -f auto/* - touch auto/config.mk - aclocal - autoconf - oe_runconf - touch auto/configure - touch auto/config.mk auto/config.h + rm -f auto/* + touch auto/config.mk + aclocal + autoconf + oe_runconf + touch auto/configure + touch auto/config.mk auto/config.h } #Available PACKAGECONFIG options are gtkgui, x11, tiny @@ -41,25 +41,25 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,xt," PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," EXTRA_OECONF = " \ - --disable-gpm \ - --disable-gtktest \ - --disable-xim \ - --disable-netbeans \ - --with-tlib=ncurses \ - ac_cv_small_wchar_t=no \ - vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=no \ - vim_cv_terminfo=yes \ - vim_cv_tgent=non-zero \ - vim_cv_toupper_broken=no \ - vim_cv_tty_group=world \ + --disable-gpm \ + --disable-gtktest \ + --disable-xim \ + --disable-netbeans \ + --with-tlib=ncurses \ + ac_cv_small_wchar_t=no \ + vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=no \ + vim_cv_terminfo=yes \ + vim_cv_tgent=non-zero \ + vim_cv_toupper_broken=no \ + vim_cv_tty_group=world \ " # Work around rpm picking up csh as a dep do_install_append() { - chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132 - install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/${PN} + chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132 + install -m 0644 ${WORKDIR}/vimrc ${D}/${datadir}/${PN} } PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb index 6d1fa9a7fd..6c9037bb2b 100644 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +++ b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" TARGET_CC_ARCH += "${LDFLAGS}" do_install() { - install -d ${D}${bindir} - install -m 0755 wmiconfig ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 wmiconfig ${D}${bindir} } diff --git a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb index 70dc150d7e..d0a868e813 100644 --- a/meta-oe/recipes-support/xchat/xchat_2.8.8.bb +++ b/meta-oe/recipes-support/xchat/xchat_2.8.8.bb @@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" PR = "r1" SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \ - file://glib-2.32.patch \ + file://glib-2.32.patch \ " inherit autotools gettext EXTRA_OECONF = "\ - --disable-perl \ - --disable-python \ - --disable-tcl \ + --disable-perl \ + --disable-python \ + --disable-tcl \ " do_configure_prepend(){ rm -f ${S}/po/Makefile.in.in diff --git a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb index ef5224b5f0..ba3490d1c3 100644 --- a/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb +++ b/meta-oe/recipes-support/xfsprogs/xfsprogs_3.1.8.bb @@ -8,8 +8,8 @@ DEPENDS = "util-linux" PR = "r1" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz \ - file://remove-install-as-user.patch \ - file://drop-configure-check-for-aio.patch \ + file://remove-install-as-user.patch \ + file://drop-configure-check-for-aio.patch \ " SRC_URI[md5sum] = "f70b2e7200d4c29f0af1cf70e7be1db6" @@ -27,16 +27,16 @@ FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" EXTRA_OECONF = "--enable-gettext=no" do_configure () { - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f include/builddefs include/platform_defs.h - # Recreate configure script. - rm -f configure - oe_runmake configure - # Configure. - export DEBUG="-DNDEBUG" - gnu-configize --force - oe_runconf + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f include/builddefs include/platform_defs.h + # Recreate configure script. + rm -f configure + oe_runmake configure + # Configure. + export DEBUG="-DNDEBUG" + gnu-configize --force + oe_runconf } LIBTOOL = "${HOST_SYS}-libtool" @@ -45,13 +45,13 @@ TARGET_CC_ARCH += "${LDFLAGS}" PARALLEL_MAKE = "" do_install () { - export DIST_ROOT=${D} - oe_runmake install - # needed for xfsdump - oe_runmake install-dev - rm ${D}${base_libdir}/libhandle.a - rm ${D}${base_libdir}/libhandle.la - rm ${D}${base_libdir}/libhandle.so - rm ${D}${libdir}/libhandle.so - ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so + export DIST_ROOT=${D} + oe_runmake install + # needed for xfsdump + oe_runmake install-dev + rm ${D}${base_libdir}/libhandle.a + rm ${D}${base_libdir}/libhandle.la + rm ${D}${base_libdir}/libhandle.so + rm ${D}${libdir}/libhandle.so + ln -s ../..${base_libdir}/libhandle.so.1 ${D}${libdir}/libhandle.so } |