From 7a77eb1760eb242a6a4b37bec71c2311a0a806d6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 11 Aug 2015 09:08:26 +0300 Subject: Change all tab characters to spaces Gerrit Sanity Bot does not like tabs, so remove them from recipes. Change-Id: Ic0bede29c9a4a01a2bd816e6771fafd76b2323e2 Reviewed-by: aavit --- classes/bootfs-image.bbclass | 26 +++++++++---------- classes/image-hdd.bbclass | 6 ++--- .../recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 30 +++++++++++----------- .../recipes/linux/linux-imx_3.0.35.bb | 14 +++++----- .../recipes/linux/linux-boundary_3.10.17.bbappend | 22 ++++++++-------- .../recipes/linux/linux-imx_3.10.%.bbappend | 14 +++++----- .../libgles/libgles-omap3_4.09.00.01.bbappend | 2 +- .../recipes/libgles/libgles-omap3_4.10.00.01.bb | 8 +++--- .../recipes/linux/linux-toradex-fsl_git.bbappend | 4 +-- .../recipes/linux/linux-toradex-vf_3.18.bbappend | 6 ++--- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 8 +++--- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 4 +-- .../b2qt-addons/b2qt-emulator-sdcardmountd.bb | 4 +-- recipes-qt/b2qt-addons/b2qt-launcher.bb | 4 +-- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 2 +- recipes-qt/qt5-addons/qtglesstream.bb | 16 ++++++------ recipes-qt/qt5/qtbase_%.bbappend | 6 ++--- recipes/adbd/adbd.bb | 20 +++++++-------- recipes/base-files/base-files_3.0.14.bbappend | 8 +++--- recipes/busybox/busybox_1.%.bbappend | 6 ++--- recipes/dbus/dbus_%.bbappend | 14 +++++----- recipes/hunspell/hunspell_1.3.2.bb | 10 ++++---- recipes/init-ifupdown/init-ifupdown_1.0.bbappend | 4 +-- recipes/initscripts/initscripts_1.0.bbappend | 2 +- recipes/opengldummy/opengldummy.bb | 14 +++++----- recipes/opengldummy/opengldummy.inc | 16 ++++++------ recipes/opengldummy/qtglesstream-dummy-client.bb | 14 +++++----- recipes/openssl/openssl_1.%.bbappend | 4 +-- recipes/virtualbox/mount-vboxsf_4.2.14.bb | 10 ++++---- .../virtualbox-guest-additions_4.2.14.bb | 8 +++--- recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend | 22 ++++++++-------- 31 files changed, 164 insertions(+), 164 deletions(-) diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index 7203b018..ccc995f9 100644 --- a/classes/bootfs-image.bbclass +++ b/classes/bootfs-image.bbclass @@ -26,24 +26,24 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" BOOTFS_DEPENDS ?= "" fakeroot do_bootfs () { - if [ -z "${BOOTFS_CONTENT}" ]; then - exit 0 - fi + if [ -z "${BOOTFS_CONTENT}" ]; then + exit 0 + fi - mkdir -p ${S}/bootfs + mkdir -p ${S}/bootfs - for item in ${BOOTFS_CONTENT}; do - src=`echo $item | awk -F':' '{ print $1 }'` - dst=`echo $item | awk -F':' '{ print $2 }'` + for item in ${BOOTFS_CONTENT}; do + src=`echo $item | awk -F':' '{ print $1 }'` + dst=`echo $item | awk -F':' '{ print $2 }'` - install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst - done + install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst + done - cd ${S}/bootfs - rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + cd ${S}/bootfs + rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz - tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz . - ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz . + ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz } addtask bootfs before do_rootfs diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index e6a0cb59..482be063 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -34,9 +34,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types boot-directdisk create_hdd_image () { - cd ${DEPLOY_DIR_IMAGE} - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd - ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + cd ${DEPLOY_DIR_IMAGE} + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index f661539b..6b0cd3ce 100644 --- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -28,21 +28,21 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ " PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ - libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ - libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ - libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ - libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ - libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ - libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ - libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ - libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \ - libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ - libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ - libvivante-dri-mx6 \ - libvivante-dfb-mx6 \ - libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ - libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ - libwayland-egl-mx6-dev \ + libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ + libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ + libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ + libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ + libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ + libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ + libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ + libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \ + libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ + libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ + libvivante-dri-mx6 \ + libvivante-dfb-mx6 \ + libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ + libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ + libwayland-egl-mx6-dev \ " # Skip package if it does not match the machine float-point type in use diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb index 8b80a6ec..948382fd 100644 --- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb +++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb @@ -24,12 +24,12 @@ SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \ RDEPENDS_kernel-base = "" do_configure_prepend() { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index 9a2bebbb..1d7f942d 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -30,19 +30,19 @@ SRC_URI += "\ RDEPENDS_kernel-base = "" do_configure_prepend() { - # fix imx-vpu break on video decoding - echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig + # fix imx-vpu break on video decoding + echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig - # include H4 UART for Broadcom BT on Nitrogen6_Lite - echo "CONFIG_BT_HCIUART_H4=y" >> ${WORKDIR}/defconfig + # include H4 UART for Broadcom BT on Nitrogen6_Lite + echo "CONFIG_BT_HCIUART_H4=y" >> ${WORKDIR}/defconfig - # include Broadcom WiFi for Nitrogen6_Lite - echo "CONFIG_BRCMFMAC=m" >> ${WORKDIR}/defconfig + # include Broadcom WiFi for Nitrogen6_Lite + echo "CONFIG_BRCMFMAC=m" >> ${WORKDIR}/defconfig - # include LEDS_GPIO for Nitrogen6_Lite - echo "CONFIG_LEDS_GPIO=y" >> ${WORKDIR}/defconfig + # include LEDS_GPIO for Nitrogen6_Lite + echo "CONFIG_LEDS_GPIO=y" >> ${WORKDIR}/defconfig - # enable uvcvideo module - echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig + # enable uvcvideo module + echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend index d6c4db42..6861affc 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend @@ -30,12 +30,12 @@ SRC_URI += "\ RDEPENDS_kernel-base = "" do_configure_prepend() { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig } diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 3cad9778..452f8a29 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -25,7 +25,7 @@ BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" do_install_append() { - echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini + echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini } # Inhibit warnings about files being stripped. diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb index 9265ffe5..1b1bf22f 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb @@ -48,8 +48,8 @@ S = "${WORKDIR}/Graphics_SDK_${SGXPV}" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FRONTWSEGL.so.1" do_configure_append() { - # PLAT_CC might not have needed arguments, so use CC instead. - for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do - sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak - done + # PLAT_CC might not have needed arguments, so use CC instead. + for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do + sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak + done } diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 5de3f197..10997eee 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -36,6 +36,6 @@ SRC_URI += " \ RDEPENDS_kernel-base = "" config_script () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config } diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend index 0ceceeb7..76bf87dd 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -27,7 +27,7 @@ SRC_URI += " \ " do_configure_prepend () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig } diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index dfea182a..6766978f 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -39,13 +39,13 @@ S = "${WORKDIR}/git" DEPENDS = "qtbase" do_configure_append() { - sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf - echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf + sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf + echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf } do_install_append() { - install -m 0755 -d ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ } FILES_${PN} += "${sysconfdir}/appcontroller.conf" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb index 6d17a58a..e082735a 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb @@ -39,8 +39,8 @@ S = "${WORKDIR}/git/src/helperlibs/proxy" DEPENDS = "qtbase qtsimulator" do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ } INITSCRIPT_NAME = "emulatorproxyd.sh" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb index cb0b2ce2..d59ba2c3 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb @@ -39,8 +39,8 @@ S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" DEPENDS = "qtbase qtsimulator" do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ } INITSCRIPT_NAME = "sdcardmountd.sh" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 4c550086..7781031e 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -40,8 +40,8 @@ DEPENDS = "qtbase qtdeclarative \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ } FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index f3d09357..1a06675a 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -39,5 +39,5 @@ S = "${WORKDIR}/git" DEPENDS += "qtbase qtdeclarative qtmultimedia" FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ + ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ " diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index c1922afd..06cec02f 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -41,17 +41,17 @@ RREPLACES_${PN} = "qtglesstream-dummy-client" RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev" do_install_append() { - install -m 0755 -d ${D}${includedir}/EGL - install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL + install -m 0755 -d ${D}${includedir}/EGL + install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL - install -m 0755 -d ${D}${includedir}/GLES2 - install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2 + install -m 0755 -d ${D}${includedir}/GLES2 + install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2 - install -m 0755 -d ${D}${includedir}/GLES3 - install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3 + install -m 0755 -d ${D}${includedir}/GLES3 + install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3 - install -m 0755 -d ${D}${includedir}/KHR - install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR + install -m 0755 -d ${D}${includedir}/KHR + install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR } # no not overwrite files from qtglesstream-dummy-client diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 340d3083..658e0686 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -41,9 +41,9 @@ SRC_URI += " \ " do_configure_prepend() { - install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf < ${D}${sysconfdir}/hostname + ln -s /home/root ${D}/root + echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname - install -m 0755 -d ${D}${sysconfdir}/modprobe.d - install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d + install -m 0755 -d ${D}${sysconfdir}/modprobe.d + install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d } diff --git a/recipes/busybox/busybox_1.%.bbappend b/recipes/busybox/busybox_1.%.bbappend index e6a72052..7a519c6e 100644 --- a/recipes/busybox/busybox_1.%.bbappend +++ b/recipes/busybox/busybox_1.%.bbappend @@ -39,8 +39,8 @@ INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh" RRECOMMENDS_${PN} += "${PN}-ifplugd" do_install_append () { - install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/ifplugd - install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ + install -d ${D}${sysconfdir}/ifplugd + install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ } diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend index d824989e..4eab3aa8 100644 --- a/recipes/dbus/dbus_%.bbappend +++ b/recipes/dbus/dbus_%.bbappend @@ -37,11 +37,11 @@ FILES_${PN}-session-init = " \ " do_install_append_class-target() { - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh - install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session - fi - install -d ${D}${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ + if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session + fi + install -d ${D}${sysconfdir}/profile.d + install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ } diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index 5d1b1b5b..6adb48c6 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -42,11 +42,11 @@ RRECOMMENDS_${PN} += "${PN}-dicts" FILES_${PN}-dicts = "${datadir}/hunspell" do_install_append() { - install -m 0755 -d ${D}${datadir}/hunspell + install -m 0755 -d ${D}${datadir}/hunspell - install -m 0755 ${WORKDIR}/git/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic - install -m 0755 ${WORKDIR}/git/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff + install -m 0755 ${WORKDIR}/git/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic + install -m 0755 ${WORKDIR}/git/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff - install -m 0755 ${WORKDIR}/git/en/en_GB.dic ${D}${datadir}/hunspell - install -m 0755 ${WORKDIR}/git/en/en_GB.aff ${D}${datadir}/hunspell + install -m 0755 ${WORKDIR}/git/en/en_GB.dic ${D}${datadir}/hunspell + install -m 0755 ${WORKDIR}/git/en/en_GB.aff ${D}${datadir}/hunspell } diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index b7da5859..38ea659e 100644 --- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend @@ -25,6 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_beagleboard = " file://fixed_mac_address" do_install_append_beagleboard() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/fixed_mac_address ${D}${sysconfdir}/network/if-pre-up.d/ + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/fixed_mac_address ${D}${sysconfdir}/network/if-pre-up.d/ } diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 09efe29a..f8cdf557 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.bbappend @@ -21,5 +21,5 @@ ############################################################################# do_configure_append() { - sed -i -e "/echo/d" ${WORKDIR}/banner.sh + sed -i -e "/echo/d" ${WORKDIR}/banner.sh } diff --git a/recipes/opengldummy/opengldummy.bb b/recipes/opengldummy/opengldummy.bb index 680e8cce..bfd8870d 100644 --- a/recipes/opengldummy/opengldummy.bb +++ b/recipes/opengldummy/opengldummy.bb @@ -29,14 +29,14 @@ PV = "1.0.0" require opengldummy.inc do_compile() { - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp } do_install_append() { - install -m 0755 -d ${D}${libdir} - install -m 0755 ${S}/libEGL.so.1 ${D}${libdir} - ln -s libEGL.so.1 ${D}${libdir}/libEGL.so - install -m 0755 ${S}/libGLESv2.so.2 ${D}${libdir} - ln -s libGLESv2.so.2 ${D}${libdir}/libGLESv2.so + install -m 0755 -d ${D}${libdir} + install -m 0755 ${S}/libEGL.so.1 ${D}${libdir} + ln -s libEGL.so.1 ${D}${libdir}/libEGL.so + install -m 0755 ${S}/libGLESv2.so.2 ${D}${libdir} + ln -s libGLESv2.so.2 ${D}${libdir}/libGLESv2.so } diff --git a/recipes/opengldummy/opengldummy.inc b/recipes/opengldummy/opengldummy.inc index 2119da06..7719f0c7 100644 --- a/recipes/opengldummy/opengldummy.inc +++ b/recipes/opengldummy/opengldummy.inc @@ -28,15 +28,15 @@ SRC_URI = "file://headers \ " do_install() { - install -m 0755 -d ${D}${includedir}/EGL - install -m 0755 ${WORKDIR}/headers/EGL/* ${D}${includedir}/EGL + install -m 0755 -d ${D}${includedir}/EGL + install -m 0755 ${WORKDIR}/headers/EGL/* ${D}${includedir}/EGL - install -m 0755 -d ${D}${includedir}/GLES2 - install -m 0755 ${WORKDIR}/headers/GLES2/* ${D}${includedir}/GLES2 + install -m 0755 -d ${D}${includedir}/GLES2 + install -m 0755 ${WORKDIR}/headers/GLES2/* ${D}${includedir}/GLES2 - install -m 0755 -d ${D}${includedir}/GLES3 - install -m 0755 ${WORKDIR}/headers/GLES3/* ${D}${includedir}/GLES3 + install -m 0755 -d ${D}${includedir}/GLES3 + install -m 0755 ${WORKDIR}/headers/GLES3/* ${D}${includedir}/GLES3 - install -m 0755 -d ${D}${includedir}/KHR - install -m 0755 ${WORKDIR}/headers/KHR/* ${D}${includedir}/KHR + install -m 0755 -d ${D}${includedir}/KHR + install -m 0755 ${WORKDIR}/headers/KHR/* ${D}${includedir}/KHR } diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb index c2e936e0..2b21d513 100644 --- a/recipes/opengldummy/qtglesstream-dummy-client.bb +++ b/recipes/opengldummy/qtglesstream-dummy-client.bb @@ -31,14 +31,14 @@ SOLIBMINOR = "0" require opengldummy.inc do_compile() { - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \ - -I${WORKDIR}/headers -o libQtGlesStreamClient.so.${PV} ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \ + -I${WORKDIR}/headers -o libQtGlesStreamClient.so.${PV} ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp } do_install_append() { - install -m 0755 -d ${D}${libdir} - install -m 0755 ${S}/libQtGlesStreamClient.so.${PV} ${D}${libdir} - ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR}.${SOLIBMINOR} - ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR} - ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so + install -m 0755 -d ${D}${libdir} + install -m 0755 ${S}/libQtGlesStreamClient.so.${PV} ${D}${libdir} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR}.${SOLIBMINOR} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so } diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend index 792ad2fb..461cb452 100644 --- a/recipes/openssl/openssl_1.%.bbappend +++ b/recipes/openssl/openssl_1.%.bbappend @@ -23,6 +23,6 @@ PACKAGECONFIG += "perl" do_install_append () { - rmdir ${D}${libdir}/ssl/certs - ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ + rmdir ${D}${libdir}/ssl/certs + ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ } diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index 63d61f68..82fd0cc5 100644 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb @@ -34,15 +34,15 @@ SRC_URI[sha256sum] = "f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd58 S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders" do_compile() { - ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf + ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf } do_install() { - install -m 0755 -d ${D}${bindir}/ - install -m 0755 mount.vboxsf ${D}${bindir}/ + install -m 0755 -d ${D}${bindir}/ + install -m 0755 mount.vboxsf ${D}${bindir}/ - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/ } INITSCRIPT_NAME = "mount-vboxsf.sh" diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index 587695c1..04fffecb 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -41,13 +41,13 @@ export KBUILD_VERBOSE="1" export BUILD_TARGET_ARCH="${ARCH}" do_compile_prepend() { - ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz - tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox + ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz + tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox } do_install() { - install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 *.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 *.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox } PKG_${PN} = "kernel-module-vbox" diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend index 9a200b20..708a6164 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend +++ b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend @@ -1,17 +1,17 @@ do_install_append () { - install -d ${D}${includedir}/wpa-supplicant + install -d ${D}${includedir}/wpa-supplicant - install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ } FILES_${PN}-dev += "${includedir}/wpa-supplicant/*" -- cgit v1.2.3