From 93c203f3a38be7db9cd7bb6b4954f3eb655acc8e Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 6 Oct 2021 16:15:23 -0500 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-security: de6712a806..a85fbe980e: Anton Antonov (1): Upgrade parsec-service 0.8.1 and parsec-tool 0.4.0 Armin Kuster (1): chkrootkit: update to 0.55 Bhupesh Sharma (1): recipes-security/fscrypt: Add fscrypt .bb file Christer Fletcher (1): dmverity: Make use of DATA_BLOCK_SIZE variable in initrdscript. Kristian Klausen (1): libtpm: update to 0.8.7 Zoltán Böszörményi (1): clamav: Set clamav:clamav ownership on /var/lib/clamav in do_install poky: 06dcace68b..80f2b56ad8: Anibal Limon (1): recipes-support/ptest-runner: Bump to v2.4.2 Bruce Ashfield (5): linux-yocto-dev: update to v5.15-rcX lttng-modules/dev-upstream: update to 2.13-latest lttng-modules: fix build against 5.15+ linux-yocto/5.13: drop recipes yocto-bsp/5.13: drop recipes Chandana kalluri (1): scriptutils.py: Add check before deleting path Daniel Wagenknecht (2): common-tasks: add note about license implications of bundled initramfs ref-manual: add note about license implications of bundled initramfs Joshua Watt (2): lib/oe/spdx.py: Add comments python3: Fix sysroot reproducibility Kenfe-Mickael Laventure (1): package_ipk: Use localdata store when signing packages Kiran Surendran (1): ffmpeg: fix CVE-2021-38171 Kristian Klausen (2): ovmf: add TPM PACKAGECONFIG and enable if tpm is in MACHINE_FEATURES wic/bootimg-efi: Add Unified Kernel Image option Markus Volk (1): wic:direct.py: ignore invalid mountpoints during fstab update Matt Madison (1): autotools.bbclass: use ordinary append for file-checksums update Michael Halstead (1): releases: update to include 3.1.11 Minjae Kim (1): vim: fix CVE-2021-3778 Quentin Schulz (1): ref-manual: fix missed override syntax change Rasmus Villemoes (1): kernel.bbclass: remove unnecessary dead code Richard Purdie (29): oeqa/qemurunner: Use oe._exit(), not sys.exit() pseudo: Add in ability to flush database with shutdown request packagegroup-core-tools-profile: Exclude systemtap from riscv32 as well bitbake: bitbake-worker: Allow shutdown/database flush of pseudo server at task exit bitbake: siggen: Fix sorting in diff output bitbake: cooker/command: Add a dummy event for tinfoil testing oeqa/selftest/gotoolchain: Fix temp file cleanup oeqa/buildproject: Ensure temp directories are cleaned up libc_package/buildstats: Fix python regex quoting warnings oeqa/selftest/tinfoil: Update to use test command glew: Stop polluting /tmp during builds rpm: Ensure compression parallelism isn't coded into rpms package: Ensure pclist files are deterministic and don't use full paths gnupg: Be deterministic about sendmail mesa: Ensure megadrivers runtime mappings are deterministic util-linux: Fix reproducibility libtool: Allow libtool-cross to reproduce gobject-introspection: Don't write $HOME into scripts oeqa/selftest/bbtests: Add uuid to force build test image: Exclude IMAGE_VERSION_SUFFIX from expansion in image tasks sstatesig: Revert "Test cross/native hashserv method extension" bitbake: data: Ensure functions are defined in a deterministic order bitbake.conf: Set vardepvalue for PARALLEL_MAKEINST externalsrc: Fix a source date epoch race in reproducible builds sstatesig: Add processing for full build paths in sysroot files python3: Drop broken pyc files image-artifact-names: Use SOURCE_DATE_EPOCH when making reproducible builds for deploy abi_version/sstate: Bump HASH_VERSION and SSTATE_VERSION reproducible_build: Work around caching issues Robert P. J. Day (3): ref-manual: extend explanation of PACKAGE_DEBUG_SPLIT_STYLE ref-manual: mention INHIBIT_PACKAGE_DEBUG_SPLIT variable overview-manual: delete bad backslashes in SSTATE_MIRRORS example Saul Wold (3): spdx-licenses.json: Use 3.14 tagged version spdx.py: Add SPDXAnnotation Object create-spdx: Use SPDXAnnotation to track native recipes Thomas Perrot (2): libevent: mark util/monotonic_prc_fallback as retriable ruby: fix the reproducibility issue Tom Pollard (2): bzip2: Update soname for libbz2 1.0.8 libsamplerate0: Set correct soname for 0.1.9 Trevor Woerner (1): hello-mod/hello.c: convert printk to pr_xxx William A. Kennington III (1): rm_work.bbclass: Fix for files starting with - Yi Zhao (1): inetutils: fix CVE-2021-40491 wangmy (1): strace: upgrade 5.13 -> 5.14 meta-openembedded: cff8331f96..23dc4f060f: Armin Kuster (1): README: update to main repo Chandana kalluri (1): python3-humanfriendly: Add nativesdk to BBCLASSEXTEND Changqing Li (1): layer.conf: add openembedded-layer as LAYERDEPENDS Khem Raj (3): smcroute: Add missing pkgconfig inherit packagegroup-meta-oe: Add new packages smarty and libjs-jquery-icheck gattlib: Upgrade to latest LiweiSong (1): chipsec: platform security assessment framework Martin Jansa (5): opencv: fix build with protobuf-3.18 when dnn PACKAGECONFIG is enabled libeigen: backport fix for -Werror=class-memaccess issues when NEON is enabled README: mention linux-libc-dev:i386 for luajit on ubuntu-21.10 gpsd: inherit pkgconfig pahole: use MACHINE_ARCH Matteo Croce (1): pahole: don't download vendored libbpf Mingli Yu (1): libqb: Upgrade to 2.0.3 Nandor Han (1): libiio: depend on avahi only when network backed is used Peter Kjellerstedt (1): netdata: Move the version to the file name and correct the SRC_URI Richard Purdie (1): gattlib: Place pkgconfig file in correct package Yi Zhao (1): phpmyadmin: upgrade 5.1.0 -> 5.1.1 wangmy (7): unionfs-fuse: upgrade 2.1 -> 2.2 smcroute: upgrade 2.4.4 -> 2.5.3 snort: upgrade 2.9.18 -> 2.9.18.1 libsass: upgrade 3.6.4 -> 3.6.5 sanlock: upgrade 3.8.3 -> 3.8.4 sassc: upgrade 3.6.1 -> 3.6.2 valijson: upgrade 0.5 -> 0.6 zangrc (8): python3-pychromecast: upgrade 9.2.0 -> 9.2.1 python3-pyro4: upgrade 4.80 -> 4.81 python3-pyzmq: upgrade 22.2.1 -> 22.3.0 python3-robotframework: upgrade 4.1 -> 4.1.1 python3-sqlparse: upgrade 0.4.1 -> 0.4.2 python3-tqdm: upgrade 4.62.2 -> 4.62.3 libjs-jquery-icheck: Add recipe smarty: Add recipe zhengruoqin (6): python3-cmd2: upgrade 2.1.2 -> 2.2.0 python3-huey: upgrade 2.4.0 -> 2.4.1 python3-humanfriendly: upgrade 9.2 -> 10.0 cifs-utils: upgrade 6.13 -> 6.14 cmark: upgrade 0.30.1 -> 0.30.2 gpsd: upgrade 3.23 -> 3.23.1 Signed-off-by: Patrick Williams Change-Id: Ie782ff5d7f3004fb1f1ac9a4c8644a178bae46ad --- .../unionfs-fuse/unionfs-fuse_2.1.bb | 18 --- .../unionfs-fuse/unionfs-fuse_2.2.bb | 18 +++ meta-openembedded/meta-gnome/README | 6 +- meta-openembedded/meta-initramfs/README | 3 +- meta-openembedded/meta-multimedia/README | 6 +- meta-openembedded/meta-multimedia/conf/layer.conf | 2 +- meta-openembedded/meta-networking/README | 9 +- .../recipes-connectivity/snort/snort_2.9.18.1.bb | 111 +++++++++++++++++ .../recipes-connectivity/snort/snort_2.9.18.bb | 111 ----------------- .../recipes-support/cifs/cifs-utils_6.13.bb | 44 ------- .../recipes-support/cifs/cifs-utils_6.14.bb | 44 +++++++ .../recipes-support/smcroute/smcroute_2.4.4.bb | 13 -- .../recipes-support/smcroute/smcroute_2.5.3.bb | 13 ++ meta-openembedded/meta-oe/README | 3 +- .../recipes-devtools/valijson/valijson_0.5.bb | 36 ------ .../recipes-devtools/valijson/valijson_0.6.bb | 36 ++++++ .../meta-oe/recipes-bsp/chipsec/chipsec_git.bb | 35 ++++++ .../files/0001-cmake-Use-GNUInstallDirs.patch | 53 --------- .../recipes-connectivity/gattlib/gattlib_git.bb | 9 +- .../packagegroups/packagegroup-meta-oe.bb | 2 + ...xt-don-t-download-libbpf-source-when-syst.patch | 34 ++++++ .../meta-oe/recipes-devtools/pahole/pahole_1.22.bb | 5 +- ...onfigure-script-neglecting-re-enable-out-.patch | 56 --------- .../meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 37 ------ .../meta-oe/recipes-extended/libqb/libqb_2.0.3.bb | 26 ++++ .../recipes-extended/sanlock/sanlock_3.8.3.bb | 45 ------- .../recipes-extended/sanlock/sanlock_3.8.4.bb | 45 +++++++ ...-Correct-the-installation-of-gpsd.hotplug.patch | 29 ----- .../meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb | 129 ++++++++++++++++++++ .../meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb | 131 --------------------- .../meta-oe/recipes-support/cmark/cmark_0.30.1.bb | 15 --- .../meta-oe/recipes-support/cmark/cmark_0.30.2.bb | 15 +++ ...-Default-eigen_packet_wrapper-constructor.patch | 72 +++++++++++ .../recipes-support/libeigen/libeigen_3.4.0.bb | 4 +- .../meta-oe/recipes-support/libiio/libiio_git.bb | 8 +- .../libjs/libjs-jquery-icheck_1.0.3.bb | 42 +++++++ ...ne-argument-version-of-SetTotalBytesLimit.patch | 41 +++++++ .../meta-oe/recipes-support/opencv/opencv_4.5.2.bb | 1 + .../meta-oe/recipes-support/sass/libsass_git.bb | 4 +- .../meta-oe/recipes-support/sass/sassc_git.bb | 4 +- .../recipes-support/smarty/smarty_3.1.39.bb | 25 ++++ meta-openembedded/meta-perl/README | 2 - meta-openembedded/meta-python/README | 2 - .../python-pyro4/python3-pyro4_4.80.bb | 16 --- .../python-pyro4/python3-pyro4_4.81.bb | 15 +++ .../recipes-devtools/python/python3-cmd2_2.1.2.bb | 22 ---- .../recipes-devtools/python/python3-cmd2_2.2.0.bb | 23 ++++ .../recipes-devtools/python/python3-huey_2.4.0.bb | 11 -- .../recipes-devtools/python/python3-huey_2.4.1.bb | 18 +++ .../python/python3-humanfriendly_10.0.bb | 24 ++++ .../python/python3-humanfriendly_9.2.bb | 24 ---- .../python/python3-pychromecast_9.2.0.bb | 18 --- .../python/python3-pychromecast_9.2.1.bb | 18 +++ .../python/python3-pyzmq_22.2.1.bb | 29 ----- .../python/python3-pyzmq_22.3.0.bb | 29 +++++ .../python/python3-robotframework_4.1.1.bb | 29 +++++ .../python/python3-robotframework_4.1.bb | 29 ----- .../python/python3-sqlparse_0.4.1.bb | 29 ----- .../python/python3-sqlparse_0.4.2.bb | 28 +++++ .../recipes-devtools/python/python3-tqdm_4.62.2.bb | 19 --- .../recipes-devtools/python/python3-tqdm_4.62.3.bb | 19 +++ meta-openembedded/meta-webserver/README | 6 +- .../recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb | 41 ------- .../recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb | 41 +++++++ .../recipes-webadmin/netdata/netdata_1.22.1.bb | 63 ++++++++++ .../recipes-webadmin/netdata/netdata_git.bb | 64 ---------- meta-openembedded/meta-xfce/README | 7 +- 67 files changed, 1032 insertions(+), 934 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.1.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.3.bb delete mode 100644 meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.5.bb create mode 100644 meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/chipsec/chipsec_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb delete mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.80.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.81.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb create mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb (limited to 'meta-openembedded') diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.1.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.1.bb deleted file mode 100644 index 3dd5c82ee5..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A FUSE based implemention of unionfs" -HOMEPAGE = "https://github.com/rpodgorny/unionfs-fuse" -SECTION = "console/network" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8abab00b483a1b7943a32 \ - file://LICENSE;md5=7e5a37fce17307066eec6b23546da3b3 \ -" - -SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master \ - file://0001-support-cross-compiling.patch \ - " -SRCREV = "8d732962423c3ca5be1f14b7ec139ff464e10a51" - -DEPENDS = "fuse" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.2.bb new file mode 100644 index 0000000000..0cc02983d1 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "A FUSE based implemention of unionfs" +HOMEPAGE = "https://github.com/rpodgorny/unionfs-fuse" +SECTION = "console/network" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8abab00b483a1b7943a32 \ + file://LICENSE;md5=7e5a37fce17307066eec6b23546da3b3 \ +" + +SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master \ + file://0001-support-cross-compiling.patch \ + " +SRCREV = "b0e3805d3d84d44ddf3e4e5238ae0332145d8157" + +DEPENDS = "fuse" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index 1a91050004..fbb0d72476 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -2,13 +2,11 @@ Dependencies ------------ This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded branch: master -revision: HEAD Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' diff --git a/meta-openembedded/meta-initramfs/README b/meta-openembedded/meta-initramfs/README index a8f17ba859..119293a741 100644 --- a/meta-openembedded/meta-initramfs/README +++ b/meta-openembedded/meta-initramfs/README @@ -11,9 +11,8 @@ Dependencies This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/meta-openembedded branch: master -revision: HEAD Maintenance diff --git a/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README index 9c649ff87c..235c34331b 100644 --- a/meta-openembedded/meta-multimedia/README +++ b/meta-openembedded/meta-multimedia/README @@ -1,13 +1,11 @@ This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded layers: meta-oe branch: master -revision: HEAD Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf index 5a17a50487..56c3569d00 100644 --- a/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/meta-openembedded/meta-multimedia/conf/layer.conf @@ -29,6 +29,6 @@ BBFILE_PRIORITY_multimedia-layer = "6" # cause compatibility issues with other layers LAYERVERSION_multimedia-layer = "1" -LAYERDEPENDS_multimedia-layer = "core meta-python" +LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" LAYERSERIES_COMPAT_multimedia-layer = "honister" diff --git a/meta-openembedded/meta-networking/README b/meta-openembedded/meta-networking/README index e1ba27d83b..1aea8a6613 100644 --- a/meta-openembedded/meta-networking/README +++ b/meta-openembedded/meta-networking/README @@ -17,21 +17,18 @@ Dependencies This layer depends on: -URI: git://github.com/openembedded/openembedded-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD For some recipes, the meta-oe layer is required: -URI: git://github.com/openembedded/meta-openembedded.git +URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-openembedded.git +URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-python branch: master -revision: HEAD Maintenance ----------- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.1.bb new file mode 100644 index 0000000000..1e2495406e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.1.bb @@ -0,0 +1,111 @@ +DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" + +SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ + file://snort.init \ + file://volatiles.99_snort \ + file://0001-libpcap-search-sysroot-for-headers.patch \ + file://fix-host-contamination-when-enable-static-daq.patch \ + file://disable-run-test-program-while-cross-compiling.patch \ + file://configure.in-disable-tirpc-checking-for-fedora.patch \ +" +SRC_URI[sha256sum] = "da8af0f1b2e4f247d970c6a3c0e83fb6dcd5c84faa21aea49f306f269e8e28aa" + +UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" +UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar" + +inherit autotools gettext update-rc.d pkgconfig + +INITSCRIPT_NAME = "snort" +INITSCRIPT_PARAMS = "defaults" + +EXTRA_OECONF = " \ + --enable-gre \ + --enable-linux-smp-stats \ + --enable-reload \ + --enable-reload-error-restart \ + --enable-targetbased \ + --enable-static-daq \ + --with-dnet-includes=${STAGING_INCDIR} \ + --with-dnet-libraries=${STAGING_LIBDIR} \ + --with-libpcre-includes=${STAGING_INCDIR} \ + --with-libpcre-libraries=${STAGING_LIBDIR} \ + --with-daq-includes=${STAGING_INCDIR} \ + --with-daq-libraries=${STAGING_LIBDIR} \ +" + +# if you want to disable it, you need to patch configure.in first +# AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") +# is called even with --without-openssl-includes +PACKAGECONFIG ?= "openssl lzma" +PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," +PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" + +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += " -ltirpc" + +do_install:append() { + install -d ${D}${sysconfdir}/snort/rules + install -d ${D}${sysconfdir}/snort/preproc_rules + install -d ${D}${sysconfdir}/init.d + for i in map config conf dtd; do + cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/ + done + + # fix the hardcoded path and lib name + # comment out the rules that are not provided + sed -i -e 's#/usr/local/lib#${libdir}#' \ + -e 's#\.\./\(.*rules\)#${sysconfdir}/snort/\1#' \ + -e 's#\(libsf_engine.so\)#\1.0#' \ + -e 's/^\(include $RULE_PATH\)/#\1/' \ + -e 's/^\(dynamicdetection\)/#\1/' \ + -e '/preprocessor reputation/,/blacklist/ s/^/#/' \ + ${D}${sysconfdir}/snort/snort.conf + + cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ + install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort + + sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc +} + +pkg_postinst:${PN}() { + if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi +} + +FILES:${PN} += " \ + ${libdir}/snort_dynamicengine/*.so.* \ + ${libdir}/snort_dynamicpreprocessor/*.so.* \ + ${libdir}/snort_dynamicrules/*.so.* \ +" +FILES:${PN}-dbg += " \ + ${libdir}/snort_dynamicengine/.debug \ + ${libdir}/snort_dynamicpreprocessor/.debug \ + ${libdir}/snort_dynamicrules/.debug \ +" +FILES:${PN}-staticdev += " \ + ${libdir}/snort_dynamicengine/*.a \ + ${libdir}/snort_dynamicpreprocessor/*.a \ + ${libdir}/snort_dynamicrules/*.a \ + ${libdir}/snort/dynamic_preproc/*.a \ + ${libdir}/snort/dynamic_output/*.a \ +" +FILES:${PN}-dev += " \ + ${libdir}/snort_dynamicengine/*.la \ + ${libdir}/snort_dynamicpreprocessor/*.la \ + ${libdir}/snort_dynamicrules/*.la \ + ${libdir}/snort_dynamicengine/*.so \ + ${libdir}/snort_dynamicpreprocessor/*.so \ + ${libdir}/snort_dynamicrules/*.so \ + ${prefix}/src/snort_dynamicsrc \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb deleted file mode 100644 index 47c201fa13..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb +++ /dev/null @@ -1,111 +0,0 @@ -DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." -HOMEPAGE = "http://www.snort.org/" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" - -DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" - -SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ - file://snort.init \ - file://volatiles.99_snort \ - file://0001-libpcap-search-sysroot-for-headers.patch \ - file://fix-host-contamination-when-enable-static-daq.patch \ - file://disable-run-test-program-while-cross-compiling.patch \ - file://configure.in-disable-tirpc-checking-for-fedora.patch \ -" -SRC_URI[sha256sum] = "d0308642f69e0d36f70db9703e5766afce2f44ff05b7d2c9cc8e3ac8323b2c77" - -UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" -UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar" - -inherit autotools gettext update-rc.d pkgconfig - -INITSCRIPT_NAME = "snort" -INITSCRIPT_PARAMS = "defaults" - -EXTRA_OECONF = " \ - --enable-gre \ - --enable-linux-smp-stats \ - --enable-reload \ - --enable-reload-error-restart \ - --enable-targetbased \ - --enable-static-daq \ - --with-dnet-includes=${STAGING_INCDIR} \ - --with-dnet-libraries=${STAGING_LIBDIR} \ - --with-libpcre-includes=${STAGING_INCDIR} \ - --with-libpcre-libraries=${STAGING_LIBDIR} \ - --with-daq-includes=${STAGING_INCDIR} \ - --with-daq-libraries=${STAGING_LIBDIR} \ -" - -# if you want to disable it, you need to patch configure.in first -# AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") -# is called even with --without-openssl-includes -PACKAGECONFIG ?= "openssl lzma" -PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," -PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," -PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" - -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDFLAGS += " -ltirpc" - -do_install:append() { - install -d ${D}${sysconfdir}/snort/rules - install -d ${D}${sysconfdir}/snort/preproc_rules - install -d ${D}${sysconfdir}/init.d - for i in map config conf dtd; do - cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/ - done - - # fix the hardcoded path and lib name - # comment out the rules that are not provided - sed -i -e 's#/usr/local/lib#${libdir}#' \ - -e 's#\.\./\(.*rules\)#${sysconfdir}/snort/\1#' \ - -e 's#\(libsf_engine.so\)#\1.0#' \ - -e 's/^\(include $RULE_PATH\)/#\1/' \ - -e 's/^\(dynamicdetection\)/#\1/' \ - -e '/preprocessor reputation/,/blacklist/ s/^/#/' \ - ${D}${sysconfdir}/snort/snort.conf - - cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ - install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort - - sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc -} - -pkg_postinst:${PN}() { - if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi -} - -FILES:${PN} += " \ - ${libdir}/snort_dynamicengine/*.so.* \ - ${libdir}/snort_dynamicpreprocessor/*.so.* \ - ${libdir}/snort_dynamicrules/*.so.* \ -" -FILES:${PN}-dbg += " \ - ${libdir}/snort_dynamicengine/.debug \ - ${libdir}/snort_dynamicpreprocessor/.debug \ - ${libdir}/snort_dynamicrules/.debug \ -" -FILES:${PN}-staticdev += " \ - ${libdir}/snort_dynamicengine/*.a \ - ${libdir}/snort_dynamicpreprocessor/*.a \ - ${libdir}/snort_dynamicrules/*.a \ - ${libdir}/snort/dynamic_preproc/*.a \ - ${libdir}/snort/dynamic_output/*.a \ -" -FILES:${PN}-dev += " \ - ${libdir}/snort_dynamicengine/*.la \ - ${libdir}/snort_dynamicpreprocessor/*.la \ - ${libdir}/snort_dynamicrules/*.la \ - ${libdir}/snort_dynamicengine/*.so \ - ${libdir}/snort_dynamicpreprocessor/*.so \ - ${libdir}/snort_dynamicrules/*.so \ - ${prefix}/src/snort_dynamicsrc \ -" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb deleted file mode 100644 index a8d3e91ebb..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." -HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" -SECTION = "otherosfs" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRCREV = "464a60344a324311a6f5bb326fdf5f422a3c9005" -SRC_URI = "git://git.samba.org/cifs-utils.git" - -S = "${WORKDIR}/git" -DEPENDS += "libtalloc" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" -# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install:append is needed -PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" -# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install:append is needed -PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" -PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" -PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" -PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" - -inherit autotools pkgconfig - -do_configure:prepend() { - # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant - # must override ROOTSBINDIR (default '/sbin'), - # setting --exec-prefix or --prefix in EXTRA_OECONF does not work - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then - export ROOTSBINDIR=${sbindir} - fi -} - -do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} - fi -} - -FILES:${PN} += "${base_libdir}/security" -FILES:${PN}-dbg += "${base_libdir}/security/.debug" -RRECOMMENDS:${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb new file mode 100644 index 0000000000..5fafb4ef69 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." +HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" +SECTION = "otherosfs" +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRCREV = "8c06dce7d596e478c20bc54bdcec87ad97f80a1b" +SRC_URI = "git://git.samba.org/cifs-utils.git" + +S = "${WORKDIR}/git" +DEPENDS += "libtalloc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install:append is needed +PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install:append is needed +PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" +PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" +PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" +PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" + +inherit autotools pkgconfig + +do_configure:prepend() { + # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant + # must override ROOTSBINDIR (default '/sbin'), + # setting --exec-prefix or --prefix in EXTRA_OECONF does not work + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + export ROOTSBINDIR=${sbindir} + fi +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + fi +} + +FILES:${PN} += "${base_libdir}/security" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" +RRECOMMENDS:${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb deleted file mode 100644 index 0b63f79aca..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Static Multicast Routing Daemon" -DESCRIPTION = "SMCRoute is a daemon and command line tool to manipulate the multicast routing table in the UNIX kernel." -HOMEPAGE = "http://troglobit.github.io/smcroute.html" -SECTION = "net" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRCREV = "a8e5847e5f7e411be424f9b52a6cdf9d2ed4aeb5" -SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=git" - -S = "${WORKDIR}/git" - -inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.3.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.3.bb new file mode 100644 index 0000000000..8e62f588f3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "Static Multicast Routing Daemon" +DESCRIPTION = "SMCRoute is a daemon and command line tool to manipulate the multicast routing table in the UNIX kernel." +HOMEPAGE = "http://troglobit.github.io/smcroute.html" +SECTION = "net" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRCREV = "d998043dc39cb763c9adec3eda3cc8b1d79f444c" +SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 98f671d7c2..676a2c8925 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -5,7 +5,6 @@ This layer depends on: URI: git://github.com/openembedded/openembedded-core.git branch: master -revision: HEAD luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit e.g. arm, so ensure that $CC -m32 is functional on build host, if building this recipe, needed @@ -15,7 +14,7 @@ e.g. on archlinux based distributions install prerequisites like below pacman -S lib32-gcc-libs lib32-glibc Ubuntu -sudo apt-get install gcc-multilib +sudo apt-get install gcc-multilib linux-libc-dev:i386 Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' diff --git a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.5.bb b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.5.bb deleted file mode 100644 index 9b6f19f58f..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.5.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Header-only C++ library for JSON Schema validation" -HOMEPAGE = "https://github.com/tristanpenman/valijson" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" - -SRC_URI = "git://github.com/tristanpenman/valijson.git" -SRCREV = "c5487c39eb900b97535f8b3a38a17af098c784e3" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" - -DEPENDS = "curlpp" - -# valijson is a header only C++ library, so the main package will be empty. -RDEPENDS:${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - -do_install() { - install -d ${D}${includedir}/compat - install -d ${D}${includedir}/valijson - install -d ${D}${includedir}/valijson/adapters - install -d ${D}${includedir}/valijson/constraints - install -d ${D}${includedir}/valijson/internal - install -d ${D}${includedir}/valijson/utils - - install -m 0644 ${S}/include/compat/* ${D}${includedir}/compat - install -D -m 0644 ${S}/include/valijson/*.hpp -t ${D}${includedir}/valijson - install -D -m 0644 ${S}/include/valijson/adapters/*.hpp -t ${D}${includedir}/valijson/adapters - install -D -m 0644 ${S}/include/valijson/constraints/*.hpp -t ${D}${includedir}/valijson/constraints - install -D -m 0644 ${S}/include/valijson/internal/*.hpp -t ${D}${includedir}/valijson/internal - install -D -m 0644 ${S}/include/valijson/utils/*.hpp -t ${D}${includedir}/valijson/utils -} diff --git a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb new file mode 100644 index 0000000000..a57aaf08a8 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb @@ -0,0 +1,36 @@ +SUMMARY = "Header-only C++ library for JSON Schema validation" +HOMEPAGE = "https://github.com/tristanpenman/valijson" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" + +SRC_URI = "git://github.com/tristanpenman/valijson.git" +SRCREV = "2dfc7499a31b84edef71189f4247919268ebc74e" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" + +DEPENDS = "curlpp" + +# valijson is a header only C++ library, so the main package will be empty. +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +do_install() { + install -d ${D}${includedir}/compat + install -d ${D}${includedir}/valijson + install -d ${D}${includedir}/valijson/adapters + install -d ${D}${includedir}/valijson/constraints + install -d ${D}${includedir}/valijson/internal + install -d ${D}${includedir}/valijson/utils + + install -m 0644 ${S}/include/compat/* ${D}${includedir}/compat + install -D -m 0644 ${S}/include/valijson/*.hpp -t ${D}${includedir}/valijson + install -D -m 0644 ${S}/include/valijson/adapters/*.hpp -t ${D}${includedir}/valijson/adapters + install -D -m 0644 ${S}/include/valijson/constraints/*.hpp -t ${D}${includedir}/valijson/constraints + install -D -m 0644 ${S}/include/valijson/internal/*.hpp -t ${D}${includedir}/valijson/internal + install -D -m 0644 ${S}/include/valijson/utils/*.hpp -t ${D}${includedir}/valijson/utils +} diff --git a/meta-openembedded/meta-oe/recipes-bsp/chipsec/chipsec_git.bb b/meta-openembedded/meta-oe/recipes-bsp/chipsec/chipsec_git.bb new file mode 100644 index 0000000000..3339dc1421 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/chipsec/chipsec_git.bb @@ -0,0 +1,35 @@ +SUMMARY = "CHIPSEC: Platform Security Assessment Framework" + +DESCRIPTION = "CHIPSEC is a framework for analyzing the security \ + of PC platforms including hardware, system firmware \ + (BIOS/UEFI), and platform components." + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=bc2d1f9b427be5fb63f6af9da56f7c5d" + +SRC_URI = "git://github.com/chipsec/chipsec.git;branch=master \ + " + +SRCREV = "b2a61684826dc8b9f622a844a40efea579cd7e7d" + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" + +S = "${WORKDIR}/git" +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" + +DEPENDS = "virtual/kernel nasm-native python3-setuptools-native" +RDEPENDS:${PN} += "python3 python3-modules" + +inherit module distutils3 + +do_compile:append() { + cd ${S}/drivers/linux + oe_runmake KSRC=${STAGING_KERNEL_BUILDDIR} +} + +do_install:append() { + install -m 0644 ${S}/drivers/linux/chipsec.ko ${D}${PYTHON_SITEPACKAGES_DIR}/chipsec/helper/linux +} + +FILES:${PN} += "${exec_prefix} \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index ffe0a00673..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 63dc2d0c9384d85482dc4cbb3c179b4b0bb18d4e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 19 Dec 2019 22:32:01 -0800 -Subject: [PATCH] cmake: Use GNUInstallDirs - -Helps install cmakefiles in right libdir - -Upstream-Status: Submitted [https://github.com/labapart/gattlib/pull/139] -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 5 +++-- - dbus/CMakeLists.txt | 18 ++++++++++-------- - 2 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12d8d71..ded7239 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,7 +152,8 @@ endif() - # - # List of file to install - # --install(FILES include/gattlib.h DESTINATION include) --install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig) -+include(GNUInstallDirs) -+install(FILES include/gattlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - include(CPack) -diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt -index f5096ce..cef031f 100644 ---- a/dbus/CMakeLists.txt -+++ b/dbus/CMakeLists.txt -@@ -19,7 +19,7 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.0) - - find_package(PkgConfig REQUIRED) - -@@ -119,4 +119,6 @@ endif() - add_library(gattlib SHARED ${gattlib_SRCS}) - target_link_libraries(gattlib ${gattlib_LIBS}) - --install(TARGETS gattlib LIBRARY DESTINATION lib) -+include(GNUInstallDirs) -+ -+install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index 234f840f95..ea4f4d5468 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Bluetooth library with attribute support" SECTION = "libs/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=20;md5=8d5efeb9189b60866baff80ff791bf00" +LICENSE = "GPL-2.0+ | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=71fdd2be76b4e95fe28324a70d4981c5" DEPENDS = "bluez5 glib-2.0" DEPENDS += "glib-2.0-native" @@ -11,11 +11,10 @@ PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/labapart/gattlib.git \ file://dbus-avoid-strange-chars-from-the-build-dir.patch \ - file://0001-cmake-Use-GNUInstallDirs.patch \ " SRCBRANCH = "master" -SRCREV = "5c7ee43bd70ee09a7170ddd55b9fdbdef69e9080" +SRCREV = "fa54ae42ccb3d8f911e00b02ed1e581537e47f79" S = "${WORKDIR}/git" @@ -29,4 +28,4 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" inherit pkgconfig cmake FILES:${PN} = "${libdir}/*" -FILES:${PN}-dev = "${includedir}/*" +FILES:${PN}-dev = "${includedir}/* ${libdir}/pkgconfig" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index efa7b7a66e..dab983b947 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -823,6 +823,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ remmina \ neon \ nmon \ + libjs-jquery-icheck \ libtinyxml \ libusbg \ libutempter \ @@ -874,6 +875,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ spitools \ libsass \ sassc \ + smarty \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "synergy", "", d)} \ syslog-ng \ system-config-keyboard \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch new file mode 100644 index 0000000000..3d491e2ef2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/files/0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch @@ -0,0 +1,34 @@ +From 3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5 Mon Sep 17 00:00:00 2001 +From: Matteo Croce +Date: Mon, 20 Sep 2021 18:44:52 +0200 +Subject: [PATCH] CMakeList.txt: Don't download libbpf source when system + library is used + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=3d20210d84f61ee2189927e2d9de9ce3e5a0a9c5] + +The build system always download the libbpf submodule, regardless if +we're using the embedded or the system version. +Download the libbpf source only if we're using the embedded one. + +Signed-off-by: Matteo Croce +Signed-off-by: Arnaldo Carvalho de Melo +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8523bce..2ab66e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ find_package(Python3 QUIET) + + # make sure git submodule(s) are checked out + find_package(Git QUIET) +-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") ++if(LIBBPF_EMBEDDED AND GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") + # Update submodules as needed + option(GIT_SUBMODULE "Check submodules during build" ON) + if(GIT_SUBMODULE) +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb index 0fdde93e0e..66f7761357 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pahole/pahole_1.22.bb @@ -5,12 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "elfutils zlib libbpf" +# Depends on MACHINE_ARCH libbpf +PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|aarch64).*-linux" SRCREV = "f02af2553ea58ae1186226af0d0ec835a248358f" SRC_URI = "git://git.kernel.org/pub/scm/devel/pahole/pahole.git \ file://0001-CMakeList.txt-make-python-optional.patch \ - file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch" + file://0002-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \ + file://0003-CMakeList.txt-don-t-download-libbpf-source-when-syst.patch" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch deleted file mode 100644 index c82f3bf017..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 73d2aea33e32272bac693550e8a3b0e3ad89707f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= -Date: Tue, 26 Dec 2017 00:02:26 +0100 -Subject: [PATCH] build: fix configure script neglecting, re-enable out-of-tree - builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For the former, a prototype and the final code got (hm, mysteriously) -intertwisted. For the latter, I am clearly guilty of (rare, anyway) -testing of the out-of-tree builds only with libqb-already-system-wide -scenario, which is rather shortsighted. - -Thanks Fabio and his ci.kronosnet.org project for spotting that. - -X-mas-present-for: Fabio M. Di Nitto -Signed-off-by: Jan Pokorný ---- -Upstream-Status: Backport - - configure.ac | 2 +- - lib/Makefile.am | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9900310..f9761cc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -710,7 +710,7 @@ if test "x${GCC}" = xyes; then - | grep __stop___verbose | cut -d" " -f 3) - test "${verbose_start_addr}" = "${verbose_stop_addr}" \ - && gcc_has_attribute_section_visible=no \ -- || { verbose_start_type=$(${READELF} -s backup \ -+ || { verbose_start_type=$(${READELF} -s "conftest${shrext_cmds}" \ - | sed -n '/__start___verbose/{s/^\s*//p;q}' \ - | tr -s ' ' \ - | cut -d" " -f6) -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6ca6b15..b035f0b 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -101,7 +101,9 @@ endif - endif - - qblog_script.ld: %.ld: %.ld.in -- $(AM_V_GEN)$(CPP) -xc -I$(top_srcdir)/include -D_GNU_SOURCE -C -P $< \ -+ $(AM_V_GEN)$(CPP) -C -D_GNU_SOURCE -P \ -+ -I$(top_srcdir)/include -I$(top_builddir)/include \ -+ -xc $< \ - | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ - > $@ - --- -2.16.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb deleted file mode 100644 index d14fbaed3e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "An IPC library for high performance servers" -DESCRIPTION = "libqb is a library with the primary purpose of providing high performance client server reusable features. \ -It provides high performance logging, tracing, ipc, and poll." - -HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" -SECTION = "libs" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" - -inherit autotools pkgconfig - -# v1.0.5 -SRCREV = "d08dbcf08b0da418bce9b5427dfd89522916322a" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=version_1 \ - file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ - " -S = "${WORKDIR}/git" - -# otherwise do_configure fails -# configure:21609: checking whether linker workaround for orphan sections usable -# configure:21639: i586-oe-linux-gcc -m32 -march=i586 --sysroot=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot -o conftest -O -fno-omit-frame-pointer -g -feliminate-unused-debug-types -fdebug-prefix-map=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0=/usr/src/debug/libqb/1.0.3+gitAUTOINC+c235284b5f-r0 -fdebug-prefix-map=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot= -fdebug-prefix-map=WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native= -pipe -pthread -D_REENTRANT -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,conftest.ld conftest.c >&5 -# WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script -# WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791 -# collect2: error: ld returned 1 exit status -NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}" -NOSECTION_FALLBACK:toolchain-clang:mips64 = "--enable-nosection-fallback" - -EXTRA_OECONF += "${NOSECTION_FALLBACK}" - -CFLAGS += "-pthread -D_REENTRANT" - -do_configure:prepend() { - ( cd ${S} - ${S}/autogen.sh ) -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb new file mode 100644 index 0000000000..18d6a4f27c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.3.bb @@ -0,0 +1,26 @@ +SUMMARY = "An IPC library for high performance servers" +DESCRIPTION = "libqb is a library with the primary purpose of providing high performance client server reusable features. \ +It provides high performance logging, tracing, ipc, and poll." + +HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" +SECTION = "libs" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" + +inherit autotools pkgconfig + +SRCREV = "404adbcd998ec83643e47d92b3ea8d9c3970e68b" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ + " +S = "${WORKDIR}/git" + +DEPENDS += "libxml2" + +CFLAGS += "-pthread -D_REENTRANT" + +do_configure:prepend() { + ( cd ${S} + ${S}/autogen.sh ) +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb deleted file mode 100644 index 11a165ed79..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A shared storage lock manager" -DESCRIPTION = "sanlock is a lock manager built on shared storage. Hosts with access \ -to the storage can perform locking. An application running on the \ -hosts is given a small amount of space on the shared block device or \ -file, and uses sanlock for its own application-specific synchronization. \ -Internally, the sanlock daemon manages locks using two disk-based \ -lease algorithms: delta leases and paxos leases." -HOMEPAGE = "https://pagure.io/sanlock" -SECTION = "utils" - -LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" - -PV .= "+git${SRCPV}" - -SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ - file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ - " -SRCREV = "3a750fed849405c745dcb7b4ceb85f662c53d8d0" - -S = "${WORKDIR}/git/python" - -DEPENDS = "libaio util-linux" - -inherit distutils3 useradd - -do_configure[noexec] = "1" - -do_compile:prepend () { - oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" - oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" -} - -do_install:prepend () { - oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install - oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install -} - -SANLOCKGROUP ?= "sanlock" -SANLOCKUSER ?= "sanlock" -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system ${SANLOCKGROUP}" -USERADD_PARAM:${PN} = "--system -g ${SANLOCKGROUP} -G disk \ - --home-dir /run/${SANLOCKUSER} --no-create-home \ - --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb new file mode 100644 index 0000000000..fa08d0f98e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb @@ -0,0 +1,45 @@ +SUMMARY = "A shared storage lock manager" +DESCRIPTION = "sanlock is a lock manager built on shared storage. Hosts with access \ +to the storage can perform locking. An application running on the \ +hosts is given a small amount of space on the shared block device or \ +file, and uses sanlock for its own application-specific synchronization. \ +Internally, the sanlock daemon manages locks using two disk-based \ +lease algorithms: delta leases and paxos leases." +HOMEPAGE = "https://pagure.io/sanlock" +SECTION = "utils" + +LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://../README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" + +PV .= "+git${SRCPV}" + +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch;patchdir=../ \ + " +SRCREV = "a181e951376d49a82eef17920c8ebedec80b4823" + +S = "${WORKDIR}/git/python" + +DEPENDS = "libaio util-linux" + +inherit distutils3 useradd + +do_configure[noexec] = "1" + +do_compile:prepend () { + oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" + oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" +} + +do_install:prepend () { + oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install + oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install +} + +SANLOCKGROUP ?= "sanlock" +SANLOCKUSER ?= "sanlock" +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system ${SANLOCKGROUP}" +USERADD_PARAM:${PN} = "--system -g ${SANLOCKGROUP} -G disk \ + --home-dir /run/${SANLOCKUSER} --no-create-home \ + --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch deleted file mode 100644 index 172f47825f..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c7183b2cc4a42f6ca7c2dc687ee7881efe9aeb73 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Sat, 28 Aug 2021 14:22:02 +0200 -Subject: [PATCH] SConscript: Correct the installation of gpsd.hotplug - -Without this, `scons systemd=false && scons udev-install` fails with: - - cp .../gpsd/gpsd-3.23.1~dev/gpsd.hotplug /home/pkj/gpsd/foobar/lib/udev - cp: cannot stat '.../gpsd/gpsd-3.23.1~dev/gpsd.hotplug': No such file or directory - -Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/277] -Signed-off-by: Peter Kjellerstedt ---- - SConscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConscript b/SConscript -index 1cd3354e1..e578012f5 100644 ---- a/SConscript -+++ b/SConscript -@@ -3060,7 +3060,7 @@ if env['systemd']: - hotplug_wrapper_install = [] - else: - hotplug_wrapper_install = [ -- 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'], -+ 'cp $SRCDIR/../gpsd.hotplug ' + DESTDIR + env['udevdir'], - 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug' - ] - diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb new file mode 100644 index 0000000000..4740e0c987 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.1.bb @@ -0,0 +1,129 @@ +SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" +SECTION = "console/network" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=7a5d174db44ec45f9638b2c747806821" +DEPENDS = "dbus ncurses python3 pps-tools" +PROVIDES = "virtual/gpsd" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ + file://gpsd.init \ + " +SRC_URI[sha256sum] = "0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09" + +inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig + +INITSCRIPT_PACKAGES = "gpsd-conf" +INITSCRIPT_NAME = "gpsd" +INITSCRIPT_PARAMS = "defaults 35" + +SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" + +export STAGING_INCDIR +export STAGING_LIBDIR + +CLEANBROKEN = "1" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" +PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" +PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" +PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" +EXTRA_OESCONS = " \ + sysroot=${STAGING_DIR_TARGET} \ + libQgpsmm='false' \ + debug='false' \ + nostrip='true' \ + systemd='${SYSTEMD_OESCONS}' \ + libdir='${libdir}' \ + udevdir='${nonarch_base_libdir}/udev' \ + unitdir='${systemd_system_unitdir}' \ + manbuild='false' \ + LINK='${CC}' \ + ${PACKAGECONFIG_CONFARGS} \ +" +# This cannot be used, because then chrpath is not found and only static lib is built +# target=${HOST_SYS} + +do_compile:prepend() { + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" + export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LD="${CC}" + export LINKFLAGS="${LDFLAGS}" +} + +do_install() { + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" + export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LD="${CC}" + export LINKFLAGS="${LDFLAGS}" + + export DESTDIR="${D}" + # prefix is used for RPATH and DESTDIR/prefix for installation + ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} udev-install ${EXTRA_OESCONS} || \ + bbfatal "scons install execution failed." +} + +do_install:append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd + install -d ${D}${sysconfdir}/default + install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default + + # Support for python + install -d ${D}${PYTHON_SITEPACKAGES_DIR}/gps + install -m 755 ${S}/gps/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/gps +} + +PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" + +RPROVIDES:${PN}-dbg += "python-pygps-dbg" + +FILES:${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ + ${libdir}/libQgpsmm.prl" + +FILES:${PN}-doc += "${datadir}/${BPN}/doc" + +RDEPENDS:${PN} = "gpsd-gpsctl" +RRECOMMENDS:${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf" + +SUMMARY:gpsd-udev = "udev relevant files to use gpsd hotplugging" +FILES:gpsd-udev = "${nonarch_base_libdir}/udev" +RDEPENDS:gpsd-udev += "udev gpsd-conf" + +SUMMARY:libgpsd = "C service library used for communicating with gpsd" +FILES:libgpsd = "${libdir}/libgpsd.so.*" + +SUMMARY:libgps = "C service library used for communicating with gpsd" +FILES:libgps = "${libdir}/libgps.so.*" + +SUMMARY:gpsd-conf = "gpsd configuration files and init scripts" +FILES:gpsd-conf = "${sysconfdir}" +CONFFILES:gpsd-conf = "${sysconfdir}/default/gpsd.default" + +SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" +FILES:gpsd-gpsctl = "${bindir}/gpsctl" + +SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" +# Python files are required for gps/fake, required for gpsfake. +FILES:gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" +RDEPENDS:gps-utils = "python3-pygps" + +SUMMARY:python3-pygps = "Python bindings to gpsd" +FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" +RDEPENDS:python3-pygps = " \ + python3-core \ + python3-io \ + python3-threading \ + python3-terminal \ + gpsd \ + python3-json" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}.socket ${BPN}ctl@.service" + +ALTERNATIVE:${PN} = "gpsd-defaults" +ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" +ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb deleted file mode 100644 index aaf7429291..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.23.bb +++ /dev/null @@ -1,131 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=7a5d174db44ec45f9638b2c747806821" -DEPENDS = "dbus ncurses python3 pps-tools" -PROVIDES = "virtual/gpsd" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://0001-SConscript-Correct-the-installation-of-gpsd.hotplug.patch \ - file://gpsd.init \ -" -SRC_URI[md5sum] = "b4f96cb01cbc06542b1cb66b3296078d" -SRC_URI[sha256sum] = "522c2362a7eb2d7ac37eaa1504f12aded1c373479a87ba06cc6795974b567bbc" - -inherit scons update-rc.d python3-dir python3native systemd update-alternatives - -INITSCRIPT_PACKAGES = "gpsd-conf" -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 35" - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -CLEANBROKEN = "1" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" -PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" -PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" -PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='false' \ - nostrip='true' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - udevdir='${nonarch_base_libdir}/udev' \ - unitdir='${systemd_system_unitdir}' \ - manbuild='false' \ - LINK='${CC}' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# This cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile:prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LD="${CC}" - export LINKFLAGS="${LDFLAGS}" -} - -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LD="${CC}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for installation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} udev-install ${EXTRA_OESCONS} || \ - bbfatal "scons install execution failed." -} - -do_install:append() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd - install -d ${D}${sysconfdir}/default - install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default - - # Support for python - install -d ${D}${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/gps -} - -PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" - -RPROVIDES:${PN}-dbg += "python-pygps-dbg" - -FILES:${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl" - -FILES:${PN}-doc += "${datadir}/${BPN}/doc" - -RDEPENDS:${PN} = "gpsd-gpsctl" -RRECOMMENDS:${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf" - -SUMMARY:gpsd-udev = "udev relevant files to use gpsd hotplugging" -FILES:gpsd-udev = "${nonarch_base_libdir}/udev" -RDEPENDS:gpsd-udev += "udev gpsd-conf" - -SUMMARY:libgpsd = "C service library used for communicating with gpsd" -FILES:libgpsd = "${libdir}/libgpsd.so.*" - -SUMMARY:libgps = "C service library used for communicating with gpsd" -FILES:libgps = "${libdir}/libgps.so.*" - -SUMMARY:gpsd-conf = "gpsd configuration files and init scripts" -FILES:gpsd-conf = "${sysconfdir}" -CONFFILES:gpsd-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" -FILES:gpsd-gpsctl = "${bindir}/gpsctl" - -SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" -# Python files are required for gps/fake, required for gpsfake. -FILES:gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" -RDEPENDS:gps-utils = "python3-pygps" - -SUMMARY:python3-pygps = "Python bindings to gpsd" -FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" -RDEPENDS:python3-pygps = " \ - python3-core \ - python3-io \ - python3-threading \ - python3-terminal \ - gpsd \ - python3-json" - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" -SYSTEMD_SERVICE:${PN} = "${BPN}.socket ${BPN}ctl@.service" - -ALTERNATIVE:${PN} = "gpsd-defaults" -ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" -ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb deleted file mode 100644 index e2db8aa762..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "CommonMark parsing and rendering library and program in C" -HOMEPAGE = "https://github.com/commonmark/cmark" -LICENSE = "BSD-2-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" - -SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "977b128291c0cf6c5053cdcf2ac72e627f09c105" -S = "${WORKDIR}/git" - -inherit cmake lib_package - -EXTRA_OECMAKE += " \ - -DCMARK_TESTS=OFF \ - -DCMARK_STATIC=OFF \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb new file mode 100644 index 0000000000..6669c6e500 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "CommonMark parsing and rendering library and program in C" +HOMEPAGE = "https://github.com/commonmark/cmark" +LICENSE = "BSD-2-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" + +SRC_URI = "git://github.com/commonmark/cmark.git" +SRCREV = "a8da5a2f252b96eca60ae8bada1a9ba059a38401" +S = "${WORKDIR}/git" + +inherit cmake lib_package + +EXTRA_OECMAKE += " \ + -DCMARK_TESTS=OFF \ + -DCMARK_STATIC=OFF \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch new file mode 100644 index 0000000000..84b5a4da9f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch @@ -0,0 +1,72 @@ +From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 +From: Antonio Sanchez +Date: Tue, 14 Sep 2021 10:57:22 -0700 +Subject: [PATCH] Default eigen_packet_wrapper constructor. + +This makes it trivial, allowing use of `memcpy`. + +Fixes #2326 + +Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] +Signed-off-by: Martin Jansa + +* fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) + for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, + prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: + +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits::type*) [with Packet = Eigen::internal::eigen_packet_wrapper; typename Eigen::internal::unpacket_traits::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1671 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits::type*) [with Packet = Eigen::internal::eigen_packet_wrapper; typename Eigen::internal::unpacket_traits::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1716 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +cc1plus: all warnings being treated as errors + +--- + Eigen/src/Core/GenericPacketMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h +index 8f8f64f15..72234288e 100644 +--- a/Eigen/src/Core/GenericPacketMath.h ++++ b/Eigen/src/Core/GenericPacketMath.h +@@ -162,7 +162,7 @@ struct eigen_packet_wrapper + { + EIGEN_ALWAYS_INLINE operator T&() { return m_val; } + EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } +- EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} ++ EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; + EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} + EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { + m_val = v; +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb index 54b6f74d8c..9682f7a8e2 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ " -SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ + file://0001-Default-eigen_packet_wrapper-constructor.patch \ +" SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 6ac534a288..488d4e3b0b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -18,7 +18,6 @@ DISTUTILS_SETUP_PATH ?= "${B}/bindings/python/" DEPENDS = " \ flex-native bison-native libaio \ - ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ " inherit cmake python3native systemd setuptools3 @@ -31,8 +30,13 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "usb_backend network_backend serial_backend" +NETWORK_BACKEND_DEPENDENCIES = "\ + libxml2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ +" + PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" -PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF, ${NETWORK_BACKEND_DEPENDENCIES}" PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb new file mode 100644 index 0000000000..f14b619a94 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Highly customizable checkboxes and radio buttons (jQuery & Zepto)" +SECTION = "console/network" +HOMEPAGE = "http://fronteed.com/iCheck" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://icheck.js;start_line=1;end_line=8;md5=404078d7de9f05ed64d364274f790055" + +DEPENDS = "virtual/libc" + +SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV};tag=${PV}" + +FILES:${PN} += "${datadir}/javascript/jquery-icheck" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.js ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.min.js ${D}${datadir}/javascript/jquery-icheck/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/ + install -m 0644 ${S}/skins/all.css ${D}${datadir}/javascript/jquery-icheck/skins/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + install -m 0644 ${S}/skins/flat/* ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + install -m 0644 ${S}/skins/futurico/* ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/line/ + install -m 0644 ${S}/skins/line/* ${D}${datadir}/javascript/jquery-icheck/skins/line/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + install -m 0644 ${S}/skins/minimal/* ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + install -m 0644 ${S}/skins/polaris/* ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/square/ + install -m 0644 ${S}/skins/square/* ${D}${datadir}/javascript/jquery-icheck/skins/square/ +} + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch new file mode 100644 index 0000000000..5d88d1a6ab --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch @@ -0,0 +1,41 @@ +From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001 +From: Vincent Rabaud +Date: Sat, 10 Jul 2021 00:21:52 +0200 +Subject: [PATCH] Use the one argument version of SetTotalBytesLimit. + +The two argument versions has been deprecated, cf +https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream + +Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag] +Signed-off-by: Martin Jansa +--- + modules/dnn/src/caffe/caffe_io.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 2fc4d84f46..ebecf95eea 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -92,6 +92,7 @@ + #ifdef HAVE_PROTOBUF + #include + #include ++#include + #include + + #include +@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by + + bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { + CodedInputStream coded_input(input); ++#if GOOGLE_PROTOBUF_VERSION >= 3006000 ++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); ++#else + coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); ++#endif + + return proto->ParseFromCodedStream(&coded_input); + } +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 7eefbccfe0..361ac0cb95 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb @@ -52,6 +52,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ + file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index 9cba3a8901..bc2ec805e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" -PV = "3.6.4" +SRCREV = "f6afdbb9288d20d1257122e71d88e53348a53af3" +PV = "3.6.5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb index 3c7a55cc3d..407cbbddd0 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/sassc_git.bb @@ -7,8 +7,8 @@ DEPENDS = "libsass" inherit autotools pkgconfig SRC_URI = "git://github.com/sass/sassc.git" -SRCREV = "46748216ba0b60545e814c07846ca10c9fefc5b6" +SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" -PV = "3.6.1" +PV = "3.6.2" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb new file mode 100644 index 0000000000..50d9958384 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/smarty/smarty_3.1.39.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "the compiling PHP template engine" +SECTION = "console/network" +HOMEPAGE = "https://www.smarty.net/" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" + +DEPENDS = "php" + +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;tag=v${PV}" + +FILES:${PN} = "${datadir}/php/smarty3/" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/php/smarty3/libs/ + install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/ + + install -d ${D}${datadir}/php/smarty3/libs/plugins + install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/ + + install -d ${D}${datadir}/php/smarty3/libs/sysplugins + install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ +} diff --git a/meta-openembedded/meta-perl/README b/meta-openembedded/meta-perl/README index c519dff524..13014b0ff3 100644 --- a/meta-openembedded/meta-perl/README +++ b/meta-openembedded/meta-perl/README @@ -53,8 +53,6 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core branch: master - revision: HEAD - prio: default Adding the meta-perl layer to your build --------------------------------------- diff --git a/meta-openembedded/meta-python/README b/meta-openembedded/meta-python/README index df6abe0e2e..194bac39c7 100644 --- a/meta-openembedded/meta-python/README +++ b/meta-openembedded/meta-python/README @@ -14,12 +14,10 @@ The meta-python layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta branch: master - revision: HEAD URI: git://git.openembedded.org/meta-openembedded layers: meta-oe branch: master - revision: HEAD Please follow the recommended setup procedures of your OE distribution. For Angstrom that is: diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.80.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.80.bb deleted file mode 100644 index ba331eea02..0000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.80.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Python Remote Objects" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc" - -SRC_URI[md5sum] = "e31fc077e06de9fc0bb061e357401954" -SRC_URI[sha256sum] = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220" - -PYPI_PACKAGE = "Pyro4" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-serpent \ - ${PYTHON_PN}-threading \ - " diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.81.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.81.bb new file mode 100644 index 0000000000..b05ce34f84 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.81.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python Remote Objects" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc" + +SRC_URI[sha256sum] = "e130da06478b813173b959f7013d134865e07fbf58cc5f1a2598f99479cdac5f" + +PYPI_PACKAGE = "Pyro4" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-serpent \ + ${PYTHON_PN}-threading \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.1.2.bb deleted file mode 100644 index 874e7cf0c1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.1.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "https://github.com/python-cmd2/cmd2" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4c527bcb481233ebcb803de975f42701" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -SRC_URI[sha256sum] = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-pyperclip \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-pydoc \ - ${PYTHON_PN}-json \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.2.0.bb new file mode 100644 index 0000000000..2632ce1c80 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.2.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "https://github.com/python-cmd2/cmd2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4c527bcb481233ebcb803de975f42701" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[sha256sum] = "34cd12424d9e2835eff125146af3d9f4a4c2931c6bc5a3cea9790bd4f55756d9" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-colorama \ + ${PYTHON_PN}-pyperclip \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-pydoc \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numbers \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.0.bb deleted file mode 100644 index afdc65b246..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "a little task queue for python" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" - -PYPI_PACKAGE = "huey" - -SRC_URI[sha256sum] = "82981fb8f1964e8c9ee8f4ebcd5a2ebad561dd93ce8b454bf4f4ecfb54bd1411" - -inherit pypi setuptools3 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.1.bb new file mode 100644 index 0000000000..64bd8880ec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "a little task queue for python" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" + +PYPI_PACKAGE = "huey" + +SRC_URI[sha256sum] = "bd55e90746cec16e7a61d6dc60d4591c74cba59000dca96c387a4d4eee1395f6" + +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-logging \ + python3-multiprocessing \ + python3-json \ +" + +inherit pypi setuptools3 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb new file mode 100644 index 0000000000..7d185989d9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Human friendly output for text interfaces using Python" +HOMEPAGE = "https://humanfriendly.readthedocs.io/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5d178009f806c2bdd498a19be0013a7a" + +PYPI_PACKAGE = "humanfriendly" + +SRC_URI[sha256sum] = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc" + +inherit pypi setuptools3 + +RDEPENDS:${PN}:class-target += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-fcntl \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-stringold \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.2.bb deleted file mode 100644 index d87ed4d2a2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Human friendly output for text interfaces using Python" -HOMEPAGE = "https://humanfriendly.readthedocs.io/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5d178009f806c2bdd498a19be0013a7a" - -PYPI_PACKAGE = "humanfriendly" - -SRC_URI[sha256sum] = "f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48" - -inherit pypi setuptools3 - -RDEPENDS:${PN}:class-target += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.0.bb deleted file mode 100644 index c1f52881af..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[sha256sum] = "6d34593575cf77565df47af4c75dd47c6a65831ec18a8c10b5367b2f1c172f0a" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-zeroconf \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-protobuf \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.1.bb new file mode 100644 index 0000000000..1fd76ed39d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[sha256sum] = "883d6e836ff5f1068a8bd00364a15b4c9854293086495e9fd9cacd9b4d54c0bf" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-zeroconf \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-protobuf \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.2.1.bb deleted file mode 100644 index f58074a9a9..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.2.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Pyzmq provides Zero message queue access for the Python language" -HOMEPAGE = "http://zeromq.org/bindings:python" -LICENSE = "BSD & LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ - file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" -DEPENDS = "zeromq" - -FILESEXTRAPATHS:prepend := "${THISDIR}/python-pyzmq:" - -SRC_URI += "file://club-rpath-out.patch" -SRC_URI[sha256sum] = "6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242" - -inherit pypi pkgconfig setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-json \ -" - -FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" - -do_compile:prepend() { - echo [global] > ${S}/setup.cfg - echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg - echo have_sys_un_h = True >> ${S}/setup.cfg - echo skip_check_zmq = True >> ${S}/setup.cfg - echo libzmq_extension = False >> ${S}/setup.cfg - echo no_libzmq_extension = True >> ${S}/setup.cfg -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb new file mode 100644 index 0000000000..3c91eee16f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Pyzmq provides Zero message queue access for the Python language" +HOMEPAGE = "http://zeromq.org/bindings:python" +LICENSE = "BSD & LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ + file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" +DEPENDS = "zeromq" + +FILESEXTRAPATHS:prepend := "${THISDIR}/python-pyzmq:" + +SRC_URI += "file://club-rpath-out.patch" +SRC_URI[sha256sum] = "8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c" + +inherit pypi pkgconfig setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-json \ +" + +FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" + +do_compile:prepend() { + echo [global] > ${S}/setup.cfg + echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg + echo have_sys_un_h = True >> ${S}/setup.cfg + echo skip_check_zmq = True >> ${S}/setup.cfg + echo libzmq_extension = False >> ${S}/setup.cfg + echo no_libzmq_extension = True >> ${S}/setup.cfg +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.1.bb new file mode 100644 index 0000000000..d715f35135 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "A Python generic test automation framework" +DESCRIPTION = "Generic open source test atomation framework for acceptance\ +testing and acceptance test-driven development (ATDD). It has easy-to-use\ +tabular test data syntax and it utilizes the keyword-driven testing approach.\ +Its testing capabilities can be extended by test libraries implemented either\ +with Python or Java, and users can create new higher-level keywords from\ +existing ones using the same syntax that is used for creating test cases." +HOMEPAGE = "http://robotframework.org" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi setuptools3 + +PYPI_PACKAGE_EXT = "zip" + +SRC_URI[sha256sum] = "663f84c177b2fa9b3b782939e31637a057a33f3a4b29067812f1259b7f4bad35" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-docutils \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.bb deleted file mode 100644 index 7c6c41af7c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A Python generic test automation framework" -DESCRIPTION = "Generic open source test atomation framework for acceptance\ -testing and acceptance test-driven development (ATDD). It has easy-to-use\ -tabular test data syntax and it utilizes the keyword-driven testing approach.\ -Its testing capabilities can be extended by test libraries implemented either\ -with Python or Java, and users can create new higher-level keywords from\ -existing ones using the same syntax that is used for creating test cases." -HOMEPAGE = "http://robotframework.org" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pypi setuptools3 - -PYPI_PACKAGE_EXT = "zip" - -SRC_URI[sha256sum] = "567f2a21f0906635e21d45fe3cb84a4809a12980c9f2706a8a5f65f40f6b4ccd" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-docutils \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb deleted file mode 100644 index 3565da7d13..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Non-validating SQL parser module" -HOMEPAGE = "http://pypi.python.org/pypi/sqlparse" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" - -SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "eebbc6b5f1033054873033e54b0c1266" -SRC_URI[sha256sum] = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8" - -export BUILD_SYS -export HOST_SYS - -inherit pypi ptest setuptools3 - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.2.bb new file mode 100644 index 0000000000..0980ff9c24 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.2.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Non-validating SQL parser module" +HOMEPAGE = "http://pypi.python.org/pypi/sqlparse" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" + +SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae" + +export BUILD_SYS +export HOST_SYS + +inherit pypi ptest setuptools3 + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.2.bb deleted file mode 100644 index bbdd795aab..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Fast, Extensible Progress Meter" -HOMEPAGE = "http://tqdm.github.io/" -SECTION = "devel/python" - -LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=59e4271a933d33edfe60237db377a14b" - -SRC_URI[sha256sum] = "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} += " \ - python3-logging \ - python3-numbers \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb new file mode 100644 index 0000000000..148431d0ad --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb @@ -0,0 +1,19 @@ +SUMMARY = "Fast, Extensible Progress Meter" +HOMEPAGE = "http://tqdm.github.io/" +SECTION = "devel/python" + +LICENSE = "MIT & MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=1672e2674934fd93a31c09cf17f34100" + +SRC_URI[sha256sum] = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-logging \ + python3-numbers \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README index 7b60630700..d23f6cc65c 100644 --- a/meta-openembedded/meta-webserver/README +++ b/meta-openembedded/meta-webserver/README @@ -11,17 +11,15 @@ Dependencies This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core subdirectory: meta branch: master -revision: HEAD For some recipes, the meta-oe layer is required: -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe branch: master -revision: HEAD diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb deleted file mode 100644 index 84e1da6203..0000000000 --- a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Web-based MySQL administration interface" -HOMEPAGE = "http://www.phpmyadmin.net" -# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT -LICENSE = "GPLv2 & LGPLv3 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ - file://js/vendor/jquery/MIT-LICENSE.txt;md5=75308107741f7dcdc39127209c7e3fc8 \ -" - -SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ - file://apache.conf \ -" - -SRC_URI[md5sum] = "4587343e706c5434adf91c396b418731" -SRC_URI[sha256sum] = "aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68" - -UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" -UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" - -S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" - -inherit allarch - -do_install() { - install -d ${D}${datadir}/${BPN} - cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} - chown -R root:root ${D}${datadir}/${BPN} - # Don't install patches to target - rm -rf ${D}${datadir}/${BPN}/patches - - install -d ${D}${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf - - # Remove a few scripts that explicitly require bash (!) - rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh -} - -FILES:${PN} = "${datadir}/${BPN} \ - ${sysconfdir}/apache2/conf.d" - -RDEPENDS:${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb new file mode 100644 index 0000000000..b64824c474 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.1.bb @@ -0,0 +1,41 @@ +SUMMARY = "Web-based MySQL administration interface" +HOMEPAGE = "http://www.phpmyadmin.net" +# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT +LICENSE = "GPLv2 & LGPLv3 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ + file://js/vendor/jquery/MIT-LICENSE.txt;md5=75308107741f7dcdc39127209c7e3fc8 \ +" + +SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ + file://apache.conf \ +" + +SRC_URI[md5sum] = "e73377b11b7d38fa3f3014f2799c5252" +SRC_URI[sha256sum] = "1964d7190223c11e89fa1b7970c618e3a3bae2e859f5f60383f64c3848ef6921" + +UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" +UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" + +S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/${BPN} + cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} + chown -R root:root ${D}${datadir}/${BPN} + # Don't install patches to target + rm -rf ${D}${datadir}/${BPN}/patches + + install -d ${D}${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + + # Remove a few scripts that explicitly require bash (!) + rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh +} + +FILES:${PN} = "${datadir}/${BPN} \ + ${sysconfdir}/apache2/conf.d" + +RDEPENDS:${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb new file mode 100644 index 0000000000..fb4d272947 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.22.1.bb @@ -0,0 +1,63 @@ +HOMEPAGE = "https://github.com/netdata/netdata/" +SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" + +SRC_URI = "git://github.com/netdata/netdata.git;protocol=https" +SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" + +# default netdata.conf for netdata configuration +SRC_URI += "file://netdata.conf" + +# file for providing systemd service support +SRC_URI += "file://netdata.service" + +S = "${WORKDIR}/git" + +DEPENDS += "zlib util-linux libuv" + +inherit pkgconfig autotools-brokensep useradd systemd + +LIBS:toolchain-clang:x86 = "-latomic" +LIBS:riscv64 = "-latomic" +LIBS:riscv32 = "-latomic" +export LIBS + +#systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "netdata.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +#User specific +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" + +do_install:append() { + #set S UID for plugins + chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system + sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + fi + + # Install default netdata.conf + install -d ${D}${sysconfdir}/netdata + install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ + sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web +} + +FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + +RDEPENDS:${PN} = "bash zlib" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb deleted file mode 100644 index 7ec9898152..0000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -HOMEPAGE = "https://github.com/netdata/netdata/" -SUMMARY = "Real-time performance monitoring" -DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ - Open-source, free, preconfigured, opinionated, and always real-time." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" - -SRC_URI:append = " git://github.com/firehol/netdata.git;protocol=https" -SRCREV = "1be9200ba8e11dc81a2101d85a2725137d43f766" -PV = "1.22.1" - -# default netdata.conf for netdata configuration -SRC_URI += " file://netdata.conf" - -# file for providing systemd service support -SRC_URI += " file://netdata.service" - -S = "${WORKDIR}/git" - -DEPENDS += "zlib util-linux libuv" - -inherit pkgconfig autotools-brokensep useradd systemd - -LIBS:toolchain-clang:x86 = "-latomic" -LIBS:riscv64 = "-latomic" -LIBS:riscv32 = "-latomic" -export LIBS - -#systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "netdata.service" -SYSTEMD_AUTO_ENABLE:${PN} = "enable" - -#User specific -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" - -do_install:append() { - #set S UID for plugins - chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system - sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service - fi - - # Install default netdata.conf - install -d ${D}${sysconfdir}/netdata - install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ - sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf - - install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata - install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata - - chown -R netdata:netdata ${D}${datadir}/netdata/web -} - -FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" - -RDEPENDS:${PN} = "bash zlib" diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index bbf4b2edf2..1e9acc471d 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -1,12 +1,11 @@ This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded branch: master -revision: HEAD + meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. To avoid dependencies on meta-multimedia you need to mask recipes by adding -- cgit v1.2.3