From 966f278b30303ab88d319af077f4ac8abf012dbe Mon Sep 17 00:00:00 2001 From: aavit Date: Thu, 25 Sep 2014 16:15:00 +0200 Subject: Make bbappends more flexible by using wildcard version matching From v1.6, yocto supports wildcards in .bbappend file names. This is practical since we then don't have to rename them every time the upstream version changes slightly. Also allows for support of earlier poky versions. Change-Id: Ib21e6fa1b56d11421c06af353c6ba848f38e07e0 Reviewed-by: Samuli Piippo --- .../gpu-viv-bin-mx6q_3.10.%-hfp.bbappend | 1 + .../gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend | 1 - .../recipes/linux/linux-imx_3.%.bbappend | 35 ++++++++++++++++ .../recipes/linux/linux-imx_3.10.17.bbappend | 35 ---------------- recipes/busybox/busybox_1.%.bbappend | 46 ++++++++++++++++++++++ recipes/busybox/busybox_1.22.1.bbappend | 46 ---------------------- recipes/linux/linux-yocto_3.%.bbappend | 29 ++++++++++++++ recipes/linux/linux-yocto_3.14.bbappend | 29 -------------- recipes/mesa/mesa_9.%.bbappend | 26 ++++++++++++ recipes/mesa/mesa_9.2.5.bbappend | 26 ------------ recipes/openssl/openssl_1.%.bbappend | 28 +++++++++++++ recipes/openssl/openssl_1.0.1g.bbappend | 28 ------------- recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend | 18 +++++++++ recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend | 18 --------- 14 files changed, 183 insertions(+), 183 deletions(-) create mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend delete mode 100644 meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend create mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend delete mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend create mode 100644 recipes/busybox/busybox_1.%.bbappend delete mode 100644 recipes/busybox/busybox_1.22.1.bbappend create mode 100644 recipes/linux/linux-yocto_3.%.bbappend delete mode 100644 recipes/linux/linux-yocto_3.14.bbappend create mode 100644 recipes/mesa/mesa_9.%.bbappend delete mode 100644 recipes/mesa/mesa_9.2.5.bbappend create mode 100644 recipes/openssl/openssl_1.%.bbappend delete mode 100644 recipes/openssl/openssl_1.0.1g.bbappend create mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend delete mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend new file mode 100644 index 0000000..bed361e --- /dev/null +++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.%-hfp.bbappend @@ -0,0 +1 @@ +RDEPENDS_libgl-mx6-dev = "" diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend deleted file mode 100644 index bed361e..0000000 --- a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend +++ /dev/null @@ -1 +0,0 @@ -RDEPENDS_libgl-mx6-dev = "" diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend new file mode 100644 index 0000000..df01b62 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend @@ -0,0 +1,35 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +# kernel image files are not needed in the image +RDEPENDS_kernel-base = "" + +do_configure_prepend() { + # 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 +} diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend deleted file mode 100644 index df01b62..0000000 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -# kernel image files are not needed in the image -RDEPENDS_kernel-base = "" - -do_configure_prepend() { - # 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 -} diff --git a/recipes/busybox/busybox_1.%.bbappend b/recipes/busybox/busybox_1.%.bbappend new file mode 100644 index 0000000..fe5d5ea --- /dev/null +++ b/recipes/busybox/busybox_1.%.bbappend @@ -0,0 +1,46 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://network.cfg \ + file://busybox-ifplugd.sh \ + file://ifplugd.action \ + " + +PACKAGES =+ "${PN}-ifplugd" +FILES_${PN}-ifplugd = "\ + ${sysconfdir}/init.d/busybox-ifplugd.sh \ + ${sysconfdir}/etc/ifplugd/ifplugd.action \ + " + +INITSCRIPT_PACKAGES += "${PN}-ifplugd" +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 -d ${D}${sysconfdir}/ifplugd + install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ +} diff --git a/recipes/busybox/busybox_1.22.1.bbappend b/recipes/busybox/busybox_1.22.1.bbappend deleted file mode 100644 index fe5d5ea..0000000 --- a/recipes/busybox/busybox_1.22.1.bbappend +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://network.cfg \ - file://busybox-ifplugd.sh \ - file://ifplugd.action \ - " - -PACKAGES =+ "${PN}-ifplugd" -FILES_${PN}-ifplugd = "\ - ${sysconfdir}/init.d/busybox-ifplugd.sh \ - ${sysconfdir}/etc/ifplugd/ifplugd.action \ - " - -INITSCRIPT_PACKAGES += "${PN}-ifplugd" -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 -d ${D}${sysconfdir}/ifplugd - install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ -} diff --git a/recipes/linux/linux-yocto_3.%.bbappend b/recipes/linux/linux-yocto_3.%.bbappend new file mode 100644 index 0000000..2645cbc --- /dev/null +++ b/recipes/linux/linux-yocto_3.%.bbappend @@ -0,0 +1,29 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://snd_intel8x0.cfg \ + " + +KMACHINE_emulator = "qemux86" +COMPATIBLE_MACHINE_emulator = "emulator" diff --git a/recipes/linux/linux-yocto_3.14.bbappend b/recipes/linux/linux-yocto_3.14.bbappend deleted file mode 100644 index 2645cbc..0000000 --- a/recipes/linux/linux-yocto_3.14.bbappend +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://snd_intel8x0.cfg \ - " - -KMACHINE_emulator = "qemux86" -COMPATIBLE_MACHINE_emulator = "emulator" diff --git a/recipes/mesa/mesa_9.%.bbappend b/recipes/mesa/mesa_9.%.bbappend new file mode 100644 index 0000000..627f70b --- /dev/null +++ b/recipes/mesa/mesa_9.%.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +EGL_PLATFORMS = "fbdev" +DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append += "swrast" +EXTRA_OECONF += "--with-dri-drivers=""" diff --git a/recipes/mesa/mesa_9.2.5.bbappend b/recipes/mesa/mesa_9.2.5.bbappend deleted file mode 100644 index 627f70b..0000000 --- a/recipes/mesa/mesa_9.2.5.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -EGL_PLATFORMS = "fbdev" -DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append += "swrast" -EXTRA_OECONF += "--with-dri-drivers=""" diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend new file mode 100644 index 0000000..1ba0a2e --- /dev/null +++ b/recipes/openssl/openssl_1.%.bbappend @@ -0,0 +1,28 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +PACKAGECONFIG += "perl" + +do_install_append () { + rmdir ${D}${libdir}/ssl/certs + ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ +} diff --git a/recipes/openssl/openssl_1.0.1g.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend deleted file mode 100644 index 1ba0a2e..0000000 --- a/recipes/openssl/openssl_1.0.1g.bbappend +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://qt.digia.com/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -PACKAGECONFIG += "perl" - -do_install_append () { - rmdir ${D}${libdir}/ssl/certs - ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ -} diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend new file mode 100644 index 0000000..9a200b2 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend @@ -0,0 +1,18 @@ +do_install_append () { + 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/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/*" + diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend deleted file mode 100644 index 9a200b2..0000000 --- a/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -do_install_append () { - 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/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-54-g00ecf