diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
13 files changed, 120 insertions, 12 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.2.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb index 2994df322d..71744026da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https" -SRCREV = "91c64e18d325f4b63f0dfbd795c50c9c3ec3d3e0" +SRCREV = "5e2884f36276e44f683fa02fca39807716fdbc16" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf new file mode 100644 index 0000000000..fc32cc8084 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf @@ -0,0 +1,37 @@ +# This is the configuration file to start the etcd server with +# existing cluster configuration in the data directory. + +# Initial cluster state ('new' or 'existing'). +ETCD_INITIAL_CLUSTER_STATE='existing' + +# Path to the data directory. +ETCD_DATA_DIR='/var/lib/etcd' + +# Time (in milliseconds) of a heartbeat interval. +ETCD_HEARTBEAT_INTERVAL=100 + +# Time (in milliseconds) for an election to timeout. +ETCD_ELECTION_TIMEOUT=1000 + +# List of comma separated URLs to listen on for peer traffic. +ETCD_LISTEN_PEER_URLS=http://localhost:2380 + +# List of comma separated URLs to listen on for client traffic. +ETCD_LISTEN_CLIENT_URLS=http://localhost:2379 + +# List of this member's peer URLs to advertise to the rest of the cluster. +# The URLs needed to be a comma-separated list. +ETCD_INITIAL_ADVERTISE_PEER_URLS=http://localhost:2380 + +# List of this member's client URLs to advertise to the public. +# The URLs needed to be a comma-separated list. +ETCD_ADVERTISE_CLIENT_URLS=http://localhost:2379 + +# Enable info-level logging for etcd. +ETCD_LOG_LEVEL='info' + +# Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd. +ETCD_LOG_OUTPUTS='default' + +# etcd is not officially supported on arm64 +ETCD_UNSUPPORTED_ARCH='arm' diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.path b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.path new file mode 100644 index 0000000000..1a18a40160 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.path @@ -0,0 +1,9 @@ +[Unit] +Description=Monitor the etcd config file changes + +[Path] +PathChanged=/run/etcd-new.conf +Unit=etcd-new.service + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.service b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.service new file mode 100644 index 0000000000..479678dc67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.service @@ -0,0 +1,15 @@ +[Unit] +Description=etcd cluster member start/add service +Documentation=https://etcd.io/docs/v3.5/op-guide/clustering/ +ConditionPathExists=!/var/lib/etcd/member +ConditionPathExists=/run/etcd-new.conf +OnFailure=etcd.service + +[Service] +Type=notify +EnvironmentFile=/run/etcd-new.conf +ExecStart=/usr/bin/etcd +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd.service b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd.service new file mode 100644 index 0000000000..782ef4ef09 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd.service @@ -0,0 +1,15 @@ +[Unit] +Description=etcd key-value store +Documentation=https://github.com/etcd-io/etcd +After=network-online.target local-fs.target remote-fs.target time-sync.target +Wants=network-online.target local-fs.target remote-fs.target time-sync.target +ConditionPathExists=/var/lib/etcd/member + +[Service] +Type=notify +EnvironmentFile=/etc/etcd.d/etcd-existing.conf +ExecStart=/usr/bin/etcd +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb index 346b305f2c..0794158a52 100644 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb @@ -8,6 +8,10 @@ SRC_URI = " \ git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \ file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \ file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \ + file://etcd.service \ + file://etcd-existing.conf \ + file://etcd-new.service \ + file://etcd-new.path \ " SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f" @@ -22,7 +26,7 @@ RDEPENDS:${PN}-dev = " \ export GO111MODULE="on" -inherit go +inherit go systemd pkgconfig features_check # Go based binaries do not handle being stripped INHIBIT_PACKAGE_STRIP = "1" @@ -49,10 +53,21 @@ go_do_compile:prepend() { chmod u+w -R ${WORKDIR}/build/pkg/mod } +REQUIRED_DISTRO_FEATURES = "systemd" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN}:append = " etcd.service etcd-new.service etcd-new.path" + do_install:append() { install -d ${D}${bindir}/ - install -m 0755 ${D}/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} - install -m 0755 ${D}/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} - install -m 0755 ${D}/usr/lib/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} + install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} + install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} + install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} + install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ } +FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf" + diff --git a/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb new file mode 100755 index 0000000000..3ac270e5e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "library for CBOR" +DESCRIPTION = "C library for parsing and generating CBOR, the general-purpose schema-less binary data format." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071" + +SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master" +SRCREV = "efa6c0886bae46bdaef9b679f61f4b9d8bc296ae" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" diff --git a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb index 2f67b12a8d..87778c6314 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb @@ -8,9 +8,9 @@ DEPENDS = "libusb1" inherit autotools pkgconfig -PV = "0.7.0" +PV = "0.8.0" -SRCREV = "47cbed5355ffda7b952193a770a9a9fa9f89b25b" +SRCREV = "db9371cf9f38b5a3b2f6e4fae3f92eb052d2d929" SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb index daaff00395..0ca21314ac 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb @@ -8,7 +8,7 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig -SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" +SRCREV = "72480212cd8ec0ab8d0b5064df52c146cac603b4" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb index 82f3e4d0c9..8f5a7f166f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb @@ -8,9 +8,9 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig -PV = "2.2.0+git${SRCPV}" +PV = "2.3.0" -SRCREV = "db93bae96d64140230ad050061632531644c46ad" +SRCREV = "72480212cd8ec0ab8d0b5064df52c146cac603b4" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.17.8.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.17.8.bb index a8d1db65bf..1f2c55c699 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.17.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.17.8.bb @@ -4,7 +4,7 @@ SUMMARY = "Generic library for reporting various problems" HOMEPAGE = "https://abrt.readthedocs.org/" LICENSE = "GPL-2.0-or-later" DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ - json-c libtar libnewt libproxy rpm \ + json-c libarchive libtar libnewt libproxy rpm \ augeas satyr systemd \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.2.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.2.bb index 2990122959..7eeb77474f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.2.bb @@ -9,6 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = " \ + glib-2.0-native \ glib-2.0 \ e2fsprogs \ libcap \ @@ -28,6 +29,8 @@ S = "${WORKDIR}/libostree-${PV}" inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd +UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" + # Workaround compile failure: # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] # so remove -Og and use -O2 as workaround diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.11.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.12.bb index 5a410bf4cd..3ed6867816 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.12.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "8c75fb9cdd01849e92c23f30cb7fe205ea0032a38d11d46af191014e9acc3098" +SRC_URI[sha256sum] = "75352eef41e97e84bfa94292cbac79e5add5345fc79787df5cbdff703353fb1b" inherit autotools-brokensep update-rc.d systemd useradd |