diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-25 22:55:05 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 14:22:49 +0000 |
| commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
| tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/meta-openembedded/meta-oe/recipes-extended | |
| parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
| download | talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.gz talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.zip | |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-extended')
128 files changed, 4034 insertions, 1177 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb index ac5f7559b..99b43fa3f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb @@ -39,7 +39,9 @@ SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.g SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac" SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d" -inherit gettext autotools-brokensep pkgconfig +inherit gettext autotools-brokensep pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES += "opengl" S = "${WORKDIR}/${BPN}_release-7.6-${PV}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc new file mode 100644 index 000000000..9bdafd244 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc @@ -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 = "ftp://invisible-island.net/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" + +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 +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch new file mode 100644 index 000000000..7cd2510c8 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -0,0 +1,161 @@ +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> +--- + aclocal.m4 | 1 - + configure | 119 ------------------------------------------------------------- + 2 files changed, 120 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 917a848..62ef241 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1021,7 +1021,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: 2 updated: 2015/07/04 11:16:27 +diff --git a/configure b/configure +index 9707e50..4f0497c 100755 +--- a/configure ++++ b/configure +@@ -1946,125 +1946,6 @@ esac + # This should have been defined by AC_PROG_CC + : ${CC:=cc} + +-echo "$as_me:1949: checking \$CC variable" >&5 +-echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 +-case "$CC" in +-(*[\ \ ]-*) +- echo "$as_me:1953: result: broken" >&5 +-echo "${ECHO_T}broken" >&6 +- { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +-echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} +- # humor him... +- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'` +- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'` +- 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_flags +-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 +- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- continue +- elif test "${cf_tst_cflags}" = "\"'" ; then +- 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 +- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" +- ;; +- esac +- ;; +- (*) +- cf_new_cflags="$cf_new_cflags $cf_add_cflags" +- ;; +- esac +- ;; +-(yes) +- 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 +- +- CFLAGS="$CFLAGS $cf_new_cflags" +-fi +- +-if test -n "$cf_new_cppflags" ; then +- +- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +-fi +- +-if test -n "$cf_new_extra_cppflags" ; then +- +- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +-fi +- +- ;; +- (*) +- CC="$CC $cf_arg" +- ;; +- esac +- done +- test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 +- +-echo "${as_me:-configure}:2051: testing resulting CC: '$CC' ..." 1>&5 +- +- test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 +- +-echo "${as_me:-configure}:2055: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +- +- test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 +- +-echo "${as_me:-configure}:2059: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +- +- ;; +-(*) +- echo "$as_me:2063: result: ok" >&5 +-echo "${ECHO_T}ok" >&6 +- ;; +-esac +- + echo "$as_me:2068: 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.8.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch new file mode 100644 index 000000000..005831130 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch @@ -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 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb new file mode 100644 index 000000000..702c4c99e --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb @@ -0,0 +1,12 @@ +# 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=9176bfb16dab43ebcb8e50d9ee9550b6" +require byacc.inc + +SRC_URI[md5sum] = "4bb274bbd7b648d4251c2b9ca36ed0c9" +SRC_URI[sha256sum] = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91" + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index 70b0983e4..5069a639c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -1,14 +1,18 @@ -From 14d469bc82c758116aef7d549abd49c131b4170f Mon Sep 17 00:00:00 2001 +From b459c55e4968321e5a82272cb39aa69d4054990f 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> + --- configure.ac | 3 +- m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ @@ -16,7 +20,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/configure.ac b/configure.ac -index 8854542..f3a6b57 100644 +index 8854542..edb8cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,6 @@ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) @@ -31,7 +35,7 @@ index 8854542..f3a6b57 100644 AM_CFLAGS="$AM_CFLAGS -Werror" AM_CXXFLAGS="$AM_CXXFLAGS -Werror" fi -+AX_CHECK_COMPILE_FLAG([-Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) ++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]) @@ -117,5 +121,5 @@ index 0000000..dcabb92 +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- -2.12.2 +2.13.4 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb index b7789c7ca..c156ea19c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb @@ -13,8 +13,8 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-fix-to-build-with-glibc-2.25.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ " -SRC_URI[md5sum] = "dc36141ed3058c4919bbd54b87c07873" -SRC_URI[sha256sum] = "7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501" +SRC_URI[md5sum] = "5da2b69c286a064db35c6cc1e758b039" +SRC_URI[sha256sum] = "9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592" inherit autotools pythonnative update-rc.d pkgconfig systemd diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch deleted file mode 100644 index fe4b0793f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 85ea47fedbc96ed9180e08b0d371d9966e3a88da Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 17:28:55 -0700 -Subject: [PATCH] Include fcntl.h for F_* and O_* defines - -Fixes errors like -utils.c:95:22: error: use of undeclared identifier 'O_WRONLY' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - qdevices/utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qdevices/utils.c b/qdevices/utils.c -index 41850b8c..87090853 100644 ---- a/qdevices/utils.c -+++ b/qdevices/utils.c -@@ -39,6 +39,7 @@ - - #include <err.h> - #include <errno.h> -+#include <fcntl.h> - #include <inttypes.h> - #include <libgen.h> - #include <stdio.h> --- -2.14.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb deleted file mode 100644 index c4af00650..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" -DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ -APIs and libraries, default configuration files, and an init script." -HOMEPAGE = "http://corosync.github.io/corosync/" - -SECTION = "base" - -inherit autotools pkgconfig systemd - -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ - file://0001-Include-fcntl.h-for-F_-and-O_-defines.patch \ - " -SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" -SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" - -DEPENDS = "groff-native nss libqb" - -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_NAME = "corosync-daemon" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" - -EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash" -EXTRA_OEMAKE = "tmpfilesdir_DATA=" - -do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) -} - -do_install_append() { - install -d ${D}${sysconfdir}/sysconfig/ - install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync - install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd - - rm -rf "${D}${localstatedir}/run" - - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf - fi -} - -RDEPENDS_${PN} += "bash" - -FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb index bff3d97d2..85dede177 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20160828.bb @@ -8,7 +8,7 @@ DEPENDS = "ncurses" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ +SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " SRC_URI[md5sum] = "a39ec183517bc1feaff017d067300b8c" SRC_URI[sha256sum] = "453095abaec288bfbc1ca9faced917e17742cff1ea45ec46210071ac153562f9" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch deleted file mode 100644 index 69b2f903c..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile ---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200 -+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200 -@@ -55,7 +55,7 @@ - BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += -I../include -I../libdlm - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum - - LIB_CFLAGS += $(BIN_CFLAGS) -diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile ---- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200 -+++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200 -@@ -32,7 +32,7 @@ - BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += -L../libdlm -L../dlm_controld - BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol - -diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile ---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200 -+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200 -@@ -59,7 +59,7 @@ - BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum - - LIB_CFLAGS += $(BIN_CFLAGS) --LIB_LDFLAGS += -Wl,-z,relro -pie -+LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie - - ifeq ($(USE_SD_NOTIFY),yes) - BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb deleted file mode 100644 index 31e411e86..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "dlm control daemon and tool" - -SECTION = "utils" -HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" - -REQUIRED_DISTRO_FEATURES = "systemd" - -SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \ - file://respect-ldflags-also-from-bin_ldflags.patch \ -" - -SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f" -SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e" - -LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" - -DEPENDS = "corosync systemd" - -inherit pkgconfig systemd distro_features_check - -SYSTEMD_SERVICE_${PN} = "dlm.service" -SYSTEMD_AUTO_ENABLE = "enable" - -export EXTRA_OEMAKE = "" - -do_compile_prepend() { - sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile -} - -do_compile () { - oe_runmake 'CC=${CC}' -} - -do_install_append (){ - install -d ${D}${sysconfdir}/sysconfig/ - install -d ${D}${sysconfdir}/init.d/ - install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm - install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm - - # install systemd unit files - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system - fi -} - -do_install() { - oe_runmake install DESTDIR=${D} LIBDIR=${libdir} -} - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr/0001-Remove-extra-const-keywords-gcc-7-gripes-about.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr/0001-Remove-extra-const-keywords-gcc-7-gripes-about.patch deleted file mode 100644 index b6211c28a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr/0001-Remove-extra-const-keywords-gcc-7-gripes-about.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a9f8d414972b0b7c963d7efe38b5cfdcb6413c46 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Mon, 6 Feb 2017 16:34:54 -0500 -Subject: [PATCH] Remove extra const keywords gcc 7 gripes about. - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- - src/efibootdump.c | 2 +- - src/efibootmgr.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/efibootdump.c b/src/efibootdump.c -index 3e448c2..5a9b681 100644 ---- a/src/efibootdump.c -+++ b/src/efibootdump.c -@@ -36,7 +36,7 @@ print_boot_entry(efi_load_option *loadopt, size_t data_size) - uint8_t *optional_data = NULL; - size_t optional_data_len = 0; - uint16_t pathlen; -- const unsigned char const *desc; -+ const unsigned char *desc; - char *raw; - size_t raw_len; - -diff --git a/src/efibootmgr.c b/src/efibootmgr.c -index baefa68..683623b 100644 ---- a/src/efibootmgr.c -+++ b/src/efibootmgr.c -@@ -214,7 +214,7 @@ warn_duplicate_name(list_t *boot_list) - list_t *pos; - var_entry_t *boot; - efi_load_option *load_option; -- const unsigned char const *desc; -+ const unsigned char *desc; - - list_for_each(pos, boot_list) { - boot = list_entry(pos, var_entry_t, list); -@@ -821,7 +821,7 @@ show_boot_vars() - { - list_t *pos; - var_entry_t *boot; -- const unsigned char const *description; -+ const unsigned char *description; - efi_load_option *load_option; - efidp dp = NULL; - unsigned char *optional_data = NULL; --- -2.12.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb index 193150bb9..9cc62a959 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.12.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb @@ -10,19 +10,18 @@ DEPENDS = "pciutils zlib efivar" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "75d25807ba81cb724964c989012611272c8f1f5d" +SRCREV = "5c14da22802576a99ebb854f7aa174f796f7b031" SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ - file://0001-Remove-extra-const-keywords-gcc-7-gripes-about.patch \ " - S = "${WORKDIR}/git" - inherit pkgconfig -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/include `pkg-config --cflags efivar` \ - -DEFIBOOTMGR_VERSION=\"$(RELEASE_MAJOR).$(RELEASE_MINOR)\" '" +EXTRA_OEMAKE = "'EFIDIR=/' 'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/src/include `pkg-config --cflags efivar`'" +CFLAGS_append_toolchain-clang = " -Wno-error" do_install () { - install -D -p -m0755 src/efibootmgr ${D}/${sbindir}/efibootmgr + install -D -p -m0755 ${B}/src/efibootmgr ${D}/${sbindir}/efibootmgr } + +CLEANBROKEN = "1" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch deleted file mode 100644 index 4ae8cb90f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-Remove-some-extra-const-that-gcc-complains-about.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 29a2dea16113b5a8e51de46437c6a9f7426c5867 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Mon, 6 Feb 2017 14:28:19 -0500 -Subject: [PATCH 1/2] Remove some extra "const" that gcc complains about. - -One of these days I'll get these right. - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- - src/include/efivar/efiboot-loadopt.h | 4 ++-- - src/loadopt.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/include/efivar/efiboot-loadopt.h b/src/include/efivar/efiboot-loadopt.h -index 07db5c4..efc29c6 100644 ---- a/src/include/efivar/efiboot-loadopt.h -+++ b/src/include/efivar/efiboot-loadopt.h -@@ -32,8 +32,8 @@ extern ssize_t efi_loadopt_create(uint8_t *buf, ssize_t size, - - extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) - __attribute__((__nonnull__ (1))); --extern const unsigned char const * efi_loadopt_desc(efi_load_option *opt, -- ssize_t limit) -+extern const unsigned char * efi_loadopt_desc(efi_load_option *opt, -+ ssize_t limit) - __attribute__((__visibility__ ("default"))) - __attribute__((__nonnull__ (1))); - extern uint32_t efi_loadopt_attrs(efi_load_option *opt) -diff --git a/src/loadopt.c b/src/loadopt.c -index 64e333f..ec50722 100644 ---- a/src/loadopt.c -+++ b/src/loadopt.c -@@ -336,7 +336,7 @@ teardown(void) - - __attribute__((__nonnull__ (1))) - __attribute__((__visibility__ ("default"))) --const unsigned char const * -+const unsigned char * - efi_loadopt_desc(efi_load_option *opt, ssize_t limit) - { - if (last_desc) { --- -2.12.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch new file mode 100644 index 000000000..1b8815e9d --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch @@ -0,0 +1,32 @@ +From 3d43c5efdb632da5d7387dcadce4e87b83929c64 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 24 Aug 2017 15:54:47 -0700 +Subject: [PATCH] efivar-dp.h: Add -Wunknown-attributes when using clang + +change !dp check to a comparision against NULL to silent clang warning +nonnull parameter 'dp' will evaluate to 'true' on first encounter + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/include/efivar/efivar-dp.h | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +Index: git/src/include/efivar/efivar-dp.h +=================================================================== +--- git.orig/src/include/efivar/efivar-dp.h ++++ git/src/include/efivar/efivar-dp.h +@@ -783,9 +783,14 @@ extern int efidp_append_instance(const_e + * though older or other compilers might just ignore that attribute if they + * don't support it. Ugh. + */ ++#pragma GCC diagnostic push + #if defined(__GNUC__) && __GNUC__ >= 6 + #pragma GCC diagnostic ignored "-Wnonnull-compare" + #endif ++#if defined(__clang__) ++#pragma GCC diagnostic ignored "-Wunknown-attributes" ++#pragma GCC diagnostic ignored "-Wpointer-bool-conversion" ++#endif + + static inline int16_t + __attribute__((__artificial__)) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch new file mode 100644 index 000000000..73a772186 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch @@ -0,0 +1,37 @@ +From 98b33d4193998687aa3a78c097f7bd4c393e0c85 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2017 00:29:42 -0700 +Subject: [PATCH] makeguids: Do not use __bswap_constant_{16|32} macros + +not available on musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/makeguids.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/makeguids.c b/src/makeguids.c +index da2f5f7..daf821a 100644 +--- a/src/makeguids.c ++++ b/src/makeguids.c +@@ -155,13 +155,13 @@ main(int argc, char *argv[]) + #if BYTE_ORDER == BIG_ENDIAN\n\ + #define cpu_to_be32(n) (n)\n\ + #define cpu_to_be16(n) (n)\n\ +-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ + #else\n\ + #define cpu_to_le32(n) (n)\n\ + #define cpu_to_le16(n) (n)\n\ +-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\ +-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\ ++#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000 | (n)<<24))\n\ ++#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\ + #endif\n\ + """); + +-- +2.13.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch deleted file mode 100644 index 737b78b01..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0002-New-gcc-version-new-way-symbol-versioning-breaks.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 31e655d2b5f66e772d9714422b7332bbaa60d2e6 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Mon, 6 Feb 2017 14:41:58 -0500 -Subject: [PATCH 2/2] New gcc version, new way symbol versioning breaks. - -Apparently I get to redo this every time there's a compiler release. -Yaaaaaay. - -Anyway, the current method is to define the two compat things from the -land before time as @libefivar.so.0 symbols and list them there in the -link map. Then we have the real one defined with another name, and set -as efi_set_variable@@LIBEFIVAR_0.24. Then to make there actually be a -efi_set_variable symbol to link against, we create it as a weak alias. - -This is all completely absurd. - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- - src/lib.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/lib.c b/src/lib.c -index 6a9b392..afa7d94 100644 ---- a/src/lib.c -+++ b/src/lib.c -@@ -49,7 +49,7 @@ _efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, - { - return ops->set_variable(guid, name, data, data_size, attributes, 0600); - } --__asm__(".symver _efi_set_variable,_efi_set_variable@"); -+__asm__(".symver _efi_set_variable,_efi_set_variable@libefivar.so.0"); - - int - __attribute__((__nonnull__ (2, 3))) -@@ -59,17 +59,24 @@ _efi_set_variable_variadic(efi_guid_t guid, const char *name, uint8_t *data, - { - return ops->set_variable(guid, name, data, data_size, attributes, 0600); - } --__asm__(".symver _efi_set_variable_variadic,efi_set_variable@"); -+__asm__(".symver _efi_set_variable_variadic,efi_set_variable@libefivar.so.0"); - - int - __attribute__((__nonnull__ (2, 3))) - __attribute__((__visibility__ ("default"))) --efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, -- size_t data_size, uint32_t attributes, mode_t mode) -+_efi_set_variable_mode(efi_guid_t guid, const char *name, uint8_t *data, -+ size_t data_size, uint32_t attributes, mode_t mode) - { - return ops->set_variable(guid, name, data, data_size, attributes, mode); - } --__asm__(".symver efi_set_variable,efi_set_variable@@LIBEFIVAR_0.24"); -+__asm__(".symver _efi_set_variable_mode,efi_set_variable@@LIBEFIVAR_0.24"); -+ -+int -+__attribute__((__nonnull__ (2, 3))) -+__attribute__((__visibility__ ("default"))) -+efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, -+ size_t data_size, uint32_t attributes, mode_t mode) -+ __attribute((weak, alias ("_efi_set_variable_mode"))); - - int - __attribute__((__nonnull__ (2, 3))) --- -2.12.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch deleted file mode 100644 index 951b15921..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0002-disable-static-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 126e0d3c1ad74cf5b0abe9e98ec444bcc3c83159 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen.kooi@linaro.org> -Date: Fri, 4 Mar 2016 14:53:55 +0100 -Subject: [PATCH 2/2] disable static build - -Signed-off-by: Koen Kooi <koen.kooi@linaro.org> - -Upstream-Status: Inappropriate [meta-oe specific] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 1829d22..c7a0ca3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,9 +8,9 @@ include $(TOPDIR)/Make.defaults - - LIBTARGETS=libefivar.so libefiboot.so - STATICLIBTARGETS=libefivar.a libefiboot.a --BINTARGETS=efivar efivar-static -+BINTARGETS=efivar - PCTARGETS=efivar.pc efiboot.pc --TARGETS=$(LIBTARGETS) $(STATICLIBTARGETS) $(BINTARGETS) $(PCTARGETS) -+TARGETS=$(LIBTARGETS) $(BINTARGETS) $(PCTARGETS) - - LIBEFIBOOT_SOURCES = crc32.c creator.c disk.c gpt.c linux.c loadopt.c - LIBEFIBOOT_OBJECTS = $(patsubst %.c,%.o,$(LIBEFIBOOT_SOURCES)) --- -2.4.3 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch index 5d50c1906..96d0c6b3b 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch @@ -23,16 +23,13 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> gcc.specs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gcc.specs b/gcc.specs -index 24fabc2..5b0fdef 100644 ---- a/gcc.specs -+++ b/gcc.specs +Index: git/gcc.specs +=================================================================== +--- git.orig/gcc.specs ++++ git/gcc.specs @@ -14,4 +14,4 @@ + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} *link: --+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-PIE}} %{shared:-z relro -PIC} %{static:%<pie} -++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro -fPIC} %{static:%<pie} --- -2.8.1 - +-+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} +++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch index 1c68a2934..e3fa2e1c1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch @@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> gcc.specs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/gcc.specs b/gcc.specs -index 0d4bbda..3802ca6 100644 ---- a/gcc.specs -+++ b/gcc.specs +Index: git/gcc.specs +=================================================================== +--- git.orig/gcc.specs ++++ git/gcc.specs @@ -2,13 +2,13 @@ + -D_GNU_SOURCE @@ -35,11 +35,8 @@ index 0d4bbda..3802ca6 100644 + %(efivar_cpp_options) *cc1_options: --+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -flto -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} +-+ %(efivar_cpp_options) -Wmaybe-uninitialized -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} ++ %(efivar_cpp_options) -fno-merge-constants -fvisibility=hidden %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} *self_spec: + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} --- -2.8.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch new file mode 100644 index 000000000..fc8f8c8b2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch @@ -0,0 +1,17 @@ +Taken from void linux + +Index: git/src/linux.c +=================================================================== +--- git.orig/src/linux.c ++++ git/src/linux.c +@@ -40,6 +40,10 @@ + #include <efivar.h> + #include <efiboot.h> + ++#if !defined(__GLIBC__) ++#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) ++#endif ++ + #include "dp.h" + #include "linux.h" + #include "util.h" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.24.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.31.bb index 877ca9045..9d4cdc97b 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.24.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.31.bb @@ -12,13 +12,13 @@ inherit pkgconfig COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -SRCREV = "963cb2e5adc145fe00717f94e382f2973f80e753" +SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://0002-disable-static-build.patch \ file://allow-multi-definitions-for-native.patch \ - file://0001-Remove-some-extra-const-that-gcc-complains-about.patch \ - file://0002-New-gcc-version-new-way-symbol-versioning-breaks.patch \ -" + file://0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch \ + file://musl-strndupa.patch \ + file://0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch \ + " SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \ file://0003-efivar-fix-for-cross-compile.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'file://0004-fix-unknow-option-for-gold-linker.patch', '', d)} \ @@ -35,11 +35,15 @@ do_compile_prepend() { sed -i -e s:-Werror::g ${S}/gcc.specs } +do_compile_class-native() { + oe_runmake -C src makeguids +} + do_install() { oe_runmake install DESTDIR=${D} } -do_install_append_class-native() { +do_install_class-native() { install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch new file mode 100644 index 000000000..d3bb5c03a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch @@ -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 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb new file mode 100644 index 000000000..2b6d14e6c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb @@ -0,0 +1,24 @@ +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 = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ + file://enscript-autoconf.patch \ +" + +inherit autotools gettext + +EXTRA_OECONF += "PERL='${USRBINPATH}/env perl'" + +SRC_URI[md5sum] = "3acc242b829adacabcaf28533f049afd" +SRC_URI[sha256sum] = "6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb" + +RDEPENDS_${PN} = "perl" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch deleted file mode 100644 index 6c2f64ed9..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d9e4dc750dc45e42b482d744829254a3672c11b3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Oct 2016 00:24:08 +0000 -Subject: [PATCH 1/3] Fix compilation on aarch64 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - arch.h | 2 +- - hwaccess.c | 2 +- - hwaccess.h | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -Index: flashrom-0.9.6.1/arch.h -=================================================================== ---- flashrom-0.9.6.1.orig/arch.h -+++ flashrom-0.9.6.1/arch.h -@@ -27,7 +27,7 @@ - #define __FLASHROM_ARCH__ "mips" - #elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) - #define __FLASHROM_ARCH__ "ppc" --#elif defined(__arm__) -+#elif defined(__arm__) || defined(__aarch64__) - #define __FLASHROM_ARCH__ "arm" - #endif - __FLASHROM_ARCH__ -Index: flashrom-0.9.6.1/hwaccess.c -=================================================================== ---- flashrom-0.9.6.1.orig/hwaccess.c -+++ flashrom-0.9.6.1/hwaccess.c -@@ -121,7 +121,7 @@ int rget_io_perms(void) - return 0; - } - --#elif defined (__arm__) -+#elif defined (__arm__) || defined (__aarch64__) - - static inline void sync_primitive(void) - { -Index: flashrom-0.9.6.1/hwaccess.h -=================================================================== ---- flashrom-0.9.6.1.orig/hwaccess.h -+++ flashrom-0.9.6.1/hwaccess.h -@@ -68,8 +68,8 @@ - #error Little-endian PowerPC #defines are unknown - #endif - --#elif defined (__arm__) --#if defined (__ARMEL__) -+#elif defined (__arm__) || defined (__aarch64__) -+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - #define __FLASHROM_LITTLE_ENDIAN__ 1 - #else - #error Big-endian ARM #defines are unknown -@@ -337,7 +337,7 @@ int libpayload_wrmsr(int addr, msr_t msr - - /* PCI port I/O is not yet implemented on MIPS. */ - --#elif defined(__arm__) -+#elif defined(__arm__) || defined (__aarch64__) - - /* Non memory mapped I/O is not supported on ARM. */ - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch new file mode 100644 index 000000000..51397dc55 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch @@ -0,0 +1,82 @@ +From d2a03b3e43043b596a79803bcb93f70e513bbb50 Mon Sep 17 00:00:00 2001 +From: Patrick Georgi <pgeorgi@google.com> +Date: Mon, 13 Mar 2017 13:48:03 +0100 +Subject: [PATCH] Remove undefined behavior + +Per clang-3.9, the compiler fails on #define ...defined(...) statements +as they're undefined behavior (apparently with different behavior +between gcc/clang and msvc, too). + +See clang's cfe repo commit r258128 for details. + +Change-Id: I82b6235e11b425fae45eebbe06b08f81c5bdbb98 +Signed-off-by: Patrick Georgi <pgeorgi@google.com> +Reviewed-on: https://review.coreboot.org/18792 +Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> +Tested-by: build bot (Jenkins) <no-reply@coreboot.org> +--- + hwaccess.c | 18 +++++++++++++++--- + platform.h | 18 +++++++++++++++--- + 2 files changed, 30 insertions(+), 6 deletions(-) + +diff --git a/hwaccess.c b/hwaccess.c +index aede7e3..2bf6f42 100644 +--- a/hwaccess.c ++++ b/hwaccess.c +@@ -37,9 +37,21 @@ + #error "Unknown operating system" + #endif + +-#define USE_IOPL (IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__)) +-#define USE_DEV_IO (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) +-#define USE_IOPERM (defined(__gnu_hurd__)) ++#if IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) ++#define USE_IOPL 1 ++#else ++#define USE_IOPL 0 ++#endif ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ++#define USE_DEV_IO 1 ++#else ++#define USE_DEV_IO 0 ++#endif ++#if defined(__gnu_hurd__) ++#define USE_IOPERM 1 ++#else ++#define USE_IOPERM 0 ++#endif + + #if USE_IOPERM + #include <sys/io.h> +diff --git a/platform.h b/platform.h +index c5a52ef..b2fdcd0 100644 +--- a/platform.h ++++ b/platform.h +@@ -25,9 +25,21 @@ + #define __PLATFORM_H__ 1 + + // Helper defines for operating systems +-#define IS_LINUX (defined(__gnu_linux__) || defined(__linux__)) +-#define IS_MACOSX (defined(__APPLE__) && defined(__MACH__)) /* yes, both. */ +-#define IS_WINDOWS (defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)) ++#if defined(__gnu_linux__) || defined(__linux__) ++#define IS_LINUX 1 ++#else ++#define IS_LINUX 0 ++#endif ++#if defined(__APPLE__) && defined(__MACH__) /* yes, both. */ ++#define IS_MACOSX 1 ++#else ++#define IS_MACOSX 0 ++#endif ++#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__) ++#define IS_WINDOWS 1 ++#else ++#define IS_WINDOWS 0 ++#endif + + // Likewise for target architectures + #if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) +-- +2.13.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch deleted file mode 100644 index ff16f0b11..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-ichspi.c-Fix-build-with-clang.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a2f603c54013cd0b04bb0103dc615644f315d5e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 15 Nov 2016 17:39:24 +0000 -Subject: [PATCH] ichspi.c: Fix build with clang - -ichspi.c:1130:24: error: duplicate 'const' declaration specifier [-Werror,-Wduplicate-decl-specifier] - static const uint32_t const dec_berase[4] = { - ^ -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ichspi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ichspi.c b/ichspi.c -index 0223ae3..e47aebd 100644 ---- a/ichspi.c -+++ b/ichspi.c -@@ -1127,7 +1127,7 @@ static void ich_hwseq_set_addr(uint32_t addr) - static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr) - { - uint8_t enc_berase; -- static const uint32_t const dec_berase[4] = { -+ static const uint32_t dec_berase[4] = { - 256, - 4 * 1024, - 8 * 1024, --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch new file mode 100644 index 000000000..4170fefd2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch @@ -0,0 +1,28 @@ +From 7c65a465a3ddeb7afb9a7c49d010ae7e5d5b1ad1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Jul 2017 20:25:49 -0700 +Subject: [PATCH] spi: Define _XOPEN_SOURCE to enable ffs() libc API + +musl exposes this issue + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + spi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spi.c b/spi.c +index 894f73f..aeb6518 100644 +--- a/spi.c ++++ b/spi.c +@@ -21,7 +21,7 @@ + /* + * Contains the generic SPI framework + */ +- ++#define _XOPEN_SOURCE + #include <strings.h> + #include <string.h> + #include "flash.h" +-- +2.13.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch deleted file mode 100644 index aec11bffa..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9be0d152dfe8ac0f9b665d61aeb3f99dae533e0f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Oct 2016 00:25:09 +0000 -Subject: [PATCH 2/3] Disable Wtautological-pointer-compare when using clang - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - flashrom.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/flashrom.c b/flashrom.c -index 04e9934..bf49104 100644 ---- a/flashrom.c -+++ b/flashrom.c -@@ -1569,6 +1569,9 @@ int selfcheck(void) - * For 'flashchips' we check the first element to be non-null. In the - * other cases there exist use cases where the first element can be - * null. */ -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wtautological-pointer-compare" -+ - if (flashchips == NULL || flashchips[0].vendor == NULL) { - msg_gerr("Flashchips table miscompilation!\n"); - ret = 1; -@@ -1602,6 +1605,7 @@ int selfcheck(void) - msg_gerr("Known laptops table does not exist!\n"); - ret = 1; - } -+#pragma clang diagnostic pop - #endif - return ret; - } --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch deleted file mode 100644 index 99283d37f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 42ec9bd51e60aa38fe6e78f644e742d6989b6683 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Oct 2016 00:25:23 +0000 -Subject: [PATCH 3/3] remove duplicate const qualifiers - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - bitbang_spi.c | 12 ++++++------ - dummyflasher.c | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/bitbang_spi.c b/bitbang_spi.c -index 11d2de1..508cf45 100644 ---- a/bitbang_spi.c -+++ b/bitbang_spi.c -@@ -26,33 +26,33 @@ - #include "spi.h" - - /* Note that CS# is active low, so val=0 means the chip is active. */ --static void bitbang_spi_set_cs(const const struct bitbang_spi_master *master, int val) -+static void bitbang_spi_set_cs(const struct bitbang_spi_master *master, int val) - { - master->set_cs(val); - } - --static void bitbang_spi_set_sck(const const struct bitbang_spi_master *master, int val) -+static void bitbang_spi_set_sck(const struct bitbang_spi_master *master, int val) - { - master->set_sck(val); - } - --static void bitbang_spi_set_mosi(const const struct bitbang_spi_master *master, int val) -+static void bitbang_spi_set_mosi(const struct bitbang_spi_master *master, int val) - { - master->set_mosi(val); - } - --static int bitbang_spi_get_miso(const const struct bitbang_spi_master *master) -+static int bitbang_spi_get_miso(const struct bitbang_spi_master *master) - { - return master->get_miso(); - } - --static void bitbang_spi_request_bus(const const struct bitbang_spi_master *master) -+static void bitbang_spi_request_bus(const struct bitbang_spi_master *master) - { - if (master->request_bus) - master->request_bus(); - } - --static void bitbang_spi_release_bus(const const struct bitbang_spi_master *master) -+static void bitbang_spi_release_bus(const struct bitbang_spi_master *master) - { - if (master->release_bus) - master->release_bus(); -diff --git a/dummyflasher.c b/dummyflasher.c -index 66d0df0..d0de41c 100644 ---- a/dummyflasher.c -+++ b/dummyflasher.c -@@ -66,7 +66,7 @@ int spi_ignorelist_size = 0; - static uint8_t emu_status = 0; - - /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ --static const uint8_t const sfdp_table[] = { -+static const uint8_t sfdp_table[] = { - 0x53, 0x46, 0x44, 0x50, // @0x00: SFDP signature - 0x00, 0x01, 0x01, 0xFF, // @0x04: revision 1.0, 2 headers - 0x00, 0x00, 0x01, 0x09, // @0x08: JEDEC SFDP header rev. 1.0, 9 DW long --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch new file mode 100644 index 000000000..46a01529f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch @@ -0,0 +1,198 @@ +--- flashrom-0.9.9.orig/chipdrivers.h ++++ flashrom-0.9.9/chipdrivers.h +@@ -103,6 +103,7 @@ + int spi_prettyprint_status_register_sst25(struct flashctx *flash); + int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash); + int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash); ++int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash); + + /* sfdp.c */ + int probe_spi_sfdp(struct flashctx *flash); +--- flashrom-0.9.9.orig/flashchips.c ++++ flashrom-0.9.9/flashchips.c +@@ -12564,6 +12564,120 @@ + + { + .vendor = "SST", ++ .name = "SST26VF016B(A)", ++ .bustype = BUS_SPI, ++ .manufacture_id = SST_ID, ++ .model_id = SST_SST26VF016B, ++ .total_size = 2048, ++ .page_size = 256, ++ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, ++ .tested = TEST_OK_PREW, ++ .probe = probe_spi_rdid, ++ .probe_timing = TIMING_ZERO, ++ .block_erasers = ++ { ++ { ++ .eraseblocks = { {4 * 1024, 512} }, ++ .block_erase = spi_block_erase_20, ++ }, { ++ .eraseblocks = { ++ {8 * 1024, 4}, ++ {32 * 1024, 1}, ++ {64 * 1024, 30}, ++ {32 * 1024, 1}, ++ {8 * 1024, 4}, ++ }, ++ .block_erase = spi_block_erase_d8, ++ }, { ++ .eraseblocks = { {2 * 1024 * 1024, 1} }, ++ .block_erase = spi_block_erase_c7, ++ }, ++ }, ++ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ ++ .unlock = spi_disable_blockprotect_sst26_global_unprotect, ++ .write = spi_chip_write_256, /* Multi I/O supported */ ++ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ ++ .voltage = {2700, 3600}, ++ }, ++ { ++ .vendor = "SST", ++ .name = "SST26VF032B(A)", ++ .bustype = BUS_SPI, ++ .manufacture_id = SST_ID, ++ .model_id = SST_SST26VF032B, ++ .total_size = 4096, ++ .page_size = 256, ++ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, ++ .tested = TEST_UNTESTED, ++ .probe = probe_spi_rdid, ++ .probe_timing = TIMING_ZERO, ++ .block_erasers = ++ { ++ { ++ .eraseblocks = { {4 * 1024, 1024} }, ++ .block_erase = spi_block_erase_20, ++ }, { ++ .eraseblocks = { ++ {8 * 1024, 4}, ++ {32 * 1024, 1}, ++ {64 * 1024, 62}, ++ {32 * 1024, 1}, ++ {8 * 1024, 4}, ++ }, ++ .block_erase = spi_block_erase_d8, ++ }, { ++ .eraseblocks = { {4 * 1024 * 1024, 1} }, ++ .block_erase = spi_block_erase_c7, ++ }, ++ }, ++ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ ++ .unlock = spi_disable_blockprotect_sst26_global_unprotect, ++ .write = spi_chip_write_256, /* Multi I/O supported */ ++ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ ++ .voltage = {2700, 3600}, ++ }, ++ ++ ++ { ++ .vendor = "SST", ++ .name = "SST26VF064B(A)", ++ .bustype = BUS_SPI, ++ .manufacture_id = SST_ID, ++ .model_id = SST_SST26VF064B, ++ .total_size = 8192, ++ .page_size = 256, ++ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, ++ .tested = TEST_OK_PREW, ++ .probe = probe_spi_rdid, ++ .probe_timing = TIMING_ZERO, ++ .block_erasers = ++ { ++ { ++ .eraseblocks = { {4 * 1024, 2048} }, ++ .block_erase = spi_block_erase_20, ++ }, { ++ .eraseblocks = { ++ {8 * 1024, 4}, ++ {32 * 1024, 1}, ++ {64 * 1024, 126}, ++ {32 * 1024, 1}, ++ {8 * 1024, 4}, ++ }, ++ .block_erase = spi_block_erase_d8, ++ }, { ++ .eraseblocks = { {8 * 1024 * 1024, 1} }, ++ .block_erase = spi_block_erase_c7, ++ }, ++ }, ++ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ ++ .unlock = spi_disable_blockprotect_sst26_global_unprotect, ++ .write = spi_chip_write_256, /* Multi I/O supported */ ++ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ ++ .voltage = {2700, 3600}, ++ }, ++ ++ { ++ .vendor = "SST", + .name = "SST25WF512", + .bustype = BUS_SPI, + .manufacture_id = SST_ID, +--- flashrom-0.9.9.orig/flashchips.h ++++ flashrom-0.9.9/flashchips.h +@@ -697,6 +697,8 @@ + #define SST_SST25VF064C 0x254B + #define SST_SST26VF016 0x2601 + #define SST_SST26VF032 0x2602 ++#define SST_SST26VF016B 0x2641 ++#define SST_SST26VF032B 0x2642 + #define SST_SST26VF064B 0x2643 + #define SST_SST27SF512 0xA4 + #define SST_SST27SF010 0xA5 +--- flashrom-0.9.9.orig/linux_spi.c ++++ flashrom-0.9.9/linux_spi.c +@@ -141,6 +141,16 @@ + return 0; + } + ++static void print_hex(const char *msg, const void *buf, size_t len) ++{ ++ size_t i; ++ msg_pspew("%s:\n", msg); ++ for (i = 0; i < len; i++) { ++ msg_pspew(" %02x", ((uint8_t *)buf)[i]); ++ } ++ msg_pspew("\n"); ++} ++ + static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, + unsigned int readcnt, + const unsigned char *txbuf, +@@ -172,10 +182,12 @@ + else + iocontrol_code = SPI_IOC_MESSAGE(2); + ++ print_hex("Write", txbuf, writecnt); + if (ioctl(fd, iocontrol_code, msg) == -1) { + msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); + return -1; + } ++ if (readcnt) print_hex("Got", rxbuf, readcnt); + return 0; + } + +--- flashrom-0.9.9.orig/spi25_statusreg.c ++++ flashrom-0.9.9/spi25_statusreg.c +@@ -196,6 +196,19 @@ + return spi_disable_blockprotect_generic(flash, 0x3C, 0, 0, 0xFF); + } + ++int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash) ++{ ++ int result = spi_write_enable(flash); ++ if (result) ++ return result; ++ ++ static const unsigned char cmd[] = { 0x98 }; /* ULBPR */ ++ result = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); ++ if (result) ++ msg_cerr("ULBPR failed\n"); ++ return result; ++} ++ + /* A common block protection disable that tries to unset the status register bits masked by 0x0C (BP0-1) and + * protected/locked by bit #7. Useful when bits 4-5 may be non-0). */ + int spi_disable_blockprotect_bp1_srwd(struct flashctx *flash) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb deleted file mode 100644 index 0edc68820..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils" - -SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://0001-Fix-compilation-on-aarch64.patch \ - file://0002-Disable-Wtautological-pointer-compare-when-using-cla.patch \ - file://0003-remove-duplicate-const-qualifiers.patch \ - file://0001-ichspi.c-Fix-build-with-clang.patch \ - " - -SRC_URI[md5sum] = "407e836c0a2b17ec76583cb6809f65e5" -SRC_URI[sha256sum] = "6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a" - -CFLAGS += "-Wno-error=unknown-pragmas" - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb new file mode 100644 index 000000000..4cdd8ad23 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +LICENSE = "GPLv2" +HOMEPAGE = "http://flashrom.org" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb libusb-compat" + +SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ + file://0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch \ + file://sst26.patch \ + file://0001-Remove-undefined-behavior.patch \ + " +SRC_URI[md5sum] = "aab9c98925d9cfb5ffb28b67a6112530" +SRC_URI[sha256sum] = "cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45" + +inherit pkgconfig + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch deleted file mode 100644 index 539a42a7d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ceb47f37582a055bb7f253f813c435ad55c5b6eb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Apr 2017 10:02:50 -0700 -Subject: [PATCH 1/2] CMakeLists.txt: Add AUTOCONF_HOST_OPT to help cross - compiling - -This helps in doing cross compiles for modules which are using -GNU autoconf for build system - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b093f9a..ebf0cd7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -290,6 +290,12 @@ else() - endif() - endif() - -+if("${GNU_HOST}" STREQUAL "") -+ set(AUTOCONF_HOST_OPT "") -+else() -+ set(AUTOCONF_HOST_OPT "--host=${GNU_HOST}") -+endif() -+ - # Memory Allocator - # ================ - if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") -@@ -299,7 +305,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - # Link to Jemalloc as an external dependency - ExternalProject_Add(jemalloc - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc -- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> -+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> - CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops - BUILD_COMMAND ${MAKE} - INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ -@@ -317,7 +323,7 @@ endif() - if(FLB_REGEX) - ExternalProject_Add(onigmo - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo -- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo/configure --with-pic --disable-shared --enable-static --prefix=<INSTALL_DIR> -+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/onigmo/configure ${AUTOCONF_HOST_OPT} --with-pic --disable-shared --enable-static --prefix=<INSTALL_DIR> - CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops - BUILD_COMMAND ${MAKE} - INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ --- -2.12.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch new file mode 100644 index 000000000..e9eed24b3 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch @@ -0,0 +1,35 @@ +From 62fa9bceb15a9d160dd5d624a6d46907c1019c5c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Sep 2017 17:02:55 -0700 +Subject: [PATCH] fluent-bit-shared: Link with -lpthread + +This fixes a reference to pthread_atfork in libfluent-bit.so +otherwise we get undefined reference to the symbols in binaries +which are linked with libfluent-bit.so + +Fixes errors like +arm-bec-linux-gnueabi-ld: ../../bin/hello_world: hidden symbol `pthread_atfork' in /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/fluentbit/0.12.1-r0/recipe-sysroot/usr/lib/libpthread_nonshared.a(pthread_atfork.oS) is referenced by DSO + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 425a246..1264e59 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -168,7 +168,7 @@ set(FLB_DEPS + # Shared Library + if(NOT FLB_WITHOUT_SHARED_LIB) + add_library(fluent-bit-shared SHARED ${src}) +- target_link_libraries(fluent-bit-shared ${FLB_DEPS}) ++ target_link_libraries(fluent-bit-shared ${FLB_DEPS} -lpthread) + set_target_properties(fluent-bit-shared + PROPERTIES OUTPUT_NAME fluent-bit) + +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch deleted file mode 100644 index 35cdb18ad..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0002-msgpack-Add-comment-for-intended-fallthrough.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d95c2977da074be0d3913e94fb8fb5ed1c64404a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Apr 2017 10:04:03 -0700 -Subject: [PATCH 2/2] msgpack: Add comment for intended fallthrough - -Helps fixing build with gcc7 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h -index a6dae6f..651e6c2 100644 ---- a/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h -+++ b/lib/msgpack-c-0b7cabd/include/msgpack/unpack_template.h -@@ -248,7 +248,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c - - _fixed_trail_again: - ++p; -- -+ // fallthrough - default: - if((size_t)(pe - p) < trail) { goto _out; } - n = p; p += trail - 1; --- -2.12.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch new file mode 100644 index 000000000..abaf92c05 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch @@ -0,0 +1,18 @@ +Add --with-jemalloc-prefix=je_ so it compiles on musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: fluent-bit-0.12.1/CMakeLists.txt +=================================================================== +--- fluent-bit-0.12.1.orig/CMakeLists.txt ++++ fluent-bit-0.12.1/CMakeLists.txt +@@ -325,7 +325,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} + # Link to Jemalloc as an external dependency + ExternalProject_Add(jemalloc + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc +- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix=<INSTALL_DIR> + CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops + BUILD_COMMAND ${MAKE} + INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb deleted file mode 100644 index 8d756e6a4..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.11.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Fast data collector for Embedded Linux" -HOMEPAGE = "http://fluentbit.io" -BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" - -SRC_URI = "http://fluentbit.io/releases/0.11/fluent-bit-${PV}.tar.gz \ - file://0001-CMakeLists.txt-Add-AUTOCONF_HOST_OPT-to-help-cross-c.patch \ - file://0002-msgpack-Add-comment-for-intended-fallthrough.patch \ - " -SRC_URI[md5sum] = "9383262339412782b80cc49e7ad15609" -SRC_URI[sha256sum] = "eb8a85c656fa60682b0bf8dd1ad58d848cd251dab4f35a6777acd552c65b0511" - -S = "${WORKDIR}/fluent-bit-${PV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -DEPENDS = "zlib" -INSANE_SKIP_${PN}-dev += "dev-elf" - -inherit cmake systemd - -EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS}" - -SYSTEMD_SERVICE_${PN} = "fluent-bit.service" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb new file mode 100644 index 000000000..e2edd095a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Fast data collector for Embedded Linux" +HOMEPAGE = "http://fluentbit.io" +BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" + +SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ + file://jemalloc.patch \ + file://0001-fluent-bit-shared-Link-with-lpthread.patch \ + " +SRC_URI[md5sum] = "6b4472cb7e7213a01425af9121576827" +SRC_URI[sha256sum] = "8ec05365baea723033165687611b3bba3e67a77dce72e282e9f000f7acf9e37b" + +S = "${WORKDIR}/fluent-bit-${PV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +DEPENDS = "zlib" +INSANE_SKIP_${PN}-dev += "dev-elf" + +inherit cmake systemd + +EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" + +SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" + +TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch new file mode 100644 index 000000000..fef2bc754 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch @@ -0,0 +1,32 @@ +From d13b918a3ff8b0ebfd1e7b18b198b4b45841d720 Mon Sep 17 00:00:00 2001 +From: Andrea Galbusera <gizero@gmail.com> +Date: Fri, 31 Jul 2015 16:42:08 +0200 +Subject: [PATCH] Makefile: remove hardcoding of CC + +* upgrade previous patch to avoid wiping CFLAGS. This fixes build on arm +platforms which previously caused and issue due to -fPIC being lost + +Signed-off-by: Andrea Galbusera <gizero@gmail.com> +--- + Makefile | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 8b0f0c2..66a4317 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,11 +34,6 @@ define REDIS_TEST_CONFIG + endef + export REDIS_TEST_CONFIG + +-# Fallback to gcc when $CC is not in $PATH. +-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +-OPTIMIZATION?=-O3 +-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings +-DEBUG?= -g -ggdb + REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) + REAL_LDFLAGS=$(LDFLAGS) $(ARCH) + +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb new file mode 100644 index 000000000..fae30d771 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Minimalistic C client library for Redis" +HOMEPAGE = "http://github.com/redis/hiredis" +LICENSE = "BSD-3-Clause" +SECTION = "libs" +DEPENDS = "redis" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" +SRC_URI = "git://github.com/redis/hiredis;protocol=git;rev=f58dd249d6ed47a7e835463c3b04722972281dbb \ + file://0001-Makefile-remove-hardcoding-of-CC.patch" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE = "PREFIX=${prefix}" + +# By default INSTALL variable in Makefile is equal to 'cp -a', which preserves +# ownership and causes host-user-contamination QA issue. +# And PREFIX defaults to /usr/local. +do_install_prepend() { + export INSTALL='cp -r' +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb new file mode 100644 index 000000000..5a335b924 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb @@ -0,0 +1,29 @@ +SUMMARY = "Portable Hardware Locality (hwloc) software package" +DESCRIPTION = "The Portable Hardware Locality (hwloc) software package \ + provides a portable abstraction of the hierarchical topology of modern \ + architectures." +HOMEPAGE = "https://www.open-mpi.org/software/hwloc/" +SECTION = "base" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" + +SRC_URI = "https://www.open-mpi.org/software/${PN}/v1.11/downloads/${BP}.tar.bz2" +SRC_URI[md5sum] = "96c34136ff416d2b13a7821c27477bed" +SRC_URI[sha256sum] = "95d80286dfe658a3f79e2ac90698782bb36e5504f4bac1bba2394ba14dbbad24" + +inherit autotools pkgconfig + +DEPENDS += "ncurses udev zlib" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" + +PACKAGECONFIG ?= "pci libxml2 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +PACKAGECONFIG[numactl] = "--enable-libnuma,--disable-libnuma,numactl,numactl" +PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2,libxml2" +PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo" +PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess" + +# Split hwloc library into separate subpackage +PACKAGES_prepend = " libhwloc " +FILES_libhwloc += "${libdir}/libhwloc.so.*" +RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch new file mode 100644 index 000000000..bcfc11724 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch @@ -0,0 +1,60 @@ +From cffe4767f89ea0b54b57e8bf9065a08a9c38d46e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 18 Jul 2017 21:53:00 -0400 +Subject: [PATCH] tweak install prefix + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Makefile b/Makefile +index df16a3b..fbdfcb4 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,26 +39,26 @@ pyisomd5sum.so: $(PYOBJS) + install: all install-bin install-python install-devel + + install-bin: +- install -d -m 0755 $(DESTDIR)/usr/bin +- install -d -m 0755 $(DESTDIR)/usr/share/man/man1 +- install -m 0755 implantisomd5 $(DESTDIR)/usr/bin +- install -m 0755 checkisomd5 $(DESTDIR)/usr/bin +- install -m 0644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1 +- install -m 0644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1 ++ install -d -m 0755 $(DESTDIR)$(bindir) ++ install -d -m 0755 $(DESTDIR)$(mandir)/man1 ++ install -m 0755 implantisomd5 $(DESTDIR)$(bindir) ++ install -m 0755 checkisomd5 $(DESTDIR)$(bindir) ++ install -m 0644 implantisomd5.1 $(DESTDIR)$(mandir)/man1 ++ install -m 0644 checkisomd5.1 $(DESTDIR)$(mandir)/man1 + + install-python: + install -d -m 0755 $(DESTDIR)$(PYTHONSITEPACKAGES) + install -m 0755 pyisomd5sum.so $(DESTDIR)$(PYTHONSITEPACKAGES) + + install-devel: +- install -d -m 0755 $(DESTDIR)/usr/include +- install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR) +- install -d -m 0755 $(DESTDIR)/usr/share/pkgconfig +- install -m 0644 libimplantisomd5.h $(DESTDIR)/usr/include/ +- install -m 0644 libcheckisomd5.h $(DESTDIR)/usr/include/ +- install -m 0644 libimplantisomd5.a $(DESTDIR)/usr/$(LIBDIR) +- install -m 0644 libcheckisomd5.a $(DESTDIR)/usr/$(LIBDIR) +- sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}/usr/share/pkgconfig/isomd5sum.pc ++ install -d -m 0755 $(DESTDIR)$(includedir) ++ install -d -m 0755 $(DESTDIR)$(libdir) ++ install -d -m 0755 $(DESTDIR)${datadir}/pkgconfig ++ install -m 0644 libimplantisomd5.h $(DESTDIR)$(includedir) ++ install -m 0644 libcheckisomd5.h $(DESTDIR)$(includedir) ++ install -m 0644 libimplantisomd5.a $(DESTDIR)$(libdir) ++ install -m 0644 libcheckisomd5.a $(DESTDIR)$(libdir) ++ sed "s#@VERSION@#${VERSION}#g; s#@includedir@#${DESTDIR}/usr/include#g; s#@libdir@#${DESTDIR}/usr/${LIBDIR}#g" isomd5sum.pc.in > ${DESTDIR}${datadir}/pkgconfig/isomd5sum.pc + + clean: + rm -f *.o *.so *.pyc *.a .depend *~ +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch new file mode 100644 index 000000000..7a33e423a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch @@ -0,0 +1,33 @@ +From 2acce7bc8ab7711e76c7765c84a198fe38f247f3 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 18 Jul 2017 23:06:41 -0400 +Subject: [PATCH] fix parallel error + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index fbdfcb4..2ad3238 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,9 +29,11 @@ implantisomd5: implantisomd5.o libimplantisomd5.a + checkisomd5: checkisomd5.o libcheckisomd5.a + $(CC) $(CPPFLAGS) $(CFLAGS) checkisomd5.o libcheckisomd5.a -lpopt $(LDFLAGS) -o checkisomd5 + +-libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o utilities.o) ++libimplantisomd5.a: libimplantisomd5.o md5.o utilities.o ++ $(AR) rv $@ $^ + +-libcheckisomd5.a: libcheckisomd5.a(libcheckisomd5.o md5.o utilities.o) ++libcheckisomd5.a: libcheckisomd5.o md5.o utilities.o ++ $(AR) rv $@ $^ + + pyisomd5sum.so: $(PYOBJS) + $(CC) $(CPPFLAGS) $(CFLAGS) -shared -g -fpic $(PYOBJS) $(LDFLAGS) -o pyisomd5sum.so +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb new file mode 100644 index 000000000..815113e67 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb @@ -0,0 +1,35 @@ +SUMMARY = "Tools for taking the MD5 sum of ISO images" +DESCRIPTION = "Tools for taking the MD5 sum of ISO images" + +DEPENDS = "popt python3 openssl curl popt-native" +RDEPENDS_${PN} = "openssl curl" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master \ + file://0001-tweak-install-prefix.patch \ + file://0002-fix-parallel-error.patch \ +" + +S = "${WORKDIR}/git" +inherit python3native + +EXTRA_OEMAKE += " \ + DESTDIR='${D}' \ + PYTHONINCLUDE='-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}' \ + PYTHONSITEPACKAGES='${PYTHON_SITEPACKAGES_DIR}' \ +" + +do_install () { + oe_runmake install +} + +PACKAGES += "${PYTHON_PN}-${PN} ${PYTHON_PN}-${PN}-dbg" + +FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" +FILES_${PYTHON_PN}-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug/pyisomd5sum.so" + +SRCREV = "69dc036d20761715b734ca9cc59ecc6dc8145026" + +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb deleted file mode 100644 index 9b2ace9c4..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Tool for rapid CMPI providers development" -DESCRIPTION = "\ -KonkretCMPI makes CMPI provider development easier by generating type-safe \ -concrete CIM interfaces from MOF definitions and by providing default \ -implementations for many of the provider operations." -HOMEPAGE = "https://github.com/rnovacek/konkretcmpi" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" -DEPENDS = "cmake-native cmpi-bindings-native" - -SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ - file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \ - file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch " - -SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769" -S = "${WORKDIR}/git" - -inherit native cmake -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ - " - -do_install_append() { - rm -rf ${D}${datadir} -} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch new file mode 100644 index 000000000..342017bed --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch @@ -0,0 +1,38 @@ +From 45e1c4c04a126d2386446775f99084bd603016af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Jun 2017 23:10:59 -0700 +Subject: [PATCH] drop including rpath cmake module + +Fixes cross compilation QA errors e.g. +/usr/lib/libkonkret.so.0.0.1 contains probably-redundant RPATH /usr/lib [useless-rpaths] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/konkret/CMakeLists.txt | 1 - + src/program/CMakeLists.txt | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/konkret/CMakeLists.txt b/src/konkret/CMakeLists.txt +index c2faa40..df49e11 100644 +--- a/src/konkret/CMakeLists.txt ++++ b/src/konkret/CMakeLists.txt +@@ -8,7 +8,6 @@ set(konkret_SRCS + kstr.c + print.c + ) +-include(rpath) + include_directories(${CMPI_INCLUDE_DIR}) + + add_library(libkonkret SHARED ${konkret_SRCS}) +diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt +index afcefe5..8a4646c 100644 +--- a/src/program/CMakeLists.txt ++++ b/src/program/CMakeLists.txt +@@ -1,4 +1,3 @@ +-include (rpath) + include_directories(${CMPI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src) + + add_executable(konkret main.cpp) +-- +2.13.0 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch deleted file mode 100644 index b54d09159..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/konkretcmpi-0.9.2-fix-returning-instance-from-method.patch +++ /dev/null @@ -1,38 +0,0 @@ -Port from Fedora20 - - | commit aca6c7f910ffe9930b5789969f0adfadd668bb46 - | Author: Michal Minar <miminar@redhat.com> - | Date: Fri Jun 20 10:50:45 2014 +0200 - | - | Fix returning instance as an output argument from method - | - | Submitted By: Radek Novacek <rnovacek@redhat.com> - -Upstream-Status: Pending -Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> - -diff --git a/src/program/main.cpp b/src/program/main.cpp -index 885dc12..9e7108a 100644 ---- a/src/program/main.cpp -+++ b/src/program/main.cpp -@@ -506,7 +506,11 @@ static void gen_feature_decls( - - // Add sig entry [type][length][name][zero-terminator] - -- KTag tag = _ktag(pd->data_type, pd->array_index, key, false, false); -+ KTag tag; -+ if (pd->qualifiers->has_key("EmbeddedInstance")) -+ tag = _ktag(TOK_INSTANCE, pd->array_index, key, false, false); -+ else -+ tag = _ktag(pd->data_type, pd->array_index, key, false, false); - pack_tag(sig, tag); - pack_name(sig, pd->name); - count++; -@@ -640,6 +644,7 @@ static void gen_param(FILE* os, MOF_Parameter* p, vector<unsigned char>& sig) - const char* ktn = _ktype_name(p->data_type); - - if (p->qualifiers->has_key("EmbeddedInstance")) { -+ tag = _ktag(TOK_INSTANCE, p->array_index, false, in, out); - if (p->array_index) - put(os, " KInstanceA $0;\n", p->name, NULL); - else diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 1d8b0dbd4..cbf04734e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -6,14 +6,15 @@ implementations for many of the provider operations." HOMEPAGE = "https://github.com/rnovacek/konkretcmpi" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" -DEPENDS = "swig-native sblim-cmpi-devel python" +DEPENDS_append_class-target = " swig-native sblim-cmpi-devel python" +DEPENDS_append_class-native = " cmpi-bindings-native" SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ - file://konkretcmpi-0.9.2-fix-returning-instance-from-method.patch \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ + file://0001-drop-including-rpath-cmake-module.patch \ " -SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769" +SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7" S = "${WORKDIR}/git" inherit cmake @@ -23,6 +24,8 @@ EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " +LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + do_install_append() { rm -rf ${D}${datadir} } @@ -32,3 +35,4 @@ PACKAGES =+ "${PN}-python ${PN}-python-dbg" FILES_${PN}-python = "${libdir}/python2.7/site-packages/konkretmof.py* ${libdir}/python2.7/site-packages/_konkretmof.so" FILES_${PN}-python-dbg = "${libdir}/python2.7/site-packages/.debug/*" +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch deleted file mode 100644 index 4b76dd0c3..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Wed, 1 Oct 2014 18:54:04 +0200 -Subject: [PATCH] Explicitly disable tcmalloc - -Without this change leveldb autodetects tcmalloc from sysroot and -sometimes became dependant on gperftools - -Disable autodetection without TCMALLOC_ENABLED=true pased to make - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - build_detect_platform | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/build_detect_platform b/build_detect_platform -index bb76c4f..a586364 100755 ---- a/build_detect_platform -+++ b/build_detect_platform -@@ -201,15 +201,17 @@ EOF - PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy" - fi - -- # Test whether tcmalloc is available -- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF -- int main() {} -+ if [ "$TCMALLOC_ENABLED" = "true" ]; then -+ # Test whether tcmalloc is available -+ $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF -+ int main() {} - EOF -- if [ "$?" = 0 ]; then -- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" -- fi -+ if [ "$?" = 0 ]; then -+ PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" -+ fi - -- rm -f $CXXOUTPUT 2>/dev/null -+ rm -f $CXXOUTPUT 2>/dev/null -+ fi - fi - - PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS" --- -2.1.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch new file mode 100644 index 000000000..3135d4d5a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch @@ -0,0 +1,34 @@ +From c85978e77725ef233543370d24e23f853f449170 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Sep 2017 17:47:02 -0700 +Subject: [PATCH] Makefile: Fix parallel build + +Sometimes mkdir $(SHARED_OUTDIR)/db races with compiler which is +creating .o file in the same directory $(SHARED_OUTDIR)/db/db_bench.o + +Fixes error like + +| mkdir out-static +| mkdir out-shared/db +| Assembler messages: +| Fatal error: can't create out-shared/db/db_bench.o: No such file or directory + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index f7cc7d7..51a0bcd 100644 +--- a/Makefile ++++ b/Makefile +@@ -386,6 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $( + $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) + $(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS) + ++$(SHARED_OUTDIR)/db/db_bench.o: | $(SHARED_OUTDIR)/db + $(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) + $(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS) + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch new file mode 100644 index 000000000..8f93cb325 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch @@ -0,0 +1,37 @@ +From 5fd0918df2bb30e8f3edb2ee895d178edbf26f40 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 4 Sep 2017 22:38:03 -0700 +Subject: [PATCH 1/2] build_detect_platform: Check for __SSE4_2__ + +just using -msse4.2 is not enough, especially with clang +where it may accept -msse4.2 even during cross compiling +for say arm, however the difference is that builtin defines +wont be defined. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + build_detect_platform | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: git/build_detect_platform +=================================================================== +--- git.orig/build_detect_platform ++++ git/build_detect_platform +@@ -224,13 +224,13 @@ EOF + rm -f $CXXOUTPUT 2>/dev/null + + # Test if gcc SSE 4.2 is supported +- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null <<EOF ++ $CXX $CXXFLAGS -Werror -x c++ - -o $CXXOUTPUT -msse4.2 -dD -E 2>/dev/null <<EOF + int main() {} + EOF ++ eval fgrep __SSE4_2__ $CXXOUTPUT >/dev/null 2>&1 + if [ "$?" = 0 ]; then + PLATFORM_SSEFLAGS="-msse4.2" + fi +- + rm -f $CXXOUTPUT 2>/dev/null + fi + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch new file mode 100644 index 000000000..fc708b23a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch @@ -0,0 +1,43 @@ +From 1ed8cec1fcf666904bb3ebd29fc85e235b72d122 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 4 Sep 2017 22:40:49 -0700 +Subject: [PATCH 2/2] makefile: build SHARED_MEMENVLIB + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index f7cc7d7..cb42278 100644 +--- a/Makefile ++++ b/Makefile +@@ -126,12 +126,12 @@ SHARED_VERSION_MINOR = 20 + SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) + SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) + SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) +-SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) ++SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB) + $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3) + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1) + $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3) + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2) +-SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a ++SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) + endif + + $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) +@@ -294,7 +294,7 @@ endif + + $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS) + rm -f $@ +- $(AR) -rs $@ $(SHARED_MEMENVOBJECTS) ++ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS) + + $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) + $(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS) +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb index a6a302430..8fec89c6f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb @@ -4,24 +4,34 @@ HOMEPAGE = "http://leveldb.googlecode.com" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRCREV = "803d69203a62faf50f1b77897310a3a1fcae712b" -PV = "1.18+git${SRCPV}" +SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6" +PV = "1.20+git${SRCPV}" SRC_URI = "git://github.com/google/${BPN}.git \ - file://0001-Explicitly-disable-tcmalloc.patch \ -" + file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \ + file://0002-makefile-build-SHARED_MEMENVLIB.patch \ + file://0001-Makefile-Fix-parallel-build.patch \ + " S = "${WORKDIR}/git" +inherit utils + do_compile() { # do not use oe_runmake. oe_runmake pass to make compilation arguments and override # leveldb makefile variable CFLAGS and broke leveldb build. - CFLAGS="${CFLAGS}" make || die + CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die } do_install() { - install -d ${D}${libdir} - oe_libinstall -C ${S} -so libleveldb ${D}${libdir} - install -d ${D}${includedir}/leveldb + install -d ${D}${libdir} ${D}${bindir} ${D}${includedir}/leveldb + oe_libinstall -C ${B}/out-shared libleveldb ${D}${libdir} + oe_libinstall -C ${S}/out-static libleveldb ${D}${libdir} + oe_libinstall -C ${S}/out-static libmemenv ${D}${libdir} + install -m 0755 ${B}/out-shared/db_bench ${D}${bindir} + install -m 0755 ${B}/out-static/*_test ${D}${bindir} install -m 644 ${S}/include/leveldb/*.h ${D}${includedir}/leveldb/ } + +PACKAGES =+ "${PN}-ptest" +FILES_${PN}-ptest = "${bindir}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch new file mode 100644 index 000000000..914ee99db --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch @@ -0,0 +1,79 @@ +From 86686ccbf43c5d9e8c8dc97c66ba09e522050e5e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 27 Jul 2017 10:06:24 +0800 +Subject: [PATCH 1/3] fix configure and compile failures + +1. Fix do_configure failure +--------------------------- +|Checking header volume_key/libvolume_key.h existence and usability. +../tmp/6tvtK.c:1:38: fatal error: volume_key/libvolume_key.h: +No such file or directory +| #include <volume_key/libvolume_key.h> +|Checking header dmraid/dmraid.h existence and usability.../tmp/ +ktVJ6.c:1:27: fatal error: dmraid/dmraid.h: No such file or directory +| #include <dmraid/dmraid.h> +--------------------------- +We explictly add volume_key and dmraid to DEPENDS, do not need +configure to test. + +2. Fix config.h not found +Add it to configure.ac + +3. Correct AC_DEFINE +... +autoheader: warning: missing template: LIBMOUNT_NEW_ERR_API +autoheader: Use AC_DEFINE([LIBMOUNT_NEW_ERR_API], [], [Description]) +... + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0270c99..b7c7368 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,6 +9,8 @@ AC_DISABLE_STATIC + AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-syntax -Wno-portability]) + AC_CONFIG_MACRO_DIR([m4]) + ++AC_CONFIG_HEADERS([config.h]) ++ + AM_PATH_PYTHON + + AM_PROG_AR +@@ -129,7 +131,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([UDEV], [libudev >= 216]) + AS_IF([test "x$with_crypto" != "xno"], + [LIBBLOCKDEV_PKG_CHECK_MODULES([CRYPTSETUP], [libcryptsetup >= 1.6.7]) + LIBBLOCKDEV_PKG_CHECK_MODULES([NSS], [nss >= 3.18.0]) +- LIBBLOCKDEV_CHECK_HEADER([volume_key/libvolume_key.h], [$GLIB_CFLAGS $NSS_CFLAGS], [libvolume_key.h not available]) + ], + []) + +@@ -137,10 +138,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" ! + [LIBBLOCKDEV_PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.93])], + []) + +-AS_IF([test "x$with_dm" != "xno"], +- [LIBBLOCKDEV_CHECK_HEADER([dmraid/dmraid.h], [], [dmraid.h not available])], +- []) +- + AS_IF([test "x$with_kbd" != "xno"], + [LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19])], + []) +@@ -154,7 +151,8 @@ AS_IF([test "x$with_fs" != "xno"], + [LIBBLOCKDEV_PKG_CHECK_MODULES([MOUNT], [mount >= 2.23.0]) + # new versions of libmount has some new functions we can use + AS_IF([$PKG_CONFIG --atleast-version=2.30.0 mount], +- [AC_DEFINE([LIBMOUNT_NEW_ERR_API])], []) ++ [AC_DEFINE([LIBMOUNT_NEW_ERR_API], [1], [new versions of libmount has some new functions we can use])], ++ []) + + LIBBLOCKDEV_PKG_CHECK_MODULES([BLKID], [blkid >= 2.23.0]) + # older versions of libblkid don't support BLKID_SUBLKS_BADCSUM so let's just +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch new file mode 100644 index 000000000..0719759cd --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch @@ -0,0 +1,30 @@ +From 40dae7ea6450cb30f066da8443eabf063b5b0ad7 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 8 May 2017 02:05:40 -0400 +Subject: [PATCH 2/3] remove python2 support + +Only python3 is required. + +Upstream-Status: Inappropriate [wr-installer specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/python/gi/overrides/Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/python/gi/overrides/Makefile.am b/src/python/gi/overrides/Makefile.am +index a2927ac..6385502 100644 +--- a/src/python/gi/overrides/Makefile.am ++++ b/src/python/gi/overrides/Makefile.am +@@ -1,8 +1,3 @@ +-pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") +- +-overridesdir = $(pylibdir)/gi/overrides +-dist_overrides_DATA = BlockDev.py +- + if WITH_PYTHON3 + py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") + py3overridesdir = $(py3libdir)/gi/overrides +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch new file mode 100644 index 000000000..3d9cb6d01 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch @@ -0,0 +1,470 @@ +From bda7c937ba544182a5cae2a9cf0c173e0ba268c9 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 27 Jul 2017 09:47:23 +0800 +Subject: [PATCH 3/3] remove dmraid while compiling with --with-dm + +Fix the following failure: + +... +Perhaps you should add the directory containing `dmraid.pc' +to the PKG_CONFIG_PATH environment variable +No package 'dmraid' found +... + +... +../../../git/src/plugins/dm.c:24:10: fatal error: dmraid/dmraid.h: No +such file or directory + #include <dmraid/dmraid.h> + ^~~~~~~~~~~~~~~~~ +... + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/lib/plugin_apis/dm.api | 41 ----- + src/plugins/Makefile.am | 2 +- + src/plugins/dm.c | 318 ------------------------------------ + src/plugins/dm.h | 5 - + src/python/gi/overrides/BlockDev.py | 6 - + 5 files changed, 1 insertion(+), 371 deletions(-) + +diff --git a/src/lib/plugin_apis/dm.api b/src/lib/plugin_apis/dm.api +index a885bba..ec86b80 100644 +--- a/src/lib/plugin_apis/dm.api ++++ b/src/lib/plugin_apis/dm.api +@@ -68,44 +68,3 @@ gchar* bd_dm_node_from_name (const gchar *map_name, GError **error); + */ + gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean active_only, GError **error); + +-/** +- * bd_dm_get_member_raid_sets: +- * @name: (allow-none): name of the member +- * @uuid: (allow-none): uuid of the member +- * @major: major number of the device or -1 if not specified +- * @minor: minor number of the device or -1 if not specified +- * @error: (out): variable to store error (if any) +- * +- * Returns: (transfer full) (array zero-terminated=1): list of names of the RAID sets related to +- * the member or %NULL in case of error +- * +- * One of @name, @uuid or @major:@minor has to be given. +- */ +-gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); +- +-/** +- * bd_dm_activate_raid_set: +- * @name: name of the DM RAID set to activate +- * @error: (out): variable to store error (if any) +- * +- * Returns: whether the RAID set @name was successfully activate or not +- */ +-gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); +- +-/** +- * bd_dm_deactivate_raid_set: +- * @name: name of the DM RAID set to deactivate +- * @error: (out): variable to store error (if any) +- * +- * Returns: whether the RAID set @name was successfully deactivate or not +- */ +-gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); +- +-/** +- * bd_dm_get_raid_set_type: +- * @name: name of the DM RAID set to get the type of +- * @error: (out): variable to store error (if any) +- * +- * Returns: string representation of the @name RAID set's type +- */ +-gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error); +diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am +index 6c4038f..59dc5e3 100644 +--- a/src/plugins/Makefile.am ++++ b/src/plugins/Makefile.am +@@ -76,7 +76,7 @@ endif + + if WITH_DM + libbd_dm_la_CFLAGS = $(GLIB_CFLAGS) $(DEVMAPPER_CFLAGS) $(UDEV_CFLAGS) -Wall -Wextra -Werror +-libbd_dm_la_LIBADD = $(GLIB_LIBS) $(DEVMAPPER_LIBS) $(UDEV_LIBS) -ldmraid ${builddir}/../utils/libbd_utils.la ++libbd_dm_la_LIBADD = $(GLIB_LIBS) $(DEVMAPPER_LIBS) $(UDEV_LIBS) ${builddir}/../utils/libbd_utils.la + libbd_dm_la_LDFLAGS = -L${srcdir}/../utils/ -version-info 2:0:0 -Wl,--no-undefined + # Dear author of libdmdraid, VERSION really is not a good name for an enum member! + libbd_dm_la_CPPFLAGS = -I${builddir}/../../include/ -UVERSION +diff --git a/src/plugins/dm.c b/src/plugins/dm.c +index 9cee742..fd7c7ba 100644 +--- a/src/plugins/dm.c ++++ b/src/plugins/dm.c +@@ -21,16 +21,10 @@ + #include <unistd.h> + #include <blockdev/utils.h> + #include <libdevmapper.h> +-#include <dmraid/dmraid.h> + #include <libudev.h> + + #include "dm.h" + +-/* macros taken from the pyblock/dmraid.h file plus one more*/ +-#define for_each_raidset(_c, _n) list_for_each_entry(_n, LC_RS(_c), list) +-#define for_each_subset(_rs, _n) list_for_each_entry(_n, &(_rs)->sets, list) +-#define for_each_device(_rs, _d) list_for_each_entry(_d, &(_rs)->devs, devs) +- + /** + * SECTION: dm + * @short_description: plugin for basic operations with device mapper +@@ -286,315 +280,3 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a + return ret; + } + +-/** +- * init_dmraid_stack: (skip) +- * +- * Initializes the dmraid stack by creating the library context, discovering +- * devices, raid sets, etc. +- */ +-static struct lib_context* init_dmraid_stack (GError **error) { +- gint rc = 0; +- gchar *argv[] = {"blockdev.dmraid", NULL}; +- struct lib_context *lc; +- +- /* the code for this function was cherry-picked from the pyblock code */ +- /* XXX: do this all just once, store global lc and provide a reinit +- * function? */ +- +- /* initialize dmraid library context */ +- lc = libdmraid_init (1, (gchar **)argv); +- +- rc = discover_devices (lc, NULL); +- if (!rc) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, +- "Failed to discover devices"); +- libdmraid_exit (lc); +- return NULL; +- } +- discover_raid_devices (lc, NULL); +- +- if (!count_devices (lc, RAID)) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_NO_DEVS, +- "No RAIDs discovered"); +- libdmraid_exit (lc); +- return NULL; +- } +- +- argv[0] = NULL; +- if (!group_set (lc, argv)) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, +- "Failed to group_set"); +- libdmraid_exit (lc); +- return NULL; +- } +- +- return lc; +-} +- +-/** +- * raid_dev_matches_spec: (skip) +- * +- * Returns: whether the device specified by @sysname matches the spec given by @name, +- * @uuid, @major and @minor +- */ +-static gboolean raid_dev_matches_spec (struct raid_dev *raid_dev, const gchar *name, const gchar *uuid, gint major, gint minor) { +- gchar const *dev_name = NULL; +- gchar const *dev_uuid; +- gchar const *major_str; +- gchar const *minor_str; +- struct udev *context; +- struct udev_device *device; +- gboolean ret = TRUE; +- +- /* find the second '/' to get name (the rest of the string) */ +- dev_name = strchr (raid_dev->di->path, '/'); +- if (dev_name && strlen (dev_name) > 1) { +- dev_name++; +- dev_name = strchr (dev_name, '/'); +- } +- if (dev_name && strlen (dev_name) > 1) { +- dev_name++; +- } +- else +- dev_name = NULL; +- +- /* if we don't have the name, we cannot check any match */ +- g_return_val_if_fail (dev_name, FALSE); +- +- if (name && strcmp (dev_name, name) != 0) { +- return FALSE; +- } +- +- context = udev_new (); +- device = udev_device_new_from_subsystem_sysname (context, "block", dev_name); +- dev_uuid = udev_device_get_property_value (device, "UUID"); +- major_str = udev_device_get_property_value (device, "MAJOR"); +- minor_str = udev_device_get_property_value (device, "MINOR"); +- +- if (uuid && (g_strcmp0 (uuid, "") != 0) && (g_strcmp0 (uuid, dev_uuid) != 0)) +- ret = FALSE; +- +- if (major >= 0 && (atoi (major_str) != major)) +- ret = FALSE; +- +- if (minor >= 0 && (atoi (minor_str) != minor)) +- ret = FALSE; +- +- udev_device_unref (device); +- udev_unref (context); +- +- return ret; +-} +- +-/** +- * find_raid_sets_for_dev: (skip) +- */ +-static void find_raid_sets_for_dev (const gchar *name, const gchar *uuid, gint major, gint minor, struct lib_context *lc, struct raid_set *rs, GPtrArray *ret_sets) { +- struct raid_set *subset; +- struct raid_dev *dev; +- +- if (T_GROUP(rs) || !list_empty(&(rs->sets))) { +- for_each_subset (rs, subset) +- find_raid_sets_for_dev (name, uuid, major, minor, lc, subset, ret_sets); +- } else { +- for_each_device (rs, dev) { +- if (raid_dev_matches_spec (dev, name, uuid, major, minor)) +- g_ptr_array_add (ret_sets, g_strdup (rs->name)); +- } +- } +-} +- +-/** +- * bd_dm_get_member_raid_sets: +- * @name: (allow-none): name of the member +- * @uuid: (allow-none): uuid of the member +- * @major: major number of the device or -1 if not specified +- * @minor: minor number of the device or -1 if not specified +- * @error: (out): variable to store error (if any) +- * +- * Returns: (transfer full) (array zero-terminated=1): list of names of the RAID sets related to +- * the member or %NULL in case of error +- * +- * One of @name, @uuid or @major:@minor has to be given. +- */ +-gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error) { +- guint64 i = 0; +- struct lib_context *lc = NULL; +- struct raid_set *rs = NULL; +- GPtrArray *ret_sets = g_ptr_array_new (); +- gchar **ret = NULL; +- +- lc = init_dmraid_stack (error); +- if (!lc) +- /* error is already populated */ +- return NULL; +- +- for_each_raidset (lc, rs) { +- find_raid_sets_for_dev (name, uuid, major, minor, lc, rs, ret_sets); +- } +- +- /* now create the return value -- NULL-terminated array of strings */ +- ret = g_new0 (gchar*, ret_sets->len + 1); +- for (i=0; i < ret_sets->len; i++) +- ret[i] = (gchar*) g_ptr_array_index (ret_sets, i); +- ret[i] = NULL; +- +- g_ptr_array_free (ret_sets, FALSE); +- +- libdmraid_exit (lc); +- return ret; +-} +- +-/** +- * find_in_raid_sets: (skip) +- * +- * Runs @eval_fn with @data on each set (traversing recursively) and returns the +- * first RAID set that @eval_fn returns. Thus the @eval_fn should return %NULL +- * on all RAID sets that don't fulfill the search criteria. +- */ +-static struct raid_set* find_in_raid_sets (struct raid_set *rs, RSEvalFunc eval_fn, gpointer data) { +- struct raid_set *subset = NULL; +- struct raid_set *ret = NULL; +- +- ret = eval_fn (rs, data); +- if (ret) +- return ret; +- +- if (T_GROUP(rs) || !list_empty(&(rs->sets))) { +- for_each_subset (rs, subset) { +- ret = find_in_raid_sets (subset, eval_fn, data); +- if (ret) +- return ret; +- } +- } +- +- return ret; +-} +- +-static struct raid_set* rs_matches_name (struct raid_set *rs, gpointer *name_data) { +- gchar *name = (gchar*) name_data; +- +- if (g_strcmp0 (rs->name, name) == 0) +- return rs; +- else +- return NULL; +-} +- +-static gboolean change_set_by_name (const gchar *name, enum activate_type action, GError **error) { +- gint rc = 0; +- struct lib_context *lc; +- struct raid_set *iter_rs; +- struct raid_set *match_rs = NULL; +- +- lc = init_dmraid_stack (error); +- if (!lc) +- /* error is already populated */ +- return FALSE; +- +- for_each_raidset (lc, iter_rs) { +- match_rs = find_in_raid_sets (iter_rs, (RSEvalFunc)rs_matches_name, (gchar *)name); +- if (match_rs) +- break; +- } +- +- if (!match_rs) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_NO_EXIST, +- "RAID set %s doesn't exist", name); +- libdmraid_exit (lc); +- return FALSE; +- } +- +- rc = change_set (lc, action, match_rs); +- if (!rc) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, +- "Failed to activate the RAID set '%s'", name); +- libdmraid_exit (lc); +- return FALSE; +- } +- +- libdmraid_exit (lc); +- return TRUE; +-} +- +-/** +- * bd_dm_activate_raid_set: +- * @name: name of the DM RAID set to activate +- * @error: (out): variable to store error (if any) +- * +- * Returns: whether the RAID set @name was successfully activate or not +- */ +-gboolean bd_dm_activate_raid_set (const gchar *name, GError **error) { +- guint64 progress_id = 0; +- gchar *msg = NULL; +- gboolean ret = FALSE; +- +- msg = g_strdup_printf ("Activating DM RAID set '%s'", name); +- progress_id = bd_utils_report_started (msg); +- g_free (msg); +- ret = change_set_by_name (name, A_ACTIVATE, error); +- bd_utils_report_finished (progress_id, "Completed"); +- return ret; +-} +- +-/** +- * bd_dm_deactivate_raid_set: +- * @name: name of the DM RAID set to deactivate +- * @error: (out): variable to store error (if any) +- * +- * Returns: whether the RAID set @name was successfully deactivate or not +- */ +-gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error) { +- guint64 progress_id = 0; +- gchar *msg = NULL; +- gboolean ret = FALSE; +- +- msg = g_strdup_printf ("Deactivating DM RAID set '%s'", name); +- progress_id = bd_utils_report_started (msg); +- g_free (msg); +- ret = change_set_by_name (name, A_DEACTIVATE, error); +- bd_utils_report_finished (progress_id, "Completed"); +- return ret; +-} +- +-/** +- * bd_dm_get_raid_set_type: +- * @name: name of the DM RAID set to get the type of +- * @error: (out): variable to store error (if any) +- * +- * Returns: string representation of the @name RAID set's type +- */ +-gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error) { +- struct lib_context *lc; +- struct raid_set *iter_rs; +- struct raid_set *match_rs = NULL; +- const gchar *type = NULL; +- +- lc = init_dmraid_stack (error); +- if (!lc) +- /* error is already populated */ +- return NULL; +- +- for_each_raidset (lc, iter_rs) { +- match_rs = find_in_raid_sets (iter_rs, (RSEvalFunc)rs_matches_name, (gchar *)name); +- if (match_rs) +- break; +- } +- +- if (!match_rs) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_NO_EXIST, +- "RAID set %s doesn't exist", name); +- libdmraid_exit (lc); +- return NULL; +- } +- +- type = get_set_type (lc, match_rs); +- if (!type) { +- g_set_error (error, BD_DM_ERROR, BD_DM_ERROR_RAID_FAIL, +- "Failed to get RAID set's type"); +- libdmraid_exit (lc); +- return NULL; +- } +- +- libdmraid_exit (lc); +- return g_strdup (type); +-} +diff --git a/src/plugins/dm.h b/src/plugins/dm.h +index 859fb80..80acd49 100644 +--- a/src/plugins/dm.h ++++ b/src/plugins/dm.h +@@ -1,5 +1,4 @@ + #include <glib.h> +-#include <dmraid/dmraid.h> + + #ifndef BD_DM + #define BD_DM +@@ -35,9 +34,5 @@ gboolean bd_dm_remove (const gchar *map_name, GError **error); + gchar* bd_dm_name_from_node (const gchar *dm_node, GError **error); + gchar* bd_dm_node_from_name (const gchar *map_name, GError **error); + gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean active_only, GError **error); +-gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); +-gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); +-gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); +-gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error); + + #endif /* BD_DM */ +diff --git a/src/python/gi/overrides/BlockDev.py b/src/python/gi/overrides/BlockDev.py +index fb3ffb4..eed0a38 100644 +--- a/src/python/gi/overrides/BlockDev.py ++++ b/src/python/gi/overrides/BlockDev.py +@@ -233,12 +233,6 @@ def dm_create_linear(map_name, device, length, uuid=None): + return _dm_create_linear(map_name, device, length, uuid) + __all__.append("dm_create_linear") + +-_dm_get_member_raid_sets = BlockDev.dm_get_member_raid_sets +-@override(BlockDev.dm_get_member_raid_sets) +-def dm_get_member_raid_sets(name=None, uuid=None, major=-1, minor=-1): +- return _dm_get_member_raid_sets(name, uuid, major, minor) +-__all__.append("dm_get_member_raid_sets") +- + + _loop_setup = BlockDev.loop_setup + @override(BlockDev.loop_setup) +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch new file mode 100644 index 000000000..f18b56928 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch @@ -0,0 +1,50 @@ +From 59fbd57acd1df25b1972a131dc6a77a4fe147729 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 27 Jul 2017 10:45:02 +0800 +Subject: [PATCH] fix compile failure against musl C library + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/plugins/crypto.c | 2 +- + src/plugins/part.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c +index 8fbce4f..66e11e5 100644 +--- a/src/plugins/crypto.c ++++ b/src/plugins/crypto.c +@@ -22,7 +22,7 @@ + #include <libcryptsetup.h> + #include <nss.h> + #include <volume_key/libvolume_key.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <sys/ioctl.h> + #include <linux/random.h> + #include <locale.h> +diff --git a/src/plugins/part.c b/src/plugins/part.c +index 12d2ef7..3afe297 100644 +--- a/src/plugins/part.c ++++ b/src/plugins/part.c +@@ -25,6 +25,7 @@ + #include <inttypes.h> + #include <unistd.h> + #include <sys/file.h> ++#include <fcntl.h> + #include <blockdev/utils.h> + #include <part_err.h> + +@@ -1224,7 +1225,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, + real_flags |= 0x4000000000000000; /* 1 << 62 */ + if (flags & BD_PART_FLAG_GPT_NO_AUTOMOUNT) + real_flags |= 0x8000000000000000; /* 1 << 63 */ +- mask_str = g_strdup_printf ("%.16"__PRI64_PREFIX"x", real_flags); ++ mask_str = g_strdup_printf ("%.16"__PRI64"x", real_flags); + + args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); + g_free (mask_str); +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch new file mode 100644 index 000000000..381893608 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch @@ -0,0 +1,111 @@ +From 9b4a7a4d0653b627d747e00d6b3ada2990caa1d3 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 9 Aug 2017 13:57:57 +0800 +Subject: [PATCH] fix a clang compiling issue + +[snip] +../../../git/src/plugins/fs.c:2617:26: error: missing field 'start' +initializer [-Werror,-Wmissing-field-initializers] + PedGeometry geom = {0}; + ^ +../../../git/src/plugins/fs.c:2618:30: error: missing field 'start' +initializer [-Werror,-Wmissing-field-initializers] + PedGeometry new_geom = {0}; +[snip] + +Fix typo s/enum libvk_packet_format format/enum libvk_secret secret_type/ + +Upstream-Status: Submitted [https://github.com/storaged-project/libblockdev/pull/266] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/plugins/crypto.c | 6 +++--- + src/plugins/fs.c | 4 ++-- + src/plugins/part.c | 4 ++-- + src/utils/exec.c | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c +index 8fbce4f..7ee7cdc 100644 +--- a/src/plugins/crypto.c ++++ b/src/plugins/crypto.c +@@ -881,7 +881,7 @@ gboolean bd_crypto_tc_open (const gchar *device, const gchar *name, const guint8 + gint ret = 0; + guint64 progress_id = 0; + gchar *msg = NULL; +- struct crypt_params_tcrypt params = {0}; ++ struct crypt_params_tcrypt params = {NULL,0,NULL,0,NULL,NULL,NULL,0,0}; + + msg = g_strdup_printf ("Started opening '%s' TrueCrypt/VeraCrypt device", device); + progress_id = bd_utils_report_started (msg); +@@ -999,7 +999,7 @@ static gchar *replace_char (gchar *str, gchar orig, gchar new) { + return str; + } + +-static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libvk_ui *ui, enum libvk_packet_format format, const gchar *out_path, ++static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libvk_ui *ui, enum libvk_secret secret_type, const gchar *out_path, + CERTCertificate *cert, GError **error) { + gpointer packet_data = NULL; + gsize packet_data_size = 0; +@@ -1008,7 +1008,7 @@ static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libv + gsize bytes_written = 0; + GError *tmp_error = NULL; + +- packet_data = libvk_volume_create_packet_asymmetric_with_format (volume, &packet_data_size, format, cert, ++ packet_data = libvk_volume_create_packet_asymmetric_with_format (volume, &packet_data_size, secret_type, cert, + ui, LIBVK_PACKET_FORMAT_ASYMMETRIC_WRAP_SECRET_ONLY, error); + + if (!packet_data) { +diff --git a/src/plugins/fs.c b/src/plugins/fs.c +index c4b6ac8..647096d 100644 +--- a/src/plugins/fs.c ++++ b/src/plugins/fs.c +@@ -2614,8 +2614,8 @@ BDFSVfatInfo* bd_fs_vfat_get_info (const gchar *device, GError **error) { + */ + gboolean bd_fs_vfat_resize (const gchar *device, guint64 new_size, GError **error) { + PedDevice *ped_dev = NULL; +- PedGeometry geom = {0}; +- PedGeometry new_geom = {0}; ++ PedGeometry geom = {NULL, 0, 0, 0}; ++ PedGeometry new_geom = {NULL, 0, 0, 0}; + PedFileSystem *fs = NULL; + PedSector start = 0; + PedSector length = 0; +diff --git a/src/plugins/part.c b/src/plugins/part.c +index 12d2ef7..d277688 100644 +--- a/src/plugins/part.c ++++ b/src/plugins/part.c +@@ -849,7 +849,7 @@ static PedPartition* add_part_to_disk (PedDevice *dev, PedDisk *disk, BDPartType + return NULL; + } + +- part = ped_partition_new (disk, type, NULL, geom->start, geom->end); ++ part = ped_partition_new (disk, (PedPartitionType)type, NULL, geom->start, geom->end); + if (!part) { + set_parted_error (error, BD_PART_ERROR_FAIL); + g_prefix_error (error, "Failed to create new partition on device '%s'", dev->path); +@@ -1427,7 +1427,7 @@ gboolean bd_part_set_part_flags (const gchar *disk, const gchar *part, guint64 f + PedPartition *ped_part = NULL; + const gchar *part_num_str = NULL; + gint part_num = 0; +- guint64 i = 0; ++ int i = 0; + gint status = 0; + gboolean ret = FALSE; + guint64 progress_id = 0; +diff --git a/src/utils/exec.c b/src/utils/exec.c +index 7ac44fd..0a3094c 100644 +--- a/src/utils/exec.c ++++ b/src/utils/exec.c +@@ -354,7 +354,7 @@ gboolean bd_utils_exec_and_report_progress (const gchar **argv, const BDExtraArg + GIOStatus io_status = G_IO_STATUS_NORMAL; + guint i = 0; + guint8 completion = 0; +- GPollFD fds[2] = {{0}, {0}}; ++ GPollFD fds[2] = {{0,0,0}, {0,0,0}}; + gboolean out_done = FALSE; + gboolean err_done = FALSE; + GString *stdout_data = g_string_new (NULL); +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.10.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.10.bb new file mode 100644 index 000000000..2a923548a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.10.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \ +block devices. It has a plugin-based architecture where each technology (like \ +LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ +with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." +HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" +LICENSE = "LGPLv2+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "c1dda45001542edd7d7f1ffc6451c5a74623f805" +SRC_URI = "git://github.com/rhinstaller/libblockdev;branch=master \ + file://0001-fix-configure-and-compile-failures.patch \ + file://0002-remove-python2-support.patch \ + file://0003-remove-dmraid-while-compiling-with-with-dm.patch \ + file://0005-fix-a-clang-compiling-issue.patch \ +" +SRC_URI_append_libc-musl = " \ + file://0004-fix-compile-failure-against-musl-C-library.patch \ +" + +inherit autotools python3native gobject-introspection + +DEPENDS += " \ + cryptsetup \ + nss \ + volume-key \ + libbytesize \ + btrfs-tools \ +" +RDEPENDS_${PN} += " \ + lvm2 \ +" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" + +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools" +PACKAGECONFIG[dm] = "--with-dm, --without-dm" +PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod" +PACKAGECONFIG[parted] = "--with-part, --without-part, parted" +PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" +PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" + +export STAGING_INCDIR +export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb index 13a38ab49..d4bad38b7 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb @@ -15,8 +15,7 @@ SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \ SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91" SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f" -CFLAGS += "-fno-omit-frame-pointer" -CFLAGS += " -D_GNU_SOURCE" +CFLAGS += "-fno-omit-frame-pointer -D_GNU_SOURCE" do_install() { install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb index e5655b505..0c41afa3c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb @@ -1,4 +1,5 @@ SUMMARY = "File locking library" +HOMEPAGE = "http://packages.qa.debian.org/libl/liblockfile.html" SECTION = "libs" LICENSE = "LGPLv2+ & GPLv2+" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch new file mode 100644 index 000000000..d12492f02 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch @@ -0,0 +1,48 @@ +From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 3 Aug 2015 13:43:14 +0800 +Subject: [PATCH] setup.py.in: add missing python include dir for cross + compiling + +Upstream-Status: inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + python/Makefile.am | 2 +- + python/setup.py.in | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index abc5cd3..e35ba71 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,4 +14,4 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} +diff --git a/python/setup.py.in b/python/setup.py.in +index 6457595..d3db0e5 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,6 +6,7 @@ + + from distutils.core import setup, Extension + from distutils.command.build_ext import build_ext as _build_ext ++import os + + class build_ext(_build_ext): + def genconstants(self, headerfile, outputfile): +@@ -23,7 +24,7 @@ class build_ext(_build_ext): + + pwqmodule = Extension('pwquality', + sources = ['pwquality.c'], +- include_dirs = ['../src'], ++ include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])], + library_dirs = ['../src/.libs'], + libraries = ['pwquality']) + +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb new file mode 100644 index 000000000..2c96063f1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "Library for password quality checking and generating random passwords" +HOMEPAGE = "https://github.com/libpwquality/libpwquality" +SECTION = "devel/lib" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" + +SRCNAME = "libpwquality" +SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.bz2 \ + file://add-missing-python-include-dir-for-cross.patch \ +" + +SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" +SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +DEPENDS = "cracklib virtual/gettext python3" +RDEPENDS_python3-libpwquality = "${PN}" + +inherit autotools python3native gettext + +B = "${S}" + +export PYTHON_DIR +export BUILD_SYS +export HOST_SYS +export STAGING_LIBDIR +export STAGING_INCDIR + +EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ + --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ + --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \ + --libdir=${libdir} \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" + +PACKAGES += "python3-libpwquality python3-libpwquality-dbg" +FILES_${PN} += "${libdir}/security/pam_pwquality.so" +FILES_${PN}-dbg += "${libdir}/security/.debug" +FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" +FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la" +FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES_python3-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb index e26bb7c19..574f6601c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "0a329683a76bc6aeb36f20f2bf6b43ba0440c4dc" +SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch new file mode 100644 index 000000000..9b328a10a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch @@ -0,0 +1,28 @@ +From db32ba60ca75d288d3ac08b54256cb74d9e1581a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 26 Apr 2017 03:47:58 -0400 +Subject: [PATCH 1/3] Makefile.am: remove doc and apidoc + +There was a failure at do_install time, so remove doc to workaround. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index c6ab640..fb09fc1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = po src tests doc apidoc ++SUBDIRS = po src tests + + EXTRA_DIST = \ + libreport.pc.in \ +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch new file mode 100644 index 000000000..146510e3c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch @@ -0,0 +1,48 @@ +From d8c49e6a15ab28f4ca94e03b2a53ed8df63346cd Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 26 Apr 2017 03:49:45 -0400 +Subject: [PATCH 2/3] configure.ac: remove prog test of xmlto and asciidoc + +The prog of xmlto and asciidoc were used to generate documents, +and since the doc module has already been disabled, so we should +remove the prog test. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ccefe50..ed48c88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -68,24 +68,6 @@ if test -z "$PYTHON3"; then + exit 1 + fi + +-AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) +-[if test "$ASCIIDOC" = "no"] +-[then] +- [echo "The asciidoc program was not found in the search path. Please ensure"] +- [echo "that it is installed and its directory is included in the search path."] +- [echo "Then run configure again before attempting to build libreport."] +- [exit 1] +-[fi] +- +-AC_PATH_PROG([XMLTO], [xmlto], [no]) +-[if test "$XMLTO" = "no"] +-[then] +- [echo "The xmlto program was not found in the search path. Please ensure"] +- [echo "that it is installed and its directory is included in the search path."] +- [echo "Then run configure again before attempting to build libreport."] +- [exit 1] +-[fi] +- + AC_ARG_WITH(bugzilla, + AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), + LIBREPORT_PARSE_WITH([bugzilla])) +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch new file mode 100644 index 000000000..3ad777464 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch @@ -0,0 +1,26 @@ +From 0e96d9f23b2b166e7444e7c8e0a6d4b83c2eccd7 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 26 Apr 2017 03:51:03 -0400 +Subject: [PATCH 3/3] without build plugins + +Upstream-Status: Inappropriate workaround + +Rebase to 2.9.1 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index c15928c..bac02b1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -8,4 +8,4 @@ if BUILD_NEWT + sub_dirs += report-newt + endif + +-SUBDIRS = include lib plugins report-python cli client-python workflows $(sub_dirs) ++SUBDIRS = include lib report-python cli client-python workflows $(sub_dirs) +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch new file mode 100644 index 000000000..9839e5a9f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch @@ -0,0 +1,36 @@ +From cf3b646facc19078ed29f828e36dd2e552283518 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 27 Apr 2017 02:15:02 -0400 +Subject: [PATCH] configure.ac: remove prog test of augparse + +The build time does not require it. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c06af2d..b90f49e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -288,14 +288,6 @@ AC_ARG_WITH(augeaslenslibdir, + [Directory for librepor lens (default: /usr/share/augeas/lenses)])], + [], [with_augeaslenslibdir="/usr/share/augeas/lenses"]) + AC_SUBST([AUGEAS_LENS_LIB_DIR], [$with_augeaslenslibdir]) +-AC_PATH_PROG(AUGPARSE, augparse, no) +-[if test "$AUGPARSE" = "no"] +-[then] +- [echo "The augparse program was not found in the search path. Please ensure"] +- [echo "that it is installed and its directory is included in the search path."] +- [echo "Then run configure again before attempting to build libreport."] +- [exit 1] +-[fi] + + AC_ARG_WITH([defaultdumpdirmode], + AS_HELP_STRING([--with-defaultdumpdirmode=OCTAL-MODE], +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch new file mode 100644 index 000000000..9770f077c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch @@ -0,0 +1,142 @@ +From 06710ab89fc7d7a82a378289aa3fcd92d33074f2 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 27 Apr 2017 03:31:00 -0400 +Subject: [PATCH] remove python2 support + +We do not require python2, so remove it. + +Upstream-Status: Inappropriate workaround + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 15 --------------- + src/client-python/reportclient/Makefile.am | 9 --------- + src/report-python/Makefile.am | 19 ------------------- + 3 files changed, 43 deletions(-) + +diff --git a/configure.ac b/configure.ac +index eb50382..826d0fe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,15 +166,6 @@ do + done + fi dnl end NO_MANTISBT + +-AC_PATH_PROG([PYTHON_CONFIG], [python-config], [no]) +-[if test "$PYTHON_CONFIG" = "no"] +-[then] +- [echo "The python-config program was not found in the search path. Please ensure"] +- [echo "that it is installed and its directory is included in the search path."] +- [echo "Then run configure again before attempting to build libreport."] +- [exit 1] +-[fi] +- + AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) + [if test "$PYTHON3_CONFIG" = "no"] + [then] +@@ -184,9 +175,6 @@ AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no]) + [exit 1] + [fi] + +-PYTHON_CFLAGS=`python-config --cflags 2> /dev/null` +-PYTHON_LIBS=`python-config --libs 2> /dev/null` +- + PYTHON3_CFLAGS=`python3-config --cflags 2> /dev/null` + PYTHON3_LIBS=`python3-config --libs 2> /dev/null` + +@@ -198,9 +186,6 @@ PYTHON3_DIR=`$PYTHON3 -c "import distutils.sysconfig; \ + PYTHON3_EXECDIR=`$PYTHON3 -c "import distutils.sysconfig; \ + print(distutils.sysconfig.get_python_lib(1,0,prefix='$PYTHON3_EXEC_PREFIX'))"` + +-AC_SUBST(PYTHON_CFLAGS) +-AC_SUBST(PYTHON_LIBS) +- + AC_SUBST(PYTHON3_CFLAGS) + AC_SUBST(PYTHON3_LIBS) + AC_SUBST(python3dir, $PYTHON3_DIR) +diff --git a/src/client-python/reportclient/Makefile.am b/src/client-python/reportclient/Makefile.am +index 46ac42f..fb5216a 100644 +--- a/src/client-python/reportclient/Makefile.am ++++ b/src/client-python/reportclient/Makefile.am +@@ -4,13 +4,10 @@ PYFILES = \ + dnfdebuginfo.py \ + yumdebuginfo.py + +-py2clientdir = $(pyexecdir)/reportclient + py3clientdir = $(py3execdir)/reportclient + +-py2client_PYTHON = $(PYFILES) + py3client_PYTHON = $(PYFILES) + +-py2client_LTLIBRARIES = _reportclient.la + py3client_LTLIBRARIES = _reportclient3.la + + PYEXTFILES = \ +@@ -33,12 +30,6 @@ PYEXTLDFLAGS = \ + -avoid-version \ + -Wl,-z,relro -Wl,-z,now + +-_reportclient_la_SOURCES = $(PYEXTFILES) +-_reportclient_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON_CFLAGS) +-_reportclient_la_LDFLAGS = $(PYEXTLDFLAGS) \ +- -export-symbols-regex init_reportclient +-_reportclient_la_LIBADD = ../../lib/libreport.la +- + _reportclient3_la_SOURCES = $(PYEXTFILES) + _reportclient3_la_CPPFLAGS = $(PYEXTCPPFLAGS) $(PYTHON3_CFLAGS) + _reportclient3_la_LDFLAGS = $(PYEXTLDFLAGS) \ +diff --git a/src/report-python/Makefile.am b/src/report-python/Makefile.am +index 793cebd..241dcb7 100644 +--- a/src/report-python/Makefile.am ++++ b/src/report-python/Makefile.am +@@ -1,12 +1,9 @@ + PYFILES = __init__.py accountmanager.py + +-pyreportexecdir = $(pyexecdir)/report + py3reportexecdir = $(py3execdir)/report + +-pyreportexec_PYTHON = $(PYFILES) + py3reportexec_PYTHON = $(PYFILES) + +-pyreportexec_LTLIBRARIES = _pyreport.la + py3reportexec_LTLIBRARIES = _py3report.la + + PYEXTFILES = \ +@@ -34,20 +31,6 @@ PYEXTLDFLAGS = \ + -avoid-version \ + -Wl,-z,relro -Wl,-z,now + +-_pyreport_la_SOURCES = $(PYEXTFILES) +- +-_pyreport_la_CPPFLAGS = \ +- $(PYEXTCPPFLAGS) \ +- $(PYTHON_CFLAGS) +- +-_pyreport_la_LDFLAGS = \ +- $(PYEXTLDFLAGS) \ +- -export-symbols-regex init_pyreport +- +-_pyreport_la_LIBADD = \ +- ../lib/libreport.la \ +- $(PYTHON2_LIBS) +- + _py3report_la_SOURCES = $(PYEXTFILES) + + _py3report_la_CPPFLAGS = \ +@@ -64,7 +47,6 @@ _py3report_la_LIBADD = \ + + # report compat: + +-pyreportioexecdir = $(pyexecdir)/report/io + py3reportioexecdir = $(py3execdir)/report/io + + PYIOFILES = \ +@@ -73,5 +55,4 @@ PYIOFILES = \ + io/NewtIO.py \ + io/TextIO.py + +-pyreportioexec_PYTHON = $(PYIOFILES) + py3reportioexec_PYTHON = $(PYIOFILES) +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb new file mode 100644 index 000000000..525437bdb --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Libraries providing API for reporting different problems in applications \ +to different bug targets like Bugzilla, ftp, trac, etc..." +SUMMARY = "Generic library for reporting various problems" +HOMEPAGE = "https://abrt.readthedocs.org/" +LICENSE = "GPLv2+" +DEPENDS = "xmlrpc-c xmlrpc-c-native intltool-native \ + json-c libtar libnewt libproxy rpm \ + augeas satyr systemd gtk+3 \ +" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + + +SRC_URI = "git://github.com/abrt/libreport.git;protocol=https" +SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ + file://0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch \ + file://0003-without-build-plugins.patch \ + file://0004-configure.ac-remove-prog-test-of-augparse.patch \ + file://0005-remove-python2-support.patch \ +" +SRCREV = "cfff49f06d9d17e269d463ee71b3d94c8bfb0c58" +S = "${WORKDIR}/git" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "systemd" + +inherit gettext autotools python3native pkgconfig + +RDEPENDS_python3-libreport += "${PN}" + +do_patch[prefuncs] += "do_gen_version" +do_gen_version() { + cd ${S} + ./gen-version +} + +PACKAGES += "python3-libreport" + +FILES_${PN} += "${datadir}/*" +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug" +FILES_python3-libreport = "${PYTHON_SITEPACKAGES_DIR}/*" + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb deleted file mode 100644 index ba4c2ab9a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Analyzes log files and sends noticeable events as email" -DESCRIPTION = "\ -Logcheck is a simple utility which is designed to allow a system administrator \ -to view the log-files which are produced upon hosts under their control. \ -It does this by mailing summaries of the log-files to them, after first \ -filtering out "normal" entries. \ -Normal entries are entries which match one of the many included regular \ -expression files contain in the database." -SECTION = "Applications/System" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "git://git.debian.org/git/logcheck/logcheck.git" -SRCREV = "2429e67ad875fee8a0234c64d504277b038c89cd" - -S = "${WORKDIR}/git" - -do_install() { - # Fix QA Issue - sed -i '/install -d $(DESTDIR)\/var\/lock\/logcheck/s/^/#/' Makefile - - # "make install" do not install the manpages. Install them manually. - install -m 755 -d ${D}${mandir}/man1 - install -m 755 -d ${D}${mandir}/man8 - install -m 644 docs/logcheck-test.1 ${D}${mandir}/man1/ - install -m 644 docs/logtail.8 ${D}${mandir}/man8/ - install -m 644 docs/logtail2.8 ${D}${mandir}/man8/ - sed -i "s/syslog/messages/" etc/logcheck.logfiles - sed -i "s/auth\.log/secure/" etc/logcheck.logfiles - install -m 755 -d ${D}${sysconfdir}/cron.d - install -m 644 debian/logcheck.cron.d ${D}${sysconfdir}/cron.d/logcheck - install -m 755 -d ${D}/var/lib/logcheck - oe_runmake install DESTDIR=${D} -} - -RDEPENDS_${PN} = "perl" - -FILES_${PN} += "${datadir}/logtail" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch new file mode 100644 index 000000000..77da33321 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch @@ -0,0 +1,59 @@ +From: Luk Claes <luk@debian.org> +Date: Sat, 4 Jul 2009 10:54:53 +0200 +Subject: Don't reuse weak symbol optopt to fix FTBFS on mips* + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +--- + getopt.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/getopt.c b/getopt.c +index 83ce628..82e983c 100644 +--- a/getopt.c ++++ b/getopt.c +@@ -43,7 +43,7 @@ typedef int ssize_t; + char *optarg; + int optind = 1; + int opterr = 1; +-int optopt; ++int optoptc; + + static void + error(const char *s, int c) +@@ -69,7 +69,7 @@ error(const char *s, int c) + *bp++ = *s++; + while (*msg) + *bp++ = *msg++; +- *bp++ = optopt; ++ *bp++ = optoptc; + *bp++ = '\n'; + write(2, buf, bp - buf); + ac_free(buf); +@@ -101,13 +101,13 @@ getopt(int argc, char *const argv[], const char *optstring) + } + curp = &argv[optind][1]; + } +- optopt = curp[0] & 0377; ++ optoptc = curp[0] & 0377; + while (optstring[0]) { + if (optstring[0] == ':') { + optstring++; + continue; + } +- if ((optstring[0] & 0377) == optopt) { ++ if ((optstring[0] & 0377) == optoptc) { + if (optstring[1] == ':') { + if (curp[1] != '\0') { + optarg = (char *)&curp[1]; +@@ -127,7 +127,7 @@ getopt(int argc, char *const argv[], const char *optstring) + optind++; + optarg = 0; + } +- return optopt; ++ return optoptc; + } + optstring++; + } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch new file mode 100644 index 000000000..6bad433ea --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch @@ -0,0 +1,41 @@ +From: Hilko Bengen <bengen@debian.org> +Date: Wed, 27 Apr 2011 00:18:42 +0200 +Subject: Patched out SSL2 support since it is no longer supported by OpenSSL. + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +--- + mailx.1 | 2 +- + openssl.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/mailx.1 b/mailx.1 +index 417ea04..a02e430 100644 +--- a/mailx.1 ++++ b/mailx.1 +@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL. + .TP + .B ssl-method + Selects a SSL/TLS protocol version; +-valid values are `ssl2', `ssl3', and `tls1'. ++valid values are `ssl3', and `tls1'. + If unset, the method is selected automatically, + if possible. + .TP +diff --git a/openssl.c b/openssl.c +index b4e33fc..44fe4e5 100644 +--- a/openssl.c ++++ b/openssl.c +@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp) + + cp = ssl_method_string(uhp); + if (cp != NULL) { +- if (equal(cp, "ssl2")) +- method = SSLv2_client_method(); +- else if (equal(cp, "ssl3")) ++ if (equal(cp, "ssl3")) + method = SSLv3_client_method(); + else if (equal(cp, "tls1")) + method = TLSv1_client_method(); diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch new file mode 100644 index 000000000..13b73ae59 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch @@ -0,0 +1,25 @@ +From: Hilko Bengen <bengen@debian.org> +Date: Sat, 14 Apr 2012 20:22:43 +0200 +Subject: Fixed Lintian warning (warning: macro `N' not defined) + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +--- + mailx.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mailx.1 b/mailx.1 +index a02e430..b0723bd 100644 +--- a/mailx.1 ++++ b/mailx.1 +@@ -3781,7 +3781,7 @@ you could examine the first message by giving the command: + .sp + .fi + which might cause +-.N mailx ++.I mailx + to respond with, for example: + .nf + .sp diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch new file mode 100644 index 000000000..13b955c4b --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch @@ -0,0 +1,71 @@ +From 9984ae5cb0ea0d61df1612b06952a61323c083d9 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 17 Nov 2014 11:13:38 +0100 +Subject: [PATCH 1/4] outof: Introduce expandaddr flag + +Document that address expansion is disabled unless the expandaddr +binary option is set. + +This has been assigned CVE-2014-7844 for BSD mailx, but it is not +a vulnerability in Heirloom mailx because this feature was documented. + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +CVE: CVE-2014-7844 +--- + mailx.1 | 14 ++++++++++++++ + names.c | 3 +++ + 2 files changed, 17 insertions(+) + +diff --git a/mailx.1 b/mailx.1 +index 70a7859..22a171b 100644 +--- a/mailx.1 ++++ b/mailx.1 +@@ -656,6 +656,14 @@ but any reply returned to the machine + will have the system wide alias expanded + as all mail goes through sendmail. + .SS "Recipient address specifications" ++If the ++.I expandaddr ++option is not set (the default), recipient addresses must be names of ++local mailboxes or Internet mail addresses. ++.PP ++If the ++.I expandaddr ++option is set, the following rules apply: + When an address is used to name a recipient + (in any of To, Cc, or Bcc), + names of local mail folders +@@ -2391,6 +2399,12 @@ and exits immediately. + If this option is set, + \fImailx\fR starts even with an empty mailbox. + .TP ++.B expandaddr ++Causes ++.I mailx ++to expand message recipient addresses, as explained in the section, ++Recipient address specifications. ++.TP + .B flipr + Exchanges the + .I Respond +diff --git a/names.c b/names.c +index 66e976b..c69560f 100644 +--- a/names.c ++++ b/names.c +@@ -268,6 +268,9 @@ outof(struct name *names, FILE *fo, struct header *hp) + FILE *fout, *fin; + int ispipe; + ++ if (value("expandaddr") == NULL) ++ return names; ++ + top = names; + np = names; + time(&now); +-- +1.9.3 + + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch new file mode 100644 index 000000000..8cdbfd8b0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch @@ -0,0 +1,79 @@ +From e34e2ac67b80497080ebecccec40c3b61456167d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 17 Nov 2014 11:14:06 +0100 +Subject: [PATCH 2/4] unpack: Disable option processing for email addresses + when calling sendmail + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +--- + extern.h | 2 +- + names.c | 8 ++++++-- + sendout.c | 2 +- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/extern.h b/extern.h +index 6b85ba0..8873fe8 100644 +--- a/extern.h ++++ b/extern.h +@@ -396,7 +396,7 @@ struct name *outof(struct name *names, FILE *fo, struct header *hp); + int is_fileaddr(char *name); + struct name *usermap(struct name *names); + struct name *cat(struct name *n1, struct name *n2); +-char **unpack(struct name *np); ++char **unpack(struct name *smopts, struct name *np); + struct name *elide(struct name *names); + int count(struct name *np); + struct name *delete_alternates(struct name *np); +diff --git a/names.c b/names.c +index c69560f..45bbaed 100644 +--- a/names.c ++++ b/names.c +@@ -549,7 +549,7 @@ cat(struct name *n1, struct name *n2) + * Return an error if the name list won't fit. + */ + char ** +-unpack(struct name *np) ++unpack(struct name *smopts, struct name *np) + { + char **ap, **top; + struct name *n; +@@ -564,7 +564,7 @@ unpack(struct name *np) + * the terminating 0 pointer. Additional spots may be needed + * to pass along -f to the host mailer. + */ +- extra = 2; ++ extra = 3 + count(smopts); + extra++; + metoo = value("metoo") != NULL; + if (metoo) +@@ -581,6 +581,10 @@ unpack(struct name *np) + *ap++ = "-m"; + if (verbose) + *ap++ = "-v"; ++ for (; smopts != NULL; smopts = smopts->n_flink) ++ if ((smopts->n_type & GDEL) == 0) ++ *ap++ = smopts->n_name; ++ *ap++ = "--"; + for (; n != NULL; n = n->n_flink) + if ((n->n_type & GDEL) == 0) + *ap++ = n->n_name; +diff --git a/sendout.c b/sendout.c +index 7b7f2eb..c52f15d 100644 +--- a/sendout.c ++++ b/sendout.c +@@ -835,7 +835,7 @@ start_mta(struct name *to, struct name *mailargs, FILE *input, + #endif /* HAVE_SOCKETS */ + + if ((smtp = value("smtp")) == NULL) { +- args = unpack(cat(mailargs, to)); ++ args = unpack(mailargs, to); + if (debug || value("debug")) { + printf(catgets(catd, CATSET, 181, + "Sendmail arguments:")); +-- +1.9.3 + + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch new file mode 100644 index 000000000..5558d8639 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch @@ -0,0 +1,113 @@ +From 2bae8ecf04ec2ba6bb9f0af5b80485dd0edb427d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 17 Nov 2014 12:48:25 +0100 +Subject: [PATCH 3/4] fio.c: Unconditionally require wordexp support + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +--- + fio.c | 67 +++++-------------------------------------------------------------- + 1 file changed, 5 insertions(+), 62 deletions(-) + +diff --git a/fio.c b/fio.c +index 65e8f10..1529236 100644 +--- a/fio.c ++++ b/fio.c +@@ -43,12 +43,15 @@ static char sccsid[] = "@(#)fio.c 2.76 (gritter) 9/16/09"; + #endif /* not lint */ + + #include "rcv.h" ++ ++#ifndef HAVE_WORDEXP ++#error wordexp support is required ++#endif ++ + #include <sys/stat.h> + #include <sys/file.h> + #include <sys/wait.h> +-#ifdef HAVE_WORDEXP + #include <wordexp.h> +-#endif /* HAVE_WORDEXP */ + #include <unistd.h> + + #if defined (USE_NSS) +@@ -481,7 +484,6 @@ next: + static char * + globname(char *name) + { +-#ifdef HAVE_WORDEXP + wordexp_t we; + char *cp; + sigset_t nset; +@@ -527,65 +529,6 @@ globname(char *name) + } + wordfree(&we); + return cp; +-#else /* !HAVE_WORDEXP */ +- char xname[PATHSIZE]; +- char cmdbuf[PATHSIZE]; /* also used for file names */ +- int pid, l; +- char *cp, *shell; +- int pivec[2]; +- extern int wait_status; +- struct stat sbuf; +- +- if (pipe(pivec) < 0) { +- perror("pipe"); +- return name; +- } +- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name); +- if ((shell = value("SHELL")) == NULL) +- shell = SHELL; +- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL); +- if (pid < 0) { +- close(pivec[0]); +- close(pivec[1]); +- return NULL; +- } +- close(pivec[1]); +-again: +- l = read(pivec[0], xname, sizeof xname); +- if (l < 0) { +- if (errno == EINTR) +- goto again; +- perror("read"); +- close(pivec[0]); +- return NULL; +- } +- close(pivec[0]); +- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) { +- fprintf(stderr, catgets(catd, CATSET, 81, +- "\"%s\": Expansion failed.\n"), name); +- return NULL; +- } +- if (l == 0) { +- fprintf(stderr, catgets(catd, CATSET, 82, +- "\"%s\": No match.\n"), name); +- return NULL; +- } +- if (l == sizeof xname) { +- fprintf(stderr, catgets(catd, CATSET, 83, +- "\"%s\": Expansion buffer overflow.\n"), name); +- return NULL; +- } +- xname[l] = 0; +- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--) +- ; +- cp[1] = '\0'; +- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) { +- fprintf(stderr, catgets(catd, CATSET, 84, +- "\"%s\": Ambiguous.\n"), name); +- return NULL; +- } +- return savestr(xname); +-#endif /* !HAVE_WORDEXP */ + } + + /* +-- +1.9.3 + + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch new file mode 100644 index 000000000..ae14b8acf --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch @@ -0,0 +1,31 @@ +From 73fefa0c1ac70043ec84f2d8b8f9f683213f168d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 17 Nov 2014 13:11:32 +0100 +Subject: [PATCH 4/4] globname: Invoke wordexp with WRDE_NOCMD (CVE-2004-2771) + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +CVE: CVE-2004-2771 +--- + fio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fio.c b/fio.c +index 1529236..774a204 100644 +--- a/fio.c ++++ b/fio.c +@@ -497,7 +497,7 @@ globname(char *name) + sigemptyset(&nset); + sigaddset(&nset, SIGCHLD); + sigprocmask(SIG_BLOCK, &nset, NULL); +- i = wordexp(name, &we, 0); ++ i = wordexp(name, &we, WRDE_NOCMD); + sigprocmask(SIG_UNBLOCK, &nset, NULL); + switch (i) { + case 0: +-- +1.9.3 + + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch new file mode 100644 index 000000000..2b5991425 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch @@ -0,0 +1,38 @@ +Description: Sendmail is at /usr/sbin/sendmail + As per Debian Policy §11.6 +Author: Ryan Kavanagh <rak@debian.org> +Origin: Debian +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: heirloom-mailx-12.5/Makefile +=================================================================== +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] + +--- heirloom-mailx-12.5.orig/Makefile 2011-04-26 17:23:22.000000000 -0400 ++++ heirloom-mailx-12.5/Makefile 2015-01-27 13:20:04.733542801 -0500 +@@ -13,7 +13,7 @@ + + MAILRC = $(SYSCONFDIR)/nail.rc + MAILSPOOL = /var/mail +-SENDMAIL = /usr/lib/sendmail ++SENDMAIL = /usr/sbin/sendmail + + DESTDIR = + +Index: heirloom-mailx-12.5/mailx.1 +=================================================================== +--- heirloom-mailx-12.5.orig/mailx.1 2015-01-27 13:18:49.000000000 -0500 ++++ heirloom-mailx-12.5/mailx.1 2015-01-27 13:20:32.382336867 -0500 +@@ -4922,7 +4922,7 @@ + which just acts as a proxy. + .PP + \fIMailx\fR immediately contacts the SMTP server (or +-.IR \%/usr/lib/sendmail ) ++.IR \%/usr/sbin/sendmail ) + even when operating in + .I disconnected + mode. diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch new file mode 100644 index 000000000..b74fd0472 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch @@ -0,0 +1,46 @@ +krb5 support is autodetected from sysroot making builds undeterministic +feel free to improve this to support explicitly enabling/disabling it + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- a/makeconfig 2013-07-21 15:06:11.177792334 +0200 ++++ b/makeconfig 2013-07-21 15:07:20.028793994 +0200 +@@ -424,36 +424,6 @@ + } + ! + +-<$tmp2.c link_check gssapi 'for GSSAPI in libgss' \ +- '#define USE_GSSAPI' '-lgss' || +- <$tmp2.c link_check gssapi 'for GSSAPI in libgssapi_krb5' \ +- '#define USE_GSSAPI' '-lgssapi_krb5' || +- link_check gssapi 'for GSSAPI in libgssapi_krb5, old-style' \ +- '#define USE_GSSAPI +-#define GSSAPI_OLD_STYLE' '-lgssapi_krb5' <<\! || \ +- link_check gssapi 'for GSSAPI in libgssapi' \ +- '#define USE_GSSAPI +-#define GSSAPI_REG_INCLUDE' '-lgssapi' <<\% +-#include <gssapi/gssapi.h> +-#include <gssapi/gssapi_generic.h> +- +-int main(void) +-{ +- gss_import_name(0, 0, gss_nt_service_name, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-! +-#include <gssapi.h> +- +-int main(void) +-{ +- gss_import_name(0, 0, GSS_C_NT_HOSTBASED_SERVICE, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-% +- + cat >$tmp2.c <<\! + #include "config.h" + #ifdef HAVE_NL_LANGINFO diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb new file mode 100644 index 000000000..0a191a00c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb @@ -0,0 +1,53 @@ +SUMMARY = "mailx is the traditional command-line-mode mail user agent" + +DESCRIPTION = "Mailx is derived from Berkeley Mail and is intended provide the \ +functionality of the POSIX mailx command with additional support \ +for MIME, IMAP, POP3, SMTP, and S/MIME." + +HOMEPAGE = "http://heirloom.sourceforge.net/mailx.html" +SECTION = "console/network" +LICENSE = "BSD & MPL-1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd" + +DEPENDS = "openssl10" + +SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5.orig.tar.gz;name=archive \ + file://0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch \ + file://0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch \ + file://0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch \ + file://0011-outof-Introduce-expandaddr-flag.patch \ + file://0012-unpack-Disable-option-processing-for-email-addresses.patch \ + file://0013-fio.c-Unconditionally-require-wordexp-support.patch \ + file://0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch \ + file://0015-usr-sbin-sendmail.patch \ + file://explicitly.disable.krb5.support.patch \ + " + +SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2" +SRC_URI[archive.sha256sum] = "015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad" + +# for this package we're mostly interested in tracking debian patches, +# and not in the upstream version where all development has effectively stopped +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/" +UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" + +S = "${WORKDIR}/heirloom-mailx-12.5" + +inherit autotools-brokensep + +CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT" + +# "STRIP=true" means that 'true' command will be used to 'strip' files which will achieve the effect of not stripping them +# mailx's Makefile doesn't allow a more straightforward way to avoid stripping +EXTRA_OEMAKE = "SENDMAIL=${sbindir}/sendmail IPv6=-DHAVE_IPv6_FUNCS PREFIX=/usr UCBINSTALL=/usr/bin/install STRIP=true" + +# The makeconfig can't run parallelly, otherwise the checking results +# might be incorrect and lead to errors: +# fio.c:56:17: fatal error: ssl.h: No such file or directory +# #include <ssl.h> +PARALLEL_MAKE = "" + +# Causes gcc to get stuck and eat all available memory in qemuarm builds +# http://errors.yoctoproject.org/Errors/Details/20488/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb index b6744395f..49b7f156e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb @@ -1,4 +1,5 @@ SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "http://www.mozilla.org/js/" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" @@ -51,6 +52,9 @@ PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${ST # mozjs requires autoreconf 2.13 do_configure() { + export HOST_CFLAGS="${BUILD_CFLAGS}" + export HOST_CXXFLAGS="${BUILD_CPPFLAGS}" + export HOST_LDFLAGS="${BUILD_LDFLAGS}" ( cd ${S} gnu-configize --force mv config.guess config.sub build/autoconf ) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb new file mode 100644 index 000000000..616048fac --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -0,0 +1,51 @@ +SUMMARY = "Linux Library for low speed I/O Communication" +HOMEPAGE = "https://github.com/intel-iot-devkit/mraa" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f" + +SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480" +PV = "1.7.0-git${SRCPV}" + +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" + +S = "${WORKDIR}/git" + +# CMakeLists.txt checks the architecture, only x86 and ARM supported for now +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" + +inherit cmake distutils3-base + +DEPENDS += "json-c" + +EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON" + +# Prepend mraa-utils to make sure bindir ends up in there +PACKAGES =+ "${PN}-utils" + +FILES_${PN}-doc += "${datadir}/mraa/examples/" + +FILES_${PN}-utils = "${bindir}/" + +# override this in local.conf to get needed bindings. +# BINDINGS_pn-mraa="python" +# will result in only the python bindings being built/packaged. +BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS') or '0') else '' }" + +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ + ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" + +PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," +PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," +PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222" + +FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" +RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" + +FILES_node-${PN} = "${prefix}/lib/node_modules/" +RDEPENDS_node-${PN} += "nodejs" + +### Include desired language bindings ### +PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" +PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch new file mode 100644 index 000000000..a208f97eb --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch @@ -0,0 +1,37 @@ +From 52590fbf735cef3fec85a042458aa89a02c52b57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2017 11:33:12 -0700 +Subject: [PATCH] nicstat.c: Do not define uint64_t and uint32_t + +Use the defines from platform + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + nicstat.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/nicstat.c b/nicstat.c +index 83ad557..2a6e0c1 100644 +--- a/nicstat.c ++++ b/nicstat.c +@@ -32,6 +32,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <unistd.h> + #include <string.h> + #include <ctype.h> +@@ -88,8 +89,6 @@ + #define PROC_NET_BUFSIZ (128 * 1024) + #define PROC_UPTIME "/proc/uptime" + /* Needs to be fixed if not built under ILP32 */ +-typedef unsigned long long uint64_t; +-typedef unsigned int uint32_t; + extern char *optarg; + extern int optind, opterr, optopt; + #endif /* OS_LINUX */ +-- +2.13.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb index 5126a31cd..3875f0f60 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb @@ -5,7 +5,9 @@ HOMEPAGE = "http://nicstat.sourceforge.net" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0" -SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz" +SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz \ + file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \ + " SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d" SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index c23820094..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 336bb5a031077461ec6b2e5438738bf100f0dd2f Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Mon, 3 Aug 2015 02:37:46 +0900 -Subject: [PATCH] fix lib64 can not be shiped in 64bit target - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ba3cd3..2411745 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,13 +35,6 @@ if (DEBUG) - add_definitions("-DDEBUG_ENABLED") - endif (DEBUG) - --# Set LIB_SUFFIX to 64 on 64bit architectures --if(CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(LIB_SUFFIX "") --else(CMAKE_SIZEOF_VOID_P EQUAL 4) -- SET(LIB_SUFFIX 64) --endif(CMAKE_SIZEOF_VOID_P EQUAL 4) -- - # Find OpenLMIMacros when installed in other prefix than /usr (e.g. /usr/local) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}) - include(OpenLMIMacros RESULT_VARIABLE LMIMACROS) --- -1.8.4.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb deleted file mode 100644 index 081bd3bc0..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "CIM providers for network management" -DESCRIPTION = "\ -openlmi-networking is set of CMPI providers for network management using \ -Common Information Model (CIM)." -HOMEPAGE = "http://www.openlmi.org/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SECTION = "System/Management" -DEPENDS = "openlmi-providers konkretcmpi konkretcmpi-native sblim-cmpi-devel cim-schema-exper networkmanager dbus libcheck glib-2.0" - -SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ - file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \ - " -SRC_URI[md5sum] = "f20de8c76fb6a80001b14c1eb035953e" -SRC_URI[sha256sum] = "578eaa5c65fe924b5d7aeb635509dd46443166cd6a88b019bc42646e3518a460" - -inherit cmake - -EXTRA_OECMAKE = "${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ - " - - -do_configure_prepend() { - export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}" -} - - -FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI_Networking.so ${prefix}/libexec*" -FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*" - -PNBLACKLIST[openlmi-networking] ?= "Depends on blacklisted openlmi-providers - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch deleted file mode 100644 index 4bcd1c4d9..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-error.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 764171866b84e0198b67538f63022abde3e628ad Mon Sep 17 00:00:00 2001 -From: Qian Lei <qianl.fnst@cn.fujitsu.com> -Date: Fri, 16 Jan 2015 14:15:25 +0800 -Subject: [PATCH] fix error - -Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> ---- - cmake/modules/OpenLMIMacros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake -index d55f983..dbc32ec 100644 ---- a/cmake/modules/OpenLMIMacros.cmake -+++ b/cmake/modules/OpenLMIMacros.cmake -@@ -89,7 +89,7 @@ macro(konkretcmpi_generate MOFS CIM_PROVIDERS CIM_HEADERS CIM_CLASSES) - endforeach(CLASS ${CIM_CLASS_NAMES}) - - # Generate headers for CIM classes -- set(ENV{KONKRET_SCHEMA_DIR} "/usr/share/mof/cim-current") -+ set(ENV{KONKRET_SCHEMA_DIR} "$ENV{CMAKE_INSTALL_DATDIR}/mof/cim-current") - execute_process(COMMAND ${KONKRETCMPI_KONKRET} - ${KONKRET_MOF_FILES} - ${GENERATE_PROVIDERS} --- -1.8.3.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index 9c8ebe4c0..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers/0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7cecfa95f033b33a1c3260c214b2d0e5e81b4fd3 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Mon, 3 Aug 2015 02:05:56 +0900 -Subject: [PATCH] fix lib64 can not be shiped in 64bit target - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- - CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48ae206..3ead9c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,13 +21,6 @@ else(HAS_STACK_PROTECTOR_STRONG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") - endif() - --# Set LIB_SUFFIX to 64 on 64bit architectures --if(CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(LIB_SUFFIX "") --else(CMAKE_SIZEOF_VOID_P EQUAL 4) -- SET(LIB_SUFFIX 64) --endif(CMAKE_SIZEOF_VOID_P EQUAL 4) -- - if(NOT SYSCONF_INSTALL_DIR) - set(SYSCONF_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/etc) - endif(NOT SYSCONF_INSTALL_DIR) --- -1.8.4.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb deleted file mode 100644 index 2eda65320..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Set of basic CIM providers" -DESCRIPTION = "\ -openlmi-providers is set of (usually) small CMPI providers (agents) for \ -basic monitoring and management of host system using Common Information \ -Model (CIM)." -HOMEPAGE = "http://www.openlmi.org/" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SECTION = "System/Management" -DEPENDS = "konkretcmpi-native konkretcmpi sblim-sfcb sblim-cmpi-devel cim-schema-exper lmsensors libuser swig swig-native dbus udev systemd-systemctl-native pciutils" - -SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ - file://0001-fix-error.patch \ - file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \ - " -SRC_URI[md5sum] = "5904f23cf494946237cfbbdbe644a3cd" -SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56" - -inherit cmake -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -EXTRA_OECMAKE = " \ - -DWITH-DEVASSISTANT=OFF \ - -DWITH-JOURNALD=OFF \ - -DWITH-SERVICE=OFF \ - -DWITH-SERVICE-LEGACY=ON \ - -DWITH-ACCOUNT=OFF \ - -DWITH-PCP=OFF \ - -DWITH-REALMD=OFF \ - -DWITH-FAN=OFF \ - -DWITH-LOCALE=OFF \ - -DWITH-INDSENDER=OFF \ - -DWITH-JOBMANAGER=OFF \ - -DWITH-SSSD=OFF \ - -DWITH-SELINUX=OFF \ - -DWITH-SOFTWARE-DBUS=ON \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ - " - -do_configure_prepend() { - export CMAKE_INSTALL_DATDIR="${STAGING_DATADIR}" -} - -do_install_append() { - if [ -d ${D}${prefix}${sysconfidr} ]; then - mv ${D}${prefix}${sysconfdir} ${D}${sysconfdir} - fi -} - -FILES_${PN} =+ "${libdir}/cmpi/libcmpiLMI* ${prefix}/libexec*" -FILES_${PN}-dev =+ "${datadir}/cmake*" -FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug*" - -RDEPENDS_${PN} = "python" - -PNBLACKLIST[openlmi-providers] ?= "Depends on blacklisted lmsensors - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb deleted file mode 100644 index f99b77ca4..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-storage_0.8.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "CIM providers for storage management" -DESCRIPTION = "\ -The openlmi-storage package contains CMPI providers for management of storage \ -using Common Information Managemen (CIM) protocol. \ -\ -The providers can be registered in any CMPI-aware CIMOM, both OpenPegasus and \ -SFCB were tested." -HOMEPAGE = "http://www.openlmi.org/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SECTION = "System/Management" -DEPENDS = "openlmi-providers pywbem cmpi-bindings" -RDEPENDS_${PN} += "bash" - -SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "898cf0d8c03b8ad6b45d65f335ddee0d" -SRC_URI[sha256sum] = "4a1ba9957750f94ea58a89cea28985564f38d7cc9aa00fcae20c51e7b32bd0a8" - -inherit setuptools - -do_install_append() { - install -m 755 -d ${D}${datadir}/${BPN} - install -m 644 ${S}/mof/* ${D}${datadir}/${BPN}/ - - install -m 755 -d ${D}${sysconfdir}/openlmi/storage - install -m 644 storage.conf ${D}${sysconfdir}/openlmi/storage/storage.conf - - install -m 755 -d ${D}${libexecdir}/pegasus - install -m 755 pycmpiLMI_Storage-cimprovagt ${D}${libexecdir}/pegasus/ -} - -FILES_${PN} =+ "${sysconfdir}/openlmi/storage/storage.conf ${datadir}/${BPN}/*" - -PNBLACKLIST[openlmi-storage] ?= "Depends on blacklisted pywbem - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb index b23869d76..13e67cba1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb @@ -21,3 +21,8 @@ do_compile_prepend() { do_install_prepend() { cd cli } + +python() { + if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python to be present.') +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch new file mode 100644 index 000000000..7823fde7a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch @@ -0,0 +1,29 @@ +From e05bad73f5fe4be1626560d92465893a5fc931e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 15 Sep 2017 00:01:19 -0700 +Subject: [PATCH] lock.c: Define PTHREAD_MUTEX_RECURSIVE_NP if undefined + +Check for PTHREAD_MUTEX_RECURSIVE_NP being defined instead of +checking for OS + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/u/lock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/u/lock.c b/src/lib/u/lock.c +index 025eea4c..b31c77b5 100644 +--- a/src/lib/u/lock.c ++++ b/src/lib/u/lock.c +@@ -50,7 +50,7 @@ + extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type); + #endif + +-#if defined (__SVR4) && defined (__sun) ++#ifndef PTHREAD_MUTEX_RECURSIVE_NP + #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE + #endif + +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb index 2925f4b9e..c4778ca38 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb @@ -17,7 +17,9 @@ PV = "2.6.3" SRC_URI = "git://github.com/Openwsman/openwsman.git \ file://libssl-is-required-if-eventint-supported.patch \ - file://openwsmand.service" + file://openwsmand.service \ + file://0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch \ + " S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb new file mode 100644 index 000000000..ff88533ff --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -0,0 +1,48 @@ +SUMMARY = "pam-ssh-agent-auth" +DESCRIPTION = "A PAM module which permits authentication via ssh-agent." +HOMEPAGE = "http://sourceforge.net/projects/pamsshagentauth/" +SECTION = "libs" +LICENSE = "openssl & BSD" +LIC_FILES_CHKSUM = "file://LICENSE.OpenSSL;md5=8ab01146141ded59b75f8ba7811ed05a \ + file://OPENSSH_LICENSE;md5=7ae09218173be1643c998a4b71027f9b \ +" + +SRC_URI = "http://sourceforge.net/projects/pamsshagentauth/files/pam_ssh_agent_auth/v${PV}/pam_ssh_agent_auth-${PV}.tar.bz2" +SRC_URI[md5sum] = "8dbe90ab3625e545036333e6f51ccf1d" +SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763" + +DEPENDS += "libpam openssl" + +# This gets us ssh-agent, which we are almost certain to want. +# +RDEPENDS_${PN} += "openssh-misc" + +# Kind of unfortunate to have underscores in the name. +# +S = "${WORKDIR}/pam_ssh_agent_auth-${PV}" + +inherit autotools-brokensep + +# Avoid autoreconf. Override the --libexec oe_runconf specifies so that +# the module is put with the other pam modules. Because it cannot, in general, +# do a runtime test, configure wants to use rpl_malloc() and rpl_realloc() +# instead of malloc() and realloc(). We set variables to tell it not to because +# these functions do not exist. +# +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 --without-openssl-header-check --libexecdir=${base_libdir}/security \ + ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes +} + +# Link with CC. Configure cannot figure out the correct AR. +# +do_compile () { + oe_runmake LD="${CC}" AR="${AR}" +} + +# This stuff is not any place looked at by default. +# +FILES_${PN} += "${base_libdir}/security/pam*" +FILES_${PN}-dbg += "${base_libdir}/security/.debug" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb new file mode 100644 index 000000000..035fe9f65 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb @@ -0,0 +1,22 @@ +SUMMARY = "Perl module that provides simple filename and pathname matching" +DESCRIPTION = "File::FnMatch::fnmatch() provides simple, shell-like pattern \ +matching. \ +Though considerably less powerful than regular expressions, shell patterns \ +are nonetheless useful and familiar to a large audience of end-users." + +HOMEPAGE = "http://search.cpan.org/dist/File-FnMatch/" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://README;beginline=34;endline=37;md5=54fdfac62963b7cece5583ab38f2cf0d" + +SRC_URI = "https://cpan.metacpan.org/authors/id/M/MJ/MJP/File-FnMatch-${PV}.tar.gz" + +SRC_URI[md5sum] = "22f77c20d0fb5af01a3165e2df2fe34c" +SRC_URI[sha256sum] = "962454b8e86bea8b132bf8af35757d0c6a8f5d599015bd6a5d68cb7ae7a9e916" + +S = "${WORKDIR}/File-FnMatch-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb index eced4b6de..934a53e5c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Create usergroup datetime. All members off this group are allowed set date/time/timezone via system dbus" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" require polkit-group-rule.inc diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb index 551ed3eb8..66a73eaaf 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Create usergroup network. All members off this group are allowed to modify networkmanager settings" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" require polkit-group-rule.inc diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb index 326c9340e..f34928fe3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb @@ -10,7 +10,9 @@ DEPENDS = "expat glib-2.0 intltool-native mozjs" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + " PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb deleted file mode 100644 index 7f1986e51..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Python WBEM Client and Provider Interface" -DESCRIPTION = "\ -A Python library for making CIM (Common Information Model) operations over \ -HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ -WBEM client should be easy to use and not necessarily require a large amount \ -of programming knowledge. It is suitable for a large range of tasks from \ -simply poking around to writing web and GUI applications. \ -\ -WBEM, or Web Based Enterprise Management is a manageability protocol, like \ -SNMP, standardised by the Distributed Management Task Force (DMTF) available \ -at http://www.dmtf.org/standards/wbem. \ -\ -It also provides a Python provider interface, and is the fastest and easiest \ -way to write providers on the planet." -HOMEPAGE = "http://pywbem.sf.net/" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://pywbem/LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SECTION = "Development/Libraries" -DEPENDS = "python-m2crypto-native python-typing-native" -SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BPN}/${BP}/${BP}-dev.r704.zip" -SRC_URI[md5sum] = "84072451dcdd1aa9ee82363848faf7ad" -SRC_URI[sha256sum] = "898035866d3cc741bbcd62c4ac26e633ad07b7c11d89db2472b9f923f3fd3ed8" - -S = "${WORKDIR}/${BP}-dev" - -inherit setuptools python-dir - -do_install_append() { - mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli - mv ${D}${bindir}/mof_compiler.py ${D}${bindir}/mofcomp - - rm ${D}${libdir}/python2.7/site-packages/${BPN}/wbemcli.py* - rm ${D}${libdir}/python2.7/site-packages/${BPN}/mof_compiler.py* -} - -BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb new file mode 100644 index 000000000..9b19c1a5f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "RocksDB an embeddable, persistent key-value store" +DESCRIPTION = "RocksDB is library that provides an embeddable, persistent key-value store for fast storage." +HOMEPAGE = "http://rocksdb.org/" +LICENSE = "(Apache-2.0 | GPL-2.0) & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" + +SRCREV = "266ac245affd69555643b735d19d3715c4eff91a" +PV = "5.8+git${SRCPV}" + +SRC_URI = "git://github.com/facebook/${BPN}.git" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "bzip2 zlib lz4" +PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2" +PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4" +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" +PACKAGECONFIG[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF" + +# Tools and tests currently don't compile on armv5 so we disable them +EXTRA_OECMAKE = "\ + -DPORTABLE=ON \ + -DWITH_TESTS=OFF \ + -DWITH_TOOLS=OFF \ +" + +FILES_${PN}-dev += "${libdir}/cmake" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb index a3aac45dd..797bcaaee 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb @@ -22,7 +22,7 @@ BBCLASSEXTEND = "native" SYSTEMD_PACKAGES = "rrdcached" SYSTEMD_SERVICE_rrdcached = "rrdcached.socket rrdcached.service" -EXTRA_AUTORECONF = "-I m4" +EXTRA_AUTORECONF = "-I m4 --exclude=autopoint" PACKAGECONFIG ??= "python perl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -49,6 +49,7 @@ EXTRA_OECONF = " \ --disable-lua \ --disable-tcl \ --disable-rpath \ + --enable-nls=${USE_NLS} \ " export STAGING_LIBDIR diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb index 84c258331..28047eb54 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.12.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb @@ -8,7 +8,7 @@ DEPENDS = "gmp nettle libidn zlib gnutls" SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https" -SRCREV = "02c3be4f5c39fec59d05cd8b75b08dbba04098ad" +SRCREV = "fc512e337bfc7c92770246dbff5f482b879498b9" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb index d1d391bd2..7056e1c6a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "ad0f25f429aa2daa326732950a5eeb6c" -SRC_URI[sha256sum] = "06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca" +SRC_URI[md5sum] = "3805617f65a4b4bea34606487a5255a0" +SRC_URI[sha256sum] = "220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738" inherit autotools pkgconfig systemd update-rc.d ptest @@ -55,7 +55,7 @@ PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," -PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," +PACKAGECONFIG[testbench] = "--enable-testbench --enable-omstdout,--disable-testbench --disable-omstdout,," # default no in configure PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," @@ -118,9 +118,10 @@ do_install_ptest() { do_install_append() { install -d "${D}${sysconfdir}/init.d" + install -d "${D}${sysconfdir}/logrotate.d" install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf - install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog + install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog } FILES_${PN} += "${bindir}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch new file mode 100644 index 000000000..19e50ec79 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch @@ -0,0 +1,37 @@ +From 9981542cb443cdaf9134500b78fe7eda9f99861f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Sep 2017 21:43:26 -0700 +Subject: [PATCH] cimxml: Include sys/select.h for fd_set + +define __SOCKADDR_ARG on linux when libc != glibc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + backend/cimxml/indicationlistener.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/backend/cimxml/indicationlistener.c b/backend/cimxml/indicationlistener.c +index 0d7d9fe..37c45ae 100755 +--- a/backend/cimxml/indicationlistener.c ++++ b/backend/cimxml/indicationlistener.c +@@ -25,6 +25,7 @@ + + #include <pthread.h> + #include <sys/socket.h> ++#include <sys/select.h> + #include <netinet/in.h> + #include <fcntl.h> + #include <errno.h> +@@ -36,7 +37,7 @@ static int do_listen=1; + #define hdrBufsize 5000 + #define hdrLimmit 5000 + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__)) + # define __SOCKADDR_ARG struct sockaddr *__restrict + #endif + +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index 1ec99404a..df55a6799 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb @@ -2,7 +2,9 @@ SUMMARY = "Small Footprint CIM Client Library" DESCRIPTION = "Small Footprint CIM Client Library Runtime Libraries" HOMEPAGE = "http://www.sblim.org" -SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ + " SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" SRC_URI[sha256sum] = "1b8f187583bc6c6b0a63aae0165ca37892a2a3bd4bb0682cd76b56268b42c3d6" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch new file mode 100644 index 000000000..6edda08cd --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch @@ -0,0 +1,13 @@ +--- mdadm.d/mdadm-1.3.0/mdadm.h.org 2017-06-20 00:35:55.366978372 -0700 ++++ mdadm.d/mdadm-1.3.0/mdadm.h 2017-06-20 00:36:41.244363348 -0700 +@@ -29,8 +29,9 @@ + + #define __USE_LARGEFILE64 + #include <unistd.h> +-extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); ++//extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); + ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <stdlib.h> diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch new file mode 100644 index 000000000..ac8178058 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch @@ -0,0 +1,218 @@ +Index: scsirastools-1.6.6/src/sgcommon.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgcommon.c ++++ scsirastools-1.6.6/src/sgcommon.c +@@ -304,8 +304,8 @@ void showit(char *buf) + fdlog = stderr; + } + } +- if (flogopen) fprintf(fdlog, buf); /*write to log */ +- fprintf(fdmsg, buf); /*defaults to stdout */ ++ if (flogopen) fprintf(fdlog, "%s", buf); /*write to log */ ++ fprintf(fdmsg, "%s", buf); /*defaults to stdout */ + } + + void showlog(const char * format, ...) +Index: scsirastools-1.6.6/src/sgdefects.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgdefects.c ++++ scsirastools-1.6.6/src/sgdefects.c +@@ -226,7 +226,7 @@ int main(int argc, char **argv) + (" ******************************************\n"); + if (flogopen) + printf("Log file %s is open\n", logfile); +- printf(HeaderStr); ++ printf("%s", HeaderStr); + /* get SCSI Device Info */ + idev = 0; + flags = O_RDWR; /* could use OPEN_FLAG if read-only. */ +Index: scsirastools-1.6.6/src/sgdiag.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgdiag.c ++++ scsirastools-1.6.6/src/sgdiag.c +@@ -250,7 +250,7 @@ int main(int argc, char **argv) + printf(" ******************************************\n"); + if (flogopen) + printf("Log file %s is open, debug=%d\n", logfile,fdebug); +- printf(HeaderStr); ++ printf("%s", HeaderStr); + } + /* get SCSI Device Info */ + idev = 0; +@@ -356,12 +356,12 @@ int main(int argc, char **argv) + case 'F': + case 'f': + func = 'f'; +- printf(erase_msg); ++ printf("%s", erase_msg); + break; + case 'W': + case 'w': + func = 'w'; +- printf(erase_msg); ++ printf("%s", erase_msg); + break; + case 'S': + case 's': +Index: scsirastools-1.6.6/src/sgdiskmon.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgdiskmon.c ++++ scsirastools-1.6.6/src/sgdiskmon.c +@@ -197,9 +197,9 @@ void showit(char *buf) + } + } + if (flogopen) +- fprintf(fdlog, buf); /*write to log */ ++ fprintf(fdlog, "%s", buf); /*write to log */ + if (!background) +- fprintf(fdmsg, buf); /*message display defaults to stdout */ ++ fprintf(fdmsg, "%s", buf); /*message display defaults to stdout */ + } + + /* +@@ -235,7 +235,7 @@ rem_scsi_dev(int bus, int ch, int id, in + fp = fopen("/proc/scsi/scsi","r+"); + if (fp == NULL) return(errno); + sprintf(cmd,"remove-single-device %d %d %d %d",bus,ch,id,lun); +- n = fprintf(fp,cmd); ++ n = fprintf(fp,"%s", cmd); + fclose(fp); + strcat(cmd,"\n"); + showit(cmd); +@@ -256,7 +256,7 @@ add_scsi_dev(int bus, int ch, int id, in + fp = fopen("/proc/scsi/scsi","r+"); + if (fp == NULL) return(errno); + sprintf(cmd,"add-single-device %d %d %d %d",bus,ch,id,lun); +- n = fprintf(fp,cmd); ++ n = fprintf(fp, "%s", cmd); + fclose(fp); + strcat(cmd,"\n"); + showit(cmd); +@@ -1233,7 +1233,7 @@ main(int argc, char **argv) + interval = atoi(optarg); + break; + default: +- printf(output2); /*prog header*/ ++ printf("%s", output2); /*prog header*/ + printf("Usage: %s [-bemnrx -t time]\n",progname); + printf(" -b Run in Background as a daemon\n"); + printf(" -e Do not write to any files.\n"); +@@ -1246,7 +1246,7 @@ main(int argc, char **argv) + exit(1); + } + } +- if (!background) printf(output2); /*prog header*/ ++ if (!background) printf("%s", output2); /*prog header*/ + + /* only run this as superuser */ + i = geteuid(); +Index: scsirastools-1.6.6/src/sgmode.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgmode.c ++++ scsirastools-1.6.6/src/sgmode.c +@@ -303,7 +303,7 @@ int main(int argc, char **argv) + (" ******************************************\n"); + if (flogopen) + printf("Log file %s is open\n", logfile); +- printf(HeaderStr); ++ printf("%s", HeaderStr); + /* get SCSI Device Info */ + idev = 0; + flags = O_RDWR; /* could use OPEN_FLAG if read-only. */ +@@ -585,8 +585,8 @@ int do_modeselect(int idx) + if (!foverwrite) { + /* use existing capacity from mode sense */ + memcpy(sel_buffer + 4, out_buffer + 4, 8); +- sprintf(scratch, "Using existing capacity instead\n"); +- printf(scratch); ++ sprintf(scratch, "%s", "Using existing capacity instead\n"); ++ printf("%s",scratch); + showlog( scratch); + } else { /* foverwrite==1, changing something */ + /* usually only change num blks, if change blk size, flag it. */ +Index: scsirastools-1.6.6/src/sgraidmon.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgraidmon.c ++++ scsirastools-1.6.6/src/sgraidmon.c +@@ -269,9 +269,9 @@ void showit(char *buf) + } + } + if (flogopen) +- fprintf(fdlog, buf); /*write to log */ ++ fprintf(fdlog, "%s", buf); /*write to log */ + if (!background) +- fprintf(fdmsg, buf); /*message display defaults to stdout */ ++ fprintf(fdmsg, "%s", buf); /*message display defaults to stdout */ + } + + /* +@@ -563,7 +563,7 @@ add_scsi_dev(int bus, int ch, int id, in + fp = fopen("/proc/scsi/scsi","r+"); + if (fp == NULL) return(errno); + sprintf(cmd,"add-single-device %d %d %d %d",bus,ch,id,lun); +- fprintf(fp,cmd); ++ fprintf(fp, "%s", cmd); + fclose(fp); + strcat(cmd,"\n"); + showit(cmd); +@@ -1585,7 +1585,7 @@ main(int argc, char **argv) + interval = atoi(optarg); + break; + default: +- printf(output2); /*prog header*/ ++ printf("%s", output2); /*prog header*/ + printf("Usage: %s [-bemnrx -t time]\n",progname); + printf(" -b Run in Background as a daemon\n"); + printf(" -e Do not write to any files.\n"); +@@ -1598,7 +1598,7 @@ main(int argc, char **argv) + exit(1); + } + } +- if (!background) printf(output2); /*prog header*/ ++ if (!background) printf("%s", output2); /*prog header*/ + + /* only run this as superuser */ + i = geteuid(); +Index: scsirastools-1.6.6/src/sgsafte.c +=================================================================== +--- scsirastools-1.6.6.orig/src/sgsafte.c ++++ scsirastools-1.6.6/src/sgsafte.c +@@ -174,9 +174,9 @@ void showit(char *buf) + } + } + if (flogopen) +- fprintf(fdlog, buf); /*write to log */ ++ fprintf(fdlog, "%s", buf); /*write to log */ + if (!background) +- fprintf(fdmsg, buf); /*message display defaults to stdout */ ++ fprintf(fdmsg, "%s", buf); /*message display defaults to stdout */ + } + + /* +@@ -384,7 +384,7 @@ add_scsi_dev(int bus, int ch, int id, in + fp = fopen("/proc/scsi/scsi","r+"); + if (fp == NULL) return(errno); + sprintf(cmd,"add-single-device %d %d %d %d",bus,ch,id,lun); +- fprintf(fp,cmd); ++ fprintf(fp, "%s", cmd); + fclose(fp); + strcat(cmd,"\n"); + showit(cmd); +@@ -1261,7 +1261,7 @@ main(int argc, char **argv) + do_numeric = 0; + break; + default: +- printf(output2); /*prog header*/ ++ printf("%s", output2); /*prog header*/ + printf("Usage: %s [-d num -rf -emnx]\n",progname); + printf(" -d drive number to set (0, 1, ...)\n"); + printf(" -r set SAF-TE status to ready\n"); +@@ -1273,7 +1273,7 @@ main(int argc, char **argv) + exit(1); + } + } +- if (!background) printf(output2); /*prog header*/ ++ if (!background) printf("%s", output2); /*prog header*/ + + if (setval != 0 && drivenum == -1) drivenum = 0; /*default to first drive*/ + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index d0c36e472..e202d16eb 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -10,15 +10,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=687ea108478d26152ae46eb29d9d1545" DEPENDS += "groff-native" -SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.tar.gz" -SRC_URI[md5sum] = "2d775111b62e2dfc1960a722f5fda211" -SRC_URI[sha256sum] = "38d2c6c9b04a2c594e528927b950754f94c0522718d17c78e6589ba778339bf8" +SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.tar.gz \ + file://mdadm.patch;apply=no \ + file://print-format.patch \ +" +SRC_URI[md5sum] = "6271a61b2ce40aaf33ef61775148cda1" +SRC_URI[sha256sum] = "e7b997e75decb06a650c42c35cd63d0c94c34e39cf133c723337b0eeabbfdf6a" inherit autotools update-rc.d # mdadm Makefile has CC set to gcc, hence override CC to ${CC} EXTRA_OEMAKE += "CC='${CC}'" + +do_configure_append() { + oe_runmake -C mdadm.d mdadm-1.3.0 + patch -p0 < ${WORKDIR}/mdadm.patch +} INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon" INITSCRIPT_NAME_${PN}-diskmon = "sgdisk" INITSCRIPT_PARAMS_${PN}-diskmon = "defaults 80 20" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb index ee7bcdabb..63e8d36d0 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb @@ -1,4 +1,5 @@ SUMMARY = "SGPIO captive backplane tool" +HOMEPAGE = "http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing" DESCRIPTION = "Intel SGPIO enclosure management utility" SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.tar.gz/a417bf68da4e9bd79a4664c11d7debd1/${BPN}-1.2-0.10-src.tar.gz \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 931e33289..a2d62c366 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a0 DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git;branch=master" -SRCREV = "67a2bdcd336e6becfa5784742e18c88dbeddc973" +SRCREV = "4c8fb05cb4d6ddcd67299008db54af423f86fd05" PV = "0.0+gitr${SRCPV}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/subsurface/subsurface_git.bb deleted file mode 100644 index 90adaf487..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/subsurface/subsurface_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Subsurface is an open source dive log program" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf" - -PNBLACKLIST[subsurface] ?= "Needs to be upgraded for compatibility with new libdivecomputer - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -inherit gtk-icon-cache cmake - -inherit gitpkgv -PKGV = "${GITPKGVTAG}" -PV = "4.2" - -SRCREV = "f61ee20ba356ecfc4c5b247f548f52d588179c94" -SRC_URI = "git://subsurface.hohndel.org/subsurface.git" -S = "${WORKDIR}/git" - -#FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg" -RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15" - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index b7157b432..720aa3c2b 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -17,6 +17,8 @@ inherit autotools pkgconfig DEPENDS += "libdaemon" +RDEPENDS_${PN} = "iproute2-tipc" + S = "${WORKDIR}/git" do_configure_prepend() { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch new file mode 100644 index 000000000..c617d14a1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch @@ -0,0 +1,54 @@ +From c64d04d084f47b4cb3e1cdee6e96348fcc6a756e Mon Sep 17 00:00:00 2001 +From: Mihai Tudor Panu <mihai.tudor.panu@intel.com> +Date: Tue, 30 May 2017 15:14:09 -0700 +Subject: [PATCH 1/1] ads1x15: fixed case logic in getThresh() function + +Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com> + +Upstream-Status: Backported [c64d04d084f47b4cb3e1cdee6e96348fcc6a756e] + +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> + +--- + src/ads1x15/ads1x15.cxx | 4 ++-- + src/ads1x15/ads1x15.hpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ads1x15/ads1x15.cxx b/src/ads1x15/ads1x15.cxx +index 35782709..47701b2a 100644 +--- a/src/ads1x15/ads1x15.cxx ++++ b/src/ads1x15/ads1x15.cxx +@@ -116,7 +116,7 @@ ADS1X15::setContinuous(bool mode){ + + float + ADS1X15::getThresh(ADSTHRESH reg){ +- if( THRESH_HIGH && THRESH_LOW) return getLastSample(reg); ++ if(reg == THRESH_HIGH || reg == THRESH_LOW) return getLastSample(reg); + else return 0.0; + } + +@@ -137,7 +137,7 @@ ADS1X15::setThresh(ADSTHRESH reg, float value){ + case 2: + case 3: + set_value = value / getMultiplier(); +- set_value = set_value << m_bitShift; ++ set_value = set_value << m_bitShift; + if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){ + throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.write() failed"); + return; +diff --git a/src/ads1x15/ads1x15.hpp b/src/ads1x15/ads1x15.hpp +index 7524572d..efd8c8ec 100644 +--- a/src/ads1x15/ads1x15.hpp ++++ b/src/ads1x15/ads1x15.hpp +@@ -390,7 +390,7 @@ namespace upm { + * @param reg ADSTHRES enum value. + * Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested. + */ +- float getThresh(ADSTHRESH reg = THRESH_LOW); ++ float getThresh(ADSTHRESH reg = THRESH_DEFAULT); + + /** + * Sets threshold levels or configures for conversion ready +-- +2.11.0 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb new file mode 100644 index 000000000..38065ce53 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "Sensor/Actuator repository for Mraa" +HOMEPAGE = "https://github.com/intel-iot-devkit/upm" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" + +DEPENDS = "libjpeg-turbo mraa" + +SRCREV = "106b6c706268522ab0168a4ddb19e89ce832e084" +PV = "1.3.0-git${SRCPV}" + +SRC_URI = " \ + git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://ads1x15-fixed-case-logic-in-getThresh-function.patch \ +" + +S = "${WORKDIR}/git" + +# Depends on mraa which only supports x86 and ARM for now +COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" + +inherit distutils3-base cmake + + +# override this in local.conf to get needed bindings. +# BINDINGS_pn-upm="python" +# will result in only the python bindings being built/packaged. +BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS') or '0') else '' }" + +PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ + ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" + +PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," +PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," + +FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" + +FILES_node-${PN} = "${prefix}/lib/node_modules/" +RDEPENDS_node-${PN} += "nodejs" + +### Include desired language bindings ### +PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" +PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch new file mode 100644 index 000000000..ee0d074de --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch @@ -0,0 +1,37 @@ +Upstream-Status: Inappropriate [configuration] + +written by: Jeff Polk <jeff.polk@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Index: vlock-2.2.2/man/vlock.1 +=================================================================== +--- vlock-2.2.2.orig/man/vlock.1 2010-07-26 14:12:42.000000000 -0400 ++++ vlock-2.2.2/man/vlock.1 2010-07-26 14:13:06.000000000 -0400 +@@ -111,11 +111,6 @@ + to an invalid value or 0 no timeout is used. \fBWarning\fR: If this value is + too low, you may not be able to unlock your session. + .PP +-.SH FILES +-.B ~/.vlockrc +-.IP +-This file is read by \fBvlock\fR on startup if it exists. All the variables +-mentioned above can be set here. + .SH SECURITY + See the SECURITY file in the \fBvlock\fR distribution for more information. + .PP +Index: vlock-2.2.2/src/vlock.sh +=================================================================== +--- vlock-2.2.2.orig/src/vlock.sh 2010-07-26 14:12:32.000000000 -0400 ++++ vlock-2.2.2/src/vlock.sh 2010-07-26 14:13:33.000000000 -0400 +@@ -35,11 +35,6 @@ + + ${VLOCK_ENTER_PROMPT}" + +-# Read user settings. +-if [ -r "${HOME}/.vlockrc" ] ; then +- . "${HOME}/.vlockrc" +-fi +- + # "Compile" time variables. + VLOCK_MAIN="%PREFIX%/sbin/vlock-main" + VLOCK_VERSION="%VLOCK_VERSION%" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch new file mode 100644 index 000000000..6e8a6a9fd --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch @@ -0,0 +1,107 @@ +Upstream-Status: Pending + +written by: Jeff Polk <jeff.polk@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +--- a/Makefile ++++ b/Makefile +@@ -126,6 +126,10 @@ ifeq ($(AUTH_METHOD),shadow) + vlock-main : override LDLIBS += $(CRYPT_LIB) + endif + ++ifneq ($(ENABLE_FAIL_COUNT),yes) ++vlock-main.o : override CFLAGS += -DNO_FAIL_COUNT ++endif ++ + ifeq ($(ENABLE_PLUGINS),yes) + vlock-main: plugins.o plugin.o module.o process.o script.o tsort.o list.o + # -rdynamic is needed so that the all plugin can access the symbols from console_switch.o +--- a/configure ++++ b/configure +@@ -44,6 +44,7 @@ Optional Features: + --enable-shadow enable shadow authentication [disabled] + --enable-root-password enable unlogging with root password [enabled] + --enable-debug enable debugging ++ --enable-fail-count enable failed login attempt summary [enabled] + + Additional configuration: + --with-scripts=SCRIPTS enable the named scripts [] +@@ -78,6 +79,9 @@ enable_feature() { + root-password) + ENABLE_ROOT_PASSWORD="$2" + ;; ++ fail-count) ++ ENABLE_FAIL_COUNT="$2" ++ ;; + pam|shadow) + if [ "$2" = "yes" ] ; then + if [ -n "$auth_method" ] && [ "$auth_method" != "$1" ] ; then +@@ -232,6 +232,7 @@ set_defaults() { + AUTH_METHOD="pam" + ENABLE_ROOT_PASSWORD="yes" + ENABLE_PLUGINS="yes" ++ ENABLE_FAIL_COUNT="yes" + SCRIPTS="" + + VLOCK_GROUP="vlock" +@@ -356,10 +356,14 @@ ENABLE_PLUGINS = ${ENABLE_PLUGINS} + # which plugins should be build + MODULES = ${MODULES} + # which scripts should be installed + SCRIPTS = ${SCRIPTS} + ++# display a summary of failed authentication attempts after successfully ++# unlocking? ++ENABLE_FAIL_COUNT = ${ENABLE_FAIL_COUNT} ++ + # root's group + ROOT_GROUP = ${ROOT_GROUP} + + # group for privileged plugins + VLOCK_GROUP = ${VLOCK_GROUP} +--- a/src/vlock-main.c ++++ b/src/vlock-main.c +@@ -111,7 +111,9 @@ static void restore_terminal(void) + (void) tcsetattr(STDIN_FILENO, TCSANOW, &term); + } + ++#ifdef ENABLE_FAIL_COUNT + static int auth_tries; ++#endif /* ENABLE_FAIL_COUNT */ + + static void auth_loop(const char *username) + { +@@ -181,7 +183,9 @@ static void auth_loop(const char *userna + } + #endif + ++#ifdef ENABLE_FAIL_COUNT + auth_tries++; ++#endif /* ENABLE_FAIL_COUNT */ + } + + /* Free timeouts memory. */ +@@ -189,11 +193,13 @@ static void auth_loop(const char *userna + free(prompt_timeout); + } + ++#ifdef ENABLE_FAIL_COUNT + void display_auth_tries(void) + { + if (auth_tries > 0) + fprintf(stderr, "%d failed authentication %s.\n", auth_tries, auth_tries > 1 ? "tries" : "try"); + } ++#endif /* ENABLE_FAIL_COUNT */ + + #ifdef USE_PLUGINS + static void call_end_hook(void) +@@ -216,7 +222,9 @@ int main(int argc, char *const argv[]) + if (username == NULL) + fatal_perror("vlock: could not get username"); + ++#ifdef ENABLE_FAIL_COUNT + ensure_atexit(display_auth_tries); ++#endif /* ENABLE_FAIL_COUNT */ + + #ifdef USE_PLUGINS + for (int i = 1; i < argc; i++) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam new file mode 100644 index 000000000..a919682b0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam @@ -0,0 +1,3 @@ +# Use the default auth and account policies for vlock +auth include common-auth +account include common-account diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch new file mode 100644 index 000000000..4ce0abc71 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch @@ -0,0 +1,19 @@ +Upstream-Status: Pending + +written by: Jeff Polk <jeff.polk@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +Index: vlock-2.2.2/src/auth-pam.c +=================================================================== +--- vlock-2.2.2.orig/src/auth-pam.c 2010-06-14 14:38:51.000000000 -0400 ++++ vlock-2.2.2/src/auth-pam.c 2010-06-14 14:39:12.000000000 -0400 +@@ -148,6 +148,9 @@ + + if (pam_status != PAM_SUCCESS) { + fprintf(stderr, "vlock: %s\n", pam_strerror(pamh, pam_status)); ++ } else { ++ pam_status = pam_acct_mgmt(pamh, 0); ++ if (pam_status == PAM_SUCCESS) pam_setcred(pamh, PAM_REINITIALIZE_CRED); + } + + end: diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb new file mode 100644 index 000000000..259d3a5e1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb @@ -0,0 +1,59 @@ +SUMMARY = "Virtual Console lock program" +DESCRIPTION = "Sometimes a malicious local user could cause more problems \ + than a sophisticated remote one. vlock is a program that locks one or more \ + sessions on the Linux console to prevent attackers from gaining physical \ + access to the machine. \ + " +SECTION = "utils" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" + +SRC_URI = "${GENTOO_MIRROR}/${BP}.tar.gz \ + file://disable_vlockrc.patch \ + file://vlock_pam_tally2_reset.patch \ + file://vlock-no_tally.patch \ + file://vlock_pam \ + " + +SRC_URI[md5sum] = "378175c7692a8f288e65fd4dbf8a38eb" +SRC_URI[sha256sum] = "85aa5aed1ae49351378a0bd527a013078f0f969372a63164b1944174ae1a5e39" + +inherit autotools-brokensep update-alternatives + +# authentification method: either pam or shadow +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', 'shadow', d)}" +PACKAGECONFIG[pam] = "--enable-pam,,libpam," +PACKAGECONFIG[shadow] = "--enable-shadow,,shadow," + +CFLAGS += "-Wall -W -pedantic -std=gnu99" + +do_configure () { + # The configure tries to use 'getent' to get the group + # info from the host, which should be avoided. + sed -i 's/\(ROOT_GROUP=\).*/\1"root"/' ${CONFIGURE_SCRIPT} + + ${CONFIGURE_SCRIPT} \ + VLOCK_GROUP=root \ + ROOT_GROUP=root \ + CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --mandir=${mandir} \ + --with-modules="all.so new.so nosysrq.so ttyblank.so vesablank.so" \ + --disable-root-password --enable-debug --disable-fail-count \ + ${PACKAGECONFIG_CONFARGS} +} + +do_install_append () { + if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ]; then + install -d -m 0755 ${D}/${sysconfdir}/pam.d + install -m 0644 ${WORKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock + fi +} + +ALTERNATIVE_${PN} = "vlock" +ALTERNATIVE_PRIORITY = "60" +ALTERNATIVE_LINK_NAME[vlock] = "${bindir}/vlock" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch new file mode 100644 index 000000000..03edb1390 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch @@ -0,0 +1,56 @@ +From 18415c0b4c6e50ed9b99dfdae8d210590d0ab72e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 28 Apr 2017 04:50:30 -0400 +Subject: [PATCH] explicitly support python3 by pkg-config + +The PYTHON_CPPFLAGS and -lpython$(PYTHON_VERSION) is hardcoded, +use pkg-config to replace + +Upstream-Status: Inappropriate [wr-installer specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.am | 5 ++--- + configure.ac | 2 ++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4569bbf..7a8daf4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,6 @@ ACLOCAL_AMFLAGS = -I m4 + AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \ + $(libcryptsetup_CFLAGS) $(nss_CFLAGS) + LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' +-PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) + + ## Targets + SUBDIRS = po +@@ -63,9 +62,9 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \ + $(LTLIBINTL) $(libcryptsetup_LIBS) $(nss_LIBS) + + python__volume_key_la_SOURCES = python/volume_key_wrap.c +-python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) ++python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(python3_CFLAGS) + python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS) +-python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \ ++python__volume_key_la_LIBADD = lib/libvolume_key.la $(python3_LIBS) \ + $(glib_LIBS) $(nss_LIBS) + + src_volume_key_SOURCES = src/volume_key.c +diff --git a/configure.ac b/configure.ac +index ff35dd0..0928a6c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,8 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz no-define subdir-objects -Wall]) + AC_PROG_CC + AM_PROG_CC_C_O + LT_INIT([disable-static]) ++ ++PKG_CHECK_MODULES(python3, [python3]) + AM_PATH_PYTHON + + dnl Not gpg2, it cannot receive passphrases from gpgme +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb new file mode 100644 index 000000000..febf3f256 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "The volume_key project provides a libvolume_key, a library for manipulating \ +storage volume encryption keys and storing them separately from volumes, and an \ +associated command-line tool, named volume_key." +LICENSE = "GPLv2" +SECTION = "devel/lib" + +HOMEPAGE = "https://pagure.io/volume_key" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \ + file://0001-explicitly-support-python3-by-pkg-config.patch \ +" +SRC_URI[md5sum] = "a2d14931177c660e1f3ebbcf5f47d8e2" +SRC_URI[sha256sum] = "450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6" + +SRCNAME = "volume_key" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools python3native gettext + +DEPENDS += " \ + util-linux \ + glib-2.0 \ + cryptsetup \ + nss \ + gpgme \ +" + +RDEPENDS_python3-${PN} += "${PN}" + +PACKAGES += "python3-${PN}" +FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch new file mode 100644 index 000000000..71a989103 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch @@ -0,0 +1,32 @@ +From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2017 09:29:33 -0700 +Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned + int + +On 64bit machines it ends up in errors + +event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/event.c b/src/event.c +index 8f988b5..c632c33 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) + a_event->tid = pthread_self(); + + a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); +- a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); ++ a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); + + //zlog_event_profile(a_event, ZC_DEBUG); + return a_event; +-- +2.13.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb index 51c746fd3..86e6d30e2 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "1.2.12+git${SRCPV}" SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog \ + file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ + " S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb index e07f570d1..dfd75e71c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Linux zram compressed in-memory swap" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit update-rc.d systemd diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb index 39b2d95a6..1f5e39000 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e" DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "6fb0e3e52a0f8de5ca63138391b81ce0" -SRC_URI[sha256sum] = "b35cf19e4a6ba39fd03c6372b8a8760a491cc2e2e4aba3d15023ff291c2894b4" +SRC_URI[md5sum] = "d583fbca0c2410bf9542ce8a651c26ca" +SRC_URI[sha256sum] = "3d94a590ff3c562ecf387da78ac356d6bea79b050a9ef81e3ecb9f8ee513040e" inherit autotools gettext update-alternatives |
