openclaw/tqma6-yocto-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Yocto mirror with license table for TQMa6UL (2038-compliance)

Browse Source 
- 264 license table entries with exact download URLs (224/264 resolved)
- Complete sources/ directory with all BitBake recipes
- Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl)
- Full traceability for Softwarefreigabeantrag
- GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4
- License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
Siggi (OpenClaw Agent)
2026-03-01 20:58:18 +00:00
commit 16accb6b24
15086 changed files with 1292356 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/meta-openembedded/meta-oe/recipes-extended/beep/beep_1.4.12.bb Normal file
View File

@@ -0,0 +1,19 @@
SUMMARY = "beep allows you to have the PC speaker issue beeps and beep patterns"
DESCRIPTION = "beep allows you to have the PC speaker issue beeps and beep \
patterns with given frequencies, durations, and spacing."
HOMEPAGE = "https://github.com/spkr-beep/beep"
BUGTRACKER = "https://github.com/spkr-beep/beep/issues"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \
file://0001-beep-library-Make-it-compatible-with-c99.patch"
SRCREV = "11453a79f2cea81832329b06ca3a284aa7a0a52e"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "prefix='${prefix}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
do_install() {
oe_runmake install DESTDIR='${D}'
}

78
sources/meta-openembedded/meta-oe/recipes-extended/beep/files/0001-beep-library-Make-it-compatible-with-c99.patch Normal file
View File

@@ -0,0 +1,78 @@
From 66b06e03fc25a168e06c7af5ccccc3162ddbf92a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Nov 2023 17:18:55 -0800
Subject: [PATCH] beep-library: Make it compatible with < c99
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
beep-library.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- a/beep-library.c
+++ b/beep-library.c
@@ -44,7 +44,7 @@
int open_checked_char_device(const char *const device_name)
{
struct stat sb;
-
+ int fd = -1;
if (-1 == stat(device_name, &sb)) {
LOG_VERBOSE("could not stat(2) %s: %s",
device_name, strerror(errno));
@@ -57,7 +57,7 @@ int open_checked_char_device(const char
return -1;
}
- const int fd = open(device_name, O_WRONLY);
+ fd = open(device_name, O_WRONLY);
if (fd == -1) {
LOG_VERBOSE("could not open(2) %s: %s",
device_name, strerror(errno));
@@ -90,6 +90,7 @@ void safe_error_exit(const char *const m
{
const int saved_errno = errno;
char strerr_buf[128];
+ size_t errlen, msglen;
const int ret = strerror_r(saved_errno, strerr_buf, sizeof(strerr_buf));
if (ret != 0) {
if (write(STDERR_FILENO, "strerror_r error\n",
@@ -98,14 +99,14 @@ void safe_error_exit(const char *const m
}
_exit(EXIT_FAILURE);
}
- const size_t msglen = strlen(msg);
+ msglen = strlen(msg);
if (write(STDERR_FILENO, msg, msglen)) {
/* ignore all write errors */
}
if (write(STDERR_FILENO, ": ", 2)) {
/* ignore all write errors */
}
- const size_t errlen = strlen(strerr_buf);
+ errlen = strlen(strerr_buf);
if (write(STDERR_FILENO, strerr_buf, errlen)) {
/* ignore all write errors */
}
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -155,7 +155,6 @@ $(eval $(call CHECK_CFLAGS,common_CFLAGS
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wall))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wextra))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Weverything))
-$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Werror))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wno-padded))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Werror=format-security))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wno-disabled-macro-expansion))
@@ -169,11 +168,6 @@ $(eval $(call CHECK_CFLAGS,CFLAGS,-fanal
$(eval $(call CHECK_CFLAGS,CFLAGS,-fstack-protector-strong))
$(eval $(call CHECK_CFLAGS,CFLAGS,-fstack-clash-protection))
$(eval $(call CHECK_CFLAGS,CFLAGS,-fcf-protection))
-$(eval $(call CHECK_CFLAGS,CFLAGS,-fsanitize=undefined))
-
-
-CFLAGS += -save-temps=obj
-
$(info # common_CFLAGS=$(common_CFLAGS))
$(info # CFLAGS=$(CFLAGS))

32
sources/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb Normal file
View File

@@ -0,0 +1,32 @@
SUMMARY = "Bitwise terminal calculator"
DESCRIPTION = "Bitwise is multi base interactive calculator \
supporting dynamic base conversion and bit manipulation.\
It's a handy tool for low level hackers, \
kernel developers and device drivers developers."
HOMEPAGE = "https://github.com/mellowcandle/bitwise"
SECTION = "console/utils"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitwise-v${PV}.tar.gz \
file://0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch \
file://run-ptest \
file://ptest.out.expected \
"
SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e"
UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases"
S = "${WORKDIR}/${BPN}-v${PV}"
DEPENDS = "ncurses readline"
inherit autotools ptest
do_install_ptest() {
install -d ${D}${PTEST_PATH}
install -m 0644 ${WORKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected
}

31
sources/meta-openembedded/meta-oe/recipes-extended/bitwise/files/0001-makefile.am-Fix-build-when-build-dir-is-not-same-as-.patch Normal file
View File

@@ -0,0 +1,31 @@
From 2089b514045d2de64a5d9c54e241731e85d77df2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 14 Dec 2020 22:11:59 -0800
Subject: [PATCH] makefile.am: Fix build when build dir is not same as
sourcedir
This ensures right include paths are added to compiler
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index eba85a1..da998ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ if COND_DEBUG
MAYBE_DEBUG=-g -O0
endif
-AM_CFLAGS = $(MAYBE_COVERAGE) $(MAYBE_DEBUG) $(MAYBE_TRACE)
+AM_CFLAGS = $(MAYBE_COVERAGE) $(MAYBE_DEBUG) $(MAYBE_TRACE) -I$(srcdir)/inc
check_PROGRAMS = tests/test-shunting-yard
tests_test_shunting_yard_SOURCES = src/shunting-yard.c inc/shunting-yard.h \
--
2.29.2

13
sources/meta-openembedded/meta-oe/recipes-extended/bitwise/files/ptest.out.expected Normal file
View File

@@ -0,0 +1,13 @@
Unsigned decimal: 66
Signed decimal: 66
Hexadecimal: 0x42
Octal: 0102
Human: 66
Radix64: 0/
IPv4 (Network byte order - Big): 66.0.0.0
IPv4 (Reverwsed byte order - Little): 0.0.0.66
ASCII: .......B
Binary:
0 1 0 0 0 0 1 0
7 - 0

11
sources/meta-openembedded/meta-oe/recipes-extended/bitwise/files/run-ptest Executable file
View File

@@ -0,0 +1,11 @@
#!/bin/sh
# Test 1: Basic bitwise operation
bitwise --no-color -w b 0x42 > test.out
# Compare expected output with actual output
if ! cmp test.out ptest.out.expected; then
echo "[FAIL] Test 1: Basic bitwise operation"
exit 1
fi

59
sources/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/0001-Do-not-undefine-_FILE_OFFSET_BITS.patch Normal file
View File

@@ -0,0 +1,59 @@
From 4e5c5a245f248976ea55fe1f805badb0cb1bb072 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 30 Dec 2022 23:41:36 -0800
Subject: [PATCH] Do not undefine _FILE_OFFSET_BITS
This does not work when we want to use 64bit time_t in glibc
therefore let system decide on defining these macros
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
client/client_types.cpp | 9 ---------
client/hostinfo_unix.cpp | 9 ---------
2 files changed, 18 deletions(-)
diff --git a/client/client_types.cpp b/client/client_types.cpp
index 2977ef7863..7653517302 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -22,15 +22,6 @@
#include "zlib.h"
#else
#include "config.h"
-// Somehow having config.h define _FILE_OFFSET_BITS or _LARGE_FILES is
-// causing open to be redefined to open64 which somehow, in some versions
-// of zlib.h causes gzopen to be redefined as gzopen64 which subsequently gets
-// reported as a linker error. So for this file, we compile in small files
-// mode, regardless of these settings
-#undef _FILE_OFFSET_BITS
-#undef _LARGE_FILES
-#undef _LARGEFILE_SOURCE
-#undef _LARGEFILE64_SOURCE
#include <sys/stat.h>
#include <sys/types.h>
#include <zlib.h>
diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
index ff0b596221..0ad6841b39 100644
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
@@ -26,15 +26,6 @@
#if !defined(_WIN32) || defined(__CYGWIN32__)
-// Access to binary files in /proc filesystem doesn't work in the 64bit
-// files environment on some systems.
-// None of the functions here need 64bit file functions,
-// so undefine _FILE_OFFSET_BITS and _LARGE_FILES.
-//
-#undef _FILE_OFFSET_BITS
-#undef _LARGE_FILES
-#undef _LARGEFILE_SOURCE
-#undef _LARGEFILE64_SOURCE
#include <iostream>
#include <vector>
#include <string>
--
2.39.0

52
sources/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/0001-scripts-Do-not-check-for-files-on-build-host.patch Normal file
View File

@@ -0,0 +1,52 @@
From 8a8305c78143438e2bd497d55188a0da3442db08 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 27 Apr 2022 09:11:38 -0700
Subject: [PATCH] scripts: Do not check for files on build host
This will result in varied behaviour depending upon what kind of host is
used to build it. We dont want that. Instead check for these files and
dirs in staging area and create these markers in recipe via a
do_install_prepend to aide install piece a bit here ( systemd vs
sysvinit ) etc.
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
client/scripts/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/scripts/Makefile.am b/client/scripts/Makefile.am
index 2a53203d84..62a0defa93 100644
--- a/client/scripts/Makefile.am
+++ b/client/scripts/Makefile.am
@@ -2,21 +2,21 @@
install-exec-hook:
chmod +x boinc-client
- if [ -d /etc/init.d ] ; then \
+ if [ -d $(DESTDIR)/etc/init.d ] ; then \
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d ; \
$(INSTALL) -b boinc-client $(DESTDIR)$(sysconfdir)/init.d/boinc-client ; \
fi
- if [ -d /usr/lib/systemd/system ] ; then \
+ if [ -d $(DESTDIR)/usr/lib/systemd/system ] ; then \
$(INSTALL) -d $(DESTDIR)/usr/lib/systemd/system/ ; \
$(INSTALL_DATA) boinc-client.service $(DESTDIR)/usr/lib/systemd/system/boinc-client.service ; \
- elif [ -d /lib/systemd/system ] ; then \
+ elif [ -d $(DESTDIR)/lib/systemd/system ] ; then \
$(INSTALL) -d $(DESTDIR)/lib/systemd/system/ ; \
$(INSTALL_DATA) boinc-client.service $(DESTDIR)/lib/systemd/system/boinc-client.service ; \
fi
- if [ -d /etc/sysconfig ] ; then \
+ if [ -d $(DESTDIR)/etc/sysconfig ] ; then \
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/sysconfig ; \
$(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/sysconfig/boinc-client ; \
- elif [ -d /etc/default ] ; then \
+ elif [ -d $(DESTDIR)/etc/default ] ; then \
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/default ; \
$(INSTALL_DATA) $(srcdir)/boinc-client.conf $(DESTDIR)$(sysconfdir)/default/boinc-client ; \
else \
--
2.36.0

24
sources/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch Normal file
View File

@@ -0,0 +1,24 @@
From 7957756a3dd16498cf7a75e1fb6675a33bc7f3dc Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 3 Nov 2016 01:20:33 -0700
Subject: [PATCH] Add configure check for gtk2+ and objc++
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
configure.ac | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.ac b/configure.ac
index d81d795de4..7beeb34ae2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ m4_pattern_allow([AC_PROG_OBJCXX])
m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX],)
dnl ------
AC_PROG_CPP
+AC_PROG_OBJCXX
AC_PROG_MAKE_SET
SAH_LINKS
AC_LANG_PUSH(C)

86
sources/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb Normal file
View File

@@ -0,0 +1,86 @@
# Copyright (C) 2016 Khem Raj <raj.khem@gmail.com>
# Released under the MIT license (see COPYING.MIT for the terms)
SUMMARY = "Open-source software for volunteer computing"
DESCRIPTION = "The Berkeley Open Infrastructure for Network Computing (BOINC) is an open- \
source software platform which supports distributed computing, primarily in \
the form of volunteer computing and desktop Grid computing. It is well \
suited for problems which are often described as trivially parallel. BOINC \
is the underlying software used by projects such as SETI@home, Einstein@Home, \
ClimatePrediciton.net, the World Community Grid, and many other distributed \
computing projects. \
This package installs the BOINC client software, which will allow your \
computer to participate in one or more BOINC projects, using your spare \
computer time to search for cures for diseases, model protein folding, study \
global warming, discover sources of gravitational waves, and many other types \
of scientific and mathematical research."
HOMEPAGE = "http://boinc.berkeley.edu/"
LICENSE = "LGPL-2.0-or-later & GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
SECTION = "applications"
DEPENDS = "curl \
jpeg \
openssl \
sqlite3 \
virtual/egl \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libnotify', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets libnotify xcb-util libxscrnsaver', '', d)} \
nettle \
"
SRCREV = "4774e1cbe0ad13cb9a6f7fffbb626a417316f61d"
BRANCH = "client_release/7/7.20"
SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
file://boinc-AM_CONDITIONAL.patch \
file://0001-scripts-Do-not-check-for-files-on-build-host.patch \
file://0001-Do-not-undefine-_FILE_OFFSET_BITS.patch \
"
inherit gettext autotools pkgconfig features_check systemd
REQUIRED_DISTRO_FEATURES += "opengl"
S = "${WORKDIR}/git"
EXTRA_OECONF += "\
--enable-libraries \
--enable-unicode \
--enable-shared \
--enable-dynamic-client-linkage \
--enable-client \
--disable-server \
--disable-static \
--disable-manager \
--with-ssl=${STAGING_EXECPREFIXDIR} \
--without-wxdir \
--without-x \
--with-boinc-platform=${TARGET_SYS} \
ac_cv_c_undeclared_builtin_options='none' \
"
export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config"
do_compile:prepend () {
# Disable rpaths
sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/libtool
sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/libtool
sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/libtool
}
do_install:prepend() {
# help script install a bit to do right thing for OE
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
mkdir -p ${D}${systemd_system_unitdir}
else
mkdir -p ${D}${sysconfdir}/init.d
fi
mkdir -p ${D}${sysconfdir}/default
}
do_install:append() {
sed -i -e 's#${S}##g' ${D}${includedir}/boinc/svn_version.h
}
SYSTEMD_SERVICE:${PN} = "boinc-client.service"
FILES:${PN} += "${libdir}/systemd"

23
sources/meta-openembedded/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb Normal file
View File

@@ -0,0 +1,23 @@
SUMMARY = "Lossless compression library and tool"
DESCRIPTION = "Brotli is a generic-purpose lossless compression algorithm \
that it is similar in speed to deflate but offers more dense compression."
HOMEPAGE = "https://github.com/google/brotli"
BUGTRACKER = "https://github.com/google/brotli/issues"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https"
SRCREV= "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d"
S = "${WORKDIR}/git"
inherit cmake lib_package
do_install:append () {
for lib in $(ls ${D}${libdir}/*-static.a); do
basename=$(basename ${lib})
mv -v "${lib}" "${D}${libdir}/$(echo ${basename} | sed s/-static//)"
done
}
BBCLASSEXTEND = "native"

23
sources/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc Normal file
View File

@@ -0,0 +1,23 @@
SUMMARY = "Berkeley LALR Yacc parser generator"
HOMEPAGE = "http://invisible-island.net/byacc/"
DESCRIPTION = "A parser generator utility that reads a grammar specification from a file and generates an LR(1) \
parser for it. The parsers consist of a set of LALR(1) parsing tables and a driver routine written in the C \
programming language."
SECTION = "devel"
LICENSE = "PD"
SRC_URI = "https://invisible-mirror.net/archives/byacc/byacc-${PV}.tgz \
file://byacc-open.patch \
file://0001-byacc-do-not-reorder-CC-and-CFLAGS.patch"
EXTRA_OECONF += "--program-transform-name='s,^,b,'"
BBCLASSEXTEND = "native nativesdk"
inherit autotools
do_configure() {
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
oe_runconf
}

316
sources/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch Normal file
View File

@@ -0,0 +1,316 @@
Subject: byacc: do not reorder $CC and $CFLAGS
byacc tries to process $CC and decide which part should belong to CC and which
part should below to CFLAGS and then do reordering. It doesn't make much sense
for OE. And it doesn't do its work correctly. Some options are dropped.
Delete all these stuff so that we could have all options we need.
Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Update for 20190617.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Update for 20191103.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Update for 20200910.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Update for 20210808.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Update for 20210201
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
aclocal.m4 | 1 -
configure | 259 -----------------------------------------------------
2 files changed, 260 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 832d0c8..63b03f2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1421,7 +1421,6 @@ CF_GCC_VERSION
CF_ACVERSION_CHECK(2.52,
[AC_PROG_CC_STDC],
[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
diff --git a/configure b/configure
index cb47b4c..c72b6e4 100755
--- a/configure
+++ b/configure
@@ -2144,265 +2144,6 @@ esac
# This should have been defined by AC_PROG_CC
: "${CC:=cc}"
-echo "$as_me:2147: checking \$CFLAGS variable" >&5
-echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
-case "x$CFLAGS" in
-(*-[IUD]*)
- echo "$as_me:2151: result: broken" >&5
-echo "${ECHO_T}broken" >&6
- { echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
-echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
- cf_flags="$CFLAGS"
- CFLAGS=
- for cf_arg in $cf_flags
- do
-
-cf_fix_cppflags=no
-cf_new_cflags=
-cf_new_cppflags=
-cf_new_extra_cppflags=
-
-for cf_add_cflags in $cf_arg
-do
-case "$cf_fix_cppflags" in
-(no)
- case "$cf_add_cflags" in
- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
- case "$cf_add_cflags" in
- (-D*)
- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
- if test "$cf_fix_cppflags" = yes ; then
-
- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
- continue
- elif test "${cf_tst_cflags}" = "\"'" ; then
-
- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
- continue
- fi
- ;;
- esac
- case "$CPPFLAGS" in
- (*$cf_add_cflags)
- ;;
- (*)
- case "$cf_add_cflags" in
- (-D*)
- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-
-CPPFLAGS=`echo "$CPPFLAGS" | \
- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
-
- ;;
- esac
-
- test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
- cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
-
- ;;
- esac
- ;;
- (*)
-
- test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
- cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
-
- ;;
- esac
- ;;
-(yes)
-
- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'`
-
- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-esac
-done
-
-if test -n "$cf_new_cflags" ; then
-
- test -n "$CFLAGS" && CFLAGS="$CFLAGS "
- CFLAGS="${CFLAGS}$cf_new_cflags"
-
-fi
-
-if test -n "$cf_new_cppflags" ; then
-
- test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
-
-fi
-
-if test -n "$cf_new_extra_cppflags" ; then
-
- test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
- EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
-
-fi
-
- done
- ;;
-(*)
- echo "$as_me:2261: result: ok" >&5
-echo "${ECHO_T}ok" >&6
- ;;
-esac
-
-echo "$as_me:2266: checking \$CC variable" >&5
-echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
-case "$CC" in
-(*[\ \ ]-*)
- echo "$as_me:2270: result: broken" >&5
-echo "${ECHO_T}broken" >&6
- { echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
-echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
- # humor him...
- cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
- cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
- CC="$cf_prog"
- for cf_arg in $cf_flags
- do
- case "x$cf_arg" in
- (x-[IUDfgOW]*)
-
-cf_fix_cppflags=no
-cf_new_cflags=
-cf_new_cppflags=
-cf_new_extra_cppflags=
-
-for cf_add_cflags in $cf_arg
-do
-case "$cf_fix_cppflags" in
-(no)
- case "$cf_add_cflags" in
- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
- case "$cf_add_cflags" in
- (-D*)
- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=yes
-
- if test "$cf_fix_cppflags" = yes ; then
-
- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
- continue
- elif test "${cf_tst_cflags}" = "\"'" ; then
-
- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
- continue
- fi
- ;;
- esac
- case "$CPPFLAGS" in
- (*$cf_add_cflags)
- ;;
- (*)
- case "$cf_add_cflags" in
- (-D*)
- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
-
-CPPFLAGS=`echo "$CPPFLAGS" | \
- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
-
- ;;
- esac
-
- test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
- cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
-
- ;;
- esac
- ;;
- (*)
-
- test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
- cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
-
- ;;
- esac
- ;;
-(yes)
-
- test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
-
- cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'`
-
- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- && test -z "${cf_tst_cflags}" \
- && cf_fix_cppflags=no
- ;;
-esac
-done
-
-if test -n "$cf_new_cflags" ; then
-
- test -n "$CFLAGS" && CFLAGS="$CFLAGS "
- CFLAGS="${CFLAGS}$cf_new_cflags"
-
-fi
-
-if test -n "$cf_new_cppflags" ; then
-
- test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
-
-fi
-
-if test -n "$cf_new_extra_cppflags" ; then
-
- test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
- EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
-
-fi
-
- ;;
- (*)
- CC="$CC $cf_arg"
- ;;
- esac
- done
- test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
-
-echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5
-
- test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
-
-echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
-
- test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
-
-echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
-
- ;;
-(*)
- echo "$as_me:2401: result: ok" >&5
-echo "${ECHO_T}ok" >&6
- ;;
-esac
-
echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
--
2.34.1

25
sources/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch Normal file
View File

@@ -0,0 +1,25 @@
Ubuntu defaults to passing _FORTIFY_SOURCE=2 which breaks byacc as it doesn't
pass enough arguments to open():
inlined from 'open_tmpfile' at byacc-20150711/main.c:588:5:
/usr/include/x86_64-linux-gnu/bits/fcntl2.h:50:24: error: call to '__open_missing_mode' declared with attribute error:
open with O_CREAT in second argument needs 3 arguments
Add a mode of 0666 to fix this.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/main.c b/main.c
index 620ce3f..82071a4 100644
--- a/main.c
+++ b/main.c
@@ -526,7 +526,7 @@ my_mkstemp(char *temp)
}
if ((name = tempnam(dname, fname)) != 0)
{
- fd = open(name, O_CREAT | O_EXCL | O_RDWR);
+ fd = open(name, O_CREAT | O_EXCL | O_RDWR, 0666);
strcpy(temp, name);
}
else

10
sources/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20230219.bb Normal file
View File

@@ -0,0 +1,10 @@
# Sigh. This is one of those places where everyone licenses it differently. Someone
# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that:
# "I've found no reliable source which states that byacc must bear a UCB copyright."
# Setting to PD as this is what the upstream has it as.
LICENSE = "PD"
LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=b56b7454f5f865de2e6e35ee2185b461"
require byacc.inc
SRC_URI[sha256sum] = "36b972a6d4ae97584dd186925fbbc397d26cb20632a76c2f52ac7653cd081b58"

40
sources/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb Normal file
View File

@@ -0,0 +1,40 @@
#
# Copyright (C) 2014 - 2017 Wind River Systems, Inc.
#
SUMMARY = "Base policy for CFEngine"
DESCRIPTION = "CFEngine is an IT infrastructure automation framework \
that helps engineers, system administrators and other stakeholders \
in an IT system to manage and understand IT infrastructure throughout \
its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit. \
\
This package is intended to provide a stable base policy for \
installations and upgrades, and is used by CFEngine 3.6 and newer. \
\
The contents of this packge are intended to live in `/var/cfengine/masterfiles` \
or wherever `$(sys.masterdir)` points. \
"
HOMEPAGE = "http://cfengine.com"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e"
SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
"
#SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98"
SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16"
inherit autotools
export EXPLICIT_VERSION="${PV}"
EXTRA_OECONF = "--prefix=${datadir}/cfengine"
do_install:append() {
rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum
}
FILES:${PN} = "${datadir}/cfengine"
RDEPENDS:${PN} += "python3-core"

89
sources/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch Normal file
View File

@@ -0,0 +1,89 @@
From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Fri, 27 Jan 2023 15:19:48 -0600
Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac
The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no
Ticket: CFE-4023
Changelog: title
---
Upstream-Status: Pending
configure.ac | 21 +++++++++++----------
libntech/configure.ac | 21 +++++++++++----------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index e189b10..f6b8226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then
LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2
fi
fi
-fi
-CF3_WITH_LIBRARY(libxml2,
- [AC_CHECK_LIB(xml2, xmlFirstElementChild,
- [],
- [if test "x$with_libxml2" != xcheck; then
- AC_MSG_ERROR(Cannot find libxml2); fi]
- )
- AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
+ CF3_WITH_LIBRARY(libxml2,
+ [AC_CHECK_LIB(xml2, xmlFirstElementChild,
+ [],
[if test "x$with_libxml2" != xcheck; then
AC_MSG_ERROR(Cannot find libxml2); fi]
- )]
-)
+ )
+ AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
+ [if test "x$with_libxml2" != xcheck; then
+ AC_MSG_ERROR(Cannot find libxml2); fi]
+ )]
+ )
+
+fi
AM_CONDITIONAL([HAVE_LIBXML2],
[test "x$with_libxml2" != xno &&
diff --git a/libntech/configure.ac b/libntech/configure.ac
index 7bb8787..28b3683 100644
--- a/libntech/configure.ac
+++ b/libntech/configure.ac
@@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then
LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2
fi
fi
-fi
-CF3_WITH_LIBRARY(libxml2,
- [AC_CHECK_LIB(xml2, xmlFirstElementChild,
- [],
- [if test "x$with_libxml2" != xcheck; then
- AC_MSG_ERROR(Cannot find libxml2); fi]
- )
- AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
+ CF3_WITH_LIBRARY(libxml2,
+ [AC_CHECK_LIB(xml2, xmlFirstElementChild,
+ [],
[if test "x$with_libxml2" != xcheck; then
AC_MSG_ERROR(Cannot find libxml2); fi]
- )]
-)
+ )
+ AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
+ [if test "x$with_libxml2" != xcheck; then
+ AC_MSG_ERROR(Cannot find libxml2); fi]
+ )]
+ )
+
+fi
AM_CONDITIONAL([HAVE_LIBXML2],
[test "x$with_libxml2" != xno &&
--
2.39.1

38
sources/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch Normal file
View File

@@ -0,0 +1,38 @@
From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Mon, 18 Jul 2016 09:06:06 +0800
Subject: [PATCH] cfengine: add recipe and base policy
Upstream-Status: Inappropriate [configuration]
Set the path of default configure file.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
misc/init.d/cfengine3.in | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
index c584817..12f5803 100644
--- a/misc/init.d/cfengine3.in
+++ b/misc/init.d/cfengine3.in
@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
fi
# default control file
-if [ "$DEBIAN" = "1" ]; then
- DEFAULT=/etc/default/cfengine3
- INIT_FUNCTIONS=/lib/lsb/init-functions
- if [ -e "$INIT_FUNCTIONS" ]; then
- . "$INIT_FUNCTIONS"
- fi
-else
- DEFAULT=/etc/sysconfig/cfengine3
+DEFAULT=/etc/default/cfengine3
+INIT_FUNCTIONS=/lib/lsb/init-functions
+if [ -e "$INIT_FUNCTIONS" ]; then
+ . "$INIT_FUNCTIONS"
fi
if [ -f $DEFAULT ]; then

76
sources/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb Normal file
View File

@@ -0,0 +1,76 @@
#
# Copyright (C) 2014 - 2017 Wind River Systems, Inc.
#
SUMMARY = "CFEngine is an IT infrastructure automation framework"
DESCRIPTION = "CFEngine is an IT infrastructure automation framework \
that helps engineers, system administrators and other stakeholders \
in an IT system to manage and understand IT infrastructure throughout \
its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit."
HOMEPAGE = "http://cfengine.com"
SKIP_RECIPE[cfengine] ?= "Needs porting to openssl 3.x"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f"
DEPENDS += "attr tokyocabinet bison-native libxml2"
#RDEPENDS:cfengine += "attr tokyocabinet bison-native libxml2"
SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-community-${PV}.tar.gz \
file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \
file://set-path-of-default-config-file.patch \
"
#SRC_URI[md5sum] = "5318e40702bc66a3ece44ec4ad77712b"
SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126"
inherit autotools-brokensep systemd
export EXPLICIT_VERSION="${PV}"
SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \
cf-runalerts.service cf-execd.service \
cf-monitord.service cf-serverd.service \
"
SYSTEMD_AUTO_ENABLE:${PN} = "disable"
PACKAGECONFIG ??= "libpcre openssl \
${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \
"
PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2,"
PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mysql,"
PACKAGECONFIG[postgresql] = "--with-postgresql=yes,--with-postgresql=no,postgresql,"
PACKAGECONFIG[acl] = "--with-libacl=yes,--with-libacl=no,acl,"
PACKAGECONFIG[libvirt] = "--with-libvirt=yes,--with-libvirt=no,libvirt,"
PACKAGECONFIG[libpcre] = "--with-pcre=yes,--with-pcre=no,libpcre,"
PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl,"
PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam,"
PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml,"
PACKAGECONFIG[systemd] = "--with-systemd-service=${systemd_system_unitdir},--without-systemd-service"
PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl,"
EXTRA_OECONF = "hw_cv_func_va_copy=yes --with-init-script=${sysconfdir}/init.d --with-tokyocabinet"
do_install:append() {
install -d ${D}${localstatedir}/${BPN}/bin
for f in `ls ${D}${bindir}`; do
ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/
done
install -d ${D}${sysconfdir}/default
cat << EOF > ${D}${sysconfdir}/default/cfengine3
RUN_CF_SERVERD=1
RUN_CF_EXECD=1
RUN_CF_MONITORD=1
RUN_CF_HUB=0
EOF
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -m 0755 -D ${D}${sysconfdir}/init.d/cfengine3 ${D}${datadir}/${BPN}/cfengine3
sed -i -e 's#/etc/init.d#${datadir}/${BPN}#' ${D}${systemd_system_unitdir}/*.service
fi
rm -rf ${D}${datadir}/cfengine/modules/packages/zypper
}
RDEPENDS:${PN} += "${BPN}-masterfiles"

14
sources/meta-openembedded/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb Normal file
View File

@@ -0,0 +1,14 @@
SUMMARY = "Terminal based 'The Matrix' screen implementation"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https"
SRCREV = "adfdf1656f23e5ab3b52c7d7edf91249a4477e8d"
S = "${WORKDIR}/git"
inherit cmake
DEPENDS += "ncurses"
FILES:${PN} += "${datadir}/* ${libdir}/kbd/*"

24
sources/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch Normal file
View File

@@ -0,0 +1,24 @@
From 3ab3ac2876cbf4a34a94f0d3256a5be9d1202370 Mon Sep 17 00:00:00 2001
From: Qian Lei <qianl.fnst@cn.fujitsu.com>
Date: Fri, 16 Jan 2015 18:37:26 +0800
Subject: [PATCH] Fix error
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Upstream-Status: Pending
---
swig/python/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index 93b4755..a7268f0 100644
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -26,7 +26,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" )
ADD_CUSTOM_COMMAND (
OUTPUT ${SWIG_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..."
- COMMAND ${SWIG_EXECUTABLE} -python -Wall -threads -features autodoc -o ${SWIG_OUTPUT} -outdir ${CMAKE_CURRENT_BINARY_DIR} -I/usr/include ${SWIG_INPUT}
+ COMMAND ${SWIG_EXECUTABLE} -python -Wall -threads -features autodoc -o ${SWIG_OUTPUT} -outdir ${CMAKE_CURRENT_BINARY_DIR} -I$ENV{STAGING_INCDIR} ${SWIG_INPUT}
COMMAND ${CMAKE_COMMAND} -E echo "Done."
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i

45
sources/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch Normal file
View File

@@ -0,0 +1,45 @@
From 0871fb048a48a02ec598c941e577f13d8d24f574 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Mon, 24 Aug 2015 11:00:13 +0900
Subject: [PATCH] cmpi-bindings-0.4.17 no ruby perl
Port from Fedora20
Upstream-Status: Pending
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
swig/CMakeLists.txt | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 00bf40c..d3cab38 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -49,15 +49,15 @@ ELSE (BUILD_PYTHON2)
MESSAGE(STATUS "*****")
ENDIF (BUILD_PYTHON3)
-FIND_PACKAGE(Perl)
-IF (PERL_EXECUTABLE)
- MESSAGE(STATUS "Building Perl...")
- ADD_SUBDIRECTORY(perl)
-ENDIF (PERL_EXECUTABLE)
+#FIND_PACKAGE(Perl)
+#IF (PERL_EXECUTABLE)
+# MESSAGE(STATUS "Building Perl...")
+# ADD_SUBDIRECTORY(perl)
+#ENDIF (PERL_EXECUTABLE)
-FIND_PACKAGE(Ruby)
-IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
- MESSAGE(STATUS "Building Ruby...")
- ADD_SUBDIRECTORY(ruby)
- OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
-ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+#FIND_PACKAGE(Ruby)
+#IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+# MESSAGE(STATUS "Building Ruby...")
+# ADD_SUBDIRECTORY(ruby)
+# OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
+#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)

30
sources/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch Normal file
View File

@@ -0,0 +1,30 @@
From bc32342fa63b8359f985fe1e187e811455c96a50 Mon Sep 17 00:00:00 2001
From: Qian Lei <qianl.fnst@cn.fujitsu.com>
Date: Tue, 25 Aug 2015 13:19:51 +0800
Subject: [PATCH] Port from Fedora20
Upstream-Status: Pending
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
swig/python/cmpi_pywbem_bindings.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/swig/python/cmpi_pywbem_bindings.py b/swig/python/cmpi_pywbem_bindings.py
index d643990..7f0cc77 100644
--- a/swig/python/cmpi_pywbem_bindings.py
+++ b/swig/python/cmpi_pywbem_bindings.py
@@ -361,10 +361,10 @@ class BrokerCIMOMHandle(object):
allow_null_ns = False
else:
allow_null_ns = True
- if self.broker.name() == 'RequestHandler':
+# if self.broker.name() == 'RequestHandler':
# Check sblim bug #2185410.
- if instance.path is not None:
- instance.path.namespace = None
+# if instance.path is not None:
+# instance.path.namespace = None
inst = self.proxy.pywbem2cmpi_inst(instance, allow_null_ns)
rv = self.broker.deliverIndication(self.ctx, ns, inst)
return rv

34
sources/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb Normal file
View File

@@ -0,0 +1,34 @@
SUMMARY = "Adapter to write and run CMPI-type CIM providers"
DESCRIPTION = "CMPI-compliant provider interface for various languages via SWIG"
HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
SECTION = "Development/Libraries"
DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native"
SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \
file://cmpi-bindings-0.4.17-no-ruby-perl.patch \
file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \
file://0001-Fix-error.patch \
"
SRCREV = "69077ee4d249816ed428155fc933dca424167e77"
S = "${WORKDIR}/git"
inherit cmake python3targetconfig
EXTRA_OECMAKE = "-DLIB='${baselib}' \
-DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
-DPYTHON_ABI=${PYTHON_ABI} \
-DBUILD_PYTHON3=YES \
-DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \
"
# With Ninja it fails with:
# ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)
OECMAKE_GENERATOR = "Unix Makefiles"
FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
BBCLASSEXTEND = "native"

53
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch Normal file
View File

@@ -0,0 +1,53 @@
From 090a17ca338a9311d682ecc5933b32bff67cf07f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 27 Jul 2019 14:20:14 -0700
Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems
Glibc 2.30 has added deprecation notice and collectd detects it as
warning [1]
Fixes
sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and
will be removed." [-Werror,-W#warnings]
[1]
https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990
Upstream-Status: Submitted
[https://github.com/collectd/collectd/pull/3234]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/processes.c | 2 +-
src/uptime.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/processes.c b/src/processes.c
index f83913a..9f71511 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -87,7 +87,7 @@
#if HAVE_MACH_VM_PROT_H
#include <mach/vm_prot.h>
#endif
-#if HAVE_SYS_SYSCTL_H
+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
/* #endif HAVE_THREAD_INFO */
diff --git a/src/uptime.c b/src/uptime.c
index 0892bda..4b15150 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -33,7 +33,7 @@
*/
/* #endif HAVE_LIBKSTAT */
-#elif HAVE_SYS_SYSCTL_H
+#elif defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__)
#include <sys/sysctl.h>
/* Using sysctl interface to retrieve the boot time on *BSD / Darwin / OS X
* systems */
--
2.17.1

115
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch Normal file
View File

@@ -0,0 +1,115 @@
From b0a64db90a24469e36978c748417ebe456b34d59 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Apr 2017 11:54:57 -0700
Subject: [PATCH] configure: Check for -Wno-error=format-truncation compiler
option
If this option is supported by compiler then disable it ( gcc7+)
Use -Werror to elevate the warning to an error in case compiler like clang
which warn about unknown options but not error out unless asked for
Fixes
client.c:834:23: error: '%s' directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Werror=format-truncation=]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
configure.ac | 1 +
m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
create mode 100644 m4/ax_check_compile_flag.m4
diff --git a/configure.ac b/configure.ac
index a7eca97d..560eb988 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7101,6 +7101,7 @@ if test "x$GCC" = "xyes"; then
AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
fi
fi
+AX_CHECK_COMPILE_FLAG([-Werror -Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS])
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
new file mode 100644
index 00000000..dcabb92a
--- /dev/null
+++ b/m4/ax_check_compile_flag.m4
@@ -0,0 +1,74 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+# Check whether the given FLAG works with the current language's compiler
+# or gives an error. (Warnings, however, are ignored)
+#
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+# success/failure.
+#
+# If EXTRA-FLAGS is defined, it is added to the current language's default
+# flags (e.g. CFLAGS) when the check is done. The check is thus made with
+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
+# force the compiler to issue an error when a bad flag is given.
+#
+# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 5
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+ [AS_VAR_SET(CACHEVAR,[yes])],
+ [AS_VAR_SET(CACHEVAR,[no])])
+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+ [m4_default([$2], :)],
+ [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS

24
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch Normal file
View File

@@ -0,0 +1,24 @@
Subject: fix to build with glibc 2.25
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
src/md.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/md.c b/src/md.c
index 3725f9a..202225b 100644
--- a/src/md.c
+++ b/src/md.c
@@ -26,6 +26,7 @@
#include "utils/ignorelist/ignorelist.h"
#include <sys/ioctl.h>
+#include <sys/sysmacros.h>
#include <linux/major.h>
#include <linux/raid/md_u.h>
--
2.8.3

67
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0005-Disable-new-gcc8-warnings.patch Normal file
View File

@@ -0,0 +1,67 @@
From f82f8faf9942f51e9c3c773b56574652695bef5a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 9 May 2018 21:45:38 -0700
Subject: [PATCH] Disable new gcc8 warnings
GCC seems to be not able to detect the checks for size are
already in place
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
src/libcollectdclient/network_parse.c | 7 +++++++
src/write_sensu.c | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c
index aa753ce..fef43a9 100644
--- a/src/libcollectdclient/network_parse.c
+++ b/src/libcollectdclient/network_parse.c
@@ -148,6 +148,11 @@ static int parse_int(void *payload, size_t payload_size, uint64_t *out) {
return 0;
}
+#pragma GCC diagnostic push
+#if __GNUC__ == 8
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
+
static int parse_string(void *payload, size_t payload_size, char *out,
size_t out_size) {
char *in = payload;
@@ -160,6 +165,8 @@ static int parse_string(void *payload, size_t payload_size, char *out,
return 0;
}
+#pragma GCC diagnostic pop
+
static int parse_identifier(uint16_t type, void *payload, size_t payload_size,
lcc_value_list_t *state) {
char buf[LCC_NAME_LEN];
diff --git a/src/write_sensu.c b/src/write_sensu.c
index bd7a56d..6cb59d5 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -570,6 +570,11 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
return ret_str;
} /* }}} char *sensu_value_to_json */
+#pragma GCC diagnostic push
+#if __GNUC__ > 7
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
/*
* Uses replace_str2() implementation from
* http://creativeandcritical.net/str-replace-c/
@@ -632,6 +637,8 @@ static char *replace_str(const char *str, const char *old, /* {{{ */
return ret;
} /* }}} char *replace_str */
+#pragma GCC diagnostic pop
+
static char *replace_json_reserved(const char *message) /* {{{ */
{
char *msg = replace_str(message, "\\", "\\\\");

31
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0006-libcollectdclient-Fix-string-overflow-errors.patch Normal file
View File

@@ -0,0 +1,31 @@
From 98719ea7f717750c790a1f9384ea8d0117e7f52d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 17 Dec 2018 18:15:05 -0800
Subject: [PATCH] libcollectdclient: Fix string overflow errors
Ensure that string has a space for ending null char
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/libcollectdclient/network_parse.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libcollectdclient/network_parse.c b/src/libcollectdclient/network_parse.c
index fef43a9..6d65266 100644
--- a/src/libcollectdclient/network_parse.c
+++ b/src/libcollectdclient/network_parse.c
@@ -169,9 +169,9 @@ static int parse_string(void *payload, size_t payload_size, char *out,
static int parse_identifier(uint16_t type, void *payload, size_t payload_size,
lcc_value_list_t *state) {
- char buf[LCC_NAME_LEN];
-
- if (parse_string(payload, payload_size, buf, sizeof(buf)) != 0)
+ char buf[LCC_NAME_LEN+1];
+ buf[LCC_NAME_LEN] = '\0';
+ if (parse_string(payload, payload_size, buf, LCC_NAME_LEN) != 0)
return EINVAL;
switch (type) {

212
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init Normal file
View File

@@ -0,0 +1,212 @@
#!/bin/sh
#
# collectd - start and stop the statistics collection daemon
# http://collectd.org/
#
# Copyright (C) 2005-2006 Florian Forster <octo@verplant.org>
# Copyright (C) 2006-2009 Sebastian Harl <tokkee@debian.org>
#
### BEGIN INIT INFO
# Provides: collectd
# Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
# Should-Start: $network $named $syslog $time cpufrequtils
# Should-Stop: $network $named $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: manage the statistics collection daemon
# Description: collectd is the statistics collection daemon.
# It is a small daemon which collects system information
# periodically and provides mechanisms to monitor and store
# the values in a variety of ways.
### END INIT INFO
. /etc/init.d/functions
export PATH=/sbin:/bin:/usr/sbin:/usr/bin
DISABLE=0
NAME=collectd
DAEMON=/usr/sbin/collectd
CONFIGFILE=/etc/collectd.conf
PIDFILE=/var/run/collectd.pid
USE_COLLECTDMON=1
COLLECTDMON_DAEMON=/usr/sbin/collectdmon
COLLECTDMON_PIDFILE=/var/run/collectdmon.pid
MAXWAIT=30
# Gracefully exit if the package has been removed.
test -x $DAEMON || exit 0
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
if test "$ENABLE_COREFILES" = 1; then
ulimit -c unlimited
fi
if test "$USE_COLLECTDMON" = 1; then
_PIDFILE="$COLLECTDMON_PIDFILE"
else
_PIDFILE="$PIDFILE"
fi
# return:
# 0 if config is fine
# 1 if there is a syntax error
# 2 if there is no configuration
check_config() {
if test ! -e "$CONFIGFILE"; then
return 2
fi
if ! $DAEMON -t -C "$CONFIGFILE"; then
return 1
fi
return 0
}
# return:
# 0 if the daemon has been started
# 1 if the daemon was already running
# 2 if the daemon could not be started
# 3 if the daemon was not supposed to be started
d_start() {
if test "$DISABLE" != 0; then
# we get here during restart
echo "disabled by /etc/default/$NAME"
return 3
fi
if test ! -e "$CONFIGFILE"; then
# we get here during restart
echo "disabled, no configuration ($CONFIGFILE) found"
return 3
fi
check_config
rc="$?"
if test "$rc" -ne 0; then
echo "not starting, configuration error"
return 2
fi
if test "$USE_COLLECTDMON" = 1; then
start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
--exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \
|| return 2
else
start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
--exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE" \
|| return 2
fi
return 0
}
still_running_warning="
WARNING: $NAME might still be running.
In large setups it might take some time to write all pending data to
the disk. You can adjust the waiting time in /etc/default/collectd."
# return:
# 0 if the daemon has been stopped
# 1 if the daemon was already stopped
# 2 if daemon could not be stopped
d_stop() {
PID=$( cat "$_PIDFILE" 2> /dev/null ) || true
start-stop-daemon --stop --quiet --oknodo --pidfile "$_PIDFILE"
rc="$?"
if test "$rc" -eq 2; then
return 2
fi
sleep 1
if test -n "$PID" && kill -0 $PID 2> /dev/null; then
i=0
while kill -0 $PID 2> /dev/null; do
i=$(( $i + 2 ))
echo -n " ."
if test $i -gt $MAXWAIT; then
echo "$still_running_warning"
return 2
fi
sleep 2
done
return "$rc"
fi
return "$rc"
}
# return:
# 0 if the daemon is running
# 3 if the daemon is stopped
d_status(){
if test "$USE_COLLECTDMON" = 1; then
status $COLLECTDMON_DAEMON
else
status $DAEMON
fi
}
case "$1" in
start)
echo -n "Starting $NAME"
d_start
case "$?" in
0|1) echo "." ;;
*) exit 1 ;;
esac
;;
stop)
echo -n "Stopping $NAME"
d_stop
case "$?" in
0|1) echo "." ;;
*) exit 1 ;;
esac
;;
status)
d_status
;;
restart|force-reload)
echo -n "Restarting $NAME"
check_config
rc="$?"
if test "$rc" -eq 1; then
echo "not restarting, configuration error"
exit 1
fi
d_stop
rc="$?"
case "$rc" in
0|1)
sleep 1
d_start
rc2="$?"
case "$rc2" in
0|1) echo "." ;;
*) exit 1 ;;
esac
;;
*)
exit 1
;;
esac
;;
*)
echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
exit 3
;;
esac
# vim: syntax=sh noexpandtab sw=4 ts=4 :

12
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.service Normal file
View File

@@ -0,0 +1,12 @@
[Unit]
Description=Collectd
After=local-fs.target network.target
Requires=local-fs.target network.target
[Service]
ExecStart=@SBINDIR@/collectd -C /etc/collectd.conf -f
Restart=always
RestartSec=10
[Install]
WantedBy=multi-user.target

39
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch Normal file
View File

@@ -0,0 +1,39 @@
From d9b954bd9d0b084d9a1f5159a9f0c45802a51809 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Mon, 22 Apr 2013 16:28:16 +0000
---
Upstream-Status: Pending
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index e869a6a0..101d6f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2514,20 +2514,20 @@ AC_ARG_WITH([libgcrypt],
if test -f "$withval" && test -x "$withval"; then
with_libgcrypt_config="$withval"
with_libgcrypt="yes"
- else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config"; then
- with_libgcrypt_config="$withval/bin/gcrypt-config"
+ else if test -f "$withval/bin/pkg-config" && test -x "$withval/bin/pkg-config"; then
+ with_libgcrypt_config="$withval/bin/pkg-config"
with_libgcrypt="yes"
else if test -d "$withval"; then
GCRYPT_CPPFLAGS="$GCRYPT_CPPFLAGS -I$withval/include"
GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib"
with_libgcrypt="yes"
else
- with_libgcrypt_config="gcrypt-config"
+ with_libgcrypt_config="pkg-config"
with_libgcrypt="$withval"
fi; fi; fi
],
[
- with_libgcrypt_config="libgcrypt-config"
+ with_libgcrypt_config="libpkg-config"
with_libgcrypt="yes"
]
)

92
sources/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb Normal file
View File

@@ -0,0 +1,92 @@
SUMMARY = "Collects and summarises system performance statistics"
DESCRIPTION = "collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files."
HOMEPAGE = "https://collectd.org/"
LICENSE = "GPL-2.0-only & MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854"
DEPENDS = "curl libpcap libxml2 yajl libgcrypt libtool lvm2"
SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \
file://collectd.init \
file://collectd.service \
file://no-gcrypt-badpath.patch \
file://0001-fix-to-build-with-glibc-2.25.patch \
file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \
file://0005-Disable-new-gcc8-warnings.patch \
file://0006-libcollectdclient-Fix-string-overflow-errors.patch \
file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \
"
SRC_URI[md5sum] = "2b23a65960bc323d065234776a542e04"
SRC_URI[sha256sum] = "5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6"
inherit autotools python3native update-rc.d pkgconfig systemd
SYSTEMD_SERVICE:${PN} = "collectd.service"
# Floatingpoint layout, architecture dependent
# 'nothing', 'endianflip' or 'intswap'
FPLAYOUT ?= "--with-fp-layout=nothing"
PACKAGECONFIG ??= ""
PACKAGECONFIG[openjdk] = "--with-java=${STAGING_DIR_TARGET}${libdir}/jvm,--without-java,openjdk-7"
PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp"
PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached"
PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables"
PACKAGECONFIG[postgresql] = "--enable-postgresql --with-libpq=yes, \
--disable-postgresql --with-libpq=no,postgresql"
PACKAGECONFIG[mysql] = "--enable-mysql --with-libmysql=yes, \
--disable-mysql --with-libmysql=no,mysql5"
PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi"
PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus"
PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs"
PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \
--disable-sensors --with-libsensors=no,lmsensors"
PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \
--disable-amqp --with-librabbitmq=no,rabbitmq-c"
# protobuf-c, libvirt that are currently only available in meta-virtualization layer
PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf-c-native protobuf-c"
PACKAGECONFIG[libvirt] = "--enable-virt,--disable-virt,libvirt"
PACKAGECONFIG[libesmtp] = "--with-libesmtp,--without-libesmtp,libesmtp"
PACKAGECONFIG[libmnl] = "--with-libmnl,--without-libmnl,libmnl"
PACKAGECONFIG[libatasmart] = "--with-libatasmart,--without-libatasmart,libatasmart"
PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --without-libldap, openldap"
PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool"
PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdtool"
PACKAGECONFIG[python] = "--enable-python,--disable-python"
EXTRA_OECONF = " \
${FPLAYOUT} \
--disable-perl --with-libperl=no --with-perl-bindings=no \
--with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \
--disable-notify_desktop --disable-werror \
"
do_install:append() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd
sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd
sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd
sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd
sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/collectd
install -Dm 0640 ${B}/src/collectd.conf ${D}${sysconfdir}/collectd.conf
# Fix configuration file to allow collectd to start up
sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf
rmdir ${D}${localstatedir}/run ${D}${localstatedir}/log
rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
# Install systemd unit files
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/collectd.service ${D}${systemd_unitdir}/system
sed -i -e 's,@SBINDIR@,${sbindir},g' \
${D}${systemd_unitdir}/system/collectd.service
}
CONFFILES:${PN} = "${sysconfdir}/collectd.conf"
INITSCRIPT_NAME = "collectd"
INITSCRIPT_PARAMS = "defaults"
# threshold.so load.so are also provided by gegl
# disk.so is also provided by libgphoto2-camlibs
PRIVATE_LIBS = "threshold.so load.so disk.so"

44
sources/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.28.bb Normal file
View File

@@ -0,0 +1,44 @@
SUMMARY = "Data recovery tool"
DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \
from one file or block device (hard disc, cdrom, etc) to another, \
trying hard to rescue data in case of read errors."
HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
SECTION = "console"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
file://main_common.cc;beginline=5;endline=16;md5=ad099df052bdd8297f490712285069da \
"
SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
SRC_URI[sha256sum] = "6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1"
# This isn't already added by base.bbclass
do_unpack[depends] += "lzip-native:do_populate_sysroot"
CONFIGUREOPTS = "\
'--srcdir=${S}' \
'--prefix=${prefix}' \
'--exec-prefix=${exec_prefix}' \
'--bindir=${bindir}' \
'--datadir=${datadir}' \
'--infodir=${infodir}' \
'--sysconfdir=${sysconfdir}' \
'CXX=${CXX}' \
'CPPFLAGS=${CPPFLAGS}' \
'CXXFLAGS=${CXXFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
EXTRA_OEMAKE = ""
do_configure () {
${S}/configure ${CONFIGUREOPTS}
}
do_install () {
oe_runmake 'DESTDIR=${D}' install
# Info dir listing isn't interesting at this point so remove it if it exists.
if [ -e "${D}${infodir}/dir" ]; then
rm -f ${D}${infodir}/dir
fi
}

31
sources/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb Normal file
View File

@@ -0,0 +1,31 @@
SUMMARY = "display dialog boxes from shell scripts"
DESCRIPTION = "Dialog lets you to present a variety of questions \
or display messages using dialog boxes from a shell \
script (or any scripting language)."
HOMEPAGE = "http://invisible-island.net/dialog/"
SECTION = "console/utils"
DEPENDS = "ncurses"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz"
SRC_URI[sha256sum] = "339d311c6abb240213426b99ad63565cbcb3e8641ef1989c033e945b754d34ef"
# hardcoded here for use in dialog-static recipe
S = "${WORKDIR}/dialog-${PV}"
inherit autotools-brokensep pkgconfig
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11"
EXTRA_OECONF = "--with-ncurses \
--disable-rpath-hack"
do_configure() {
gnu-configize --force
sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure
sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure
oe_runconf
}

40
sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch Normal file
View File

@@ -0,0 +1,40 @@
From bc03f142507da92add8ba325fdf8187d47a7d719 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Fri, 13 Dec 2024 16:37:24 +0800
Subject: [PATCH] CMakeLists.txt: make DLT_WatchdogSec can be set by user
In my test env, WatchdogSec default value 2 is not enough, manually
changed to 3 is ok. This makes dlt.service/dlt-system.service start
failed during boot time. So, make DLT_WatchdogSec can be set by user, so
user can set them to proper value at build time, then service can start
successfully in boot time.
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Upstream-Status: Backport [https://github.com/COVESA/dlt-daemon/pull/720/commits/bc03f142507da92add8ba325fdf8187d47a7d719]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
systemd/CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 16cbe86b5..659378d16 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -18,10 +18,14 @@ if(WITH_SYSTEMD)
set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${SYSTEMD_UNITDIR} )
if(WITH_SYSTEMD_WATCHDOG)
- set( DLT_WatchdogSec 2 )
+ if(NOT DEFINED DLT_WatchdogSec)
+ set(DLT_WatchdogSec 2 CACHE STRING "Watchdog timeout in seconds")
+ endif()
message( STATUS "The systemd watchdog is enabled - timeout is set to ${DLT_WatchdogSec} seconds")
else(WITH_SYSTEMD_WATCHDOG)
- set( DLT_WatchdogSec 0 )
+ if(NOT DEFINED DLT_WatchdogSec)
+ set(DLT_WatchdogSec 0 CACHE STRING "Watchdog timeout in seconds")
+ endif()
message( STATUS "The systemd watchdog is disabled")
endif(WITH_SYSTEMD_WATCHDOG)

94
sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch Normal file
View File

@@ -0,0 +1,94 @@
From bcca4c99394ba422d03a5e76f2a0023ef248824a Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@windriver.com>
Date: Tue, 18 Nov 2014 15:47:22 +0100
Subject: [PATCH 2/4] Don't execute processes as a specific user.
Upstream-Status: Inappropriate [Configuration Specific]
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
systemd/dlt-adaptor-udp.service.cmake | 1 -
systemd/dlt-dbus.service.cmake | 1 -
systemd/dlt-example-user.service.cmake | 1 -
systemd/dlt-receive.service.cmake | 1 -
systemd/dlt-system.service.cmake | 1 -
systemd/dlt.service.cmake | 1 -
6 files changed, 6 deletions(-)
diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake
index 8dac1f2..ecf9f9e 100644
--- a/systemd/dlt-adaptor-udp.service.cmake
+++ b/systemd/dlt-adaptor-udp.service.cmake
@@ -19,9 +19,8 @@ Wants=dlt.service
[Service]
Type=simple
-User=@DLT_USER@
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-adaptor-udp -a @DLT_ADAPTOR_UDP_APPID@ -c @DLT_ADAPTOR_UDP_CTID@ -p @DLT_ADAPTOR_UDP_PORT@
LimitCORE=infinity
[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake
index 9baf3e9..74a7eac 100644
--- a/systemd/dlt-dbus.service.cmake
+++ b/systemd/dlt-dbus.service.cmake
@@ -20,7 +20,6 @@ Wants=dlt.service
[Service]
Type=simple
-User=@DLT_USER@
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-dbus
WatchdogSec=@DLT_WatchdogSec@
NotifyAccess=main
diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake
index b665742..35009b0 100644
--- a/systemd/dlt-example-user.service.cmake
+++ b/systemd/dlt-example-user.service.cmake
@@ -21,6 +21,5 @@ Wants=dlt.service
[Service]
Type=simple
-User=@DLT_USER@
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from COVESA DLT example user application"
-LimitCORE=infinity
\ No newline at end of file
+LimitCORE=infinity
diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake
index c07d447..8f88f00 100644
--- a/systemd/dlt-receive.service.cmake
+++ b/systemd/dlt-receive.service.cmake
@@ -20,6 +20,5 @@ Wants=dlt.service
[Service]
Type=simple
-User=@DLT_USER@
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-receive -o /tmp/dlt_receive_log.dlt localhost
-LimitCORE=infinity
\ No newline at end of file
+LimitCORE=infinity
diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake
index 0e91f42..1a5b913 100755
--- a/systemd/dlt-system.service.cmake
+++ b/systemd/dlt-system.service.cmake
@@ -20,7 +20,6 @@ Wants=dlt.service
[Service]
Type=simple
-User=@DLT_USER@
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-system
WatchdogSec=@DLT_WatchdogSec@
NotifyAccess=main
diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake
index 0b3ee2c..e4753a2 100755
--- a/systemd/dlt.service.cmake
+++ b/systemd/dlt.service.cmake
@@ -19,7 +19,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5)
[Service]
Type=simple
-User=@DLT_USER@
ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon
WatchdogSec=@DLT_WatchdogSec@
NotifyAccess=main

24
sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0004-Modify-systemd-config-directory.patch Normal file
View File

@@ -0,0 +1,24 @@
From 9a5e655cf57301008cd61d53c8a410a7f397e650 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@windriver.com>
Date: Tue, 18 Nov 2014 15:51:30 +0100
Subject: [PATCH 4/4] Modify systemd config directory
Upstream-Status: Inappropriate [Configuration Specific]
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
systemd/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6b44a2..0e885bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,7 +201,7 @@ if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL)
set(systemd_SRCS ${PROJECT_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c)
- set(SYSTEMD_UNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" CACHE PATH
+ set(SYSTEMD_UNITDIR "/lib/systemd/system" CACHE PATH
"Set directory to install systemd unit files")
add_subdirectory(systemd)

80
sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch Normal file
View File

@@ -0,0 +1,80 @@
Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544]
From 8121a979026d5fcb05bd4e5d3a0647f321b56106 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Thu, 28 Sep 2023 12:54:23 +0200
Subject: [PATCH] Add common dlt_cdh_cpuinfo.c to unblock build on non amd64
and i386 arcs
---
src/core_dump_handler/dlt_cdh.h | 2 ++
src/core_dump_handler/dlt_cdh_cpuinfo.c | 33 +++++++++++++++++++++++++
src/core_dump_handler/dlt_cdh_crashid.c | 2 +-
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 src/core_dump_handler/dlt_cdh_cpuinfo.c
diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
index d572ecf3..8608c6c4 100644
--- a/src/core_dump_handler/dlt_cdh.h
+++ b/src/core_dump_handler/dlt_cdh.h
@@ -55,6 +55,8 @@ typedef struct
uint64_t pc;
uint64_t ip;
uint64_t lr;
+ uint64_t sp;
+ uint64_t fp;
} cdh_registers_t;
diff --git a/src/core_dump_handler/dlt_cdh_cpuinfo.c b/src/core_dump_handler/dlt_cdh_cpuinfo.c
new file mode 100644
index 00000000..03509fda
--- /dev/null
+++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c
@@ -0,0 +1,33 @@
+/*
+ * SPDX license identifier: MPL-2.0
+ *
+ * Copyright (C) 2011-2015, BMW AG
+ *
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
+ *
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License (MPL), v. 2.0.
+ * If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * For further information see http://www.covesa.org/.
+ */
+
+/*!
+ * \author Gianfranco Costamagna <locutusofborg@debian.org>
+ *
+ * \copyright Copyright © 2011-2015 BMW AG. \n
+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
+ *
+ * \file dlt_cdh_cpuinfo.c
+ */
+
+#include "dlt_cdh_cpuinfo.h"
+
+void get_registers(prstatus_t *prstatus, cdh_registers_t *registers)
+{
+/* struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg;
+
+ registers->pc = ptr_reg->pc;*/ /* [REG_PROC_COUNTER]; */
+
+}
diff --git a/src/core_dump_handler/dlt_cdh_crashid.c b/src/core_dump_handler/dlt_cdh_crashid.c
index bca44e0e..8dd98d70 100644
--- a/src/core_dump_handler/dlt_cdh_crashid.c
+++ b/src/core_dump_handler/dlt_cdh_crashid.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <asm/prctl.h>
+#include <sys/prctl.h>
#include <inttypes.h>
#include "dlt_cdh.h"

36
sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/567.patch Normal file
View File

@@ -0,0 +1,36 @@
Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/567]
From c84e48f6986054cf8b9459e608235b7bd1635746 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Mon, 13 Nov 2023 12:37:23 +0100
Subject: [PATCH] dlt_cdh:
Make sure on 64 bit we read an ELF64 structure.
Otherwise we get a read error, and the context file is missing some good
to know information
---
src/core_dump_handler/dlt_cdh.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
index 8608c6c4..3dac480a 100644
--- a/src/core_dump_handler/dlt_cdh.h
+++ b/src/core_dump_handler/dlt_cdh.h
@@ -45,10 +45,17 @@
#define CORE_FILE_PATTERN "%s/core.%d.%s.%d.gz"
#define CONTEXT_FILE_PATTERN "%s/context.%d.%s.%d.txt"
+#if ((__SIZEOF_POINTER) == 4)
#define ELF_Ehdr Elf32_Ehdr
#define ELF_Phdr Elf32_Phdr
#define ELF_Shdr Elf32_Shdr
#define ELF_Nhdr Elf32_Nhdr
+#else
+#define ELF_Ehdr Elf64_Ehdr
+#define ELF_Phdr Elf64_Phdr
+#define ELF_Shdr Elf64_Shdr
+#define ELF_Nhdr Elf64_Nhdr
+#endif
typedef struct
{

74
sources/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb Normal file
View File

@@ -0,0 +1,74 @@
SUMMARY = "Diagnostic Log and Trace"
DESCRIPTION = "This component provides a standardised log and trace interface, \
based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \
This component can be used by COVESA components and other applications as \
logging facility providing: \
- the DLT shared library \
- the DLT daemon, including startup scripts \
- the DLT daemon adaptors- the DLT client console utilities \
- the DLT test applications"
HOMEPAGE = "https://www.covesa.global/"
SECTION = "console/utils"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea"
DEPENDS = "zlib gzip-native json-c"
SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0004-Modify-systemd-config-directory.patch \
file://544.patch \
file://567.patch \
file://0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch \
"
SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
S = "${WORKDIR}/git"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \
dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \
udp-connection dlt-system dlt-filetransfer "
# dlt-dbus
# General options
PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF"
# Linux options
PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF -DWITH_DLT_SYSTEM=OFF,systemd"
PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd"
PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd"
PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib"
PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF"
# Command line options
PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF"
PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF"
PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF"
PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF"
PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF"
PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF"
inherit autotools gettext cmake pkgconfig systemd
# -DWITH_DLT_COREDUMPHANDLER=ON this feature is too experimental, disable for now
#FILES:${PN} += "${libdir}/sysctl.d"
EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}"
PACKAGES += "${PN}-systemd"
SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-system', 'dlt-system.service', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-dbus', 'dlt-dbus.service', '', d)}"
SYSTEMD_AUTO_ENABLE:${PN} = "enable"
SYSTEMD_SERVICE:${PN}-systemd = " \
${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples', 'dlt-example-user.service', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples dlt-console', 'dlt-receive.service', '', d)} \
"
SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable"
FILES:${PN}-doc += "${datadir}/dlt-filetransfer"
do_install:append() {
rm -f ${D}${bindir}/dlt-test-*
}

30
sources/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb Normal file
View File

@@ -0,0 +1,30 @@
SUMMARY = "C++11 port of docopt command-line interface description language and parser"
DESCRIPTION = "docopt is library that lets you define a command line interface with the \
utility argument syntax that has been used by command line utilities for \
decades (formalized in POSIX.1-2017). From the description, docopt \
automatically generates a parser for the command line arguments."
HOMEPAGE = "https://github.com/docopt/docopt.cpp"
LICENSE = "MIT | BSL-1.0"
LIC_FILES_CHKSUM = "\
file://LICENSE-Boost-1.0;md5=e4224ccaecb14d942c71d31bef20d78c \
file://LICENSE-MIT;md5=4b242fd9ef20207e18286d73da8a6677 \
"
SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196"
PV = "0.6.3+git"
SRC_URI = "\
git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \
"
S = "${WORKDIR}/git"
inherit cmake
PACKAGECONFIG ??= ""
PACKAGECONFIG[boost] = "-DUSE_BOOST_REGEX=ON,-DUSE_BOOST_REGEX=OFF,boost"
BBCLASSEXTEND = "native nativesdk"

40
sources/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb Normal file
View File

@@ -0,0 +1,40 @@
SUMMARY = "Duktape embeddable Javascript engine"
DESCRIPTION = "Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint."
HOMEPAGE = "https://duktape.org"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b7825df97b52f926fc71300f7880408"
SRC_URI = "https://duktape.org/duktape-${PV}.tar.xz \
file://run-ptest \
"
inherit ptest
SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890"
EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR='/${baselib}'"
do_compile () {
oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}"
}
do_compile_ptest() {
oe_runmake -f Makefile.hello INSTALL_PREFIX="${prefix}" DESTDIR="${D}"
oe_runmake -f Makefile.eval INSTALL_PREFIX="${prefix}" DESTDIR="${D}"
oe_runmake -f Makefile.eventloop INSTALL_PREFIX="${prefix}" DESTDIR="${D}"
}
do_install () {
oe_runmake -f Makefile.sharedlibrary INSTALL_PREFIX="${prefix}" DESTDIR="${D}" install
# libduktaped is identical to libduktape but has an hard-coded -g build flags, remove it
rm -f ${D}${libdir}/libduktaped.so*
}
do_install_ptest() {
install -m 0755 "${WORKDIR}/duktape-2.7.0/hello" "${D}${PTEST_PATH}"
install -m 0755 "${WORKDIR}/duktape-2.7.0/eval" "${D}${PTEST_PATH}"
install -m 0755 "${WORKDIR}/duktape-2.7.0/evloop" "${D}${PTEST_PATH}"
install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}"
install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}"
}
RDEPENDS:${PN}-ptest += "make"

32
sources/meta-openembedded/meta-oe/recipes-extended/duktape/files/run-ptest Normal file
View File

@@ -0,0 +1,32 @@
#!/bin/sh
./hello &> $test.output 2>&1
out="Hello world!"
if grep -i "$out" $test.output 2>&1 ; then
echo "PASS: Hello duktape"
else
echo "FAIL: Hello duktape"
fi
rm -f $test.output
./eval "print('Hello world!'); 123;" > out.log
sed -n '2p' out.log > eval.log
sed -n '3p' out.log >> eval.log
if grep -w 'Hello world!\|123' eval.log 2>&1; then
echo "PASS: eval duktape"
else
echo "FAIL: eval duktape"
fi
rm -f eval.log out.log
./evloop timer-test.js > evloop.log 2>&1
if grep -i "no active timers and no sockets to poll" evloop.log 2>&1; then
echo "PASS: evloop duktape"
else
echo "FAIL: evloop duktape"
fi
rm -f evloop.log

15
sources/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb Normal file
View File

@@ -0,0 +1,15 @@
SUMMARY = "Simple wrapper script which proxies signals to a child"
HOMEPAGE = "https://github.com/Yelp/dumb-init/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c"
SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf"
SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'"
do_install() {
install -d ${D}${base_sbindir}
install ${S}/dumb-init ${D}${base_sbindir}/
}

24
sources/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/0001-Fix-builds-with-recent-gettext.patch Normal file
View File

@@ -0,0 +1,24 @@
From 771cd2a12db8b8c9a558f1a04958df8ed614f2e0 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 20 Dec 2019 14:06:50 +0100
Subject: [PATCH] Fix builds with recent gettext
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index dedabd6..8833ac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
# along with Enscript. If not, see <http://www.gnu.org/licenses/>.
#
-SUBDIRS = intl compat afm afmlib lib scripts src po states docs w32
+SUBDIRS = compat afm afmlib lib scripts src po states docs w32
EXTRA_DIST = README.ESCAPES README.DOS ascii.txt \
asciifise.txt asciidkno.txt 88591.txt 88592.txt 88593.txt 88594.txt \

27
sources/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch Normal file
View File

@@ -0,0 +1,27 @@
From faec0206611f8ea4ca6f70987866077ac8c3c6c1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 21:24:27 -0700
Subject: [PATCH] getopt: Include string.h for strcmp/stcncmp functions
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
compat/getopt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/compat/getopt.c b/compat/getopt.c
index 752f28a..9b984b4 100644
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -43,6 +43,7 @@
#endif
#include <stdio.h>
+#include <string.h> /* strcmp */
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
--
2.37.3

118
sources/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch Normal file
View File

@@ -0,0 +1,118 @@
autoconf no longer supports AM_C_PROTOTYPES
| configure.ac:14: error: automatic de-ANSI-fication support has been removed
| /bitbake_build/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:10: AM_C_PROTOTYPES is expanded from...
Upstream-Status: Pending
Author: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Index: enscript-1.6.6/configure.ac
===================================================================
--- enscript-1.6.6.orig/configure.ac
+++ enscript-1.6.6/configure.ac
@@ -11,7 +11,6 @@ AC_PROG_INSTALL
AC_PROG_CC
AC_USE_SYSTEM_EXTENSIONS
-AM_C_PROTOTYPES
AC_C_CONST
AC_FUNC_ALLOCA
Index: enscript-1.6.6/afmlib/afm.h
===================================================================
--- enscript-1.6.6.orig/afmlib/afm.h
+++ enscript-1.6.6/afmlib/afm.h
@@ -24,11 +24,7 @@
#define AFM_H
#ifndef ___P
-#if PROTOTYPES
#define ___P(protos) protos
-#else /* no PROTOTYPES */
-#define ___P(protos) ()
-#endif /* no PROTOTYPES */
#endif
/**********************************************************************
Index: enscript-1.6.6/afmlib/afmint.h
===================================================================
--- enscript-1.6.6.orig/afmlib/afmint.h
+++ enscript-1.6.6/afmlib/afmint.h
@@ -34,11 +34,7 @@
#include <stdio.h>
#ifndef ___P
-#if PROTOTYPES
#define ___P(protos) protos
-#else /* no PROTOTYPES */
-#define ___P(protos) ()
-#endif /* no PROTOTYPES */
#endif
#if STDC_HEADERS
Index: enscript-1.6.6/afmlib/strhash.h
===================================================================
--- enscript-1.6.6.orig/afmlib/strhash.h
+++ enscript-1.6.6/afmlib/strhash.h
@@ -24,11 +24,7 @@
#define STRHASH_H
#ifndef ___P
-#if PROTOTYPES
#define ___P(protos) protos
-#else /* no PROTOTYPES */
-#define ___P(protos) ()
-#endif /* no PROTOTYPES */
#endif
typedef struct stringhash_st *StringHashPtr;
Index: enscript-1.6.6/compat/xalloc.h
===================================================================
--- enscript-1.6.6.orig/compat/xalloc.h
+++ enscript-1.6.6/compat/xalloc.h
@@ -28,11 +28,7 @@
#define XALLOC_H
#ifndef ___P
-#if PROTOTYPES
#define ___P(protos) protos
-#else /* no PROTOTYPES */
-#define ___P(protos) ()
-#endif /* no PROTOTYPES */
#endif
void *xmalloc ___P ((size_t size));
Index: enscript-1.6.6/src/gsint.h
===================================================================
--- enscript-1.6.6.orig/src/gsint.h
+++ enscript-1.6.6/src/gsint.h
@@ -39,11 +39,7 @@
#include <sys/stat.h>
#ifndef ___P
-#if PROTOTYPES
#define ___P(protos) protos
-#else /* no PROTOTYPES */
-#define ___P(protos) ()
-#endif /* no PROTOTYPES */
#endif
#if STDC_HEADERS
Index: enscript-1.6.6/states/defs.h
===================================================================
--- enscript-1.6.6.orig/states/defs.h
+++ enscript-1.6.6/states/defs.h
@@ -37,11 +37,7 @@
#include <ctype.h>
#ifndef ___P
-#if PROTOTYPES
#define ___P(protos) protos
-#else /* no PROTOTYPES */
-#define ___P(protos) ()
-#endif /* no PROTOTYPES */
#endif
#if STDC_HEADERS

26
sources/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb Normal file
View File

@@ -0,0 +1,26 @@
SUMMARY = "A plain ASCII to PostScript converter"
DESCRIPTION = "GNU enscript is a free replacement for Adobe''s Enscript \
program. Enscript converts ASCII files to PostScript(TM) and spools generated \
PostScript output to the specified printer or saves it to a file. Enscript can \
be extended to handle different output media and includes many options for \
customizing printouts."
HOMEPAGE = "http://www.gnu.org/software/enscript/"
SECTION = "console/utils"
LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
file://enscript-autoconf.patch \
file://0001-Fix-builds-with-recent-gettext.patch \
file://0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch \
"
inherit autotools gettext
EXTRA_OECONF += "PERL='${USRBINPATH}/env perl'"
SRC_URI[md5sum] = "3acc242b829adacabcaf28533f049afd"
SRC_URI[sha256sum] = "6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb"
RDEPENDS:${PN} = "perl"

68
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch Normal file
View File

@@ -0,0 +1,68 @@
From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
Date: Sat, 23 Sep 2023 11:32:18 +0200
Subject: [PATCH] cmake: fix when cross compiling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In order to generate protobuf files CMake need to use the protoc
and grpc-cpp-plugin compiled for the host architecture.
Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake
configuration file are the one for the target architecture.
Fix this by properly finding the correct executable when
CMake is cross compiling.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
Upstream-Status: Pending
CMakeLists.txt | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5aa1310..80ebad2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE)
endif()
endif()
+# When cross compiling we look for the native protoc compiler
+# overwrite protobuf::protoc with the proper protoc
+if(CMAKE_CROSSCOMPILING)
+ find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc)
+ if(NOT TARGET protobuf::protoc)
+ add_executable(protobuf::protoc IMPORTED)
+ endif()
+ set_target_properties(protobuf::protoc PROPERTIES
+ IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}")
+endif()
+
find_package(gRPC QUIET)
-if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin)
+if(gRPC_FOUND AND TARGET gRPC::grpc)
+ # When cross compiling we look for the native grpc_cpp_plugin
+ if(CMAKE_CROSSCOMPILING)
+ find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin)
+ if(NOT TARGET gRPC::grpc_cpp_plugin)
+ add_executable(gRPC::grpc_cpp_plugin IMPORTED)
+ endif()
+ set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES
+ IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}")
+ elseif(TARGET gRPC::grpc_cpp_plugin)
+ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION)
+ else()
+ message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined")
+ endif()
+
set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++)
- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION)
get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES)
else()
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake)
--
2.39.3 (Apple Git-145)

27
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb Normal file
View File

@@ -0,0 +1,27 @@
DESCRIPTION = "C++ API for etcd's v3 client API"
HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3"
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 \
file://0001-cmake-fix-when-cross-compiling.patch \
"
SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96"
inherit cmake
DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native"
S = "${WORKDIR}/git"
EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON"
do_install:append() {
sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/cmake/etcd-cpp-api/etcd-targets.cmake
}
SOLIBS = ".so"
FILES_SOLIBSDEV = ""

51
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/0001-test_lib.sh-remove-gobin-requirement-during-build.patch Normal file
View File

@@ -0,0 +1,51 @@
From a57d78a94e7cbc8cfa468b58c7d4e23668c05fec Mon Sep 17 00:00:00 2001
From: Andrew Geissler <geissonator@yahoo.com>
Date: Tue, 2 May 2023 13:36:36 -0600
Subject: [PATCH] test_lib.sh: remove gobin requirement during build
This tool is installed as a part of the build process (build.sh sources
test_lib.sh)
This tool has been removed in the latest etcd main branch. Installing it
as a part of the build process breaks bitbake (it doesn't allow
downloading of packages once in the build steps).
This tool is not needed to build etcd (it appears to be used for some
optional test cases).
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
Upstream-Status: Pending
scripts/test_lib.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh
index 44b9d2895..da97a9c26 100644
--- a/scripts/test_lib.sh
+++ b/scripts/test_lib.sh
@@ -140,7 +140,7 @@ function run {
command=("${command[@]@Q}")
if [[ "${rpath}" != "." && "${rpath}" != "" ]]; then
repro="(cd ${rpath} && ${command[*]})"
- else
+ else
repro="${command[*]}"
fi
@@ -305,7 +305,11 @@ function tool_exists {
# Ensure gobin is available, as it runs majority of the tools
if ! command -v "gobin" >/dev/null; then
- run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1
+ # This script is run as a part of the build process. Installing packages
+ # during the build process is not allowed in bitbake.
+ # Gobin is deprecated and not needed when building in the bitbake env
+ echo "Not installing gobin in bitbake env"
+ # run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1
fi
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error)
--
2.37.1 (Apple Git-137.1)

205
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/0001-xxhash-bump-to-v2.1.2.patch Normal file
View File

@@ -0,0 +1,205 @@
From e99ee73e7660689203b83fab6b26c400191b145c Mon Sep 17 00:00:00 2001
From: Andrew Geissler <geissonator@yahoo.com>
Date: Fri, 24 Mar 2023 10:00:35 -0500
Subject: [PATCH] xxhash: bump to v2.1.2
There is a known issue in v2.1.1:
https://github.com/cespare/xxhash/issues/54
Fix that issue by bumping to the version with the fix.
This has been fixed in upstream etcd via the following:
https://github.com/etcd-io/etcd/commit/f0f77fc14e3bd4d94a953b490e810a06ef36695a
But it was a pretty major upgrade so just take the one piece we need for
the etcd v3.5 release tag.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
---
Upstream-Status: Pending
client/v3/go.mod | 2 +-
client/v3/go.sum | 2 ++
etcdctl/go.mod | 2 +-
etcdctl/go.sum | 3 ++-
etcdutl/go.mod | 2 +-
etcdutl/go.sum | 3 ++-
go.mod | 2 +-
go.sum | 3 ++-
server/go.mod | 2 +-
server/go.sum | 3 ++-
tests/go.mod | 2 +-
tests/go.sum | 3 ++-
12 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/client/v3/go.mod b/client/v3/go.mod
index ec286316a..6e72eb067 100644
--- a/client/v3/go.mod
+++ b/client/v3/go.mod
@@ -15,7 +15,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
diff --git a/client/v3/go.sum b/client/v3/go.sum
index 024078504..8866fabba 100644
--- a/client/v3/go.sum
+++ b/client/v3/go.sum
@@ -14,6 +14,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
diff --git a/etcdctl/go.mod b/etcdctl/go.mod
index 2101ed78e..3a727b492 100644
--- a/etcdctl/go.mod
+++ b/etcdctl/go.mod
@@ -23,7 +23,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
diff --git a/etcdctl/go.sum b/etcdctl/go.sum
index 980aca775..765a77e72 100644
--- a/etcdctl/go.sum
+++ b/etcdctl/go.sum
@@ -38,8 +38,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
diff --git a/etcdutl/go.mod b/etcdutl/go.mod
index 24fd3f1bb..7f7ad8bc4 100644
--- a/etcdutl/go.mod
+++ b/etcdutl/go.mod
@@ -36,7 +36,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
diff --git a/etcdutl/go.sum b/etcdutl/go.sum
index 7d3675855..4c894740e 100644
--- a/etcdutl/go.sum
+++ b/etcdutl/go.sum
@@ -37,8 +37,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
diff --git a/go.mod b/go.mod
index 3df2c43e1..f794ab8d2 100644
--- a/go.mod
+++ b/go.mod
@@ -39,7 +39,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7 // indirect
github.com/cockroachdb/errors v1.9.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
diff --git a/go.sum b/go.sum
index 7bb455e8b..e2e07cfe4 100644
--- a/go.sum
+++ b/go.sum
@@ -50,8 +50,9 @@ github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
diff --git a/server/go.mod b/server/go.mod
index 46dcfad08..ab635e592 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -47,7 +47,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
diff --git a/server/go.sum b/server/go.sum
index 8f78c3864..c4fbfac25 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
diff --git a/tests/go.mod b/tests/go.mod
index b578bbf02..45820817c 100644
--- a/tests/go.mod
+++ b/tests/go.mod
@@ -46,7 +46,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/creack/pty v1.1.11 // indirect
diff --git a/tests/go.sum b/tests/go.sum
index 203bf65d6..46c18c31f 100644
--- a/tests/go.sum
+++ b/tests/go.sum
@@ -39,8 +39,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
--
2.37.1 (Apple Git-137.1)

37
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-existing.conf Normal file
View File

@@ -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'

9
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.path Normal file
View File

@@ -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

15
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd-new.service Normal file
View File

@@ -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

15
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd/etcd.service Normal file
View File

@@ -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

73
sources/meta-openembedded/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb Normal file
View File

@@ -0,0 +1,73 @@
DESCRIPTION = "etcd is a distributed key-value store for distributed systems"
HOMEPAGE = "https://etcd.io/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
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"
UPSTREAM_CHECK_COMMITS = "1"
GO_IMPORT = "go.etcd.io/etcd/v3"
GO_INSTALL = "src/${GO_IMPORT}/"
RDEPENDS:${PN}-dev = " \
bash \
"
export GO111MODULE="on"
inherit go systemd pkgconfig features_check
# Go based binaries do not handle being stripped
INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_SYSROOT_STRIP = "1"
# network is required by go to get dependent packages
do_compile[network] = "1"
# Need to build etcd out of where it is extracted to
# Need to directly call build script vs. "make build"
# because "make build" executes the generated binaries
# at the end of the build which do not run correctly
# when cross compiling for another machine
go_do_compile:prepend() {
cd ${GO_INSTALL}
./build.sh
# Lots of discussion in go community about how it sets packages to
# read-only by default -> https://github.com/golang/go/issues/31481
# etcd is going to need some upstream work to support it.
# For now, set the packages which are read-only back to
# writeable so things like "bitbake -c cleanall etcd" will work.
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}${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"

252
sources/meta-openembedded/meta-oe/recipes-extended/figlet/figlet/0001-build-add-autotools-support-to-allow-easy-cross-comp.patch Normal file
View File

@@ -0,0 +1,252 @@
From 902b022c03ad6769abe4d7e6fde1df7a883857ef Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Tue, 24 Mar 2020 14:44:54 +0100
Subject: [PATCH] build: add autotools support to allow easy cross-compilation
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Upstream-Status: Inappropriate [upstream uses a custom Makefile and builds on
linux as well as Windows. I'm not sure autotools
would be preferred as a general solution but it
works well enough for yocto.]
---
Makefile | 122 ---------------------------------------------------
Makefile.am | 67 ++++++++++++++++++++++++++++
configure.ac | 23 ++++++++++
3 files changed, 90 insertions(+), 122 deletions(-)
delete mode 100644 Makefile
create mode 100644 Makefile.am
create mode 100644 configure.ac
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e92bcaf..0000000
--- a/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# Makefile for figlet version 2.2.4 (26 Jan 2011)
-# adapted from Makefile for figlet version 2.2.2 (05 July 2005)
-# adapted from Makefile for figlet version 2.2 (15 Oct 1996)
-# Copyright 1993, 1994,1995 Glenn Chappell and Ian Chai
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan
-# Copyright 2002 Christiaan Keet
-# Copyright 2011 Claudio Matsuoka
-
-# Please notice that to follow modern standards and ease third-party
-# package creation, binaries are now installed under BINDIR, and DESTDIR
-# is reserved for the installation pathname prefix.
-#
-# Please make sure BINDIR, MANDIR, DEFAULTFONTDIR and
-# DEFAULTFONTFILE are defined to reflect the situation
-# on your computer. See README for details.
-
-# Don't change this even if your shell is different. The only reason
-# for changing this is if sh is not in the same place.
-SHELL = /bin/sh
-
-# The C compiler and linker to use
-CC = gcc
-CFLAGS = -g -O2 -Wall -Wno-unused-value
-LD = gcc
-LDFLAGS =
-
-# Feature flags:
-# define TLF_FONTS to use TOIlet TLF fonts
-XCFLAGS = -DTLF_FONTS
-
-# Where to install files
-prefix = /usr/local
-
-# Where the executables should be put
-BINDIR = $(prefix)/bin
-
-# Where the man page should be put
-MANDIR = $(prefix)/man
-
-# Where figlet will search first for fonts (the ".flf" files).
-DEFAULTFONTDIR = $(prefix)/share/figlet
-# Use this definition if you can't put things in $(prefix)/share/figlet
-#DEFAULTFONTDIR = fonts
-
-# The filename of the font to be used if no other is specified,
-# without suffix.(standard is recommended, but any other can be
-# used). This font file should reside in the directory specified
-# by DEFAULTFONTDIR.
-DEFAULTFONTFILE = standard
-
-##
-## END OF CONFIGURATION SECTION
-##
-
-VERSION = 2.2.5
-DIST = figlet-$(VERSION)
-OBJS = figlet.o zipio.o crc.o inflate.o utf8.o
-BINS = figlet chkfont figlist showfigfonts
-MANUAL = figlet.6 chkfont.6 figlist.6 showfigfonts.6
-DFILES = Makefile Makefile.tc $(MANUAL) $(OBJS:.o=.c) chkfont.c getopt.c \
- figlist showfigfonts CHANGES FAQ README LICENSE figfont.txt \
- crc.h inflate.h zipio.h utf8.h run-tests.sh figmagic
-
-.c.o:
- $(CC) -c $(CFLAGS) $(XCFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \
- -DDEFAULTFONTFILE=\"$(DEFAULTFONTFILE)\" -o $*.o $<
-
-all: $(BINS)
-
-figlet: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $(OBJS)
-
-chkfont: chkfont.o
- $(LD) $(LDFLAGS) -o $@ chkfont.o
-
-clean:
- rm -f *.o *~ core figlet chkfont
-
-install: all
- mkdir -p $(DESTDIR)$(BINDIR)
- mkdir -p $(DESTDIR)$(MANDIR)/man6
- mkdir -p $(DESTDIR)$(DEFAULTFONTDIR)
- cp $(BINS) $(DESTDIR)$(BINDIR)
- cp $(MANUAL) $(DESTDIR)$(MANDIR)/man6
- cp fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
- cp fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
-
-dist:
- rm -Rf $(DIST) $(DIST).tar.gz
- mkdir $(DIST)/
- cp $(DFILES) $(DIST)/
- mkdir $(DIST)/fonts
- cp fonts/*.fl[fc] $(DIST)/fonts
- mkdir $(DIST)/tests
- cp tests/*txt tests/emboss.tlf $(DIST)/tests
- tar cvf - $(DIST) | gzip -9c > $(DIST).tar.gz
- rm -Rf $(DIST)
- tar xf $(DIST).tar.gz
- (cd $(DIST); make all check vercheck)
- @rm -Rf $(DIST)
- @echo
- @ls -l $(DIST).tar.gz
-
-check:
- @echo "Run tests in `pwd`"
- @./run-tests.sh fonts
- @echo
-
-vercheck:
- @printf "Infocode: "; ./figlet -I1
- @./figlet -v|sed -n '/Version/s/.*\(Version\)/\1/p'
- @printf "README: "; head -1 < README|sed 's/.*) //'
- @printf "FAQ: "; grep latest FAQ|sed 's/ and can.*//'
- @grep -h "^\.TH" *.6
-
-$(OBJS) chkfont.o getopt.o: Makefile
-chkfont.o: chkfont.c
-crc.o: crc.c crc.h
-figlet.o: figlet.c zipio.h
-getopt.o: getopt.c
-inflate.o: inflate.c inflate.h
-zipio.o: zipio.c zipio.h inflate.h crc.h
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7feb42c
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,67 @@
+AM_CFLAGS = -include $(top_builddir)/config.h -Wall -Wextra -g
+
+bin_PROGRAMS = figlet chkfont
+dist_bin_SCRIPTS = figlist showfigfonts
+
+figlet_SOURCES = figlet.c zipio.c crc.c inflate.c utf8.c
+chkfont_SOURCES = chkfont.c
+
+fontdir = $(prefix)/share/figlet
+dist_font_DATA = \
+ fonts/646-ca2.flc \
+ fonts/646-fr.flc \
+ fonts/646-no.flc \
+ fonts/8859-4.flc \
+ fonts/bubble.flf \
+ fonts/lean.flf \
+ fonts/smscript.flf \
+ fonts/utf8.flc \
+ fonts/646-ca.flc \
+ fonts/646-gb.flc \
+ fonts/646-pt2.flc \
+ fonts/8859-5.flc \
+ fonts/digital.flf \
+ fonts/mini.flf \
+ fonts/smshadow.flf \
+ fonts/646-cn.flc \
+ fonts/646-hu.flc \
+ fonts/646-pt.flc \
+ fonts/8859-7.flc \
+ fonts/frango.flc \
+ fonts/mnemonic.flf \
+ fonts/smslant.flf \
+ fonts/646-cu.flc \
+ fonts/646-irv.flc \
+ fonts/646-se2.flc \
+ fonts/8859-8.flc \
+ fonts/hz.flc \
+ fonts/moscow.flc \
+ fonts/standard.flf \
+ fonts/646-de.flc \
+ fonts/646-it.flc \
+ fonts/646-se.flc \
+ fonts/8859-9.flc \
+ fonts/ilhebrew.flc \
+ fonts/script.flf \
+ fonts/term.flf \
+ fonts/646-dk.flc \
+ fonts/646-jp.flc \
+ fonts/646-yu.flc \
+ fonts/banner.flf \
+ fonts/ivrit.flf \
+ fonts/shadow.flf \
+ fonts/upper.flc \
+ fonts/646-es2.flc \
+ fonts/646-kr.flc \
+ fonts/8859-2.flc \
+ fonts/big.flf \
+ fonts/jis0201.flc \
+ fonts/slant.flf \
+ fonts/ushebrew.flc \
+ fonts/646-es.flc \
+ fonts/646-no2.flc \
+ fonts/8859-3.flc \
+ fonts/block.flf \
+ fonts/koi8r.flc \
+ fonts/small.flf \
+ fonts/uskata.flc
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..72154e2
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,23 @@
+AC_PREREQ(2.61)
+
+AC_INIT([figlet], 2.2.5)
+
+AC_CONFIG_AUX_DIR([autostuff])
+AC_CONFIG_MACRO_DIRS([m4])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AC_CONFIG_SRCDIR([figlet.c])
+AC_CONFIG_HEADER([config.h])
+
+AC_DEFINE([DEFAULTFONTDIR], ["/usr/share/figlet"], [Default font directory])
+AC_DEFINE([DEFAULTFONTFILE], ["standard"], [Default font])
+
+AM_PROG_AR
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_HEADER_STDC
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
--
2.25.0

15
sources/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb Normal file
View File

@@ -0,0 +1,15 @@
SUMMARY = "FIGlet is a program that creates large characters out of ordinary screen characters"
HOMEPAGE = "http://www.figlet.org/"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857"
SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \
file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch"
SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3"
S = "${WORKDIR}/git"
PV = "2.2.5+git"
inherit autotools
BBCLASSEXTEND = "native nativesdk"

14
sources/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb Normal file
View File

@@ -0,0 +1,14 @@
DESCRIPTION = "This repository contains a number of commandline utilities for use inside Flatpak sandboxes."
HOMEPAGE = "http://flatpak.org"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=main"
SRCREV = "5ba39872f81bf8d98d58c5f8acb86604645be468"
S = "${WORKDIR}/git"
inherit meson pkgconfig
DEPENDS = "glib-2.0"

28
sources/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch Normal file
View File

@@ -0,0 +1,28 @@
From 3a1ab02d821cd4b0af44c0dad87e290ebaabef83 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Wed, 14 Dec 2022 06:50:40 +0100
Subject: [PATCH] flatpak.pc: add pc_sysrootdir
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
Upstream-Status: Inappropriate [oe-specific]
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 4a0b865e..5f69b1d9 100644
--- a/meson.build
+++ b/meson.build
@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}'
pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir'))
pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir'))
-pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/'
+pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/'
pkgconfig_variables += 'httpbackend=' + get_option('http_backend')
pkgconfig.generate(
--
2.34.1

78
sources/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb Normal file
View File

@@ -0,0 +1,78 @@
DESCRIPTION = "Desktop containment framework."
HOMEPAGE = "http://flatpak.org"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = " \
gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \
file://0001-flatpak-pc-add-pc_sysrootdir.patch \
"
SRCREV = "925c80f913d69e7ca424428823e1431c4ffb0deb"
S = "${WORKDIR}/git"
inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check
REQUIRED_DISTRO_FEATURES = "polkit"
DEPENDS = " \
appstream \
bison-native \
dconf \
fuse3 \
gdk-pixbuf \
glib-2.0 \
gpgme \
json-glib \
libarchive \
libcap \
libxml2 \
ostree \
polkit \
python3-pyparsing-native \
zstd \
"
RDEPENDS:${PN} = " \
ca-certificates \
dconf \
flatpak-xdg-utils \
"
GIR_MESON_OPTION = "gir"
GIR_MESON_ENABLE_FLAG = 'enabled'
GIR_MESON_DISABLE_FLAG = 'disabled'
GTKDOC_MESON_OPTION = 'gtkdoc'
GTKDOC_MESON_ENABLE_FLAG = 'enabled'
GTKDOC_MESON_DISABLE_FLAG = 'disabled'
PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl"
PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native"
PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native"
PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4"
PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native"
PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth"
PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp"
PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,libselinux"
PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols"
PACKAGECONFIG ?= " \
curl \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \
"
EXTRA_OEMESON = "-Dsystem_fusermount=${bindir}/fusermount3"
FILES:${PN} += "${libdir} ${datadir}"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
do_install:append() {
chmod 0700 ${D}/${datadir}/polkit-1/rules.d
chown polkitd ${D}/${datadir}/polkit-1/rules.d
chgrp root ${D}/${datadir}/polkit-1/rules.d
}

70
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch Normal file
View File

@@ -0,0 +1,70 @@
From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001
From: Paulo Neves <ptsneves@gmail.com>
Date: Thu, 28 Jul 2022 11:28:41 +0200
Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target
$< is a private detail from the Makefile generated by CMakefile and
are not under control or to be used at the CMakeLists level. In 3.20
that private generation changed pre-requisite targets[1] and now logs
contain the path compiler_depend.ts instead of the actual file.
Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
---
CMakeLists.txt | 6 +-----
lib/chunkio/CMakeLists.txt | 7 +------
lib/cmetrics/CMakeLists.txt | 7 +------
3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dba5a8..d94b988 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,11 +46,7 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
endif()
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
-endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
index bbe1f39..809ea93 100644
--- a/lib/chunkio/CMakeLists.txt
+++ b/lib/chunkio/CMakeLists.txt
@@ -14,12 +14,7 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ")
endif()
-# Set __FILENAME__
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
-endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
include(cmake/macros.cmake)
diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
index 60e8774..e3d6149 100644
--- a/lib/cmetrics/CMakeLists.txt
+++ b/lib/cmetrics/CMakeLists.txt
@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3)
set(CMT_VERSION_PATCH 5)
set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
-# Define __FILENAME__ consistently across Operating Systems
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
-else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
-endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
# Configuration options
option(CMT_DEV "Enable development mode" No)

34
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch Normal file
View File

@@ -0,0 +1,34 @@
From f645128082117a0152a95b3dccd869a184b7513f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 10 Aug 2022 01:23:48 -0700
Subject: [PATCH 1/2] Use posix strerror_r with musl
Default with glibc is GNU extention of strerror_r
where as musl uses posix variant, call that out
Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/flb_network.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/flb_network.c b/src/flb_network.c
index 992eb1d..5d7a337 100644
--- a/src/flb_network.c
+++ b/src/flb_network.c
@@ -506,7 +506,12 @@ static int net_connect_async(int fd,
}
/* Connection is broken, not much to do here */
+#ifdef __GLIBC__
str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
+#else
+ strerror_r(error, so_error_buf, sizeof(so_error_buf));
+ str = so_error_buf;
+#endif
flb_error("[net] TCP connection failed: %s:%i (%s)",
u->tcp_host, u->tcp_port, str);
return -1;
--
2.37.1

28
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch Normal file
View File

@@ -0,0 +1,28 @@
From 0d22024c5defba7007e3e633753790e20209c6f6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 Aug 2022 09:59:41 -0700
Subject: [PATCH 1/5] monkey: Define _GNU_SOURCE for memmem API check
This define is necessary to get this API on glibc based systems
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/monkey/mk_core/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/monkey/mk_core/CMakeLists.txt b/lib/monkey/mk_core/CMakeLists.txt
index 0e74f8d..739fff3 100644
--- a/lib/monkey/mk_core/CMakeLists.txt
+++ b/lib/monkey/mk_core/CMakeLists.txt
@@ -62,6 +62,7 @@ set(src "${src}"
)
check_c_source_compiles("
+ #define _GNU_SOURCE
#include <string.h>
int main() {
char haystack[] = \"1234\";
--
2.37.1

30
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch Normal file
View File

@@ -0,0 +1,30 @@
From 63dbbad5978e5f5b0e7d42614999cb6b4ebcce10 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 10 Aug 2022 01:27:16 -0700
Subject: [PATCH 2/2] chunkio: Link with fts library with musl
Fixes
cio_utils.c:(.text+0x64): undefined reference to `fts_read'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
lib/chunkio/src/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/chunkio/src/CMakeLists.txt b/lib/chunkio/src/CMakeLists.txt
index a4fc2d3..4244eb8 100644
--- a/lib/chunkio/src/CMakeLists.txt
+++ b/lib/chunkio/src/CMakeLists.txt
@@ -13,6 +13,7 @@ set(src
)
set(libs cio-crc32)
+set(libs ${libs} fts)
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(src
--
2.37.1

28
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch Normal file
View File

@@ -0,0 +1,28 @@
From 71dab751a27a2e582b711de22873065dd28f4b65 Mon Sep 17 00:00:00 2001
From: Paulo Neves <ptsneves@gmail.com>
Date: Thu, 28 Jul 2022 11:42:31 +0200
Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories
Including the source dir in the header makes the header not
reproducible and contaminates it with host builder paths. Instead
make it take CMAKE_DEBUG_SRCDIR that can be set to a known
reproducible value
---
Upstream-Status: Pending
include/fluent-bit/flb_info.h.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in
index a89485c..2579afc 100644
--- a/include/fluent-bit/flb_info.h.in
+++ b/include/fluent-bit/flb_info.h.in
@@ -23,7 +23,7 @@
#define STR_HELPER(s) #s
#define STR(s) STR_HELPER(s)
-#define FLB_SOURCE_DIR "@CMAKE_SOURCE_DIR@"
+#define FLB_SOURCE_DIR "@CMAKE_DEBUG_SRCDIR@"
/* General flags set by CMakeLists.txt */
@FLB_BUILD_FLAGS@

40
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch Normal file
View File

@@ -0,0 +1,40 @@
From c7b969d1a2a6b61bd179214ee2516b7b6cd55b27 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 Aug 2022 11:21:57 -0700
Subject: [PATCH 2/5] mbedtls: Remove unused variable
Fixes
library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
lib/mbedtls-2.28.0/library/bignum.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
index 62e7f76..9c256ae 100644
--- a/lib/mbedtls-2.28.0/library/bignum.c
+++ b/lib/mbedtls-2.28.0/library/bignum.c
@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
mbedtls_mpi_uint *d,
mbedtls_mpi_uint b )
{
- mbedtls_mpi_uint c = 0, t = 0;
+ mbedtls_mpi_uint c = 0;
#if defined(MULADDC_HUIT)
for( ; i >= 8; i -= 8 )
@@ -1443,8 +1443,6 @@ void mpi_mul_hlp( size_t i,
}
#endif /* MULADDC_HUIT */
- t++;
-
while( c != 0 )
{
*d += c; c = ( *d < c ); d++;
--
2.37.1

32
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch Normal file
View File

@@ -0,0 +1,32 @@
From 2d12629f768d2459b1fc8a8ca0c38024d84bc195 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 Aug 2022 11:32:12 -0700
Subject: [PATCH 3/5] mbedtls: Disable documentation warning as error with
clang
There are shortcomings with doxygen info which clang-15+ flags, dont
treat them as errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
lib/mbedtls-2.28.0/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/mbedtls-2.28.0/CMakeLists.txt b/lib/mbedtls-2.28.0/CMakeLists.txt
index b33c088..c5f886f 100644
--- a/lib/mbedtls-2.28.0/CMakeLists.txt
+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
@@ -212,7 +212,7 @@ if(CMAKE_COMPILER_IS_GNU)
endif(CMAKE_COMPILER_IS_GNU)
if(CMAKE_COMPILER_IS_CLANG)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
--
2.37.1

34
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch Normal file
View File

@@ -0,0 +1,34 @@
From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
From: Paulo Neves <ptsneves@gmail.com>
Date: Thu, 28 Jul 2022 14:37:18 +0200
Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
bitbake passes CFLAGS that are often in conflict with the ones set
in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
FORTIFY_SOURCE=2 except in release mode
Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
---
lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
1 file changed, 2 deletions(-)
--- a/lib/mbedtls-2.28.0/CMakeLists.txt
+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
endif()
- set(CMAKE_C_FLAGS_RELEASE "-O2")
- set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
@@ -215,8 +213,6 @@ endif(CMAKE_COMPILER_IS_GNU)
if(CMAKE_COMPILER_IS_CLANG)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
- set(CMAKE_C_FLAGS_RELEASE "-O2")
- set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
set(CMAKE_C_FLAGS_ASAN "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
set(CMAKE_C_FLAGS_ASANDBG "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")

45
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch Normal file
View File

@@ -0,0 +1,45 @@
From a797b79483940ed4adcaa5fe2c40dd0487c7c2c7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 Aug 2022 11:39:08 -0700
Subject: [PATCH 4/5] Use correct type to store return from flb_kv_item_create
Fix
error: incompatible pointer to integer conversion assigning to 'int' from 'struct flb_kv *'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
plugins/out_stackdriver/stackdriver_conf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/out_stackdriver/stackdriver_conf.c b/plugins/out_stackdriver/stackdriver_conf.c
index a9a8eb0..e4f969e 100644
--- a/plugins/out_stackdriver/stackdriver_conf.c
+++ b/plugins/out_stackdriver/stackdriver_conf.c
@@ -176,12 +176,12 @@ static int read_credentials_file(const char *cred_file, struct flb_stackdriver *
static int parse_configuration_labels(struct flb_stackdriver *ctx)
{
- int ret;
char *p;
flb_sds_t key;
flb_sds_t val;
struct mk_list *head;
struct flb_slist_entry *entry;
+ struct flb_kv *ret;
msgpack_object_kv *kv = NULL;
if (ctx->labels) {
@@ -216,7 +216,7 @@ static int parse_configuration_labels(struct flb_stackdriver *ctx)
flb_sds_destroy(key);
flb_sds_destroy(val);
- if (ret == -1) {
+ if (!ret) {
return -1;
}
}
--
2.37.1

63
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch Normal file
View File

@@ -0,0 +1,63 @@
From 7a792624925d46690c1f07fe4b194b5f4c510db6 Mon Sep 17 00:00:00 2001
From: Paulo Neves <ptsneves@gmail.com>
Date: Tue, 2 Aug 2022 09:57:05 +0200
Subject: [PATCH 1/1] build: Make systemd init systemd detection contingent on
pkgconfig
Use pkg-config to get systemd.pc variables and systemdunitdir. Those
variable ensure that .service files are installed in the correct paths
and only when systemd is detected.
Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/5818]
---
cmake/FindJournald.cmake | 4 ++++
src/CMakeLists.txt | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
index f5a3a832b..9e6657a29 100644
--- a/cmake/FindJournald.cmake
+++ b/cmake/FindJournald.cmake
@@ -5,6 +5,8 @@
# JOURNALD_INCLUDE_DIR - the Journald include directory
# JOURNALD_LIBRARIES - Link these to use Journald
# JOURNALD_DEFINITIONS - Compiler switches required for using Journald
+# SYSTEMD_UNITDIR - The systemd units' directory
+#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
@@ -16,7 +18,9 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
pkg_check_modules(PC_JOURNALD QUIET systemd)
+pkg_get_variable(PC_SYSTEMD_UNITDIR systemd "systemdsystemunitdir")
+set(SYSTEMD_UNITDIR ${PC_SYSTEMD_UNITDIR})
set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 522bbf9bd..30743d8d6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -480,13 +480,13 @@ if(FLB_BINARY)
endif()
# Detect init system, install upstart, systemd or init.d script
- if(IS_DIRECTORY /lib/systemd/system)
+ if(DEFINED SYSTEMD_UNITDIR)
set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
configure_file(
"${PROJECT_SOURCE_DIR}/init/systemd.in"
${FLB_SYSTEMD_SCRIPT}
)
- install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
+ install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
elseif(IS_DIRECTORY /usr/share/upstart)
set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
--
2.25.1

33
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch Normal file
View File

@@ -0,0 +1,33 @@
From 27f0bd5a3339612e03112e6b490900a9fabc3337 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 Aug 2022 11:44:25 -0700
Subject: [PATCH 5/5] stackdriver: Fix return type mismatch
Fix
error: incompatible integer to pointer conversion returning 'int' from a function with result type 'flb_sds_t' (aka 'char *') [-Wint-conversion]
return -1;
^~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
plugins/out_stackdriver/stackdriver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/out_stackdriver/stackdriver.c b/plugins/out_stackdriver/stackdriver.c
index ae66bf2..e01755c 100644
--- a/plugins/out_stackdriver/stackdriver.c
+++ b/plugins/out_stackdriver/stackdriver.c
@@ -2033,7 +2033,7 @@ static flb_sds_t stackdriver_format(struct flb_stackdriver *ctx,
flb_sds_destroy(operation_producer);
msgpack_unpacked_destroy(&result);
msgpack_sbuffer_destroy(&mp_sbuf);
- return -1;
+ return NULL;
}
/* Number of parsed labels */
--
2.37.1

36
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch Normal file
View File

@@ -0,0 +1,36 @@
From f88d9b82e8bd8ae38fba666b5825ffb41769f81a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 Aug 2022 12:25:22 -0700
Subject: [PATCH] monkey: Fix TLS detection testcase
Clang15 errors out on compiling the check and disables TLS
Fixes errors like
error: call to undeclared function '__tls_get_addr'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
__tls_get_addr(0);
^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
lib/monkey/CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
index 15e62e8..96ac2bd 100644
--- a/lib/monkey/CMakeLists.txt
+++ b/lib/monkey/CMakeLists.txt
@@ -178,6 +178,8 @@ endif()
# Use old Pthread TLS
if(NOT MK_PTHREAD_TLS)
check_c_source_compiles("
+ #include <sys/types.h>
+ extern void *__tls_get_addr(size_t *v);
__thread int a;
int main() {
__tls_get_addr(0);
--
2.37.1

46
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch Normal file
View File

@@ -0,0 +1,46 @@
From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 23 Mar 2023 18:05:27 -0700
Subject: [PATCH] cmake: Do not check for upstart on build host
Some ubuntu distros might have this directory /usr/share/upstart around
and yocto based distros not using systemd will process this piece of
code and falsely assume that target supports upstart, which may not be
true in case of cross-compilation.
This also can end up in configure errors e.g.
| CMake Error at src/CMakeLists.txt:496 (install):
| install DIRECTORY given unknown argument "/etc/td-agent-bit/".
|
|
| -- Configuring incomplete, errors occurred!
Upstream-Status: Inappropriate [ Cross-compile Specific ]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/CMakeLists.txt | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb30b2a..c63b6d8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -486,14 +486,6 @@ if(FLB_BINARY)
)
install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
- elseif(IS_DIRECTORY /usr/share/upstart)
- set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
- configure_file(
- "${PROJECT_SOURCE_DIR}/init/upstart.in"
- ${FLB_UPSTART_SCRIPT}
- )
- install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
- install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
else()
# FIXME: should we support Sysv init script ?
endif()
--
2.40.0

92
sources/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb Normal file
View File

@@ -0,0 +1,92 @@
SUMMARY = "Fast Log processor and Forwarder"
DESCRIPTION = "Fluent Bit is a data collector, processor and \
forwarder for Linux. It supports several input sources and \
backends (destinations) for your data. \
"
HOMEPAGE = "http://fluentbit.io"
BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
SECTION = "net"
SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV};downloadfilename=${BPN}-${PV}.tar.gz \
file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \
file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \
file://0004-build-Make-systemd-init-systemd-detection-contingent.patch \
file://0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch \
file://0002-mbedtls-Remove-unused-variable.patch \
file://0003-mbedtls-Disable-documentation-warning-as-error-with-.patch \
file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
file://0005-stackdriver-Fix-return-type-mismatch.patch \
file://0006-monkey-Fix-TLS-detection-testcase.patch \
file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \
"
SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
SRC_URI:append:libc-musl = "\
file://0001-Use-posix-strerror_r-with-musl.patch \
file://0002-chunkio-Link-with-fts-library-with-musl.patch \
"
SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540"
S = "${WORKDIR}/fluent-bit-${PV}"
DEPENDS = "zlib bison-native flex-native openssl"
DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[yaml] = "-DFLB_CONFIG_YAML=On,-DFLB_CONFIG_YAML=Off,libyaml"
PACKAGECONFIG[kafka] = "-DFLB_OUT_KAFKA=On,-DFLB_OUT_KAFKA=Off,librdkafka"
PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=On,-DFLB_EXAMPLES=Off"
PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=On,-DFLB_JEMALLOC=Off,jemalloc"
#TODO add more fluentbit options to PACKAGECONFIG[]
DEPENDS:append:libc-musl = " fts "
# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
do_compile:append() {
find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
}
PACKAGECONFIG ?= "yaml"
LTO = ""
# Use CMake 'Unix Makefiles' generator
OECMAKE_GENERATOR ?= "Unix Makefiles"
# Fluent Bit build options
# ========================
# Host related setup
EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_TD=1"
# Disable LuaJIT and filter_lua support
EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
# Disable Library and examples
EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off"
# Enable systemd iff systemd is in DISTRO_FEATURES
EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','-DFLB_SYSTEMD=Off',d)}"
# Enable release builds
EXTRA_OECMAKE += "-DFLB_RELEASE=On"
# musl needs these options
EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefix=je_ --with-lg-quantum=3" -DFLB_CORO_STACK_SIZE=24576'
EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
inherit cmake systemd pkgconfig
SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"

28
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch Normal file
View File

@@ -0,0 +1,28 @@
From a2ac966813fdc04b788be9c8474a4c5e36c109a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 6 Mar 2018 21:53:26 +0100
Subject: [PATCH] reduce build to conversion tools for native build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 9241ce5..b24e291 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = config m4 term src docs man demo share
+SUBDIRS = docs
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
PATCHLEVEL PGPKEYS README RELEASE_NOTES \

31
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch Normal file
View File

@@ -0,0 +1,31 @@
From a2ac966813fdc04b788be9c8474a4c5e36c109a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 6 Mar 2018 21:53:26 +0100
Subject: [PATCH] Do not build demos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 7e2c400..a8dbf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = config m4 term src docs man demo share
+SUBDIRS = config m4 term src docs man share
EXTRA_DIST = BUGS Copyright FAQ.pdf INSTALL INSTALL.gnu \
PATCHLEVEL PGPKEYS README RELEASE_NOTES \
--
2.31.1

119
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch Normal file
View File

@@ -0,0 +1,119 @@
From 1128a98fd1676981e536d8773f363cb832cfa6bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 6 Mar 2018 22:28:56 +0100
Subject: [PATCH] Use native tools to build docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Upstream-Status: Pending
docs/Makefile.am | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index b20918a..47406eb 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -156,7 +156,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms
### doc2xxx dependencies
gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ms "$(srcdir)/titlepag.ms"
+ $(AM_V_GEN) doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ms "$(srcdir)/titlepag.ms"
doc2ms_SOURCES = doc2ms.c termdoc.c
doc2ms_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
@@ -177,10 +177,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
$(AM_V_GEN)touch $@
figures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN)./doc2tex$(EXEEXT) -figures $(srcdir)/gnuplot.doc $@
+ $(AM_V_GEN) doc2tex$(EXEEXT) -figures $(srcdir)/gnuplot.doc $@
nofigures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN)./doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc $@
+ $(AM_V_GEN) doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc $@
pdf: gnuplot.pdf
pdf_nofig: nofigures.pdf
@@ -260,7 +260,7 @@ gnuplot.ps: gnuplot.dvi
hlp: gnuplot.hlp
gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN)./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
+ $(AM_V_GEN)doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
doc2hlp_SOURCES = doc2hlp.c termdoc.c
@@ -268,14 +268,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c
gih: gnuplot.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ $(AM_V_GEN)doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
doc2gih_SOURCES = doc2gih.c termdoc.c
# To include all terminals in the .gih file
allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
@echo "generate gnuplot.gih with all terminals"
- $(AM_V_at)./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ $(AM_V_at)alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
alldoc2gih_SOURCES = doc2gih.c termdoc.c
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
@@ -290,7 +290,7 @@ $(srcdir)/windows/wgnuplot.hhk
wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk wxhelp/*.html windows/*.png
wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/
+ $(AM_V_GEN) doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/
doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h
doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS)
@@ -340,7 +340,7 @@ install-info: gnuplot.info
ipf: gnuplot.ipf
gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf
+ $(AM_V_GEN) doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf
doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
@@ -348,7 +348,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c
rtf: gnuplot.rtf
gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf
+ $(AM_V_GEN) doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf
doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c
@@ -356,13 +356,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c
rnh: gnuplot.rnh
gnuplot.rnh: doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc
- $(AM_V_GEN) ./doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rnh
+ $(AM_V_GEN) doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rnh
doc2rnh_SOURCES = doc2rnh.c termdoc.c
# this is how to check the gnuplot.doc file
check-local: checkdoc$(EXEEXT)
- $(AM_V_at)./checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \
+ $(AM_V_at)checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \
if test $$? -eq 0; then \
echo "PASS: gnuplot.doc"; \
else \
--
2.14.3

42
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch Normal file
View File

@@ -0,0 +1,42 @@
From 577e21622475fa29fd471149cf2380c53fdbfcbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 6 Mar 2018 22:26:48 +0100
Subject: [PATCH] Add configure option to find qt5 native tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Pkg-config checks for target locations. With these qt5 tools as uic/moc..
cannot be used.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index cdd831a..fdd192b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1133,11 +1133,15 @@ if test "${enable_qt}" = yes ; then
else
try_qt4=yes
fi
+ AC_ARG_WITH(qt5nativesysroot,
+ AC_HELP_STRING([--with-qt5nativesysroot=PATH], [prepend path - for native qt5 tools]),
+ [QT5NATIVESYSROOT="$withval"], [QT5NATIVESYSROOT=""])
+
if test "x${with_qt}" != "xqt4"; then
PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport])
if test $pkg_failed = no; then
try_qt4=no
- QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core`
+ QT5LOC=${QT5NATIVESYSROOT}`$PKG_CONFIG --variable=host_bins Qt5Core`
if test "x${QT5LOC}" != "x"; then
UIC=${QT5LOC}/uic
MOC=${QT5LOC}/moc
--
2.14.3

8
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop Normal file
View File

@@ -0,0 +1,8 @@
[Desktop Entry]
Name=Gnuplot
Comment=Plot data and function graphs
Exec=gnuplot
Terminal=true
Type=Application
Icon=gnuplot
Categories=Science;

BIN
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

71
sources/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb Normal file
View File

@@ -0,0 +1,71 @@
SUMMARY = "Gnuplot is a portable command-line driven graphing utility"
DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
(text or binary) and function plotting utility."
HOMEPAGE = "http://www.gnuplot.info/"
SECTION = "console/scientific"
LICENSE = "gnuplot"
LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
DEPENDS = "${BPN}-native virtual/libx11 gd readline"
inherit autotools features_check pkgconfig
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;name=archive \
http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
file://gnuplot.desktop \
file://gnuplot.png \
"
SRC_URI:append:class-target = " \
file://0002-do-not-build-demos.patch \
file://0003-Use-native-tools-to-build-docs.patch \
file://0004-Add-configure-option-to-find-qt5-native-tools.patch \
"
SRC_URI[archive.sha256sum] = "51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84"
SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
# for building docs (they deserve it) we need *doc2* tools native
BBCLASSEXTEND = "native"
DEPENDS:class-native = "readline-native"
PACKAGECONFIG:class-native = ""
SRC_URI:append:class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch"
do_install:class-native() {
install -d ${D}${bindir}
install ${B}/docs/*doc* ${D}${bindir}
rm ${D}${bindir}/*.o
}
PACKAGECONFIG ??= "cairo"
PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native"
EXTRA_OECONF = " \
--with-readline=${STAGING_LIBDIR}/.. \
--disable-wxwidgets \
--without-libcerf \
"
do_compile:prepend() {
install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
}
do_install:append:class-target() {
install -d ${D}${datadir}/applications/
install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
install -d ${D}${datadir}/pixmaps/
install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
}
PACKAGES =+ "${PN}-x11"
RPROVIDES:${PN}-dbg += "${PN}-x11-dbg"
DESCRIPTION:${PN}-x11 = "X11 display terminal for Gnuplot."
SECTION:${PN}-x11 = "x11/scientific"
FILES:${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 "
FILES:${PN} += "${datadir}/texmf"

25
sources/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb Normal file
View File

@@ -0,0 +1,25 @@
SUMMARY = "haveged - A simple entropy daemon"
DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpredictable random number generator based upon an adaptation of the HAVEGE algorithm. Haveged was created to remedy low-entropy conditions in the Linux random device that can occur under some workloads, especially on headless servers."
HOMEPAGE = "https://www.issihosts.com/haveged/index.html"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
# v1.9.17
SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2"
SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \
"
S = "${WORKDIR}/git"
UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases"
inherit autotools
EXTRA_OECONF = "\
--enable-nistest=yes \
--enable-olt=yes \
--enable-threads=no \
"
MIPS_INSTRUCTION_SET = "mips"

20
sources/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb Normal file
View File

@@ -0,0 +1,20 @@
SUMMARY = "view and edit files in hexadecimal or in ASCII"
HOMEPAGE = "http://rigaux.org/hexedit.html"
SECTION = "console/utils"
LICENSE = "GPL-2.0-or-later"
DEPENDS = "ncurses"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \
"
SRCREV = "eab92dcaa34b66bc5182772afc9fda4ac8a27597"
S = "${WORKDIR}/git"
inherit autotools-brokensep update-alternatives
ALTERNATIVE:${PN} = "hexedit"
ALTERNATIVE_LINK_NAME[hexedit] = "${bindir}/hexedit"

17
sources/meta-openembedded/meta-oe/recipes-extended/highway/highway_1.1.0.bb Normal file
View File

@@ -0,0 +1,17 @@
SUMMARY = "Highway is a C++ library for SIMD (Single Instruction, Multiple Data)"
HOMEPAGE = "https://github.com/google/highway/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
inherit cmake
SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master"
SRCREV = "58b52a717469e62b2d9b8eaa2f5dddb44d4a4cbf"
S = "${WORKDIR}/git"
EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
CXXFLAGS:append:arm = " -mfp16-format=ieee"
# Option not supported with clang and its default format for __fp16 anyway with clang
CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee"

18
sources/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis/run-ptest Normal file
View File

@@ -0,0 +1,18 @@
#!/bin/sh
TEST_SSL=0 TEST_ASYNC=0 ./test.sh | sed -e 's/PASSED/PASS/g' -e 's/FAILED/FAIL/g' -e 's/SKIPPED/SKIP/g' | awk '
{
gsub(/\x1B\[[0-9;]*m/, "")
if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") {
printf "%s: %s\n", $NF, $0
} else {
print
}
}' | awk '{
if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") {
$NF = ""
print $0
} else {
print
}
}' | awk '{gsub(/:/,"",$NF)}1'

39
sources/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb Normal file
View File

@@ -0,0 +1,39 @@
DESCRIPTION = "Minimalistic C client library for Redis"
HOMEPAGE = "http://github.com/redis/hiredis"
SECTION = "libs"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51"
SRC_URI = " \
git://github.com/redis/hiredis;protocol=https;branch=master \
file://run-ptest \
"
SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8"
S = "${WORKDIR}/git"
inherit cmake ptest
# 'testssl' is not enabled by default as redis recipe does not build with ssl support
# option 'testssl' requires 'ssl'
PACKAGECONFIG ??= "ssl ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test testasync', '', d)}"
PACKAGECONFIG[ssl] = "-DENABLE_SSL=ON, -DENABLE_SSL=OFF, openssl"
PACKAGECONFIG[test] = "-DDISABLE_TESTS=OFF, -DDISABLE_TESTS=ON"
PACKAGECONFIG[testssl] = "-DENABLE_SSL_TESTS=ON, -DENABLE_SSL_TESTS=OFF, openssl"
PACKAGECONFIG[testasync] = "-DENABLE_ASYNC_TESTS=ON, -DENABLE_ASYNC_TESTS=OFF, libevent"
do_install_ptest() {
install ${S}/test.sh ${D}${PTEST_PATH}/
install ${B}/hiredis-test ${D}${PTEST_PATH}/
if ${@bb.utils.contains('PACKAGECONFIG','testssl','true','false',d)}; then
sed -i 's/TEST_SSL=0/TEST_SSL=1/g' ${D}${PTEST_PATH}/run-ptest
fi
if ${@bb.utils.contains('PACKAGECONFIG','testasync','true','false',d)}; then
sed -i 's/TEST_ASYNC=0/TEST_ASYNC=1/g' ${D}${PTEST_PATH}/run-ptest
fi
}
FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build"
RDEPENDS:${PN} = "redis"
RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}"

309
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch Normal file
View File

@@ -0,0 +1,309 @@
From c36f0af7ba75c133edc46f052b291188351b6c20 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 18 Jan 2023 15:49:16 -0800
Subject: [PATCH] Drop using register storage classifier
Its beeing dropped from latest standards beginning C++17
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ip/xjpg_dct.c | 4 +--
ip/xjpg_dct.h | 4 +--
prnt/hpcups/Mode9.cpp | 2 +-
prnt/hpcups/ModeDeltaPlus.cpp | 4 +--
prnt/hpcups/jccolor.c | 46 +++++++++++++++++------------------
prnt/hpijs/compression.cpp | 2 +-
prnt/hpijs/jccolor.c | 44 ++++++++++++++++-----------------
prnt/hpijs/ljfastraster.cpp | 4 +--
prnt/hpps/psutil.c | 6 ++---
9 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c
index 63f021b..1986923 100644
--- a/ip/xjpg_dct.c
+++ b/ip/xjpg_dct.c
@@ -103,7 +103,7 @@
| for the Winograd DCT. |
|____________________________________________________________________________|
*/
-void dct_forward (register int *block_p)
+void dct_forward (int *block_p)
{
#define CONST_FRAC_BITS 14 /* bits of frac in CONST_1-CONST_5 below */
@@ -257,7 +257,7 @@ void dct_forward (register int *block_p)
| and level-shifting, you must clamp these values to 0..255. |
|____________________________________________________________________________|
*/
-void dct_inverse (register int *block_p)
+void dct_inverse (int *block_p)
{
#define CONST_FRAC_BITS 13 /* bits of frac in CONST_1-CONST_5 below */
diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h
index 7dc90f3..149d66f 100644
--- a/ip/xjpg_dct.h
+++ b/ip/xjpg_dct.h
@@ -43,8 +43,8 @@
|____________________________________________________________________________|
*/
-void dct_forward (register int *block_p);
+void dct_forward (int *block_p);
-void dct_inverse (register int *block_p);
+void dct_inverse (int *block_p);
/* End of File */
diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp
index 94ff571..6cc210a 100644
--- a/prnt/hpcups/Mode9.cpp
+++ b/prnt/hpcups/Mode9.cpp
@@ -203,7 +203,7 @@ bool Mode9::Process(RASTERDATA* input)
unsigned int offset,byte_count,rem_count;
Mode9_comtype command;
char* dest= (char*) compressBuf;
- register char *dptr=dest;
+ char *dptr=dest;
while ( size > 0 )
{
diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp
index 4552f4a..6a5837f 100644
--- a/prnt/hpcups/ModeDeltaPlus.cpp
+++ b/prnt/hpcups/ModeDeltaPlus.cpp
@@ -241,8 +241,8 @@ bool ModeDeltaPlus::compress (BYTE *outmem,
const uint32_t inheight,
uint32_t horz_ht_dist)
{
- register BYTE *outptr = outmem;
- register uint32_t col;
+ BYTE *outptr = outmem;
+ uint32_t col;
const BYTE *seedrow;
uint32_t seedrow_count = 0;
uint32_t location = 0;
diff --git a/prnt/hpcups/jccolor.c b/prnt/hpcups/jccolor.c
index 7cc8906..6794575 100644
--- a/prnt/hpcups/jccolor.c
+++ b/prnt/hpcups/jccolor.c
@@ -73,7 +73,7 @@ typedef my_color_converter * my_cconvert_ptr;
/* We allocate one big table and divide it up into eight parts, instead of
* doing eight alloc_small requests. This lets us use a single table base
- * address, which can be held in a register in the inner loops on many
+ * address, which can be held in a in the inner loops on many
* machines (more than can hold all eight addresses, anyway).
*/
@@ -205,11 +205,11 @@ rgb_ycc_convert (j_compress_ptr cinfo,
JDIMENSION output_row, int num_rows)
{
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
- register int r, g, b;
- register INT32 * ctab = cconvert->rgb_ycc_tab;
- register JSAMPROW inptr;
- register JSAMPROW outptr0, outptr1, outptr2;
- register JDIMENSION col;
+ int r, g, b;
+ INT32 * ctab = cconvert->rgb_ycc_tab;
+ JSAMPROW inptr;
+ JSAMPROW outptr0, outptr1, outptr2;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
while (--num_rows >= 0) {
@@ -261,11 +261,11 @@ rgb_gray_convert (j_compress_ptr cinfo,
JDIMENSION output_row, int num_rows)
{
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
- register int r, g, b;
- register INT32 * ctab = cconvert->rgb_ycc_tab;
- register JSAMPROW inptr;
- register JSAMPROW outptr;
- register JDIMENSION col;
+ int r, g, b;
+ INT32 * ctab = cconvert->rgb_ycc_tab;
+ JSAMPROW inptr;
+ JSAMPROW outptr;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
while (--num_rows >= 0) {
@@ -300,11 +300,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo,
JDIMENSION output_row, int num_rows)
{
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
- register int r, g, b;
- register INT32 * ctab = cconvert->rgb_ycc_tab;
- register JSAMPROW inptr;
- register JSAMPROW outptr0, outptr1, outptr2, outptr3;
- register JDIMENSION col;
+ int r, g, b;
+ INT32 * ctab = cconvert->rgb_ycc_tab;
+ JSAMPROW inptr;
+ JSAMPROW outptr0, outptr1, outptr2, outptr3;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
while (--num_rows >= 0) {
@@ -354,9 +354,9 @@ grayscale_convert (j_compress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
JDIMENSION output_row, int num_rows)
{
- register JSAMPROW inptr;
- register JSAMPROW outptr;
- register JDIMENSION col;
+ JSAMPROW inptr;
+ JSAMPROW outptr;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
int instride = cinfo->input_components;
@@ -383,10 +383,10 @@ null_convert (j_compress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
JDIMENSION output_row, int num_rows)
{
- register JSAMPROW inptr;
- register JSAMPROW outptr;
- register JDIMENSION col;
- register int ci;
+ JSAMPROW inptr;
+ JSAMPROW outptr;
+ JDIMENSION col;
+ int ci;
int nc = cinfo->num_components;
JDIMENSION num_cols = cinfo->image_width;
diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp
index fcac793..10194ca 100644
--- a/prnt/hpijs/compression.cpp
+++ b/prnt/hpijs/compression.cpp
@@ -266,7 +266,7 @@ BOOL Mode9::Process(RASTERDATA* input)
unsigned int offset,byte_count,rem_count;
Mode9_comtype command;
char* dest= (char*) compressBuf;
- register char *dptr=dest;
+ char *dptr=dest;
while ( size > 0 )
{
diff --git a/prnt/hpijs/jccolor.c b/prnt/hpijs/jccolor.c
index a6b2333..8486b65 100644
--- a/prnt/hpijs/jccolor.c
+++ b/prnt/hpijs/jccolor.c
@@ -206,11 +206,11 @@ rgb_ycc_convert (j_compress_ptr cinfo,
JDIMENSION output_row, int num_rows)
{
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
- register int r, g, b;
- register INT32 * ctab = cconvert->rgb_ycc_tab;
- register JSAMPROW inptr;
- register JSAMPROW outptr0, outptr1, outptr2;
- register JDIMENSION col;
+ int r, g, b;
+ INT32 * ctab = cconvert->rgb_ycc_tab;
+ JSAMPROW inptr;
+ JSAMPROW outptr0, outptr1, outptr2;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
while (--num_rows >= 0) {
@@ -262,11 +262,11 @@ rgb_gray_convert (j_compress_ptr cinfo,
JDIMENSION output_row, int num_rows)
{
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
- register int r, g, b;
- register INT32 * ctab = cconvert->rgb_ycc_tab;
- register JSAMPROW inptr;
- register JSAMPROW outptr;
- register JDIMENSION col;
+ int r, g, b;
+ INT32 * ctab = cconvert->rgb_ycc_tab;
+ JSAMPROW inptr;
+ JSAMPROW outptr;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
while (--num_rows >= 0) {
@@ -301,11 +301,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo,
JDIMENSION output_row, int num_rows)
{
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
- register int r, g, b;
- register INT32 * ctab = cconvert->rgb_ycc_tab;
- register JSAMPROW inptr;
- register JSAMPROW outptr0, outptr1, outptr2, outptr3;
- register JDIMENSION col;
+ int r, g, b;
+ INT32 * ctab = cconvert->rgb_ycc_tab;
+ JSAMPROW inptr;
+ JSAMPROW outptr0, outptr1, outptr2, outptr3;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
while (--num_rows >= 0) {
@@ -355,9 +355,9 @@ grayscale_convert (j_compress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
JDIMENSION output_row, int num_rows)
{
- register JSAMPROW inptr;
- register JSAMPROW outptr;
- register JDIMENSION col;
+ JSAMPROW inptr;
+ JSAMPROW outptr;
+ JDIMENSION col;
JDIMENSION num_cols = cinfo->image_width;
int instride = cinfo->input_components;
@@ -384,10 +384,10 @@ null_convert (j_compress_ptr cinfo,
JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
JDIMENSION output_row, int num_rows)
{
- register JSAMPROW inptr;
- register JSAMPROW outptr;
- register JDIMENSION col;
- register int ci;
+ JSAMPROW inptr;
+ JSAMPROW outptr;
+ JDIMENSION col;
+ int ci;
int nc = cinfo->num_components;
JDIMENSION num_cols = cinfo->image_width;
diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp
index 8c7073a..7e82fac 100644
--- a/prnt/hpijs/ljfastraster.cpp
+++ b/prnt/hpijs/ljfastraster.cpp
@@ -919,8 +919,8 @@ BOOL ModeDeltaPlus::Compress (HPUInt8 *outmem,
const uint32_t inheight,
uint32_t horz_ht_dist)
{
- register HPUInt8 *outptr = outmem;
- register uint32_t col;
+ HPUInt8 *outptr = outmem;
+ uint32_t col;
const HPUInt8 *seedrow;
uint32_t seedrow_count = 0;
uint32_t location = 0;
diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c
index 7282dc2..87fba4f 100644
--- a/prnt/hpps/psutil.c
+++ b/prnt/hpps/psutil.c
@@ -148,9 +148,9 @@ static int fcopy(long upto)
/* build array of pointers to start/end of pages */
void scanpages(void)
{
- register char *comment = buffer+2;
- register int nesting = 0;
- register long int record;
+ char *comment = buffer+2;
+ int nesting = 0;
+ long int record;
if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL)
message(FATAL, "out of memory\n");
--
2.39.1

40
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0001-Fix-installing-ipp-usb-quirk.patch Normal file
View File

@@ -0,0 +1,40 @@
From 5cfe30829174a18ec64e53c84292a0229ffa5602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
<zboszor@gmail.com>
Date: Thu, 30 Mar 2023 11:31:27 +0200
Subject: [PATCH] Fix installing ipp-usb quirk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Use $(DESTDIR) as installation prefix for
/usr/share/usb-ipp/quirk/HPLIP.conf.
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
Upstream-Status: Pending
Makefile.am | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e10364d..f520225 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -703,10 +703,9 @@ if !DISBALE_IMAGEPROCESSOR_BUILD
ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
fi
endif #DISABLE_IMAGEPROCESSOR
- if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
- echo "ipp-usb directory exists"; \
- cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
- fi
+ install -d -m0755 $(DESTDIR)/usr/share/ipp-usb/quirks ; \
+ echo "ipp-usb directory exists"; \
+ cp prnt/ipp-usb/HPLIP.conf $(DESTDIR)/usr/share/ipp-usb/quirks/
if !HPLIP_CLASS_DRIVER
# If scanner build, add hpaio entry to sane dll.conf.
if [ "$(scan_build)" = "yes" ]; then \
--
2.39.2

44
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0001-common-utils-Include-string.h-for-strcasestr.patch Normal file
View File

@@ -0,0 +1,44 @@
From 20984c73bea8c3df00f297176edd4f6d47c31b55 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 17:49:20 -0700
Subject: [PATCH 1/4] common/utils: Include string.h for strcasestr
Also define _GNU_SOURCE for the same
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
common/utils.c | 2 ++
1 file changed, 2 insertions(+)
--- a/common/utils.c
+++ b/common/utils.c
@@ -1,9 +1,11 @@
+#define _GNU_SOURCE
#include "utils.h"
#include "string.h"
#include <dlfcn.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdlib.h>
+#include <string.h> /* strcasestr */
extern int errno;
--- a/protocol/hp_ipp.c
+++ b/protocol/hp_ipp.c
@@ -18,12 +18,13 @@ Boston, MA 02110-1301, USA.
\******************************************************************************/
-
+#define _GNU_SOURCE
#include <cups/cups.h>
#include <cups/language.h>
#include <cups/ppd.h>
#include <syslog.h>
#include <stdarg.h>
+#include <string.h> /* strcasecmp */
#include <sys/types.h>
#include <pwd.h>
#include <sys/stat.h>

48
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch Normal file
View File

@@ -0,0 +1,48 @@
From 3d53d02af7c45763eb33f7bbe5f9e389fbcb7e21 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 17:55:48 -0700
Subject: [PATCH 2/4] Add ImageProcessor only when DISBALE_IMAGEPROCESSOR_BUILD
is not set
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.am | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 5f75759..73421b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -597,7 +597,11 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
+if !DISBALE_IMAGEPROCESSOR_BUILD
+hpcups_LDADD += "-lImageProcessor"
+endif #DISABLE_IMAGEPROCESSOR
+
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -687,6 +692,7 @@
install-data-hook:
if HPLIP_BUILD
+if !DISBALE_IMAGEPROCESSOR_BUILD
if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
@@ -697,6 +703,7 @@
chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
fi
+endif #DISABLE_IMAGEPROCESSOR
if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
echo "ipp-usb directory exists"; \
cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
--
2.37.3

23
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0003-pserror.c-Define-column-to-be-int-explcitly.patch Normal file
View File

@@ -0,0 +1,23 @@
From a27d6264671e7201b5d78bcc9200e7d946429979 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 17:57:53 -0700
Subject: [PATCH 3/4] pserror.c: Define column to be int explcitly
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
prnt/hpps/pserror.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/prnt/hpps/pserror.c
+++ b/prnt/hpps/pserror.c
@@ -24,7 +24,7 @@ extern char *program ; /* Defined by mai
void message(int flags, char *format, ...)
{
va_list args ;
- static column = 0 ; /* current screen column for message wrap */
+ static int column = 0 ; /* current screen column for message wrap */
char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */
char *bufptr = msgbuf ; /* message buffer pointer */

55
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0004-Define-missing-prototype-for-functions.patch Normal file
View File

@@ -0,0 +1,55 @@
From 33454817880fa57b2226dd40b724e5c3d6074aca Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 17:58:33 -0700
Subject: [PATCH 4/4] Define missing prototype for functions
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
prnt/cupsext/cupsext.c | 1 +
protocol/hp_ipp.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
--- a/prnt/cupsext/cupsext.c
+++ b/prnt/cupsext/cupsext.c
@@ -101,6 +101,11 @@ typedef int Py_ssize_t;
#define _STRINGIZE(x) #x
#define STRINGIZE(x) _STRINGIZE(x)
+void _releaseCupsInstance(void);
+int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, char *model, char *info);
+int setDefaultCupsPrinter(char *pr_name);
+int delCupsPrinter(char *pr_name);
+int controlCupsPrinter(char *pr_name, int op);
//static http_t * http = NULL; /* HTTP object */
--- a/protocol/hp_ipp.c
+++ b/protocol/hp_ipp.c
@@ -22,6 +22,7 @@ Boston, MA 02110-1301, USA.
#include <cups/cups.h>
#include <cups/language.h>
#include <cups/ppd.h>
+#include <stdio.h>
#include <syslog.h>
#include <stdarg.h>
#include <string.h> /* strcasecmp */
@@ -42,7 +43,7 @@ Boston, MA 02110-1301, USA.
#define STRINGIZE(x) _STRINGIZE(x)
-http_t* acquireCupsInstance()
+http_t* acquireCupsInstance(void)
{
if ( http == NULL)
{
@@ -53,7 +54,7 @@ http_t* acquireCupsInstance()
}
-void _releaseCupsInstance()
+void _releaseCupsInstance(void)
{
if (http)
{

64
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch Normal file
View File

@@ -0,0 +1,64 @@
From 4b3014df3990d90d6929510f2bde073171503329 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 18:18:44 -0700
Subject: [PATCH] hp_ipp.c: Add printf format to snprintf calls
Avoid -Wformat warnings
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
protocol/hp_ipp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c
index 597d9b9..a027baf 100644
--- a/protocol/hp_ipp.c
+++ b/protocol/hp_ipp.c
@@ -112,7 +112,7 @@ int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file,
}
if ( info == NULL )
- snprintf( info,sizeof(info), name );
+ snprintf( info,sizeof(info), "%s", name );
sprintf( printer_uri, "ipp://localhost/printers/%s", name );
@@ -513,27 +513,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_t **printer_list)
if ( strcmp(attr_name, "printer-name") == 0 &&
val_tag == IPP_TAG_NAME ) {
- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) );
+ snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) );
}
else if ( strcmp(attr_name, "device-uri") == 0 &&
val_tag == IPP_TAG_URI ) {
- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) );
+ snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) );
}
else if ( strcmp(attr_name, "printer-uri-supported") == 0 &&
val_tag == IPP_TAG_URI ) {
- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) );
+ snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) );
}
else if ( strcmp(attr_name, "printer-info") == 0 &&
val_tag == IPP_TAG_TEXT ) {
- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) );
+ snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) );
}
else if ( strcmp(attr_name, "printer-location") == 0 &&
val_tag == IPP_TAG_TEXT ) {
- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) );
+ snprintf(t_printer->location,sizeof(t_printer->location), "%s", ippGetString(attr, 0, NULL) );
}
else if ( strcmp(attr_name, "printer-make-and-model") == 0 &&
val_tag == IPP_TAG_TEXT ) {
- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) );
+ snprintf(t_printer->make_model,sizeof(t_printer->make_model), "%s", ippGetString(attr, 0, NULL) );
}
else if ( strcmp(attr_name, "printer-state") == 0 &&
val_tag == IPP_TAG_ENUM ) {
--
2.37.3

132
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/0006-Workaround-patch-for-missing-Python3-transition-of-t.patch Normal file
View File

@@ -0,0 +1,132 @@
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Fri, 22 Jul 2016 09:33:04 +0200
Subject: Workaround patch for missing Python3 transition of the old
(pre-USB-storage) photo memory card support (pcardext) as this part builds
in Python3 environments but with pointer-related warnings which are fatal
errors for Ubuntu's build servers. The patch silences the warnings but the
memory card support is dropped in Python3 environments. This patch is
supplied by the HPLIP upstream developers and will be replaced by a more
proper solution in the next upstream release of HPLIP (see LP: #1275353)
---
Upstream-Status: Pending
pcard/pcardext/pcardext.c | 59 +++++++++++++++++++++++++++++++++++++----------
pcard/photocard.py | 2 +-
unload.py | 5 ++++
3 files changed, 53 insertions(+), 13 deletions(-)
--- a/pcard/pcardext/pcardext.c
+++ b/pcard/pcardext/pcardext.c
@@ -20,7 +20,7 @@ pcardext - Python extension for HP photo
Requires:
Python 2.2+
-Author: Don Welch
+Author: Don Welch
\*****************************************************************************/
@@ -41,9 +41,37 @@ typedef int Py_ssize_t;
int verbose=0;
+#if PY_MAJOR_VERSION >= 3
+ #define MOD_ERROR_VAL NULL
+ #define MOD_SUCCESS_VAL(val) val
+ #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+ #define PyInt_AS_LONG PyLong_AS_LONG
+ #define MOD_DEF(ob, name, doc, methods) \
+ static struct PyModuleDef moduledef = { \
+ PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
+ ob = PyModule_Create(&moduledef);
+
+
+ #define PY_String_Bytes PyBytes_FromStringAndSize
+ #define PY_AsString_Bytes PyBytes_AsStringAndSize
+
+#else
+ #define MOD_ERROR_VAL
+ #define MOD_SUCCESS_VAL(val)
+ #define MOD_INIT(name) void init##name(void)
+ #define MOD_DEF(ob, name, doc, methods) \
+ ob = Py_InitModule3(name, methods, doc);
+
+ #define PY_String_Bytes PyString_FromStringAndSize
+ #define PY_AsString_Bytes PyString_AsStringAndSize
+
+#endif
+
PyObject * readsectorFunc = NULL;
PyObject * writesectorFunc = NULL;
+
+
int ReadSector(int sector, int nsector, void *buf, int size)
{
PyObject * result;
@@ -59,9 +87,13 @@ int ReadSector(int sector, int nsector,
if( result )
{
Py_ssize_t len = 0;
- PyString_AsStringAndSize( result, &result_str, &len );
+
+ //PyString_AsStringAndSize( result, &result_str, &len );
+ //PyBytes_AsStringAndSize( result, &result_str, &len );
+ PY_AsString_Bytes( result, &result_str, &len );
- if( len < nsector*FAT_HARDSECT )
+
+ if( len < nsector*FAT_HARDSECT )
{
goto abort;
}
@@ -208,7 +240,9 @@ PyObject * pcardext_read( PyObject * sel
if( FatReadFileExt( name, offset, len, buffer ) == len )
{
- return PyString_FromStringAndSize( (char *)buffer, len );
+ // return PyString_FromStringAndSize( (char *)buffer, len );
+ return PY_String_Bytes( (char *)buffer, len );
+ // return PyBytes_FromStringAndSize( (char *)buffer, len );
}
else
{
@@ -236,14 +270,15 @@ static PyMethodDef pcardext_methods[] =
static char pcardext_documentation[] = "Python extension for HP photocard services";
-void initpcardext( void )
-{
- PyObject * mod = Py_InitModule4( "pcardext", pcardext_methods,
- pcardext_documentation, (PyObject*)NULL,
- PYTHON_API_VERSION );
-
- if (mod == NULL)
- return;
+MOD_INIT(pcardext) {
+
+ PyObject* mod ;
+ MOD_DEF(mod, "pcardext", pcardext_documentation, pcardext_methods);
+ if (mod == NULL)
+ return MOD_ERROR_VAL;
+
+ return MOD_SUCCESS_VAL(mod);
+
}
--- a/unload.py
+++ b/unload.py
@@ -44,6 +44,11 @@ except ImportError:
# Local
from base.g import *
+from base.sixext import PY3
+if PY3:
+ log.error("This functionality is not spported in python3 environment.")
+ sys.exit(1)
+
from base import device, utils, tui, module
from prnt import cups

17
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/030-replace_unsafe_memcpy_with_memmove.patch Normal file
View File

@@ -0,0 +1,17 @@
Upstream-Status: Pending
https://bugs.launchpad.net/hplip/+bug/1672256
memcpy should never be used with overlapping memory regions
--- a/io/hpmud/musb.c
+++ b/io/hpmud/musb.c
@@ -775,7 +775,7 @@ static int device_id(int fd, unsigned ch
len = size-1; /* leave byte for zero termination */
if (len > 2)
len -= 2;
- memcpy(buffer, buffer+2, len); /* remove length */
+ memmove(buffer, buffer+2, len); /* remove length */
buffer[len]=0;
DBG("read actual device_id successfully fd=%d len=%d\n", fd, len);

19
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/050-fix-glibcisms.patch Normal file
View File

@@ -0,0 +1,19 @@
Upstream-Status: Pending
diff --git a/scan/sane/OrbliteScan/LinuxCommon.h b/scan/sane/OrbliteScan/LinuxCommon.h
index 6605dd9..55c7110 100644
--- a/scan/sane/OrbliteScan/LinuxCommon.h
+++ b/scan/sane/OrbliteScan/LinuxCommon.h
@@ -18,10 +18,8 @@ typedef u_int32_t UInt32;
typedef int32_t SInt32;
//typedef unsigned long UInt32;
//typedef signed long SInt32;
-typedef __S64_TYPE SInt64;
-typedef __U64_TYPE UInt64;
-typedef __S64_TYPE int64_t;
-typedef __U64_TYPE uint64_t;
+typedef int64_t SInt64;
+typedef uint64_t UInt64;
//typedef unsigned long ULONG;
//typedef void* LPVOID;

12
sources/meta-openembedded/meta-oe/recipes-extended/hplip/hplip/600-fix.patch Normal file
View File

@@ -0,0 +1,12 @@
Upstream-Status: Pending
--- a/configure.in
+++ b/configure.in
@@ -254,7 +254,6 @@ if test "$class_driver" = "yes"; then
test `sh ./createPPD.sh -f` == 0
else
AC_MSG_RESULT(no)
- test `sh ./createPPD.sh -q` == 0
fi
AM_CONDITIONAL(HPLIP_CLASS_DRIVER, test x$class_driver = xyes)

Some files were not shown because too many files have changed in this diff Show More