diff --git a/classes/easysplash_animation.bbclass b/classes/easysplash-animation.bbclass similarity index 100% rename from classes/easysplash_animation.bbclass rename to classes/easysplash-animation.bbclass diff --git a/classes/ossystems-factory-defaults.bbclass b/classes/ossystems-factory-defaults.bbclass index afde1a6..f3c3a06 100644 --- a/classes/ossystems-factory-defaults.bbclass +++ b/classes/ossystems-factory-defaults.bbclass @@ -32,6 +32,7 @@ inherit ossystems-factory-defaults-base +member[doc] = "Return success if the first argument is present in the remaining arguments." member() { elt=$1 shift @@ -65,7 +66,7 @@ do_install:append() { local dir for file in $no_leading_slash; do dir="${D}/`dirname $file`" - mkdir -p $dir + install -d $dir cd $dir ln -sf ${OSSYSTEMS_FACTORY_DEFAULTS_RUNTIME_DIR}/$file `basename $file` done diff --git a/classes/release-bundle-generation.bbclass b/classes/release-bundle-generation.bbclass index 4a3964d..aaadfed 100644 --- a/classes/release-bundle-generation.bbclass +++ b/classes/release-bundle-generation.bbclass @@ -20,11 +20,12 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" do_populate_sysroot[noexec] = "1" +do_packagedata[noexec] = "1" do_package[noexec] = "1" do_package_qa[noexec] = "1" -do_packagedata[noexec] = "1" -LICENSE = "MIT" +SRC_URI = "file://bundle-shar-extract.sh" + PACKAGES = "" INHIBIT_DEFAULT_DEPS = "1" @@ -35,25 +36,18 @@ RELEASE_BUNDLE_VERSION ?= "${DISTRO_VERSION}" RELEASE_BUNDLE_DEPLOY = "${DEPLOY_DIR}/release-bundle" RELEASE_BUNDLE_WORKDIR = "${TMPDIR}/release-bundle/workdir" +RELEASE_BUNDLE_TMP_DOWNLOAD_CACHE ?= "${TMPDIR}/release-bundle/download-cache" RELEASE_BUNDLE_OUTPUTNAME ?= "${RELEASE_BUNDLE_NAME}-release-${RELEASE_BUNDLE_VERSION}" RELEASE_BUNDLE_RECIPES_WITH_SOURCE ?= "" -SRC_URI = "file://bundle-shar-extract.sh" - -python() { - recipes = d.getVar('RELEASE_BUNDLE_RECIPES_WITH_SOURCE', True).split() - d.appendVarFlag('do_release_bundle_finalize', - 'depends', - " ".join(map(lambda x: - x + ":do_collect_recipe_source", - recipes))) - - d.delVarFlag('do_build', 'recrdeptask') - d.delVarFlag('do_build', 'depends') -} +do_build[depends] = "" +do_build[recrdeptask] = "" +do_release_bundle_finalize[depends] += "${@' '.join('%s:do_collect_recipe_source' % recipe for recipe in d.getVar('RELEASE_BUNDLE_RECIPES_WITH_SOURCE').split())}" addtask collect_platform_source before do_release_bundle_finalize do_collect_platform_source[cleandirs] = "${RELEASE_BUNDLE_WORKDIR}" +do_collect_platform_source[depends] += "repo-native:do_populate_sysroot " +do_collect_platform_source[doc] = "Collect platform repositories into the release bundle work directory." do_collect_platform_source[nostamp] = "1" do_collect_platform_source() { cd "${PLATFORM_ROOT_DIR}" @@ -77,6 +71,7 @@ RELEASE_BUNDLE_TAR_OPTS = "--owner=root --group=root" RELEASE_BUNDLE_OLDEST_KERNEL = "3.2.0" RELEASE_BUNDLE_PATH = "\$HOME/src/${RELEASE_BUNDLE_NAME}/${RELEASE_BUNDLE_VERSION}" +tar_release_bundle[doc] = "Create the compressed release bundle archive." fakeroot tar_release_bundle() { mkdir -p ${RELEASE_BUNDLE_DEPLOY} cd ${RELEASE_BUNDLE_WORKDIR} @@ -86,13 +81,18 @@ fakeroot tar_release_bundle() { addtask release_bundle_finalize after do_unpack do_collect_platform_source before do_build do_release_bundle_finalize[dirs] = "${RELEASE_BUNDLE_WORKDIR}/download" do_release_bundle_finalize[depends] += "pbzip2-native:do_populate_sysroot " +do_release_bundle_finalize[doc] = "Finalize and emit the self-extracting release bundle." do_release_bundle_finalize() { - cp --archive -L ${RELEASE_BUNDLE_TMP_DOWNLOAD_CACHE}/*/* ${RELEASE_BUNDLE_WORKDIR}/ + for bundle_dir in ${RELEASE_BUNDLE_TMP_DOWNLOAD_CACHE}/*/*; do + [ -e "$bundle_dir" ] || continue + cp --archive -L "$bundle_dir" ${RELEASE_BUNDLE_WORKDIR}/ + done + find ${RELEASE_BUNDLE_WORKDIR} -type d -empty -delete tar_release_bundle - cp "${WORKDIR}/bundle-shar-extract.sh" ${RELEASE_BUNDLE_DEPLOY}/${RELEASE_BUNDLE_OUTPUTNAME}.sh + cp "${UNPACKDIR}/bundle-shar-extract.sh" ${RELEASE_BUNDLE_DEPLOY}/${RELEASE_BUNDLE_OUTPUTNAME}.sh # substitute variables sed -e "s#@RELEASE_BUNDLE_PATH@#${RELEASE_BUNDLE_PATH}#g" \ diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init.bb b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb similarity index 63% rename from dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init.bb rename to dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb index f85a8bc..a46cdb1 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init.bb +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb @@ -1,19 +1,26 @@ SUMMARY = "Startup script and service for the Chromium Browser using Ozone" +DESCRIPTION = "Installs init scripts, systemd unit files, and default configuration for launching Chromium Ozone Wayland." +HOMEPAGE = "https://www.chromium.org" +BUGTRACKER = "https://issues.chromium.org/issues" +SECTION = "graphics" +CVE_PRODUCT = "chromium" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ + file://COPYING.MIT \ file://${BPN}.default \ file://${BPN}.initd \ file://${BPN}.service \ " +S = "${UNPACKDIR}" inherit systemd update-rc.d ## Configuration variables # URL to load when start. -CHROMIUM_URL ?= "https://ossystems.com.br" +CHROMIUM_URL ?= "https://ossystems.com.br" # Extra arguments to pass to 'chromium' application. CHROMIUM_EXTRA_ARGS ?= "" @@ -34,13 +41,13 @@ do_compile[noexec] = "1" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/chromium-ozone-wayland + install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/chromium-ozone-wayland fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/chromium-ozone-wayland.service + install -Dm 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/chromium-ozone-wayland.service fi - install -Dm 0644 ${WORKDIR}/${BPN}.default ${D}${sysconfdir}/default/chromium-ozone-wayland + install -Dm 0644 ${UNPACKDIR}/${BPN}.default ${D}${sysconfdir}/default/chromium-ozone-wayland echo ${CHROMIUM_ENV} >> ${D}${sysconfdir}/default/chromium-ozone-wayland @@ -49,6 +56,6 @@ do_install() { -i ${D}${sysconfdir}/default/chromium-ozone-wayland } -RDEPENDS:${PN} += "chromium-ozone-wayland" - PACKAGE_ARCH = "${MACHINE_ARCH}" + +RDEPENDS:${PN} += "chromium-ozone-wayland" diff --git a/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend b/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend index 923677b..87adda8 100644 --- a/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend +++ b/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend @@ -1,6 +1,2 @@ -# Upstream is dual licensed on GPLv2 | GPLv3, so force GPLv2 in order -# to allow safe checks via image-license-checker -LICENSE = "GPL-2.0-only" - # Disabled by default to avoid conflicts with NM/systemd -SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_AUTO_ENABLE:oel = "disable" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init.bb b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb similarity index 61% rename from dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init.bb rename to dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb index fb79172..813e76c 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init.bb +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb @@ -1,13 +1,20 @@ SUMMARY = "Startup script and service for the Kiosk Browser" +DESCRIPTION = "Installs init scripts, systemd unit files, and default configuration for launching Qt Kiosk Browser." +HOMEPAGE = "https://github.com/OSSystems/qt-kiosk-browser" +BUGTRACKER = "https://github.com/OSSystems/qt-kiosk-browser/issues" +SECTION = "graphics" +CVE_PRODUCT = "qt-kiosk-browser" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ +SRC_URI = "\ + file://COPYING.MIT \ file://${BPN}.default \ file://${BPN}.initd \ file://${BPN}.service \ file://${BPN}.conf \ " +S = "${UNPACKDIR}" inherit systemd update-rc.d @@ -21,7 +28,6 @@ QT_KIOSK_SCREENSAVER_TIME ?= "0" # Defines the time to restart the browser after entering in screen saving mode (0 to disable). QT_KIOSK_RESTART_TIME ?= "0" - SYSTEMD_SERVICE:${PN} = "qt-kiosk-browser.service" # Start after weston-init @@ -34,15 +40,15 @@ INITSCRIPT_NAME = "qt-kiosk-browser" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -Dm 0755 ${WORKDIR}/${PN}.initd ${D}${sysconfdir}/init.d/kiosk + install -Dm 0755 ${UNPACKDIR}/${PN}.initd ${D}${sysconfdir}/init.d/kiosk fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/${PN}.service ${D}${systemd_system_unitdir}/qt-kiosk-browser.service + install -Dm 0644 ${UNPACKDIR}/${PN}.service ${D}${systemd_system_unitdir}/qt-kiosk-browser.service fi - install -Dm 0644 ${WORKDIR}/${PN}.default ${D}${sysconfdir}/default/qt-kiosk-browser + install -Dm 0644 ${UNPACKDIR}/${PN}.default ${D}${sysconfdir}/default/qt-kiosk-browser - install -Dm 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/qt-kiosk-browser.conf + install -Dm 0644 ${UNPACKDIR}/${PN}.conf ${D}${sysconfdir}/qt-kiosk-browser.conf sed -e 's,@QT_KIOSK_URL@,${QT_KIOSK_URL},g' \ -e 's,@QT_KIOSK_RESTART_TIME@,${QT_KIOSK_RESTART_TIME},g' \ @@ -50,6 +56,6 @@ do_install() { -i ${D}${sysconfdir}/qt-kiosk-browser.conf } -RDEPENDS:${PN} += "qt-kiosk-browser" - PACKAGE_ARCH = "${MACHINE_ARCH}" + +RDEPENDS:${PN} += "qt-kiosk-browser" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend index 45680e0..c80c5eb 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:oel := "${THISDIR}/${PN}:" #The default config file is removed to allow the generation of a new one with the proper parameters -do_install:append() { +do_install:append:oel() { rm ${D}${sysconfdir}/${PN}.conf } diff --git a/recipes-browser/cog/cog-init.bb b/recipes-browser/cog/cog-init_1.0.bb similarity index 81% rename from recipes-browser/cog/cog-init.bb rename to recipes-browser/cog/cog-init_1.0.bb index 4e76dd3..5e62545 100644 --- a/recipes-browser/cog/cog-init.bb +++ b/recipes-browser/cog/cog-init_1.0.bb @@ -1,12 +1,19 @@ SUMMARY = "Startup script and service for the Cog Browser" +DESCRIPTION = "Installs init scripts, systemd unit files, and default configuration for launching Cog." +HOMEPAGE = "https://wpewebkit.org" +BUGTRACKER = "https://github.com/Igalia/cog/issues" +SECTION = "graphics" +CVE_PRODUCT = "cog" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ + file://COPYING.MIT \ file://${BPN}.default \ file://${BPN}.initd \ file://${BPN}.service \ " +S = "${UNPACKDIR}" inherit systemd update-rc.d @@ -20,7 +27,7 @@ COG_PLATFORM ?= "wl" COG_PLATFORM_WL_VIEW_FULLSCREEN ?= "1" # URL to load when start. -COG_URL ?= "https://ossystems.com.br" +COG_URL ?= "https://ossystems.com.br" # Extra arguments to pass to 'cog' application. COG_EXTRA_ARGS ?= "" @@ -58,6 +65,6 @@ do_install() { -i ${D}${sysconfdir}/default/cog } -RDEPENDS:${PN} += "cog" - PACKAGE_ARCH = "${MACHINE_ARCH}" + +RDEPENDS:${PN} += "cog" diff --git a/recipes-browser/cog/files/COPYING.MIT b/recipes-browser/cog/files/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/recipes-browser/cog/files/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/recipes-connectivity/ppp/ppp_%.bbappend b/recipes-connectivity/ppp/ppp_%.bbappend index ef1cb93..4b7fbbe 100644 --- a/recipes-connectivity/ppp/ppp_%.bbappend +++ b/recipes-connectivity/ppp/ppp_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:oel := "${THISDIR}/files:" -SRC_URI += "file://options" +SRC_URI:append:oel = " file://options" -do_install:append() { - install -Dm 0755 ${WORKDIR}/options ${D}${sysconfdir}/${PN}/options +do_install:append:oel() { + install -Dm 0755 ${UNPACKDIR}/options ${D}${sysconfdir}/${PN}/options } diff --git a/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb index 58efdfa..927e1c5 100644 --- a/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb +++ b/recipes-core/easysplash/easysplash-animation-default_2.0.0.bb @@ -8,7 +8,7 @@ LICENSE = "CLOSED" require easysplash-common-2.0.inc -inherit easysplash_animation +inherit easysplash-animation do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb b/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb index e410f4b..12bc66c 100644 --- a/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb +++ b/recipes-core/easysplash/easysplash-animation-ossystems_2.0.0.bb @@ -8,7 +8,7 @@ LICENSE = "CLOSED" require easysplash-common-2.0.inc -inherit easysplash_animation +inherit easysplash-animation do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-core/easysplash/easysplash_2.0.0.bb b/recipes-core/easysplash/easysplash_2.0.0.bb index 86e5397..2f5adf0 100644 --- a/recipes-core/easysplash/easysplash_2.0.0.bb +++ b/recipes-core/easysplash/easysplash_2.0.0.bb @@ -25,7 +25,7 @@ inherit cargo pkgconfig systemd update-rc.d cargo-update-recipe-crates # DEFAULT_PREFERENCE = "-1" CARGO_SRC_DIR = "" -PV .= ".AUTOINC+724e1c7edc" +PV .= "+git${SRCPV}" INITSCRIPT_NAME = "${PN}-start" INITSCRIPT_PARAMS:${PN} = "start 5 S ." diff --git a/recipes-core/images/initramfs-psplash-image.bb b/recipes-core/images/initramfs-psplash-image.bb index 4b55c9a..8832e56 100644 --- a/recipes-core/images/initramfs-psplash-image.bb +++ b/recipes-core/images/initramfs-psplash-image.bb @@ -1,13 +1,15 @@ +SUMMARY = "Initramfs image with psplash" DESCRIPTION = "Small image with psplash implementation to use as \ -an alternative to the splash kernel." + an alternative to the splash kernel." +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "images" +CVE_PRODUCT = "meta-ossystems-base" +LICENSE = "MIT" IMAGE_FSTYPES = "cpio.gz.u-boot" IMAGE_ROOTFS_SIZE = "0" -IMAGE_FEATURES = " \ - splash \ - debug-tweaks \ -" +IMAGE_FEATURES = "splash" # Avoid installation of syslog BAD_RECOMMENDATIONS += "busybox-syslog" @@ -17,7 +19,7 @@ USE_DEVFS = "1" inherit core-image -CORE_IMAGE_BASE_INSTALL = " \ +CORE_IMAGE_BASE_INSTALL = "\ initramfs-framework-base \ initramfs-module-psplash \ initramfs-module-rootfs \ diff --git a/recipes-core/images/ossystems-minimal-initramfs.bb b/recipes-core/images/ossystems-minimal-initramfs.bb index 7a942c5..5526055 100644 --- a/recipes-core/images/ossystems-minimal-initramfs.bb +++ b/recipes-core/images/ossystems-minimal-initramfs.bb @@ -4,6 +4,10 @@ # Released under the MIT license SUMMARY = "The very minimal initramfs image capable of booting a device" +DESCRIPTION = "Minimal initramfs image with enough userspace to boot a device." +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "images" +CVE_PRODUCT = "meta-ossystems-base" PACKAGE_INSTALL = "initramfs-module-mdev ${VIRTUAL-RUNTIME_base-utils} ${ROOTFS_BOOTSTRAP_INSTALL}" @@ -22,7 +26,7 @@ inherit core-image IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -BAD_RECOMMENDATIONS += " \ +BAD_RECOMMENDATIONS += "\ busybox-udhcpc \ busybox-syslog \ initramfs-module-rootfs \ diff --git a/recipes-core/initrdscripts/initramfs-framework-psplash/COPYING.MIT b/recipes-core/initrdscripts/initramfs-framework-psplash/COPYING.MIT new file mode 100644 index 0000000..fb950dc --- /dev/null +++ b/recipes-core/initrdscripts/initramfs-framework-psplash/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb b/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb index 9344c28..287ea51 100644 --- a/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb +++ b/recipes-core/initrdscripts/initramfs-framework-psplash_1.0.bb @@ -1,28 +1,34 @@ SUMMARY = "Modular psplash to initramfs system" +SUMMARY:initramfs-module-psplash = "initramfs psplash support" +DESCRIPTION = "Adds psplash start and finish hooks to initramfs-framework images." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "base" +CVE_PRODUCT = "initramfs-framework-psplash" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" -RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r4" -inherit allarch - -SRC_URI = " \ +SRC_URI = "\ + file://COPYING.MIT \ file://psplash \ file://psplash-finish \ " S = "${UNPACKDIR}" +PACKAGES = "initramfs-module-psplash" + +inherit allarch + do_install() { # psplash install -Dm 0755 ${S}/psplash ${D}/init.d/11-psplash install -Dm 0755 ${S}/psplash-finish ${D}/init.d/98-psplash_finish } -PACKAGES = "initramfs-module-psplash" - -SUMMARY:initramfs-module-psplash = "initramfs psplash support" +FILES:initramfs-module-psplash += "/init.d" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" RDEPENDS:initramfs-module-psplash = "initramfs-framework-base psplash" -FILES:initramfs-module-psplash = "/init.d" +RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" diff --git a/recipes-core/net-persistent-mac/net-persistent-mac.bb b/recipes-core/net-persistent-mac/net-persistent-mac.bb deleted file mode 100644 index 5c6a777..0000000 --- a/recipes-core/net-persistent-mac/net-persistent-mac.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Network device MAC persistency" -DESCRIPTION = "Provides support to store/restore the MAC of a specific network device" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI = "\ - file://${BPN} \ - file://${BPN}.default \ - file://${BPN}.service \ -" - -OSSYSTEMS_FACTORY_DEFAULTS_HOOKS = "file://${BPN}.factory-defaults-hook" - -inherit ossystems-factory-defaults systemd - -SYSTEMD_SERVICE:${PN} = "${PN}.service" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -Dm 0644 ${WORKDIR}/${PN}.service ${D}${systemd_system_unitdir}/${PN}.service - install -Dm 0644 ${WORKDIR}/${PN}.default ${D}${sysconfdir}/default/${PN} - install -Dm 0755 ${WORKDIR}/${PN} ${D}${bindir}/${PN} -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT b/recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb b/recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb new file mode 100644 index 0000000..181ef4c --- /dev/null +++ b/recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Network device MAC persistency" +DESCRIPTION = "Provides support to store/restore the MAC of a specific network device" +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "base" +CVE_PRODUCT = "net-persistent-mac" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "\ + file://COPYING.MIT \ + file://${BPN} \ + file://${BPN}.default \ + file://${BPN}.service \ +" +S = "${UNPACKDIR}" + +OSSYSTEMS_FACTORY_DEFAULTS_HOOKS = "file://${BPN}.factory-defaults-hook" + +inherit ossystems-factory-defaults systemd + +SYSTEMD_SERVICE:${PN} = "${PN}.service" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm 0644 ${UNPACKDIR}/${PN}.service ${D}${systemd_system_unitdir}/${PN}.service + install -Dm 0644 ${UNPACKDIR}/${PN}.default ${D}${sysconfdir}/default/${PN} + install -Dm 0755 ${UNPACKDIR}/${PN} ${D}${bindir}/${PN} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults.bb b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults_1.0.bb similarity index 72% rename from recipes-core/ossystems-factory-defaults/ossystems-factory-defaults.bb rename to recipes-core/ossystems-factory-defaults/ossystems-factory-defaults_1.0.bb index 04b8e1b..aabbc9d 100644 --- a/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults.bb +++ b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults_1.0.bb @@ -1,8 +1,14 @@ SUMMARY = "Tool to restore image state to factory defaults" +DESCRIPTION = "Installs the factory-defaults utility and service for restoring configured files to factory defaults." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "base" +CVE_PRODUCT = "ossystems-factory-defaults" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ + file://COPYING.MIT \ file://factory-defaults \ file://${BPN}.service \ " diff --git a/recipes-core/release/files/COPYING.MIT b/recipes-core/release/files/COPYING.MIT new file mode 100644 index 0000000..fb950dc --- /dev/null +++ b/recipes-core/release/files/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/recipes-core/release/generate-release-bundle.bb b/recipes-core/release/generate-release-bundle.bb deleted file mode 100644 index fa45482..0000000 --- a/recipes-core/release/generate-release-bundle.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "Generate release bundle" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit release-bundle-generation diff --git a/recipes-core/release/generate-release-bundle_1.0.bb b/recipes-core/release/generate-release-bundle_1.0.bb new file mode 100644 index 0000000..a077e27 --- /dev/null +++ b/recipes-core/release/generate-release-bundle_1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Generate release bundle" +DESCRIPTION = "Generates self-extracting release bundles from the configured platform source tree." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "devel" +CVE_PRODUCT = "meta-ossystems-base" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit release-bundle-generation + +SRC_URI += "file://COPYING.MIT" +S = "${UNPACKDIR}" diff --git a/recipes-demos/html5-demo/files/COPYING.MIT b/recipes-demos/html5-demo/files/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/recipes-demos/html5-demo/files/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/recipes-demos/html5-demo/html5-demo_git.bb b/recipes-demos/html5-demo/html5-demo_git.bb index db9bfff..8543027 100644 --- a/recipes-demos/html5-demo/html5-demo_git.bb +++ b/recipes-demos/html5-demo/html5-demo_git.bb @@ -1,9 +1,17 @@ SUMMARY = "HTML5 demo useful for test browser performance" +DESCRIPTION = "Installs the O.S. Systems HTML5 browser performance demo." +HOMEPAGE = "https://github.com/OSSystems/html5-demo" +BUGTRACKER = "https://github.com/OSSystems/html5-demo/issues" +SECTION = "demos" +CVE_PRODUCT = "html5-demo" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://../COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "git://github.com/OSSystems/${BPN}.git;protocol=https;branch=master" -SRCREV = "e9ede7082b9e9e919e25b3a147d18e46dc3802f0" +SRC_URI = "\ + git://github.com/OSSystems/${BPN}.git;protocol=https;branch=master \ + file://COPYING.MIT \ +" +SRCREV = "f6ce362a53e4ce5405383bef94864adf10777377" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-devtools/telegraf/files/telegraf.conf b/recipes-devtools/telegraf/files/telegraf.conf new file mode 100644 index 0000000..e28f811 --- /dev/null +++ b/recipes-devtools/telegraf/files/telegraf.conf @@ -0,0 +1,2132 @@ +# Telegraf Configuration +# +# Telegraf is entirely plugin driven. All metrics are gathered from the +# declared inputs, and sent to the declared outputs. +# +# Plugins must be declared in here to be active. +# To deactivate a plugin, comment out the name and any variables. +# +# Use 'telegraf -config telegraf.conf -test' to see what metrics a config +# file would generate. +# +# Environment variables can be used anywhere in this config file, simply surround +# them with ${}. For strings the variable must be within quotes (ie, "${STR_VAR}"), +# for numbers and booleans they should be plain (ie, ${INT_VAR}, ${BOOL_VAR}) + + +# Global tags can be specified here in key="value" format. +[global_tags] + # dc = "us-east-1" # will tag all metrics with dc=us-east-1 + # rack = "1a" + ## Environment variables can be used as tags, and throughout the config file + # user = "$USER" + + +# Configuration for telegraf agent +[agent] + ## Default data collection interval for all inputs + interval = "10s" + ## Rounds collection interval to 'interval' + ## ie, if interval="10s" then always collect on :00, :10, :20, etc. + round_interval = true + + ## Telegraf will send metrics to outputs in batches of at most + ## metric_batch_size metrics. + ## This controls the size of writes that Telegraf sends to output plugins. + metric_batch_size = 1000 + + ## Maximum number of unwritten metrics per output. Increasing this value + ## allows for longer periods of output downtime without dropping metrics at the + ## cost of higher maximum memory usage. + metric_buffer_limit = 10000 + + ## Collection jitter is used to jitter the collection by a random amount. + ## Each plugin will sleep for a random time within jitter before collecting. + ## This can be used to avoid many plugins querying things like sysfs at the + ## same time, which can have a measurable effect on the system. + collection_jitter = "0s" + + ## Default flushing interval for all outputs. Maximum flush_interval will be + ## flush_interval + flush_jitter + flush_interval = "10s" + ## Jitter the flush interval by a random amount. This is primarily to avoid + ## large write spikes for users running a large number of telegraf instances. + ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s + flush_jitter = "0s" + + ## By default or when set to "0s", precision will be set to the same + ## timestamp order as the collection interval, with the maximum being 1s. + ## ie, when interval = "10s", precision will be "1s" + ## when interval = "250ms", precision will be "1ms" + ## Precision will NOT be used for service inputs. It is up to each individual + ## service input to set the timestamp at the appropriate precision. + ## Valid time units are "ns", "us" (or "µs"), "ms", "s". + precision = "" + + ## Log at debug level. + # debug = false + ## Log only error level messages. + # quiet = false + + ## Log target controls the destination for logs and can be one of "file", + ## "stderr" or, on Windows, "eventlog". When set to "file", the output file + ## is determined by the "logfile" setting. + # logtarget = "file" + + ## Name of the file to be logged to when using the "file" logtarget. If set to + ## the empty string then logs are written to stderr. + # logfile = "" + + ## The logfile will be rotated after the time interval specified. When set + ## to 0 no time based rotation is performed. Logs are rotated only when + ## written to, if there is no log activity rotation may be delayed. + # logfile_rotation_interval = "0d" + + ## The logfile will be rotated when it becomes larger than the specified + ## size. When set to 0 no size based rotation is performed. + # logfile_rotation_max_size = "0MB" + + ## Maximum number of rotated archives to keep, any older logs are deleted. + ## If set to -1, no archives are removed. + # logfile_rotation_max_archives = 5 + + ## Override default hostname, if empty use os.Hostname() + hostname = "" + ## If set to true, do no set the "host" tag in the telegraf agent. + omit_hostname = false + + +############################################################################### +# OUTPUT PLUGINS # +############################################################################### + + +# Configuration for sending metrics to InfluxDB +[[outputs.influxdb]] + ## The full HTTP or UDP URL for your InfluxDB instance. + ## + ## Multiple URLs can be specified for a single cluster, only ONE of the + ## urls will be written to each interval. + # urls = ["unix:///var/run/influxdb.sock"] + # urls = ["udp://127.0.0.1:8089"] + # urls = ["http://127.0.0.1:8086"] + + ## The target database for metrics; will be created as needed. + ## For UDP url endpoint database needs to be configured on server side. + # database = "telegraf" + + ## The value of this tag will be used to determine the database. If this + ## tag is not set the 'database' option is used as the default. + # database_tag = "" + + ## If true, the 'database_tag' will not be included in the written metric. + # exclude_database_tag = false + + ## If true, no CREATE DATABASE queries will be sent. Set to true when using + ## Telegraf with a user without permissions to create databases or when the + ## database already exists. + # skip_database_creation = false + + ## Name of existing retention policy to write to. Empty string writes to + ## the default retention policy. Only takes effect when using HTTP. + # retention_policy = "" + + ## The value of this tag will be used to determine the retention policy. If this + ## tag is not set the 'retention_policy' option is used as the default. + # retention_policy_tag = "" + + ## If true, the 'retention_policy_tag' will not be included in the written metric. + # exclude_retention_policy_tag = false + + ## Write consistency (clusters only), can be: "any", "one", "quorum", "all". + ## Only takes effect when using HTTP. + # write_consistency = "any" + + ## Timeout for HTTP messages. + # timeout = "5s" + + ## HTTP Basic Auth + # username = "telegraf" + # password = "metricsmetricsmetricsmetrics" + + ## HTTP User-Agent + # user_agent = "telegraf" + + ## UDP payload size is the maximum packet size to send. + # udp_payload = "512B" + + ## Optional TLS Config for use on HTTP connections. + # tls_ca = "/etc/telegraf/ca.pem" + # tls_cert = "/etc/telegraf/cert.pem" + # tls_key = "/etc/telegraf/key.pem" + ## Use TLS but skip chain & host verification + # insecure_skip_verify = false + + ## HTTP Proxy override, if unset values the standard proxy environment + ## variables are consulted to determine which proxy, if any, should be used. + # http_proxy = "http://corporate.proxy:3128" + + ## Additional HTTP headers + # http_headers = {"X-Special-Header" = "Special-Value"} + + ## HTTP Content-Encoding for write request body, can be set to "gzip" to + ## compress body or "identity" to apply no encoding. + # content_encoding = "identity" + + ## When true, Telegraf will output unsigned integers as unsigned values, + ## i.e.: "42u". You will need a version of InfluxDB supporting unsigned + ## integer values. Enabling this option will result in field type errors if + ## existing data has been written. + # influx_uint_support = false + + +# # Configuration for Amon Server to send metrics to. +# [[outputs.amon]] +# ## Amon Server Key +# server_key = "my-server-key" # required. +# +# ## Amon Instance URL +# amon_instance = "https://youramoninstance" # required +# +# ## Connection timeout. +# # timeout = "5s" + + +# # Publishes metrics to an AMQP broker +# [[outputs.amqp]] +# ## Broker to publish to. +# ## deprecated in 1.7; use the brokers option +# # url = "amqp://localhost:5672/influxdb" +# +# ## Brokers to publish to. If multiple brokers are specified a random broker +# ## will be selected anytime a connection is established. This can be +# ## helpful for load balancing when not using a dedicated load balancer. +# brokers = ["amqp://localhost:5672/influxdb"] +# +# ## Maximum messages to send over a connection. Once this is reached, the +# ## connection is closed and a new connection is made. This can be helpful for +# ## load balancing when not using a dedicated load balancer. +# # max_messages = 0 +# +# ## Exchange to declare and publish to. +# exchange = "telegraf" +# +# ## Exchange type; common types are "direct", "fanout", "topic", "header", "x-consistent-hash". +# # exchange_type = "topic" +# +# ## If true, exchange will be passively declared. +# # exchange_passive = false +# +# ## Exchange durability can be either "transient" or "durable". +# # exchange_durability = "durable" +# +# ## Additional exchange arguments. +# # exchange_arguments = { } +# # exchange_arguments = {"hash_propery" = "timestamp"} +# +# ## Authentication credentials for the PLAIN auth_method. +# # username = "" +# # password = "" +# +# ## Auth method. PLAIN and EXTERNAL are supported +# ## Using EXTERNAL requires enabling the rabbitmq_auth_mechanism_ssl plugin as +# ## described here: https://www.rabbitmq.com/plugins.html +# # auth_method = "PLAIN" +# +# ## Metric tag to use as a routing key. +# ## ie, if this tag exists, its value will be used as the routing key +# # routing_tag = "host" +# +# ## Static routing key. Used when no routing_tag is set or as a fallback +# ## when the tag specified in routing tag is not found. +# # routing_key = "" +# # routing_key = "telegraf" +# +# ## Delivery Mode controls if a published message is persistent. +# ## One of "transient" or "persistent". +# # delivery_mode = "transient" +# +# ## InfluxDB database added as a message header. +# ## deprecated in 1.7; use the headers option +# # database = "telegraf" +# +# ## InfluxDB retention policy added as a message header +# ## deprecated in 1.7; use the headers option +# # retention_policy = "default" +# +# ## Static headers added to each published message. +# # headers = { } +# # headers = {"database" = "telegraf", "retention_policy" = "default"} +# +# ## Connection timeout. If not provided, will default to 5s. 0s means no +# ## timeout (not recommended). +# # timeout = "5s" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## If true use batch serialization format instead of line based delimiting. +# ## Only applies to data formats which are not line based such as JSON. +# ## Recommended to set to true. +# # use_batch_format = false +# +# ## Content encoding for message payloads, can be set to "gzip" to or +# ## "identity" to apply no encoding. +# ## +# ## Please note that when use_batch_format = false each amqp message contains only +# ## a single metric, it is recommended to use compression with batch format +# ## for best results. +# # content_encoding = "identity" +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# # data_format = "influx" + + +# # Send metrics to Azure Application Insights +# [[outputs.application_insights]] +# ## Instrumentation key of the Application Insights resource. +# instrumentation_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx" +# +# ## Timeout for closing (default: 5s). +# # timeout = "5s" +# +# ## Enable additional diagnostic logging. +# # enable_diagnostic_logging = false +# +# ## Context Tag Sources add Application Insights context tags to a tag value. +# ## +# ## For list of allowed context tag keys see: +# ## https://github.com/Microsoft/ApplicationInsights-Go/blob/master/appinsights/contracts/contexttagkeys.go +# # [outputs.application_insights.context_tag_sources] +# # "ai.cloud.role" = "kubernetes_container_name" +# # "ai.cloud.roleInstance" = "kubernetes_pod_name" + + +# # Send aggregate metrics to Azure Monitor +# [[outputs.azure_monitor]] +# ## Timeout for HTTP writes. +# # timeout = "20s" +# +# ## Set the namespace prefix, defaults to "Telegraf/". +# # namespace_prefix = "Telegraf/" +# +# ## Azure Monitor doesn't have a string value type, so convert string +# ## fields to dimensions (a.k.a. tags) if enabled. Azure Monitor allows +# ## a maximum of 10 dimensions so Telegraf will only send the first 10 +# ## alphanumeric dimensions. +# # strings_as_dimensions = false +# +# ## Both region and resource_id must be set or be available via the +# ## Instance Metadata service on Azure Virtual Machines. +# # +# ## Azure Region to publish metrics against. +# ## ex: region = "southcentralus" +# # region = "" +# # +# ## The Azure Resource ID against which metric will be logged, e.g. +# ## ex: resource_id = "/subscriptions//resourceGroups//providers/Microsoft.Compute/virtualMachines/" +# # resource_id = "" +# +# ## Optionally, if in Azure US Government, China or other sovereign +# ## cloud environment, set appropriate REST endpoint for receiving +# ## metrics. (Note: region may be unused in this context) +# # endpoint_url = "https://monitoring.core.usgovcloudapi.net" + + +# # Publish Telegraf metrics to a Google Cloud PubSub topic +# [[outputs.cloud_pubsub]] +# ## Required. Name of Google Cloud Platform (GCP) Project that owns +# ## the given PubSub topic. +# project = "my-project" +# +# ## Required. Name of PubSub topic to publish metrics to. +# topic = "my-topic" +# +# ## Required. Data format to consume. +# ## Each data format has its own unique set of configuration options. +# ## Read more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md +# data_format = "influx" +# +# ## Optional. Filepath for GCP credentials JSON file to authorize calls to +# ## PubSub APIs. If not set explicitly, Telegraf will attempt to use +# ## Application Default Credentials, which is preferred. +# # credentials_file = "path/to/my/creds.json" +# +# ## Optional. If true, will send all metrics per write in one PubSub message. +# # send_batched = true +# +# ## The following publish_* parameters specifically configures batching +# ## requests made to the GCP Cloud PubSub API via the PubSub Golang library. Read +# ## more here: https://godoc.org/cloud.google.com/go/pubsub#PublishSettings +# +# ## Optional. Send a request to PubSub (i.e. actually publish a batch) +# ## when it has this many PubSub messages. If send_batched is true, +# ## this is ignored and treated as if it were 1. +# # publish_count_threshold = 1000 +# +# ## Optional. Send a request to PubSub (i.e. actually publish a batch) +# ## when it has this many PubSub messages. If send_batched is true, +# ## this is ignored and treated as if it were 1 +# # publish_byte_threshold = 1000000 +# +# ## Optional. Specifically configures requests made to the PubSub API. +# # publish_num_go_routines = 2 +# +# ## Optional. Specifies a timeout for requests to the PubSub API. +# # publish_timeout = "30s" +# +# ## Optional. If true, published PubSub message data will be base64-encoded. +# # base64_data = false +# +# ## Optional. PubSub attributes to add to metrics. +# # [[inputs.pubsub.attributes]] +# # my_attr = "tag_value" + + +# # Configuration for AWS CloudWatch output. +# [[outputs.cloudwatch]] +# ## Amazon REGION +# region = "us-east-1" +# +# ## Amazon Credentials +# ## Credentials are loaded in the following order +# ## 1) Assumed credentials via STS if role_arn is specified +# ## 2) explicit credentials from 'access_key' and 'secret_key' +# ## 3) shared profile from 'profile' +# ## 4) environment variables +# ## 5) shared credentials file +# ## 6) EC2 Instance Profile +# #access_key = "" +# #secret_key = "" +# #token = "" +# #role_arn = "" +# #profile = "" +# #shared_credential_file = "" +# +# ## Endpoint to make request against, the correct endpoint is automatically +# ## determined and this option should only be set if you wish to override the +# ## default. +# ## ex: endpoint_url = "http://localhost:8000" +# # endpoint_url = "" +# +# ## Namespace for the CloudWatch MetricDatums +# namespace = "InfluxData/Telegraf" +# +# ## If you have a large amount of metrics, you should consider to send statistic +# ## values instead of raw metrics which could not only improve performance but +# ## also save AWS API cost. If enable this flag, this plugin would parse the required +# ## CloudWatch statistic fields (count, min, max, and sum) and send them to CloudWatch. +# ## You could use basicstats aggregator to calculate those fields. If not all statistic +# ## fields are available, all fields would still be sent as raw metrics. +# # write_statistics = false +# +# ## Enable high resolution metrics of 1 second (if not enabled, standard resolution are of 60 seconds precision) +# # high_resolution_metrics = false + + +# # Configuration for CrateDB to send metrics to. +# [[outputs.cratedb]] +# # A github.com/jackc/pgx connection string. +# # See https://godoc.org/github.com/jackc/pgx#ParseDSN +# url = "postgres://user:password@localhost/schema?sslmode=disable" +# # Timeout for all CrateDB queries. +# timeout = "5s" +# # Name of the table to store metrics in. +# table = "metrics" +# # If true, and the metrics table does not exist, create it automatically. +# table_create = true + + +# # Configuration for DataDog API to send metrics to. +# [[outputs.datadog]] +# ## Datadog API key +# apikey = "my-secret-key" # required. +# +# # The base endpoint URL can optionally be specified but it defaults to: +# #url = "https://app.datadoghq.com/api/v1/series" +# +# ## Connection timeout. +# # timeout = "5s" + + +# # Send metrics to nowhere at all +# [[outputs.discard]] +# # no configuration + + +# # Configuration for Elasticsearch to send metrics to. +# [[outputs.elasticsearch]] +# ## The full HTTP endpoint URL for your Elasticsearch instance +# ## Multiple urls can be specified as part of the same cluster, +# ## this means that only ONE of the urls will be written to each interval. +# urls = [ "http://node1.es.example.com:9200" ] # required. +# ## Elasticsearch client timeout, defaults to "5s" if not set. +# timeout = "5s" +# ## Set to true to ask Elasticsearch a list of all cluster nodes, +# ## thus it is not necessary to list all nodes in the urls config option. +# enable_sniffer = false +# ## Set the interval to check if the Elasticsearch nodes are available +# ## Setting to "0s" will disable the health check (not recommended in production) +# health_check_interval = "10s" +# ## HTTP basic authentication details +# # username = "telegraf" +# # password = "mypassword" +# +# ## Index Config +# ## The target index for metrics (Elasticsearch will create if it not exists). +# ## You can use the date specifiers below to create indexes per time frame. +# ## The metric timestamp will be used to decide the destination index name +# # %Y - year (2016) +# # %y - last two digits of year (00..99) +# # %m - month (01..12) +# # %d - day of month (e.g., 01) +# # %H - hour (00..23) +# # %V - week of the year (ISO week) (01..53) +# ## Additionally, you can specify a tag name using the notation {{tag_name}} +# ## which will be used as part of the index name. If the tag does not exist, +# ## the default tag value will be used. +# # index_name = "telegraf-{{host}}-%Y.%m.%d" +# # default_tag_value = "none" +# index_name = "telegraf-%Y.%m.%d" # required. +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## Template Config +# ## Set to true if you want telegraf to manage its index template. +# ## If enabled it will create a recommended index template for telegraf indexes +# manage_template = true +# ## The template name used for telegraf indexes +# template_name = "telegraf" +# ## Set to true if you want telegraf to overwrite an existing template +# overwrite_template = false + + +# # Send metrics to command as input over stdin +# [[outputs.exec]] +# ## Command to ingest metrics via stdin. +# command = ["tee", "-a", "/dev/null"] +# +# ## Timeout for command to complete. +# # timeout = "5s" +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# # data_format = "influx" + + +# # Send telegraf metrics to file(s) +# [[outputs.file]] +# ## Files to write to, "stdout" is a specially handled file. +# files = ["stdout", "/tmp/metrics.out"] +# +# ## Use batch serialization format instead of line based delimiting. The +# ## batch format allows for the production of non line based output formats and +# ## may more effiently encode metric groups. +# # use_batch_format = false +# +# ## The file will be rotated after the time interval specified. When set +# ## to 0 no time based rotation is performed. +# # rotation_interval = "0d" +# +# ## The logfile will be rotated when it becomes larger than the specified +# ## size. When set to 0 no size based rotation is performed. +# # rotation_max_size = "0MB" +# +# ## Maximum number of rotated archives to keep, any older logs are deleted. +# ## If set to -1, no archives are removed. +# # rotation_max_archives = 5 +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# data_format = "influx" + + +# # Configuration for Graphite server to send metrics to +# [[outputs.graphite]] +# ## TCP endpoint for your graphite instance. +# ## If multiple endpoints are configured, output will be load balanced. +# ## Only one of the endpoints will be written to with each iteration. +# servers = ["localhost:2003"] +# ## Prefix metrics name +# prefix = "" +# ## Graphite output template +# ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# template = "host.tags.measurement.field" +# +# ## Enable Graphite tags support +# # graphite_tag_support = false +# +# ## timeout in seconds for the write connection to graphite +# timeout = 2 +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + +# # Send telegraf metrics to graylog +# [[outputs.graylog]] +# ## UDP endpoint for your graylog instance. +# servers = ["127.0.0.1:12201"] +# +# ## The field to use as the GELF short_message, if unset the static string +# ## "telegraf" will be used. +# ## example: short_message_field = "message" +# # short_message_field = "" + + +# # Configurable HTTP health check resource based on metrics +# [[outputs.health]] +# ## Address and port to listen on. +# ## ex: service_address = "http://localhost:8080" +# ## service_address = "unix:///var/run/telegraf-health.sock" +# # service_address = "http://:8080" +# +# ## The maximum duration for reading the entire request. +# # read_timeout = "5s" +# ## The maximum duration for writing the entire response. +# # write_timeout = "5s" +# +# ## Username and password to accept for HTTP basic authentication. +# # basic_username = "user1" +# # basic_password = "secret" +# +# ## Allowed CA certificates for client certificates. +# # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"] +# +# ## TLS server certificate and private key. +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# +# ## One or more check sub-tables should be defined, it is also recommended to +# ## use metric filtering to limit the metrics that flow into this output. +# ## +# ## When using the default buffer sizes, this example will fail when the +# ## metric buffer is half full. +# ## +# ## namepass = ["internal_write"] +# ## tagpass = { output = ["influxdb"] } +# ## +# ## [[outputs.health.compares]] +# ## field = "buffer_size" +# ## lt = 5000.0 +# ## +# ## [[outputs.health.contains]] +# ## field = "buffer_size" + + +# # A plugin that can transmit metrics over HTTP +# [[outputs.http]] +# ## URL is the address to send metrics to +# url = "http://127.0.0.1:8080/telegraf" +# +# ## Timeout for HTTP message +# # timeout = "5s" +# +# ## HTTP method, one of: "POST" or "PUT" +# # method = "POST" +# +# ## HTTP Basic Auth credentials +# # username = "username" +# # password = "pa$$word" +# +# ## OAuth2 Client Credentials Grant +# # client_id = "clientid" +# # client_secret = "secret" +# # token_url = "https://indentityprovider/oauth2/v1/token" +# # scopes = ["urn:opc:idm:__myscopes__"] +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## Data format to output. +# ## Each data format has it's own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# # data_format = "influx" +# +# ## HTTP Content-Encoding for write request body, can be set to "gzip" to +# ## compress body or "identity" to apply no encoding. +# # content_encoding = "identity" +# +# ## Additional HTTP headers +# # [outputs.http.headers] +# # # Should be set manually to "application/json" for json data_format +# # Content-Type = "text/plain; charset=utf-8" + + +# # Configuration for sending metrics to InfluxDB +# [[outputs.influxdb_v2]] +# ## The URLs of the InfluxDB cluster nodes. +# ## +# ## Multiple URLs can be specified for a single cluster, only ONE of the +# ## urls will be written to each interval. +# ## ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"] +# urls = ["http://127.0.0.1:9999"] +# +# ## Token for authentication. +# token = "" +# +# ## Organization is the name of the organization you wish to write to; must exist. +# organization = "" +# +# ## Destination bucket to write into. +# bucket = "" +# +# ## The value of this tag will be used to determine the bucket. If this +# ## tag is not set the 'bucket' option is used as the default. +# # bucket_tag = "" +# +# ## If true, the bucket tag will not be added to the metric. +# # exclude_bucket_tag = false +# +# ## Timeout for HTTP messages. +# # timeout = "5s" +# +# ## Additional HTTP headers +# # http_headers = {"X-Special-Header" = "Special-Value"} +# +# ## HTTP Proxy override, if unset values the standard proxy environment +# ## variables are consulted to determine which proxy, if any, should be used. +# # http_proxy = "http://corporate.proxy:3128" +# +# ## HTTP User-Agent +# # user_agent = "telegraf" +# +# ## Content-Encoding for write request body, can be set to "gzip" to +# ## compress body or "identity" to apply no encoding. +# # content_encoding = "gzip" +# +# ## Enable or disable uint support for writing uints influxdb 2.0. +# # influx_uint_support = false +# +# ## Optional TLS Config for use on HTTP connections. +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + +# # Configuration for sending metrics to an Instrumental project +# [[outputs.instrumental]] +# ## Project API Token (required) +# api_token = "API Token" # required +# ## Prefix the metrics with a given name +# prefix = "" +# ## Stats output template (Graphite formatting) +# ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite +# template = "host.tags.measurement.field" +# ## Timeout in seconds to connect +# timeout = "2s" +# ## Display Communcation to Instrumental +# debug = false + + +# # Configuration for the Kafka server to send metrics to +# [[outputs.kafka]] +# ## URLs of kafka brokers +# brokers = ["localhost:9092"] +# ## Kafka topic for producer messages +# topic = "telegraf" +# +# ## The value of this tag will be used as the topic. If not set the 'topic' +# ## option is used. +# # topic_tag = "" +# +# ## If true, the 'topic_tag' will be removed from to the metric. +# # exclude_topic_tag = false +# +# ## Optional Client id +# # client_id = "Telegraf" +# +# ## Set the minimal supported Kafka version. Setting this enables the use of new +# ## Kafka features and APIs. Of particular interest, lz4 compression +# ## requires at least version 0.10.0.0. +# ## ex: version = "1.1.0" +# # version = "" +# +# ## Optional topic suffix configuration. +# ## If the section is omitted, no suffix is used. +# ## Following topic suffix methods are supported: +# ## measurement - suffix equals to separator + measurement's name +# ## tags - suffix equals to separator + specified tags' values +# ## interleaved with separator +# +# ## Suffix equals to "_" + measurement name +# # [outputs.kafka.topic_suffix] +# # method = "measurement" +# # separator = "_" +# +# ## Suffix equals to "__" + measurement's "foo" tag value. +# ## If there's no such a tag, suffix equals to an empty string +# # [outputs.kafka.topic_suffix] +# # method = "tags" +# # keys = ["foo"] +# # separator = "__" +# +# ## Suffix equals to "_" + measurement's "foo" and "bar" +# ## tag values, separated by "_". If there is no such tags, +# ## their values treated as empty strings. +# # [outputs.kafka.topic_suffix] +# # method = "tags" +# # keys = ["foo", "bar"] +# # separator = "_" +# +# ## The routing tag specifies a tagkey on the metric whose value is used as +# ## the message key. The message key is used to determine which partition to +# ## send the message to. This tag is prefered over the routing_key option. +# routing_tag = "host" +# +# ## The routing key is set as the message key and used to determine which +# ## partition to send the message to. This value is only used when no +# ## routing_tag is set or as a fallback when the tag specified in routing tag +# ## is not found. +# ## +# ## If set to "random", a random value will be generated for each message. +# ## +# ## When unset, no message key is added and each message is routed to a random +# ## partition. +# ## +# ## ex: routing_key = "random" +# ## routing_key = "telegraf" +# # routing_key = "" +# +# ## CompressionCodec represents the various compression codecs recognized by +# ## Kafka in messages. +# ## 0 : No compression +# ## 1 : Gzip compression +# ## 2 : Snappy compression +# ## 3 : LZ4 compression +# # compression_codec = 0 +# +# ## RequiredAcks is used in Produce Requests to tell the broker how many +# ## replica acknowledgements it must see before responding +# ## 0 : the producer never waits for an acknowledgement from the broker. +# ## This option provides the lowest latency but the weakest durability +# ## guarantees (some data will be lost when a server fails). +# ## 1 : the producer gets an acknowledgement after the leader replica has +# ## received the data. This option provides better durability as the +# ## client waits until the server acknowledges the request as successful +# ## (only messages that were written to the now-dead leader but not yet +# ## replicated will be lost). +# ## -1: the producer gets an acknowledgement after all in-sync replicas have +# ## received the data. This option provides the best durability, we +# ## guarantee that no messages will be lost as long as at least one in +# ## sync replica remains. +# # required_acks = -1 +# +# ## The maximum number of times to retry sending a metric before failing +# ## until the next flush. +# # max_retry = 3 +# +# ## The maximum permitted size of a message. Should be set equal to or +# ## smaller than the broker's 'message.max.bytes'. +# # max_message_bytes = 1000000 +# +# ## Optional TLS Config +# # enable_tls = true +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## Optional SASL Config +# # sasl_username = "kafka" +# # sasl_password = "secret" +# +# ## SASL protocol version. When connecting to Azure EventHub set to 0. +# # sasl_version = 1 +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# # data_format = "influx" + + +# # Configuration for the AWS Kinesis output. +# [[outputs.kinesis]] +# ## Amazon REGION of kinesis endpoint. +# region = "ap-southeast-2" +# +# ## Amazon Credentials +# ## Credentials are loaded in the following order +# ## 1) Assumed credentials via STS if role_arn is specified +# ## 2) explicit credentials from 'access_key' and 'secret_key' +# ## 3) shared profile from 'profile' +# ## 4) environment variables +# ## 5) shared credentials file +# ## 6) EC2 Instance Profile +# #access_key = "" +# #secret_key = "" +# #token = "" +# #role_arn = "" +# #profile = "" +# #shared_credential_file = "" +# +# ## Endpoint to make request against, the correct endpoint is automatically +# ## determined and this option should only be set if you wish to override the +# ## default. +# ## ex: endpoint_url = "http://localhost:8000" +# # endpoint_url = "" +# +# ## Kinesis StreamName must exist prior to starting telegraf. +# streamname = "StreamName" +# ## DEPRECATED: PartitionKey as used for sharding data. +# partitionkey = "PartitionKey" +# ## DEPRECATED: If set the paritionKey will be a random UUID on every put. +# ## This allows for scaling across multiple shards in a stream. +# ## This will cause issues with ordering. +# use_random_partitionkey = false +# ## The partition key can be calculated using one of several methods: +# ## +# ## Use a static value for all writes: +# # [outputs.kinesis.partition] +# # method = "static" +# # key = "howdy" +# # +# ## Use a random partition key on each write: +# # [outputs.kinesis.partition] +# # method = "random" +# # +# ## Use the measurement name as the partition key: +# # [outputs.kinesis.partition] +# # method = "measurement" +# # +# ## Use the value of a tag for all writes, if the tag is not set the empty +# ## default option will be used. When no default, defaults to "telegraf" +# # [outputs.kinesis.partition] +# # method = "tag" +# # key = "host" +# # default = "mykey" +# +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# data_format = "influx" +# +# ## debug will show upstream aws messages. +# debug = false + + +# # Configuration for Librato API to send metrics to. +# [[outputs.librato]] +# ## Librator API Docs +# ## http://dev.librato.com/v1/metrics-authentication +# ## Librato API user +# api_user = "telegraf@influxdb.com" # required. +# ## Librato API token +# api_token = "my-secret-token" # required. +# ## Debug +# # debug = false +# ## Connection timeout. +# # timeout = "5s" +# ## Output source Template (same as graphite buckets) +# ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite +# ## This template is used in librato's source (not metric's name) +# template = "host" +# + + +# # Configuration for MQTT server to send metrics to +# [[outputs.mqtt]] +# servers = ["localhost:1883"] # required. +# +# ## MQTT outputs send metrics to this topic format +# ## "///" +# ## ex: prefix/web01.example.com/mem +# topic_prefix = "telegraf" +# +# ## QoS policy for messages +# ## 0 = at most once +# ## 1 = at least once +# ## 2 = exactly once +# # qos = 2 +# +# ## username and password to connect MQTT server. +# # username = "telegraf" +# # password = "metricsmetricsmetricsmetrics" +# +# ## client ID, if not set a random ID is generated +# # client_id = "" +# +# ## Timeout for write operations. default: 5s +# # timeout = "5s" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## When true, metrics will be sent in one MQTT message per flush. Otherwise, +# ## metrics are written one metric per MQTT message. +# # batch = false +# +# ## When true, metric will have RETAIN flag set, making broker cache entries until someone +# ## actually reads it +# # retain = false +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# data_format = "influx" + + +# # Send telegraf measurements to NATS +# [[outputs.nats]] +# ## URLs of NATS servers +# servers = ["nats://localhost:4222"] +# +# ## Optional credentials +# # username = "" +# # password = "" +# +# ## Optional NATS 2.0 and NATS NGS compatible user credentials +# # credentials = "/etc/telegraf/nats.creds" +# +# ## NATS subject for producer messages +# subject = "telegraf" +# +# ## Use Transport Layer Security +# # secure = false +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# data_format = "influx" + + +# # Send telegraf measurements to NSQD +# [[outputs.nsq]] +# ## Location of nsqd instance listening on TCP +# server = "localhost:4150" +# ## NSQ topic for producer messages +# topic = "telegraf" +# +# ## Data format to output. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md +# data_format = "influx" + + +# # Configuration for OpenTSDB server to send metrics to +# [[outputs.opentsdb]] +# ## prefix for metrics keys +# prefix = "my.specific.prefix." +# +# ## DNS name of the OpenTSDB server +# ## Using "opentsdb.example.com" or "tcp://opentsdb.example.com" will use the +# ## telnet API. "http://opentsdb.example.com" will use the Http API. +# host = "opentsdb.example.com" +# +# ## Port of the OpenTSDB server +# port = 4242 +# +# ## Number of data points to send to OpenTSDB in Http requests. +# ## Not used with telnet API. +# http_batch_size = 50 +# +# ## URI Path for Http requests to OpenTSDB. +# ## Used in cases where OpenTSDB is located behind a reverse proxy. +# http_path = "/api/put" +# +# ## Debug true - Prints OpenTSDB communication +# debug = false +# +# ## Separator separates measurement name from field +# separator = "_" + + +# # Configuration for the Prometheus client to spawn +# [[outputs.prometheus_client]] +# ## Address to listen on +# listen = ":9273" +# +# ## Metric version controls the mapping from Telegraf metrics into +# ## Prometheus format. When using the prometheus input, use the same value in +# ## both plugins to ensure metrics are round-tripped without modification. +# ## +# ## example: metric_version = 1; deprecated in 1.13 +# ## metric_version = 2; recommended version +# # metric_version = 1 +# +# ## Use HTTP Basic Authentication. +# # basic_username = "Foo" +# # basic_password = "Bar" +# +# ## If set, the IP Ranges which are allowed to access metrics. +# ## ex: ip_range = ["192.168.0.0/24", "192.168.1.0/30"] +# # ip_range = [] +# +# ## Path to publish the metrics on. +# # path = "/metrics" +# +# ## Expiration interval for each metric. 0 == no expiration +# # expiration_interval = "60s" +# +# ## Collectors to enable, valid entries are "gocollector" and "process". +# ## If unset, both are enabled. +# # collectors_exclude = ["gocollector", "process"] +# +# ## Send string metrics as Prometheus labels. +# ## Unless set to false all string metrics will be sent as labels. +# # string_as_label = true +# +# ## If set, enable TLS with the given certificate. +# # tls_cert = "/etc/ssl/telegraf.crt" +# # tls_key = "/etc/ssl/telegraf.key" +# +# ## Set one or more allowed client CA certificate file names to +# ## enable mutually authenticated TLS connections +# # tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"] +# +# ## Export metric collection time. +# # export_timestamp = false + + +# # Configuration for the Riemann server to send metrics to +# [[outputs.riemann]] +# ## The full TCP or UDP URL of the Riemann server +# url = "tcp://localhost:5555" +# +# ## Riemann event TTL, floating-point time in seconds. +# ## Defines how long that an event is considered valid for in Riemann +# # ttl = 30.0 +# +# ## Separator to use between measurement and field name in Riemann service name +# ## This does not have any effect if 'measurement_as_attribute' is set to 'true' +# separator = "/" +# +# ## Set measurement name as Riemann attribute 'measurement', instead of prepending it to the Riemann service name +# # measurement_as_attribute = false +# +# ## Send string metrics as Riemann event states. +# ## Unless enabled all string metrics will be ignored +# # string_as_state = false +# +# ## A list of tag keys whose values get sent as Riemann tags. +# ## If empty, all Telegraf tag values will be sent as tags +# # tag_keys = ["telegraf","custom_tag"] +# +# ## Additional Riemann tags to send. +# # tags = ["telegraf-output"] +# +# ## Description for Riemann event +# # description_text = "metrics collected from telegraf" +# +# ## Riemann client write timeout, defaults to "5s" if not set. +# # timeout = "5s" + + +# # Configuration for the Riemann server to send metrics to +# [[outputs.riemann_legacy]] +# ## URL of server +# url = "localhost:5555" +# ## transport protocol to use either tcp or udp +# transport = "tcp" +# ## separator to use between input name and field name in Riemann service name +# separator = " " + + +# # Generic socket writer capable of handling multiple socket types. +# [[outputs.socket_writer]] +# ## URL to connect to +# # address = "tcp://127.0.0.1:8094" +# # address = "tcp://example.com:http" +# # address = "tcp4://127.0.0.1:8094" +# # address = "tcp6://127.0.0.1:8094" +# # address = "tcp6://[2001:db8::1]:8094" +# # address = "udp://127.0.0.1:8094" +# # address = "udp4://127.0.0.1:8094" +# # address = "udp6://127.0.0.1:8094" +# # address = "unix:///tmp/telegraf.sock" +# # address = "unixgram:///tmp/telegraf.sock" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## Period between keep alive probes. +# ## Only applies to TCP sockets. +# ## 0 disables keep alive probes. +# ## Defaults to the OS configuration. +# # keep_alive_period = "5m" +# +# ## Data format to generate. +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md +# # data_format = "influx" + + +# # Configuration for Google Cloud Stackdriver to send metrics to +# [[outputs.stackdriver]] +# ## GCP Project +# project = "erudite-bloom-151019" +# +# ## The namespace for the metric descriptor +# namespace = "telegraf" +# +# ## Custom resource type +# # resource_type = "generic_node" +# +# ## Additonal resource labels +# # [outputs.stackdriver.resource_labels] +# # node_id = "$HOSTNAME" +# # namespace = "myapp" +# # location = "eu-north0" + + +# # Configuration for Syslog server to send metrics to +# [[outputs.syslog]] +# ## URL to connect to +# ## ex: address = "tcp://127.0.0.1:8094" +# ## ex: address = "tcp4://127.0.0.1:8094" +# ## ex: address = "tcp6://127.0.0.1:8094" +# ## ex: address = "tcp6://[2001:db8::1]:8094" +# ## ex: address = "udp://127.0.0.1:8094" +# ## ex: address = "udp4://127.0.0.1:8094" +# ## ex: address = "udp6://127.0.0.1:8094" +# address = "tcp://127.0.0.1:8094" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false +# +# ## Period between keep alive probes. +# ## Only applies to TCP sockets. +# ## 0 disables keep alive probes. +# ## Defaults to the OS configuration. +# # keep_alive_period = "5m" +# +# ## The framing technique with which it is expected that messages are +# ## transported (default = "octet-counting"). Whether the messages come +# ## using the octect-counting (RFC5425#section-4.3.1, RFC6587#section-3.4.1), +# ## or the non-transparent framing technique (RFC6587#section-3.4.2). Must +# ## be one of "octet-counting", "non-transparent". +# # framing = "octet-counting" +# +# ## The trailer to be expected in case of non-trasparent framing (default = "LF"). +# ## Must be one of "LF", or "NUL". +# # trailer = "LF" +# +# ## SD-PARAMs settings +# ## Syslog messages can contain key/value pairs within zero or more +# ## structured data sections. For each unrecognised metric tag/field a +# ## SD-PARAMS is created. +# ## +# ## Example: +# ## [[outputs.syslog]] +# ## sdparam_separator = "_" +# ## default_sdid = "default@32473" +# ## sdids = ["foo@123", "bar@456"] +# ## +# ## input => xyzzy,x=y foo@123_value=42,bar@456_value2=84,something_else=1 +# ## output (structured data only) => [foo@123 value=42][bar@456 value2=84][default@32473 something_else=1 x=y] +# +# ## SD-PARAMs separator between the sdid and tag/field key (default = "_") +# # sdparam_separator = "_" +# +# ## Default sdid used for tags/fields that don't contain a prefix defined in +# ## the explict sdids setting below If no default is specified, no SD-PARAMs +# ## will be used for unrecognised field. +# # default_sdid = "default@32473" +# +# ## List of explicit prefixes to extract from tag/field keys and use as the +# ## SDID, if they match (see above example for more details): +# # sdids = ["foo@123", "bar@456"] +# +# ## Default severity value. Severity and Facility are used to calculate the +# ## message PRI value (RFC5424#section-6.2.1). Used when no metric field +# ## with key "severity_code" is defined. If unset, 5 (notice) is the default +# # default_severity_code = 5 +# +# ## Default facility value. Facility and Severity are used to calculate the +# ## message PRI value (RFC5424#section-6.2.1). Used when no metric field with +# ## key "facility_code" is defined. If unset, 1 (user-level) is the default +# # default_facility_code = 1 +# +# ## Default APP-NAME value (RFC5424#section-6.2.5) +# ## Used when no metric tag with key "appname" is defined. +# ## If unset, "Telegraf" is the default +# # default_appname = "Telegraf" + + +# # Write metrics to Warp 10 +# [[outputs.warp10]] +# # Prefix to add to the measurement. +# prefix = "telegraf." +# +# # URL of the Warp 10 server +# warp_url = "http://localhost:8080" +# +# # Write token to access your app on warp 10 +# token = "Token" +# +# # Warp 10 query timeout +# # timeout = "15s" +# +# ## Print Warp 10 error body +# # print_error_body = false +# +# ## Max string error size +# # max_string_error_size = 511 +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + +# # Configuration for Wavefront server to send metrics to +# [[outputs.wavefront]] +# ## Url for Wavefront Direct Ingestion or using HTTP with Wavefront Proxy +# ## If using Wavefront Proxy, also specify port. example: http://proxyserver:2878 +# url = "https://metrics.wavefront.com" +# +# ## Authentication Token for Wavefront. Only required if using Direct Ingestion +# #token = "DUMMY_TOKEN" +# +# ## DNS name of the wavefront proxy server. Do not use if url is specified +# #host = "wavefront.example.com" +# +# ## Port that the Wavefront proxy server listens on. Do not use if url is specified +# #port = 2878 +# +# ## prefix for metrics keys +# #prefix = "my.specific.prefix." +# +# ## whether to use "value" for name of simple fields. default is false +# #simple_fields = false +# +# ## character to use between metric and field name. default is . (dot) +# #metric_separator = "." +# +# ## Convert metric name paths to use metricSeparator character +# ## When true will convert all _ (underscore) characters in final metric name. default is true +# #convert_paths = true +# +# ## Use Strict rules to sanitize metric and tag names from invalid characters +# ## When enabled forward slash (/) and comma (,) will be accpeted +# #use_strict = false +# +# ## Use Regex to sanitize metric and tag names from invalid characters +# ## Regex is more thorough, but significantly slower. default is false +# #use_regex = false +# +# ## point tags to use as the source name for Wavefront (if none found, host will be used) +# #source_override = ["hostname", "address", "agent_host", "node_host"] +# +# ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0. default is true +# #convert_bool = true +# +# ## Define a mapping, namespaced by metric prefix, from string values to numeric values +# ## deprecated in 1.9; use the enum processor plugin +# #[[outputs.wavefront.string_to_number.elasticsearch]] +# # green = 1.0 +# # yellow = 0.5 +# # red = 0.0 + + +############################################################################### +# PROCESSOR PLUGINS # +############################################################################### + + +# # Clone metrics and apply modifications. +# [[processors.clone]] +# ## All modifications on inputs and aggregators can be overridden: +# # name_override = "new_name" +# # name_prefix = "new_name_prefix" +# # name_suffix = "new_name_suffix" +# +# ## Tags to be added (all values must be strings) +# # [processors.clone.tags] +# # additional_tag = "tag_value" + + +# # Convert values to another metric value type +# [[processors.converter]] +# ## Tags to convert +# ## +# ## The table key determines the target type, and the array of key-values +# ## select the keys to convert. The array may contain globs. +# ## = [...] +# [processors.converter.tags] +# measurement = [] +# string = [] +# integer = [] +# unsigned = [] +# boolean = [] +# float = [] +# +# ## Fields to convert +# ## +# ## The table key determines the target type, and the array of key-values +# ## select the keys to convert. The array may contain globs. +# ## = [...] +# [processors.converter.fields] +# measurement = [] +# tag = [] +# string = [] +# integer = [] +# unsigned = [] +# boolean = [] +# float = [] + + +# # Dates measurements, tags, and fields that pass through this filter. +# [[processors.date]] +# ## New tag to create +# tag_key = "month" +# +# ## Date format string, must be a representation of the Go "reference time" +# ## which is "Mon Jan 2 15:04:05 -0700 MST 2006". +# date_format = "Jan" +# +# ## Offset duration added to the date string when writing the new tag. +# # date_offset = "0s" +# +# ## Timezone to use when creating the tag. This can be set to one of +# ## "UTC", "Local", or to a location name in the IANA Time Zone database. +# ## example: timezone = "America/Los_Angeles" +# # timezone = "UTC" + + +# # Filter metrics with repeating field values +# [[processors.dedup]] +# ## Maximum time to suppress output +# dedup_interval = "600s" + + +# # Map enum values according to given table. +# [[processors.enum]] +# [[processors.enum.mapping]] +# ## Name of the field to map +# field = "status" +# +# ## Name of the tag to map +# # tag = "status" +# +# ## Destination tag or field to be used for the mapped value. By default the +# ## source tag or field is used, overwriting the original value. +# dest = "status_code" +# +# ## Default value to be used for all values not contained in the mapping +# ## table. When unset, the unmodified value for the field will be used if no +# ## match is found. +# # default = 0 +# +# ## Table of mappings +# [processors.enum.mapping.value_mappings] +# green = 1 +# amber = 2 +# red = 3 + + +# # Apply metric modifications using override semantics. +# [[processors.override]] +# ## All modifications on inputs and aggregators can be overridden: +# # name_override = "new_name" +# # name_prefix = "new_name_prefix" +# # name_suffix = "new_name_suffix" +# +# ## Tags to be added (all values must be strings) +# # [processors.override.tags] +# # additional_tag = "tag_value" + + +# # Parse a value in a specified field/tag(s) and add the result in a new metric +# [[processors.parser]] +# ## The name of the fields whose value will be parsed. +# parse_fields = [] +# +# ## If true, incoming metrics are not emitted. +# drop_original = false +# +# ## If set to override, emitted metrics will be merged by overriding the +# ## original metric using the newly parsed metrics. +# merge = "override" +# +# ## The dataformat to be read from files +# ## Each data format has its own unique set of configuration options, read +# ## more about them here: +# ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md +# data_format = "influx" + + +# # Rotate a single valued metric into a multi field metric +# [[processors.pivot]] +# ## Tag to use for naming the new field. +# tag_key = "name" +# ## Field to use as the value of the new field. +# value_key = "value" + + +# # Print all metrics that pass through this filter. +# [[processors.printer]] + + +# # Transforms tag and field values with regex pattern +# [[processors.regex]] +# ## Tag and field conversions defined in a separate sub-tables +# # [[processors.regex.tags]] +# # ## Tag to change +# # key = "resp_code" +# # ## Regular expression to match on a tag value +# # pattern = "^(\\d)\\d\\d$" +# # ## Matches of the pattern will be replaced with this string. Use ${1} +# # ## notation to use the text of the first submatch. +# # replacement = "${1}xx" +# +# # [[processors.regex.fields]] +# # ## Field to change +# # key = "request" +# # ## All the power of the Go regular expressions available here +# # ## For example, named subgroups +# # pattern = "^/api(?P/[\\w/]+)\\S*" +# # replacement = "${method}" +# # ## If result_key is present, a new field will be created +# # ## instead of changing existing field +# # result_key = "method" +# +# ## Multiple conversions may be applied for one field sequentially +# ## Let's extract one more value +# # [[processors.regex.fields]] +# # key = "request" +# # pattern = ".*category=(\\w+).*" +# # replacement = "${1}" +# # result_key = "search_category" + + +# # Rename measurements, tags, and fields that pass through this filter. +# [[processors.rename]] + + +# # Add the S2 Cell ID as a tag based on latitude and longitude fields +# [[processors.s2geo]] +# ## The name of the lat and lon fields containing WGS-84 latitude and +# ## longitude in decimal degrees. +# # lat_field = "lat" +# # lon_field = "lon" +# +# ## New tag to create +# # tag_key = "s2_cell_id" +# +# ## Cell level (see https://s2geometry.io/resources/s2cell_statistics.html) +# # cell_level = 9 + + +# # Perform string processing on tags, fields, and measurements +# [[processors.strings]] +# ## Convert a tag value to uppercase +# # [[processors.strings.uppercase]] +# # tag = "method" +# +# ## Convert a field value to lowercase and store in a new field +# # [[processors.strings.lowercase]] +# # field = "uri_stem" +# # dest = "uri_stem_normalised" +# +# ## Convert a field value to titlecase +# # [[processors.strings.titlecase]] +# # field = "status" +# +# ## Trim leading and trailing whitespace using the default cutset +# # [[processors.strings.trim]] +# # field = "message" +# +# ## Trim leading characters in cutset +# # [[processors.strings.trim_left]] +# # field = "message" +# # cutset = "\t" +# +# ## Trim trailing characters in cutset +# # [[processors.strings.trim_right]] +# # field = "message" +# # cutset = "\r\n" +# +# ## Trim the given prefix from the field +# # [[processors.strings.trim_prefix]] +# # field = "my_value" +# # prefix = "my_" +# +# ## Trim the given suffix from the field +# # [[processors.strings.trim_suffix]] +# # field = "read_count" +# # suffix = "_count" +# +# ## Replace all non-overlapping instances of old with new +# # [[processors.strings.replace]] +# # measurement = "*" +# # old = ":" +# # new = "_" +# +# ## Trims strings based on width +# # [[processors.strings.left]] +# # field = "message" +# # width = 10 +# +# ## Decode a base64 encoded utf-8 string +# # [[processors.strings.base64decode]] +# # field = "message" + + +# # Restricts the number of tags that can pass through this filter and chooses which tags to preserve when over the limit. +# [[processors.tag_limit]] +# ## Maximum number of tags to preserve +# limit = 10 +# +# ## List of tags to preferentially preserve +# keep = ["foo", "bar", "baz"] + + +# # Uses a Go template to create a new tag +# [[processors.template]] +# ## Tag to set with the output of the template. +# tag = "topic" +# +# ## Go template used to create the tag value. In order to ease TOML +# ## escaping requirements, you may wish to use single quotes around the +# ## template string. +# template = '{{ .Tag "hostname" }}.{{ .Tag "level" }}' + + +# # Print all metrics that pass through this filter. +# [[processors.topk]] +# ## How many seconds between aggregations +# # period = 10 +# +# ## How many top metrics to return +# # k = 10 +# +# ## Over which tags should the aggregation be done. Globs can be specified, in +# ## which case any tag matching the glob will aggregated over. If set to an +# ## empty list is no aggregation over tags is done +# # group_by = ['*'] +# +# ## Over which fields are the top k are calculated +# # fields = ["value"] +# +# ## What aggregation to use. Options: sum, mean, min, max +# # aggregation = "mean" +# +# ## Instead of the top k largest metrics, return the bottom k lowest metrics +# # bottomk = false +# +# ## The plugin assigns each metric a GroupBy tag generated from its name and +# ## tags. If this setting is different than "" the plugin will add a +# ## tag (which name will be the value of this setting) to each metric with +# ## the value of the calculated GroupBy tag. Useful for debugging +# # add_groupby_tag = "" +# +# ## These settings provide a way to know the position of each metric in +# ## the top k. The 'add_rank_field' setting allows to specify for which +# ## fields the position is required. If the list is non empty, then a field +# ## will be added to each and every metric for each string present in this +# ## setting. This field will contain the ranking of the group that +# ## the metric belonged to when aggregated over that field. +# ## The name of the field will be set to the name of the aggregation field, +# ## suffixed with the string '_topk_rank' +# # add_rank_fields = [] +# +# ## These settings provide a way to know what values the plugin is generating +# ## when aggregating metrics. The 'add_agregate_field' setting allows to +# ## specify for which fields the final aggregation value is required. If the +# ## list is non empty, then a field will be added to each every metric for +# ## each field present in this setting. This field will contain +# ## the computed aggregation for the group that the metric belonged to when +# ## aggregated over that field. +# ## The name of the field will be set to the name of the aggregation field, +# ## suffixed with the string '_topk_aggregate' +# # add_aggregate_fields = [] + + +# # Rotate multi field metric into several single field metrics +# [[processors.unpivot]] +# ## Tag to use for the name. +# tag_key = "name" +# ## Field to use for the name of the value. +# value_key = "value" + + +############################################################################### +# AGGREGATOR PLUGINS # +############################################################################### + + +# # Keep the aggregate basicstats of each metric passing through. +# [[aggregators.basicstats]] +# ## The period on which to flush & clear the aggregator. +# period = "30s" +# +# ## If true, the original metric will be dropped by the +# ## aggregator and will not get sent to the output plugins. +# drop_original = false +# +# ## Configures which basic stats to push as fields +# # stats = ["count", "min", "max", "mean", "stdev", "s2", "sum"] + + +# # Report the final metric of a series +# [[aggregators.final]] +# ## The period on which to flush & clear the aggregator. +# period = "30s" +# ## If true, the original metric will be dropped by the +# ## aggregator and will not get sent to the output plugins. +# drop_original = false +# +# ## The time that a series is not updated until considering it final. +# series_timeout = "5m" + + +# # Create aggregate histograms. +# [[aggregators.histogram]] +# ## The period in which to flush the aggregator. +# period = "30s" +# +# ## If true, the original metric will be dropped by the +# ## aggregator and will not get sent to the output plugins. +# drop_original = false +# +# ## If true, the histogram will be reset on flush instead +# ## of accumulating the results. +# reset = false +# +# ## Whether bucket values should be accumulated. If set to false, "gt" tag will be added. +# ## Defaults to true. +# cumulative = true +# +# ## Example config that aggregates all fields of the metric. +# # [[aggregators.histogram.config]] +# # ## Right borders of buckets (with +Inf implicitly added). +# # buckets = [0.0, 15.6, 34.5, 49.1, 71.5, 80.5, 94.5, 100.0] +# # ## The name of metric. +# # measurement_name = "cpu" +# +# ## Example config that aggregates only specific fields of the metric. +# # [[aggregators.histogram.config]] +# # ## Right borders of buckets (with +Inf implicitly added). +# # buckets = [0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0] +# # ## The name of metric. +# # measurement_name = "diskio" +# # ## The concrete fields of metric +# # fields = ["io_time", "read_time", "write_time"] + + +# # Merge metrics into multifield metrics by series key +# [[aggregators.merge]] +# ## If true, the original metric will be dropped by the +# ## aggregator and will not get sent to the output plugins. +# drop_original = true + + +# # Keep the aggregate min/max of each metric passing through. +# [[aggregators.minmax]] +# ## General Aggregator Arguments: +# ## The period on which to flush & clear the aggregator. +# period = "30s" +# ## If true, the original metric will be dropped by the +# ## aggregator and will not get sent to the output plugins. +# drop_original = false + + +# # Count the occurrence of values in fields. +# [[aggregators.valuecounter]] +# ## General Aggregator Arguments: +# ## The period on which to flush & clear the aggregator. +# period = "30s" +# ## If true, the original metric will be dropped by the +# ## aggregator and will not get sent to the output plugins. +# drop_original = false +# ## The fields for which the values will be counted +# fields = [] + + +############################################################################### +# INPUT PLUGINS # +############################################################################### + + +# Read metrics about cpu usage +[[inputs.cpu]] + ## Whether to report per-cpu stats or not + percpu = true + ## Whether to report total system cpu stats or not + totalcpu = true + ## If true, collect raw CPU time metrics. + collect_cpu_time = false + ## If true, compute and report the sum of all non-idle CPU states. + report_active = false + + +# Read metrics about disk usage by mount point +[[inputs.disk]] + ## By default stats will be gathered for all mount points. + ## Set mount_points will restrict the stats to only the specified mount points. + # mount_points = ["/"] + + ## Ignore mount points by filesystem type. + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] + + +# Read metrics about disk IO by device +[[inputs.diskio]] + ## By default, telegraf will gather stats for all devices including + ## disk partitions. + ## Setting devices will restrict the stats to the specified devices. + # devices = ["sda", "sdb", "vd*"] + ## Uncomment the following line if you need disk serial numbers. + # skip_serial_number = false + # + ## On systems which support it, device metadata can be added in the form of + ## tags. + ## Currently only Linux is supported via udev properties. You can view + ## available properties for a device by running: + ## 'udevadm info -q property -n /dev/sda' + ## Note: Most, but not all, udev properties can be accessed this way. Properties + ## that are currently inaccessible include DEVTYPE, DEVNAME, and DEVPATH. + # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"] + # + ## Using the same metadata source as device_tags, you can also customize the + ## name of the device via templates. + ## The 'name_templates' parameter is a list of templates to try and apply to + ## the device. The template may contain variables in the form of '$PROPERTY' or + ## '${PROPERTY}'. The first template which does not contain any variables not + ## present for the device is used as the device name tag. + ## The typical use case is for LVM volumes, to get the VG/LV name instead of + ## the near-meaningless DM-0 name. + # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"] + + +# Get kernel statistics from /proc/stat +[[inputs.kernel]] + # no configuration + + +# Read metrics about memory usage +[[inputs.mem]] + # no configuration + + +# Get the number of processes and group them by status +[[inputs.processes]] + # no configuration + + +# Read metrics about swap memory usage +[[inputs.swap]] + # no configuration + + +# Read metrics about system load & uptime +[[inputs.system]] + ## Uncomment to remove deprecated metrics. + # fielddrop = ["uptime_format"] + + +# # Gather ActiveMQ metrics +# [[inputs.activemq]] +# ## ActiveMQ WebConsole URL +# url = "http://127.0.0.1:8161" +# +# ## Required ActiveMQ Endpoint +# ## deprecated in 1.11; use the url option +# # server = "127.0.0.1" +# # port = 8161 +# +# ## Credentials for basic HTTP authentication +# # username = "admin" +# # password = "admin" +# +# ## Required ActiveMQ webadmin root path +# # webadmin = "admin" +# +# ## Maximum time to receive response. +# # response_timeout = "5s" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + +# # Read stats from aerospike server(s) +# [[inputs.aerospike]] +# ## Aerospike servers to connect to (with port) +# ## This plugin will query all namespaces the aerospike +# ## server has configured and get stats for them. +# servers = ["localhost:3000"] +# +# # username = "telegraf" +# # password = "pa$$word" +# +# ## Optional TLS Config +# # enable_tls = false +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## If false, skip chain & host verification +# # insecure_skip_verify = true + + +# # Read Apache status information (mod_status) +# [[inputs.apache]] +# ## An array of URLs to gather from, must be directed at the machine +# ## readable version of the mod_status page including the auto query string. +# ## Default is "http://localhost/server-status?auto". +# urls = ["http://localhost/server-status?auto"] +# +# ## Credentials for basic HTTP authentication. +# # username = "myuser" +# # password = "mypassword" +# +# ## Maximum time to receive response. +# # response_timeout = "5s" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + +# # Monitor APC UPSes connected to apcupsd +# [[inputs.apcupsd]] +# # A list of running apcupsd server to connect to. +# # If not provided will default to tcp://127.0.0.1:3551 +# servers = ["tcp://127.0.0.1:3551"] +# +# ## Timeout for dialing server. +# timeout = "5s" + + +# # Gather metrics from Apache Aurora schedulers +# [[inputs.aurora]] +# ## Schedulers are the base addresses of your Aurora Schedulers +# schedulers = ["http://127.0.0.1:8081"] +# +# ## Set of role types to collect metrics from. +# ## +# ## The scheduler roles are checked each interval by contacting the +# ## scheduler nodes; zookeeper is not contacted. +# # roles = ["leader", "follower"] +# +# ## Timeout is the max time for total network operations. +# # timeout = "5s" +# +# ## Username and password are sent using HTTP Basic Auth. +# # username = "username" +# # password = "pa$$word" +# +# ## Optional TLS Config +# # tls_ca = "/etc/telegraf/ca.pem" +# # tls_cert = "/etc/telegraf/cert.pem" +# # tls_key = "/etc/telegraf/key.pem" +# ## Use TLS but skip chain & host verification +# # insecure_skip_verify = false + + +# # Gather Azure Storage Queue metrics +# [[inputs.azure_storage_queue]] +# ## Required Azure Storage Account name +# account_name = "mystorageaccount" +# +# ## Required Azure Storage Account access key +# account_key = "storageaccountaccesskey" +# +# ## Set to false to disable peeking age of oldest message (executes faster) +# # peek_oldest_message_age = true + + +# # Read metrics of bcache from stats_total and dirty_data +# [[inputs.bcache]] +# ## Bcache sets path +# ## If not specified, then default is: +# bcachePath = "/sys/fs/bcache" +# +# ## By default, telegraf gather stats for all bcache devices +# ## Setting devices will restrict the stats to the specified +# ## bcache devices. +# bcacheDevs = ["bcache0"] + + +# # Collects Beanstalkd server and tubes stats +# [[inputs.beanstalkd]] +# ## Server to collect data from +# server = "localhost:11300" +# +# ## List of tubes to gather stats about. +# ## If no tubes specified then data gathered for each tube on server reported by list-tubes command +# tubes = ["notifications"] + + +# # Read BIND nameserver XML statistics +# [[inputs.bind]] +# ## An array of BIND XML statistics URI to gather stats. +# ## Default is "http://localhost:8053/xml/v3". +# # urls = ["http://localhost:8053/xml/v3"] +# # gather_memory_contexts = false +# # gather_views = false + + +# # Collect bond interface status, slaves statuses and failures count +# [[inputs.bond]] +# ## Sets 'proc' directory path +# ## If not specified, then default is /proc +# # host_proc = "/proc" +# +# ## By default, telegraf gather stats for all bond interfaces +# ## Setting interfaces will restrict the stats to the specified +# ## bond interfaces. +# # bond_interfaces = ["bond0"] + + +# # Collect Kafka topics and consumers status from Burrow HTTP API. +# [[inputs.burrow]] +# ## Burrow API endpoints in format "schema://host:port". +# ## Default is "http://localhost:8000". +# servers = ["http://localhost:8000"] +# +# ## Override Burrow API prefix. +# ## Useful when Burrow is behind reverse-proxy. +# # api_prefix = "/v3/kafka" +# +# ## Maximum time to receive response. +# # response_timeout = "5s" +# +# ## Limit per-server concurrent connections. +# ## Useful in case of large number of topics or consumer groups. +# # concurrent_connections = 20 +# +# ## Filter clusters, default is no filtering. +# ## Values can be specified as glob patterns. +# # clusters_include = [] +# # clusters_exclude = [] +# +# ## Filter consumer groups, default is no filtering. +# ## Values can be specified as glob patterns. +# # groups_include = [] +# # groups_exclude = [] +# +# ## Filter topics, default is no filtering. +# ## Values can be specified as glob patterns. +# # topics_include = [] +# # topics_exclude = [] +# +# ## Credentials for basic HTTP authentication. +# # username = "" +# # password = "" +# +# ## Optional SSL config +# # ssl_ca = "/etc/telegraf/ca.pem" +# # ssl_cert = "/etc/telegraf/cert.pem" +# # ssl_key = "/etc/telegraf/key.pem" +# # insecure_skip_verify = false + + +# # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster. +# [[inputs.ceph]] +# ## This is the recommended interval to poll. Too frequent and you will lose +# ## data points due to timeouts during rebalancing and recovery +# interval = '1m' +# +# ## All configuration values are optional, defaults are shown below +# +# ## location of ceph binary +# ceph_binary = "/usr/bin/ceph" +# +# ## directory in which to look for socket files +# socket_dir = "/var/run/ceph" +# +# ## prefix of MON and OSD socket files, used to determine socket type +# mon_prefix = "ceph-mon" +# osd_prefix = "ceph-osd" +# +# ## suffix used to identify socket files +# socket_suffix = "asok" +# +# ## Ceph user to authenticate as +# ceph_user = "client.admin" +# +# ## Ceph configuration to use to locate the cluster +# ceph_config = "/etc/ceph/ceph.conf" +# +# ## Whether to gather statistics via the admin socket +# gather_admin_socket_stats = true +# +# ## Whether to gather statistics via ceph commands +# gather_cluster_stats = false + + +# # Read specific statistics per cgroup +# [[inputs.cgroup]] +# ## Directories in which to look for files, globs are supported. +# ## Consider restricting paths to the set of cgroups you really +# ## want to monitor if you have a large number of cgroups, to avoid +# ## any cardinality issues. +# # paths = [ +# # "/cgroup/memory", +# # "/cgroup/memory/child1", +# # "/cgroup/memory/child2/*", +# # ] +# ## cgroup stat fields, as file names, globs are supported. +# ## these file names are appended to each path from above. +# # files = ["memory.*usage*", "memory.limit_in_bytes"] + + +# # Get standard chrony metrics, requires chronyc executable. +# [[inputs.chrony]] +# ## If true, chronyc tries to perform a DNS lookup for the time server. +# # dns_lookup = false diff --git a/recipes-devtools/telegraf/telegraf_1.14.5.bb b/recipes-devtools/telegraf/telegraf_1.38.4.bb similarity index 59% rename from recipes-devtools/telegraf/telegraf_1.14.5.bb rename to recipes-devtools/telegraf/telegraf_1.38.4.bb index a900e6f..bf9e7c5 100644 --- a/recipes-devtools/telegraf/telegraf_1.14.5.bb +++ b/recipes-devtools/telegraf/telegraf_1.38.4.bb @@ -1,10 +1,18 @@ +SUMMARY = "Plugin-driven metrics collection agent" DESCRIPTION = "The plugin-driven server agent for collecting & reporting metrics" HOMEPAGE = "https://github.com/influxdata/telegraf" +BUGTRACKER = "https://github.com/influxdata/telegraf/issues" +SECTION = "console/network" +CVE_PRODUCT = "telegraf" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/src/${GO_IMPORT}/LICENSE;md5=4c87a94f9ef84eb3e8c5f0424fef3b9e" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=fe53cff8eef1afa881ea0e6325071ecd" -SRC_URI = "git://github.com/influxdata/telegraf;protocol=https;branch=release-1.14" -SRCREV = "e77ce3d11d2b3d2f66e85921142d4927752054b2" +SRC_URI = "git://github.com/influxdata/telegraf;protocol=https;branch=release-1.38;destsuffix=${BP}/src/${GO_IMPORT} \ + file://telegraf.conf \ +" + +SRCREV = "c79b06d58e912124624d029a88bbe182254f0ff4" +S = "${UNPACKDIR}/${BP}" inherit go-mod systemd @@ -22,15 +30,11 @@ do_install:append() { # FIXME: This has mixed architecture files and causes errors during # packaging rm -rf ${D}${libdir}/go/pkg/mod ${D}${libdir}/go/pkg/sumdb - - # Fix the python version to use. - sed -i -e's,^#!/usr/bin/python,#!/usr/bin/env python,' ${D}${libdir}/go/src/${GO_IMPORT}/scripts/build.py - - install -Dm 0644 ${S}/src/${GO_IMPORT}/etc/${PN}.conf ${D}${sysconfdir}/${PN}/${PN}.conf + install -Dm 0644 ${UNPACKDIR}/telegraf.conf ${D}${sysconfdir}/${PN}/${PN}.conf install -Dm 0644 ${S}/src/${GO_IMPORT}/scripts/${PN}.service ${D}${systemd_system_unitdir}/${PN}.service install -d ${D}${sysconfdir}/${PN}/${PN}.d install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/log/${PN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${PN}.conf + echo "d ${localstatedir}/log/${PN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${PN}.conf } RDEPENDS:${PN}-dev += "bash" diff --git a/recipes-extended/zram-init/zram-init_git.bb b/recipes-extended/zram-init/zram-init_13.2.bb similarity index 63% rename from recipes-extended/zram-init/zram-init_git.bb rename to recipes-extended/zram-init/zram-init_13.2.bb index b8f49b8..a2b069b 100644 --- a/recipes-extended/zram-init/zram-init_git.bb +++ b/recipes-extended/zram-init/zram-init_13.2.bb @@ -1,17 +1,32 @@ SUMMARY = "A wrapper script for the zram kernel module with interactive and init support" +DESCRIPTION = "Installs zram-init service and configuration for compressed memory devices." +HOMEPAGE = "https://github.com/vaeth/zram-init" +BUGTRACKER = "https://github.com/vaeth/zram-init/issues" +SECTION = "base" +CVE_PRODUCT = "zram-init" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/README.md;beginline=5;endline=7;md5=1c6f4971407e5a5b1aa502b9badcdf98" +LIC_FILES_CHKSUM = "file://README.md;beginline=5;endline=7;md5=1c6f4971407e5a5b1aa502b9badcdf98" inherit update-rc.d systemd +DEPENDS += "gettext-native" +PE = "1" + SRC_URI = "git://github.com/vaeth/zram-init;protocol=https;branch=main" -SRCREV = "703f63bd3e595b9b357d74c58db1370b40af250d" +SRCREV = "66ef54e36d67abf76a8bfa2c2f1a6a0d38cd2498" + +EXTRA_OEMAKE += "SHEBANG='#!/bin/sh'" INITSCRIPT_NAME = "${PN}" INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE:${PN} = "zram_swap.service" +do_compile:prepend() { + # Force upstream's generated script to be recreated with the OE shebang. + rm -f ${S}/sbin/${PN} +} + do_install () { install -Dm 0755 ${S}/sbin/${PN} ${D}${base_sbindir}/${PN} install -Dm 0644 ${S}/modprobe.d/zram.conf ${D}${sysconfdir}/modprobe.d/zram.conf diff --git a/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service.bb b/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service.bb deleted file mode 100644 index 9e15ec2..0000000 --- a/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Weston Touch Screen Calibrator Service" -LICENSE = "CLOSED" - -SRC_URI = "\ - file://weston-touch-calibrator.default \ - file://weston-touch-calibrator.service \ - file://save-touch-calibration \ - file://touchscreen.rules \ -" - -inherit systemd - -SYSTEMD_SERVICE:${PN} = "weston-touch-calibrator.service" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -Dm 0644 ${WORKDIR}/weston-touch-calibrator.default ${D}${sysconfdir}/default/weston-touch-calibrator - install -Dm 0644 ${WORKDIR}/weston-touch-calibrator.service ${D}${systemd_system_unitdir}/weston-touch-calibrator.service - install -Dm 0755 ${WORKDIR}/save-touch-calibration ${D}${bindir}/save-touch-calibration - install -Dm 0644 ${WORKDIR}/touchscreen.rules ${D}${base_libdir}/udev/rules.d/98-touchscreen.rules -} - -RDEPENDS:${PN} += " \ - weston-init \ - weston-touch-calibrator \ -" - -FILES:${PN} = "\ - ${sysconfdir}/default \ - ${systemd_system_unitdir} \ - ${bindir} \ - ${base_libdir}/udev/rules.d \ -" diff --git a/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb b/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb new file mode 100644 index 0000000..1c2d495 --- /dev/null +++ b/recipes-graphics/weston-touch-calibrator-service/weston-touch-calibrator-service_1.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "Weston Touch Screen Calibrator Service" +DESCRIPTION = "Installs the Weston touch calibrator service, default configuration, and udev rules." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "graphics" +CVE_PRODUCT = "weston-touch-calibrator-service" +LICENSE = "CLOSED" + +SRC_URI = "\ + file://weston-touch-calibrator.default \ + file://weston-touch-calibrator.service \ + file://save-touch-calibration \ + file://touchscreen.rules \ +" + +inherit systemd + +SYSTEMD_SERVICE:${PN} = "weston-touch-calibrator.service" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm 0644 ${UNPACKDIR}/weston-touch-calibrator.default ${D}${sysconfdir}/default/weston-touch-calibrator + install -Dm 0644 ${UNPACKDIR}/weston-touch-calibrator.service ${D}${systemd_system_unitdir}/weston-touch-calibrator.service + install -Dm 0755 ${UNPACKDIR}/save-touch-calibration ${D}${bindir}/save-touch-calibration + install -Dm 0644 ${UNPACKDIR}/touchscreen.rules ${D}${base_libdir}/udev/rules.d/98-touchscreen.rules +} + +FILES:${PN} += "\ + ${sysconfdir}/default \ + ${systemd_system_unitdir} \ + ${base_libdir}/udev/rules.d \ +" + +RDEPENDS:${PN} += "\ + weston-init \ + weston-touch-calibrator \ +" diff --git a/recipes-staging/beep/beep_1.2.2.bb b/recipes-staging/beep/beep_1.2.2.bb deleted file mode 100644 index 6bc3c3d..0000000 --- a/recipes-staging/beep/beep_1.2.2.bb +++ /dev/null @@ -1,31 +0,0 @@ -# beep: a console utility to "and allow a little more granularity -# than you get with the default terminal bell" -DESCRIPTION = "A console utility to make a beep noise" -SECTION = "console/utils" -LICENSE = "GPL-2.0" -PR = "r3" - -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://johnath.com/beep/beep-${PV}.tar.gz \ - file://linux-input.patch \ - " - -S = "${WORKDIR}/beep-${PV}" - -EXTRA_OEMAKE += 'CC="${CC}"' -EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"' - -# slugos requires beep in boot -BINDIR = "${bindir}" -BINDIR_slugos = "${base_bindir}" - -do_install() { - # this is easier than patching the Makefile... - install -d "${D}${BINDIR}" - install -c -m 755 beep "${D}${BINDIR}/beep" - install -d "${D}${mandir}/man1" - install -c -m 644 beep.1.gz "${D}${mandir}/man1/beep.1.gz" -} - -SRC_URI[md5sum] = "d541419fd7e5642952d7b48cbb40c712" -SRC_URI[sha256sum] = "5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1" diff --git a/recipes-staging/beep/beep_1.4.12.bb b/recipes-staging/beep/beep_1.4.12.bb new file mode 100644 index 0000000..c554904 --- /dev/null +++ b/recipes-staging/beep/beep_1.4.12.bb @@ -0,0 +1,33 @@ +SUMMARY = "Advanced PC speaker beeper" +DESCRIPTION = "A command line tool for Linux that beeps the PC speaker." +HOMEPAGE = "https://github.com/spkr-beep/beep" +BUGTRACKER = "https://github.com/spkr-beep/beep/issues" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only" +RECIPE_MAINTAINER = "O.S. Systems Software LTDA. " +CVE_PRODUCT = "beep" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/spkr-beep/${BPN}.git;protocol=https;nobranch=1" +SRCREV = "11453a79f2cea81832329b06ca3a284aa7a0a52e" + +EXTRA_OEMAKE = ' \ + CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + common_CFLAGS="-std=gnu99" \ + PANDOC=false \ + prefix="${prefix}" \ + bindir="${bindir}" \ + mandir="${mandir}" \ + ' + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR="${D}" CC=false install +} diff --git a/recipes-staging/beep/files/linux-input.patch b/recipes-staging/beep/files/linux-input.patch deleted file mode 100644 index 1b38ba7..0000000 --- a/recipes-staging/beep/files/linux-input.patch +++ /dev/null @@ -1,155 +0,0 @@ -# the diff between Alessandro Zummo's copy of beep.c and the original -# one... - ---- beep-1.2.2/beep.c.orig 2006-01-29 12:13:36.994560551 -0800 -+++ beep-1.2.2/beep.c 2006-01-29 12:35:02.950558713 -0800 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - /* I don't know where this number comes from, I admit that freely. A - wonderful human named Raine M. Ekman used it in a program that played -@@ -86,18 +87,28 @@ typedef struct beep_parms_t { - struct beep_parms_t *next; /* in case -n/--new is used. */ - } beep_parms_t; - -+enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; -+ - /* Momma taught me never to use globals, but we need something the signal - handlers can get at.*/ - int console_fd = -1; -+int console_type = BEEP_TYPE_CONSOLE; -+char *console_device = NULL; -+ -+void do_beep(int freq); - - /* If we get interrupted, it would be nice to not leave the speaker beeping in - perpetuity. */ - void handle_signal(int signum) { -+ -+ if(console_device) -+ free(console_device); -+ - switch(signum) { - case SIGINT: - if(console_fd >= 0) { - /* Kill the sound, quit gracefully */ -- ioctl(console_fd, KIOCSOUND, 0); -+ do_beep(0); - close(console_fd); - exit(signum); - } else { -@@ -110,7 +121,7 @@ void handle_signal(int signum) { - /* print usage and exit */ - void usage_bail(const char *executable_name) { - printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " -- "[-D delay] [-s] [-c]\n", -+ "[-D delay] [-s] [-c] [-e device]\n", - executable_name); - printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); - printf("%s [-h] [--help]\n", executable_name); -@@ -141,11 +152,12 @@ void usage_bail(const char *executable_n - void parse_command_line(int argc, char **argv, beep_parms_t *result) { - int c; - -- struct option opt_list[4] = {{"help", 0, NULL, 'h'}, -+ struct option opt_list[] = {{"help", 0, NULL, 'h'}, - {"version", 0, NULL, 'V'}, - {"new", 0, NULL, 'n'}, -+ {"device", 1, NULL, 'e'}, - {0,0,0,0}}; -- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) -+ while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) - != EOF) { - int argval = -1; /* handle parsed numbers for various arguments */ - float argfreq = -1; -@@ -207,6 +219,9 @@ void parse_command_line(int argc, char * - result->next->next = NULL; - result = result->next; /* yes, I meant to do that. */ - break; -+ case 'e' : /* also --device */ -+ console_device = strdup(optarg); -+ break; - case 'h' : /* notice that this is also --help */ - default : - usage_bail(argv[0]); -@@ -214,26 +229,61 @@ void parse_command_line(int argc, char * - } - } - -+void do_beep(int freq) -+{ -+ if (console_type == BEEP_TYPE_CONSOLE) -+ { -+ if(ioctl(console_fd, KIOCSOUND, freq != 0 -+ ? (int)(CLOCK_TICK_RATE/freq) -+ : freq) < 0) { -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("ioctl"); -+ } -+ } -+ else -+ { -+ /* BEEP_TYPE_EVDEV */ -+ struct input_event e; -+ -+ e.type = EV_SND; -+ e.code = SND_TONE; -+ e.value = freq; -+ -+ write(console_fd, &e, sizeof(struct input_event)); -+ } -+} -+ - void play_beep(beep_parms_t parms) { - int i; /* loop counter */ - - /* try to snag the console */ -- if((console_fd = open("/dev/console", O_WRONLY)) == -1) { -- fprintf(stderr, "Could not open /dev/console for writing.\n"); -+ -+ if(console_device) -+ console_fd = open(console_device, O_WRONLY); -+ else -+ if((console_fd = open("/dev/input/event0", O_WRONLY)) == -1) -+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) -+ console_fd = open("/dev/vc/0", O_WRONLY); -+ -+ if(console_fd == -1) { -+ fprintf(stderr, "Could not open %s for writing\n", -+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("open"); - exit(1); - } - -+ if (ioctl(console_fd, EVIOCGSND(0)) != -1) -+ console_type = BEEP_TYPE_EVDEV; -+ else -+ console_type = BEEP_TYPE_CONSOLE; -+ - /* Beep */ - for (i = 0; i < parms.reps; i++) { /* start beep */ -- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("ioctl"); -- } -+ do_beep(parms.freq); - /* Look ma, I'm not ansi C compatible! */ - usleep(1000*parms.length); /* wait... */ -- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ -+ do_beep(0); - if(parms.end_delay || (i+1 < parms.reps)) - usleep(1000*parms.delay); /* wait... */ - } /* repeat. */ -@@ -295,5 +345,8 @@ int main(int argc, char **argv) { - parms = next; - } - -+ if(console_device) -+ free(console_device); -+ - return EXIT_SUCCESS; - } diff --git a/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index f03aa32..cfac11b 100644 --- a/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/recipes-staging/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG:append = " kms" +PACKAGECONFIG:append:oel = " kms" diff --git a/recipes-staging/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes-staging/gstreamer/gstreamer1.0-plugins-base_%.bbappend index 85d8f62..414d584 100644 --- a/recipes-staging/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ b/recipes-staging/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -1,2 +1,2 @@ PACKAGECONFIG[viv-fb] = ",,virtual/libgles2 virtual/libg2d" -OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'viv-fb', ' viv-fb', '', d)}" +OPENGL_WINSYS:append:oel = " ${@bb.utils.contains('PACKAGECONFIG', 'viv-fb', 'viv-fb', '', d)}" diff --git a/recipes-staging/inputattach-config/inputattach-config.bb b/recipes-staging/inputattach-config/inputattach-config.bb deleted file mode 100644 index 68beec6..0000000 --- a/recipes-staging/inputattach-config/inputattach-config.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "inputattach configuration file" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI = "file://inputattach.conf" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -Dm 0644 ${WORKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf -} diff --git a/recipes-staging/inputattach-config/inputattach-config/GPL-2.0 b/recipes-staging/inputattach-config/inputattach-config/GPL-2.0 new file mode 100644 index 0000000..7f5abbc --- /dev/null +++ b/recipes-staging/inputattach-config/inputattach-config/GPL-2.0 @@ -0,0 +1,132 @@ + +GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation`s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author`s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors` reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone`s free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program`s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients` exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the program`s name and an idea of what it does. +Copyright (C) yyyy name of author + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author +Gnomovision comes with ABSOLUTELY NO WARRANTY; for details +type `show w`. This is free software, and you are welcome +to redistribute it under certain conditions; type `show c` +for details. +The hypothetical commands `show w` and `show c` should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w` and `show c`; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright +interest in the program `Gnomovision` +(which makes passes at compilers) written +by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + diff --git a/recipes-staging/inputattach-config/inputattach-config_1.0.bb b/recipes-staging/inputattach-config/inputattach-config_1.0.bb new file mode 100644 index 0000000..b53fd94 --- /dev/null +++ b/recipes-staging/inputattach-config/inputattach-config_1.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "inputattach configuration file" +DESCRIPTION = "Installs the default inputattach configuration used by the inputattach service." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "base" +CVE_PRODUCT = "inputattach-config" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI = "\ + file://GPL-2.0 \ + file://inputattach.conf \ +" + +S = "${UNPACKDIR}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm 0644 ${UNPACKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf +} diff --git a/recipes-staging/linuxconsole/linuxconsole_1.7.0.bb b/recipes-staging/linuxconsole/linuxconsole_1.7.0.bb deleted file mode 100644 index 6ea7392..0000000 --- a/recipes-staging/linuxconsole/linuxconsole_1.7.0.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "Linux Console Project" -DESCRIPTION = "This project maintains the Linux Console tools, which include \ -utilities to test and configure joysticks, connect legacy devices to the kernel's \ -input subsystem (providing support for serial mice, touchscreens etc.), and test \ -the input event layer." -HOMEPAGE = "https://sourceforge.net/projects/linuxconsole" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libsdl2" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ - file://51-these-are-not-joysticks-rm.rules \ - file://60-joystick.rules \ - file://inputattachctl \ - file://inputattach.service \ -" - -SRC_URI[sha256sum] = "95d112f06393806116341d593bda002c8bc44119c1538407623268fed90d8c34" - -S = "${WORKDIR}/linuxconsoletools-${PV}" - -inherit systemd pkgconfig - -EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} -C utils" -EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SUPPORT=1', '', d)}" - -SYSTEMD_PACKAGES += "inputattach" -SYSTEMD_SERVICE:inputattach = "inputattach.service" -SYSTEMD_AUTO_ENABLE:inputattach = "enable" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install - - install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules - install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${base_libdir}/udev/rules.d/60-joystick.rules - - install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service - install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl -} - -PACKAGES += "inputattach joystick" - -# We won't package any file here as we are following the same packaging schema -# Debian does and we are splitting it in 'inputattach' and 'joystick' packages. -FILES:${PN} = "" - -FILES:inputattach += "\ - ${bindir}/inputattach \ - ${bindir}/inputattachctl \ - ${systemd_system_unitdir}/inputattach.service \ -" - -FILES:joystick += "\ - ${bindir}/evdev-joystick \ - ${bindir}/ffcfstress \ - ${bindir}/ffmvforce \ - ${bindir}/ffset \ - ${bindir}/fftest \ - ${bindir}/jscal \ - ${bindir}/jscal-restore \ - ${bindir}/jscal-store \ - ${bindir}/jstest \ - ${datadir}/joystick \ - ${base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules \ - ${base_libdir}/udev/js-set-enum-leds \ - ${base_libdir}/udev/rules.d/60-joystick.rules \ - ${base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ -" - -RDEPENDS:inputattach += "inputattach-config" - -RDEPENDS:joystick += "\ - bash \ - gawk \ -" diff --git a/recipes-staging/linuxconsole/linuxconsole_1.8.1.bb b/recipes-staging/linuxconsole/linuxconsole_1.8.1.bb new file mode 100644 index 0000000..44ebd28 --- /dev/null +++ b/recipes-staging/linuxconsole/linuxconsole_1.8.1.bb @@ -0,0 +1,95 @@ +SUMMARY = "Linux Console Project" +DESCRIPTION = "This project maintains the Linux Console tools, which include \ + utilities to test and configure joysticks, connect legacy devices to the kernel's \ + input subsystem (providing support for serial mice, touchscreens etc.), and test \ + the input event layer." +HOMEPAGE = "https://sourceforge.net/projects/linuxconsole" +BUGTRACKER = "https://sourceforge.net/p/linuxconsole/bugs/" +SECTION = "console/utils" +CVE_PRODUCT = "linuxconsole" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libsdl2${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ + file://51-these-are-not-joysticks-rm.rules \ + file://60-joystick.rules \ + file://inputattachctl \ + file://inputattach.service \ +" + +SRC_URI[sha256sum] = "4da29745c782b7db18f5f37c49e77bf163121dd3761e2fc7636fa0cbf35c2456" + +S = "${UNPACKDIR}/linuxconsoletools-${PV}" + +inherit systemd pkgconfig + +LINUXCONSOLE_UDEVDIR = "${nonarch_base_libdir}/udev" +LINUXCONSOLE_UPSTREAM_UDEVDIR = "${base_prefix}/lib/udev" + +EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} -C utils" +EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SUPPORT=1', '', d)}" + +SYSTEMD_PACKAGES += "inputattach" +SYSTEMD_SERVICE:inputattach = "inputattach.service" +SYSTEMD_AUTO_ENABLE:inputattach = "enable" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install + + if [ -e ${D}${LINUXCONSOLE_UPSTREAM_UDEVDIR}/js-set-enum-leds ] && [ "${LINUXCONSOLE_UPSTREAM_UDEVDIR}" != "${LINUXCONSOLE_UDEVDIR}" ]; then + install -Dm 0755 ${D}${LINUXCONSOLE_UPSTREAM_UDEVDIR}/js-set-enum-leds ${D}${LINUXCONSOLE_UDEVDIR}/js-set-enum-leds + install -Dm 0644 ${D}${LINUXCONSOLE_UPSTREAM_UDEVDIR}/rules.d/80-stelladaptor-joystick.rules ${D}${LINUXCONSOLE_UDEVDIR}/rules.d/80-stelladaptor-joystick.rules + rm -rf ${D}${LINUXCONSOLE_UPSTREAM_UDEVDIR} + rmdir --ignore-fail-on-non-empty ${D}${base_prefix}/lib || true + fi + + install -Dm 0644 ${UNPACKDIR}/51-these-are-not-joysticks-rm.rules ${D}${LINUXCONSOLE_UDEVDIR}/rules.d/51-these-are-not-joysticks-rm.rules + install -Dm 0644 ${UNPACKDIR}/60-joystick.rules ${D}${LINUXCONSOLE_UDEVDIR}/rules.d/60-joystick.rules + + install -Dm 0644 ${UNPACKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service + install -Dm 0755 ${UNPACKDIR}/inputattachctl ${D}${bindir}/inputattachctl +} + +PACKAGES += "inputattach joystick" + +# We won't package any file here as we are following the same packaging schema +# Debian does and we are splitting it in 'inputattach' and 'joystick' packages. +FILES:${PN} = "" + +FILES:inputattach += "\ + ${bindir}/inputattach \ + ${bindir}/inputattachctl \ + ${systemd_system_unitdir}/inputattach.service \ +" + +FILES:joystick += "\ + ${bindir}/evdev-joystick \ + ${bindir}/ffcfstress \ + ${bindir}/ffmvforce \ + ${bindir}/ffset \ + ${bindir}/fftest \ + ${bindir}/jscal \ + ${bindir}/jscal-restore \ + ${bindir}/jscal-store \ + ${bindir}/jstest \ + ${datadir}/joystick \ + ${LINUXCONSOLE_UDEVDIR}/rules.d/51-these-are-not-joysticks-rm.rules \ + ${LINUXCONSOLE_UDEVDIR}/js-set-enum-leds \ + ${LINUXCONSOLE_UDEVDIR}/rules.d/60-joystick.rules \ + ${LINUXCONSOLE_UDEVDIR}/rules.d/80-stelladaptor-joystick.rules \ +" + +RDEPENDS:inputattach += "inputattach-config" + +RDEPENDS:joystick += "\ + bash \ + gawk \ +" diff --git a/recipes-staging/wayland/weston_%.bbappend b/recipes-staging/wayland/weston_%.bbappend index 504b7e4..850cc7b 100644 --- a/recipes-staging/wayland/weston_%.bbappend +++ b/recipes-staging/wayland/weston_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:oel := "${THISDIR}/${PN}:" -PACKAGE_BEFORE_PN = "${PN}-touch-calibrator" +PACKAGE_BEFORE_PN:append:oel = " ${PN}-touch-calibrator" -FILES:${PN}-touch-calibrator = "${bindir}/weston-touch-calibrator" +FILES:${PN}-touch-calibrator += "${bindir}/weston-touch-calibrator" diff --git a/recipes-staging/wifi-connect/wifi-connect-crates.inc b/recipes-staging/wifi-connect/wifi-connect-4.11.84-crates.inc similarity index 76% rename from recipes-staging/wifi-connect/wifi-connect-crates.inc rename to recipes-staging/wifi-connect/wifi-connect-4.11.84-crates.inc index c296bf6..6577074 100644 --- a/recipes-staging/wifi-connect/wifi-connect-crates.inc +++ b/recipes-staging/wifi-connect/wifi-connect-4.11.84-crates.inc @@ -1,18 +1,18 @@ -# Autogenerated with 'bitbake -c update_crates wifi-connect' +# Autogenerated from wifi-connect v4.11.84 Cargo.lock # from Cargo.lock -SRC_URI += " \ +SRC_URI += "\ crate://crates.io/aho-corasick/0.6.10 \ crate://crates.io/ansi_term/0.12.1 \ crate://crates.io/ascii/1.1.0 \ crate://crates.io/atty/0.2.14 \ crate://crates.io/autocfg/0.1.8 \ - crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/autocfg/1.4.0 \ crate://crates.io/base64/0.9.3 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/bodyparser/0.8.0 \ crate://crates.io/buf_redux/0.6.3 \ - crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/byteorder/1.5.0 \ crate://crates.io/cfg-if/0.1.10 \ crate://crates.io/cfg-if/1.0.0 \ crate://crates.io/clap/2.34.0 \ @@ -25,22 +25,22 @@ SRC_URI += " \ crate://crates.io/futures/0.1.31 \ crate://crates.io/futures-cpupool/0.1.8 \ crate://crates.io/hermit-abi/0.1.19 \ - crate://crates.io/hermit-abi/0.2.6 \ - crate://crates.io/httparse/1.8.0 \ + crate://crates.io/hermit-abi/0.3.9 \ + crate://crates.io/httparse/1.9.5 \ crate://crates.io/hyper/0.10.16 \ crate://crates.io/idna/0.1.5 \ crate://crates.io/iron/0.6.1 \ crate://crates.io/iron-cors/0.8.0 \ - crate://crates.io/itoa/1.0.5 \ + crate://crates.io/itoa/1.0.14 \ crate://crates.io/language-tags/0.2.2 \ - crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.139 \ + crate://crates.io/lazy_static/1.5.0 \ + crate://crates.io/libc/0.2.167 \ crate://crates.io/libdbus-sys/0.1.5 \ crate://crates.io/log/0.3.9 \ - crate://crates.io/log/0.4.17 \ + crate://crates.io/log/0.4.22 \ crate://crates.io/matches/0.1.10 \ crate://crates.io/memchr/1.0.2 \ - crate://crates.io/memchr/2.5.0 \ + crate://crates.io/memchr/2.7.4 \ crate://crates.io/memoffset/0.6.5 \ crate://crates.io/mime/0.2.6 \ crate://crates.io/mime_guess/1.8.8 \ @@ -51,11 +51,11 @@ SRC_URI += " \ crate://crates.io/num/0.1.42 \ crate://crates.io/num-bigint/0.1.44 \ crate://crates.io/num-complex/0.1.43 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-iter/0.1.43 \ + crate://crates.io/num-integer/0.1.46 \ + crate://crates.io/num-iter/0.1.45 \ crate://crates.io/num-rational/0.1.42 \ - crate://crates.io/num-traits/0.2.15 \ - crate://crates.io/num_cpus/1.15.0 \ + crate://crates.io/num-traits/0.2.19 \ + crate://crates.io/num_cpus/1.16.0 \ crate://crates.io/params/0.8.0 \ crate://crates.io/percent-encoding/1.0.1 \ crate://crates.io/persistent/0.4.0 \ @@ -64,10 +64,10 @@ SRC_URI += " \ crate://crates.io/phf_generator/0.7.24 \ crate://crates.io/phf_shared/0.7.24 \ crate://crates.io/pin-utils/0.1.0 \ - crate://crates.io/pkg-config/0.3.26 \ + crate://crates.io/pkg-config/0.3.31 \ crate://crates.io/plugin/0.2.6 \ - crate://crates.io/proc-macro2/1.0.51 \ - crate://crates.io/quote/1.0.23 \ + crate://crates.io/proc-macro2/1.0.92 \ + crate://crates.io/quote/1.0.37 \ crate://crates.io/rand/0.3.23 \ crate://crates.io/rand/0.4.6 \ crate://crates.io/rand/0.6.5 \ @@ -86,24 +86,24 @@ SRC_URI += " \ crate://crates.io/remove_dir_all/0.5.3 \ crate://crates.io/route-recognizer/0.1.13 \ crate://crates.io/router/0.6.0 \ - crate://crates.io/rustc-serialize/0.3.24 \ - crate://crates.io/ryu/1.0.12 \ + crate://crates.io/rustc-serialize/0.3.25 \ + crate://crates.io/ryu/1.0.18 \ crate://crates.io/safemem/0.2.0 \ crate://crates.io/safemem/0.3.3 \ crate://crates.io/sequence_trie/0.3.6 \ - crate://crates.io/serde/1.0.152 \ - crate://crates.io/serde_derive/1.0.152 \ - crate://crates.io/serde_json/1.0.93 \ + crate://crates.io/serde/1.0.215 \ + crate://crates.io/serde_derive/1.0.215 \ + crate://crates.io/serde_json/1.0.133 \ crate://crates.io/siphasher/0.2.3 \ - crate://crates.io/slab/0.4.7 \ + crate://crates.io/slab/0.4.9 \ crate://crates.io/staticfile/0.5.0 \ crate://crates.io/strsim/0.8.0 \ - crate://crates.io/syn/1.0.107 \ + crate://crates.io/syn/2.0.90 \ crate://crates.io/tempdir/0.3.7 \ crate://crates.io/textwrap/0.11.0 \ crate://crates.io/thread_local/0.3.6 \ crate://crates.io/time/0.1.45 \ - crate://crates.io/tinyvec/1.6.0 \ + crate://crates.io/tinyvec/1.8.0 \ crate://crates.io/tinyvec_macros/0.1.1 \ crate://crates.io/tokio-executor/0.1.10 \ crate://crates.io/tokio-timer/0.2.13 \ @@ -113,17 +113,17 @@ SRC_URI += " \ crate://crates.io/typemap/0.3.3 \ crate://crates.io/ucd-util/0.1.10 \ crate://crates.io/unicase/1.4.2 \ - crate://crates.io/unicode-bidi/0.3.10 \ - crate://crates.io/unicode-ident/1.0.6 \ - crate://crates.io/unicode-normalization/0.1.22 \ - crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/unicode-bidi/0.3.17 \ + crate://crates.io/unicode-ident/1.0.14 \ + crate://crates.io/unicode-normalization/0.1.24 \ + crate://crates.io/unicode-width/0.1.14 \ crate://crates.io/unsafe-any/0.4.2 \ crate://crates.io/url/1.7.2 \ crate://crates.io/urlencoded/0.6.0 \ crate://crates.io/utf8-ranges/1.0.5 \ crate://crates.io/vec_map/0.8.2 \ crate://crates.io/version_check/0.1.5 \ - crate://crates.io/version_check/0.9.4 \ + crate://crates.io/version_check/0.9.5 \ crate://crates.io/wasi/0.10.0+wasi-snapshot-preview1 \ crate://crates.io/winapi/0.3.9 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ @@ -135,12 +135,12 @@ SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac64 SRC_URI[ascii-1.1.0.sha256sum] = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" SRC_URI[autocfg-0.1.8.sha256sum] = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[autocfg-1.4.0.sha256sum] = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" SRC_URI[base64-0.9.3.sha256sum] = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" SRC_URI[bodyparser-0.8.0.sha256sum] = "f023abfa58aad6f6bc4ae0630799e24d5ee0ab8bb2e49f651d9b1f9aa4f52f30" SRC_URI[buf_redux-0.6.3.sha256sum] = "b9279646319ff816b05fb5897883ece50d7d854d12b59992683d4f8a71b0f949" -SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" SRC_URI[cfg-if-0.1.10.sha256sum] = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" @@ -153,22 +153,22 @@ SRC_URI[fuchsia-cprng-0.1.1.sha256sum] = "a06f77d526c1a601b7c4cdd98f54b5eaabffc1 SRC_URI[futures-0.1.31.sha256sum] = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" SRC_URI[futures-cpupool-0.1.8.sha256sum] = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -SRC_URI[httparse-1.8.0.sha256sum] = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +SRC_URI[hermit-abi-0.3.9.sha256sum] = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +SRC_URI[httparse-1.9.5.sha256sum] = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" SRC_URI[hyper-0.10.16.sha256sum] = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" SRC_URI[idna-0.1.5.sha256sum] = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" SRC_URI[iron-0.6.1.sha256sum] = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" SRC_URI[iron-cors-0.8.0.sha256sum] = "24b02b8856c7f14e443c483e802cf0ce693f3bec19f49d2c9a242b18f88c9b70" -SRC_URI[itoa-1.0.5.sha256sum] = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +SRC_URI[itoa-1.0.14.sha256sum] = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" SRC_URI[language-tags-0.2.2.sha256sum] = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -SRC_URI[libc-0.2.139.sha256sum] = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +SRC_URI[libc-0.2.167.sha256sum] = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" SRC_URI[libdbus-sys-0.1.5.sha256sum] = "18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210" SRC_URI[log-0.3.9.sha256sum] = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" SRC_URI[matches-0.1.10.sha256sum] = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" SRC_URI[memchr-1.0.2.sha256sum] = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" -SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" SRC_URI[memoffset-0.6.5.sha256sum] = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" SRC_URI[mime-0.2.6.sha256sum] = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" SRC_URI[mime_guess-1.8.8.sha256sum] = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" @@ -179,11 +179,11 @@ SRC_URI[nix-0.25.1.sha256sum] = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305 SRC_URI[num-0.1.42.sha256sum] = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" SRC_URI[num-bigint-0.1.44.sha256sum] = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" SRC_URI[num-complex-0.1.43.sha256sum] = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -SRC_URI[num-iter-0.1.43.sha256sum] = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +SRC_URI[num-iter-0.1.45.sha256sum] = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" SRC_URI[num-rational-0.1.42.sha256sum] = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -SRC_URI[num-traits-0.2.15.sha256sum] = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -SRC_URI[num_cpus-1.15.0.sha256sum] = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" SRC_URI[params-0.8.0.sha256sum] = "c789fdad2cfdaa551ea0e3a9eadb74c5d634968a9fb3a8c767d89be470d21589" SRC_URI[percent-encoding-1.0.1.sha256sum] = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" SRC_URI[persistent-0.4.0.sha256sum] = "8e8fa0009c4f3d350281309909c618abddf10bb7e3145f28410782f6a5ec74c5" @@ -192,10 +192,10 @@ SRC_URI[phf_codegen-0.7.24.sha256sum] = "b03e85129e324ad4166b06b2c7491ae27fe3ec3 SRC_URI[phf_generator-0.7.24.sha256sum] = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" SRC_URI[phf_shared-0.7.24.sha256sum] = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +SRC_URI[pkg-config-0.3.31.sha256sum] = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" SRC_URI[plugin-0.2.6.sha256sum] = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" -SRC_URI[proc-macro2-1.0.51.sha256sum] = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +SRC_URI[proc-macro2-1.0.92.sha256sum] = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +SRC_URI[quote-1.0.37.sha256sum] = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" SRC_URI[rand-0.3.23.sha256sum] = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" SRC_URI[rand-0.4.6.sha256sum] = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" SRC_URI[rand-0.6.5.sha256sum] = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" @@ -214,24 +214,24 @@ SRC_URI[regex-syntax-0.5.6.sha256sum] = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01 SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" SRC_URI[route-recognizer-0.1.13.sha256sum] = "ea509065eb0b3c446acdd0102f0d46567dc30902dc0be91d6552035d92b0f4f8" SRC_URI[router-0.6.0.sha256sum] = "dc63b6f3b8895b0d04e816b2b1aa58fdba2d5acca3cbb8f0ab8e017347d57397" -SRC_URI[rustc-serialize-0.3.24.sha256sum] = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -SRC_URI[ryu-1.0.12.sha256sum] = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +SRC_URI[rustc-serialize-0.3.25.sha256sum] = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" +SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" SRC_URI[safemem-0.2.0.sha256sum] = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" SRC_URI[sequence_trie-0.3.6.sha256sum] = "1ee22067b7ccd072eeb64454b9c6e1b33b61cd0d49e895fd48676a184580e0c3" -SRC_URI[serde-1.0.152.sha256sum] = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -SRC_URI[serde_derive-1.0.152.sha256sum] = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -SRC_URI[serde_json-1.0.93.sha256sum] = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +SRC_URI[serde-1.0.215.sha256sum] = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +SRC_URI[serde_derive-1.0.215.sha256sum] = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +SRC_URI[serde_json-1.0.133.sha256sum] = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" SRC_URI[siphasher-0.2.3.sha256sum] = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" SRC_URI[staticfile-0.5.0.sha256sum] = "babd3fa68bb7e3994ce181c5f21ff3ff5fffef7b18b8a10163b45e4dafc6fb86" SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +SRC_URI[syn-2.0.90.sha256sum] = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" SRC_URI[tempdir-0.3.7.sha256sum] = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" SRC_URI[thread_local-0.3.6.sha256sum] = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" SRC_URI[time-0.1.45.sha256sum] = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +SRC_URI[tinyvec-1.8.0.sha256sum] = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" SRC_URI[tokio-executor-0.1.10.sha256sum] = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" SRC_URI[tokio-timer-0.2.13.sha256sum] = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" @@ -241,17 +241,17 @@ SRC_URI[typeable-0.1.2.sha256sum] = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c SRC_URI[typemap-0.3.3.sha256sum] = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" SRC_URI[ucd-util-0.1.10.sha256sum] = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" SRC_URI[unicase-1.4.2.sha256sum] = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -SRC_URI[unicode-bidi-0.3.10.sha256sum] = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" -SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" -SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[unicode-bidi-0.3.17.sha256sum] = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" +SRC_URI[unicode-ident-1.0.14.sha256sum] = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +SRC_URI[unicode-normalization-0.1.24.sha256sum] = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +SRC_URI[unicode-width-0.1.14.sha256sum] = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" SRC_URI[unsafe-any-0.4.2.sha256sum] = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" SRC_URI[url-1.7.2.sha256sum] = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" SRC_URI[urlencoded-0.6.0.sha256sum] = "0a52f50139118b60ae91af08bf15ed158817d34b91b9d24c11ffbe21195d33e3" SRC_URI[utf8-ranges-1.0.5.sha256sum] = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" SRC_URI[version_check-0.1.5.sha256sum] = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" SRC_URI[wasi-0.10.0+wasi-snapshot-preview1.sha256sum] = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" diff --git a/recipes-staging/wifi-connect/wifi-connect/0001-params-disable-num-default-features.patch b/recipes-staging/wifi-connect/wifi-connect/0001-params-disable-num-default-features.patch new file mode 100644 index 0000000..8bdcb49 --- /dev/null +++ b/recipes-staging/wifi-connect/wifi-connect/0001-params-disable-num-default-features.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: OSSystems +Date: Fri, 5 Jun 2026 14:50:00 +0000 +Subject: [PATCH] params: disable num default features + +params only uses num::NumCast, so it does not need num's default +bigint, complex, rational, and rustc-serialize feature set. Disabling +the defaults avoids compiling legacy rustc-serialize derives that no +longer build with current Rust. + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: OSSystems +--- + Cargo.toml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Cargo.toml b/Cargo.toml +index b7f1c63..e648f9c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -25,6 +25,7 @@ version = "0.8" + + [dependencies.num] + version = "0.1" ++default-features = false + + [dependencies.tempdir] + version = "0.3" +-- +2.43.0 diff --git a/recipes-staging/wifi-connect/wifi-connect/0001-traitobject-remove-duplicate-marker-trait-impls.patch b/recipes-staging/wifi-connect/wifi-connect/0001-traitobject-remove-duplicate-marker-trait-impls.patch new file mode 100644 index 0000000..c8aa9a6 --- /dev/null +++ b/recipes-staging/wifi-connect/wifi-connect/0001-traitobject-remove-duplicate-marker-trait-impls.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: OSSystems +Date: Fri, 5 Jun 2026 14:40:00 +0000 +Subject: [PATCH] traitobject: remove duplicate marker trait impls + +Recent Rust versions canonicalize duplicate and reordered auto-trait +bounds, so these impls conflict with `Send + Sync`. + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: OSSystems +--- + src/impls.rs | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/impls.rs b/src/impls.rs +index c8eab21..6379a8b 100644 +--- a/src/impls.rs ++++ b/src/impls.rs +@@ -69,10 +69,7 @@ + unsafe impl Trait for ::std::iter::Iterator + Send + Sync { } + unsafe impl Trait for ::std::marker::Send + Send { } + unsafe impl Trait for ::std::marker::Send + Sync { } +-unsafe impl Trait for ::std::marker::Send + Send + Sync { } +-unsafe impl Trait for ::std::marker::Sync + Send { } + unsafe impl Trait for ::std::marker::Sync + Sync { } +-unsafe impl Trait for ::std::marker::Sync + Send + Sync { } + unsafe impl Trait for ::std::ops::Drop + Send { } + unsafe impl Trait for ::std::ops::Drop + Sync { } + unsafe impl Trait for ::std::ops::Drop + Send + Sync { } +-- +2.43.0 diff --git a/recipes-staging/wifi-connect/wifi-connect/0001-wifi-connect-refresh-lockfile-for-params-num-features.patch b/recipes-staging/wifi-connect/wifi-connect/0001-wifi-connect-refresh-lockfile-for-params-num-features.patch new file mode 100644 index 0000000..b2a147c --- /dev/null +++ b/recipes-staging/wifi-connect/wifi-connect/0001-wifi-connect-refresh-lockfile-for-params-num-features.patch @@ -0,0 +1,107 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: OSSystems +Date: Fri, 5 Jun 2026 15:00:00 +0000 +Subject: [PATCH] wifi-connect: refresh lockfile for params num features + +The vendored params crate is patched to disable num default features. +Refresh Cargo.lock accordingly so the frozen Cargo build does not try +to rewrite the lockfile during do_compile. + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: OSSystems +--- + Cargo.lock | 55 +++--------------------------------------------------- + 1 file changed, 3 insertions(+), 52 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 4b7ab42..919daa4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "aho-corasick" +@@ -407,7 +407,6 @@ dependencies = [ + [[package]] + name = "network-manager" + version = "0.13.3" +-source = "git+https://github.com/balena-io-modules/network-manager.git#4da2e6a57de16b6ae911f74321f929d78af8b1ba" + dependencies = [ + "ascii", + "bitflags", +@@ -439,36 +438,11 @@ version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" + dependencies = [ +- "num-bigint", +- "num-complex", + "num-integer", + "num-iter", +- "num-rational", + "num-traits", + ] + +-[[package]] +-name = "num-bigint" +-version = "0.1.44" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" +-dependencies = [ +- "num-integer", +- "num-traits", +- "rand 0.4.6", +- "rustc-serialize", +-] +- +-[[package]] +-name = "num-complex" +-version = "0.1.43" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" +-dependencies = [ +- "num-traits", +- "rustc-serialize", +-] +- + [[package]] + name = "num-integer" + version = "0.1.46" +@@ -489,18 +463,6 @@ dependencies = [ + "num-traits", + ] + +-[[package]] +-name = "num-rational" +-version = "0.1.42" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +-dependencies = [ +- "num-bigint", +- "num-integer", +- "num-traits", +- "rustc-serialize", +-] +- + [[package]] + name = "num-traits" + version = "0.2.19" +@@ -816,12 +778,6 @@ dependencies = [ + "url", + ] + +-[[package]] +-name = "rustc-serialize" +-version = "0.3.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" +- + [[package]] + name = "ryu" + version = "1.0.18" +-- +2.43.0 diff --git a/recipes-staging/wifi-connect/wifi-connect_4.11.3.bb b/recipes-staging/wifi-connect/wifi-connect_4.11.3.bb deleted file mode 100644 index 541de7d..0000000 --- a/recipes-staging/wifi-connect/wifi-connect_4.11.3.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = " \ - WiFi Connect is a utility for dynamically setting the WiFi configuration on a Linux device via a captive portal. \ - WiFi credentials are specified by connecting with a mobile phone or laptop to the access point that WiFi Connect creates. \ -" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3bfd34238ccc26128aef96796a8bbf97" - -inherit cargo cargo-update-recipe-crates pkgconfig systemd - -require ${BPN}-crates.inc - -DEPENDS = "dbus" - -SRCREV_wifi-connect = "ac20e664d630712593f959a41cb29953686395a8" -SRC_URI += " \ - git://github.com/balena-os/wifi-connect;branch=master;protocol=https;name=${BPN};name=${BPN};destsuffix=${BPN} \ - file://wifi-connect.service \ - file://wifi-connect-start.sh \ -" - -S = "${WORKDIR}/wifi-connect" - -SRCREV_FORMAT .= "_wifi-connect" - -## network-manager -SRCREV_network-manager = "4da2e6a57de16b6ae911f74321f929d78af8b1ba" -SRC_URI += "git://github.com/balena-io-modules/network-manager.git;branch=master;protocol=https;name=network-manager;destsuffix=network-manager" - -SRCREV_FORMAT .= "_network-manager" -EXTRA_OECARGO_PATHS += "${WORKDIR}/network-manager" - -PV .= "+${SRCPV}" - -SYSTEMD_SERVICE:${PN} = "wifi-connect.service" - -do_install:append() { - install -d ${D}${datadir}/wifi-connect/ui - cp -r ${S}/ui/build/* ${D}${datadir}/wifi-connect/ui - - install -Dm 0644 ${WORKDIR}/wifi-connect.service ${D}${systemd_system_unitdir}/wifi-connect.service - install -Dm 0755 ${WORKDIR}/wifi-connect-start.sh ${D}${bindir}/wifi-connect-start.sh -} - -RDEPENDS:${PN} = "networkmanager" diff --git a/recipes-staging/wifi-connect/wifi-connect_4.11.84.bb b/recipes-staging/wifi-connect/wifi-connect_4.11.84.bb new file mode 100644 index 0000000..96077fd --- /dev/null +++ b/recipes-staging/wifi-connect/wifi-connect_4.11.84.bb @@ -0,0 +1,45 @@ +SUMMARY = "Captive portal Wi-Fi configuration utility" +DESCRIPTION = "WiFi Connect dynamically sets Wi-Fi configuration via a captive portal." +HOMEPAGE = "https://github.com/balena-os/wifi-connect" +BUGTRACKER = "https://github.com/balena-os/wifi-connect/issues" +SECTION = "connectivity" +CVE_PRODUCT = "wifi-connect" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3bfd34238ccc26128aef96796a8bbf97" + +DEPENDS = "dbus" +SRCREV_wifi-connect = "5bd4c1bea548fb5714bedb18bbd12f088d5fa407" +SRCREV_network-manager = "4da2e6a57de16b6ae911f74321f929d78af8b1ba" +SRCREV_FORMAT = "wifi-connect_network-manager" + +SRC_URI += "\ + git://github.com/balena-os/wifi-connect;branch=master;protocol=https;name=wifi-connect \ + git://github.com/balena-io-modules/network-manager.git;branch=master;protocol=https;name=network-manager;destsuffix=network-manager \ + https://github.com/balena-os/wifi-connect/releases/download/v${PV}/wifi-connect-ui.tar.gz;downloadfilename=wifi-connect-ui-${PV}.tar.gz;subdir=wifi-connect-ui;name=ui \ + file://0001-wifi-connect-refresh-lockfile-for-params-num-features.patch \ + file://0001-traitobject-remove-duplicate-marker-trait-impls.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/traitobject-0.1.0/ \ + file://0001-params-disable-num-default-features.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/params-0.8.0/ \ + file://wifi-connect.service \ + file://wifi-connect-start.sh \ +" + +SRC_URI[ui.sha256sum] = "e57a3cec559729516decf892beb1e7f191b23e71b2e13bcd43d36b980034ffbe" + +RDEPENDS:${PN} = "dnsmasq networkmanager" + +inherit cargo pkgconfig systemd + +require ${BPN}-4.11.84-crates.inc + +EXTRA_OECARGO_PATHS += "${UNPACKDIR}/network-manager" + +SYSTEMD_SERVICE:${PN} = "wifi-connect.service" + +do_install:append() { + install -d ${D}${datadir}/wifi-connect/ui + cp -r ${UNPACKDIR}/wifi-connect-ui/. ${D}${datadir}/wifi-connect/ui/ + + install -Dm 0644 ${UNPACKDIR}/wifi-connect.service ${D}${systemd_system_unitdir}/wifi-connect.service + install -Dm 0755 ${UNPACKDIR}/wifi-connect-start.sh ${D}${bindir}/wifi-connect-start.sh +}