diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-extended')
101 files changed, 983 insertions, 3013 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/acpitool/acpitool_0.5.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/acpitool/acpitool_0.5.1.bb deleted file mode 100644 index bc9669d0f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/acpitool/acpitool_0.5.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Acpitool is a Linux ACPI client. It simply reads /proc/acpi or /sys/class entries \ -and presents the output in a meaningfull, human-readable format." -HOMEPAGE = "http://freeunix.dyndns.org:8088/site2/acpitool.shtml" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.bz2 \ - " - -inherit autotools - -SRC_URI[md5sum] = "9e4ec55201be0be71ffbc56d38b42b57" -SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch deleted file mode 100644 index 3f8debc28..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles/remove-policy-of-usr-local-sbin.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Directory /usr/local is not used for us. Remove the policy that not to install -binaries to /usr/local/sbin. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/cfe_internal/update/update_bins.cf b/cfe_internal/update/update_bins.cf -index 1796caa..697af0d 100644 ---- a/cfe_internal/update/update_bins.cf -+++ b/cfe_internal/update/update_bins.cf -@@ -55,16 +55,6 @@ bundle agent cfe_internal_bins - depth_search => u_recurse_basedir("inf"), - action => u_immediate; - -- "/usr/local/sbin/$(agents)" -- comment => "Create symlinks of CFE binaries in /usr/local/sbin", -- handle => canonify("cfe_internal_bins_files_sbin_$(agents)"), -- move_obstructions => "true", -- link_from => u_ln_s("$(sys.workdir)/bin/$(agents)"); -- -- "/usr/local/sbin/$(agents).cfsaved" -- comment => "Remove all .cfsaved file extension", -- handle => canonify("cfe_internal_bins_files_remove_$(agent)_cfsaved"), -- delete => u_tidy; - } - - bundle agent cfe_internal_update_bins diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.9.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb index 9d01c5128..b52e7cc08 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.9.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 - 2016 Wind River Systems, Inc. +# Copyright (C) 2014 - 2017 Wind River Systems, Inc. # SUMMARY = "Base policy for CFEngine" @@ -18,20 +18,19 @@ or wherever `$(sys.masterdir)` points. \ HOMEPAGE = "http://cfengine.com" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=52cd3d13af93180822888ab0088e9328" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f" -SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ - file://remove-policy-of-usr-local-sbin.patch \ -" -SRC_URI[md5sum] = "b101ddcd546738af6ec91be5c297cb24" -SRC_URI[sha256sum] = "63dec2f8649f5f2788cd463dccf47f8dbe941522acfcf3093517f983bbfa0606" +SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz" + +SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4" +SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6" inherit autotools export EXPLICIT_VERSION="${PV}" -EXTRA_OECONF = "--prefix=${localstatedir}/cfengine" +EXTRA_OECONF = "--prefix=${datadir}/cfengine" -FILES_${PN} += "${localstatedir}/cfengine" +FILES_${PN} = "${datadir}/cfengine" RDEPENDS_${PN} += "python-core" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb index 4aa8dedc4..b86b0a1f1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.9.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 - 2016 Wind River Systems, Inc. +# Copyright (C) 2014 - 2017 Wind River Systems, Inc. # SUMMARY = "CFEngine is an IT infrastructure automation framework" @@ -11,7 +11,7 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit." HOMEPAGE = "http://cfengine.com" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cd59c3650c8b7ff36bab1cc6587b097a" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494" DEPENDS = "attr tokyocabinet" @@ -20,14 +20,17 @@ SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz file://set-path-of-default-config-file.patch \ " -SRC_URI[md5sum] = "63da39655cfca30ca885fcc4a1bf8aa4" -SRC_URI[sha256sum] = "32a38aedf1199c2361e1335e0d4a1d98f9efa7cd591bcb647f35c7395bb66f2d" +SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992" +SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7" inherit autotools systemd export EXPLICIT_VERSION="${PV}" -SYSTEMD_SERVICE_${PN} = "cfengine3.service cfengine3-web.service" +SYSTEMD_SERVICE_${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ + cf-runalerts.service cf-consumer.service cf-execd.service \ + cf-monitord.service cf-redis-server.service cf-serverd.service \ +" SYSTEMD_AUTO_ENABLE_${PN} = "disable" PACKAGECONFIG ??= "libpcre openssl \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb index 25166ab58..987c09fe5 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb @@ -24,6 +24,10 @@ inherit cmake python3native EXTRA_OECMAKE = "-DLIB='${baselib}' \ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" +# With Ninja it fails with: +# ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) +OECMAKE_GENERATOR = "Unix Makefiles" + do_configure_prepend() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch deleted file mode 100644 index b3991faa8..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3ddf397febf47f8de9ca2805e92355ecb3ba0e9f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Apr 2017 12:37:54 -0700 -Subject: [PATCH] Fix printf format errors with clang - -error: format string is not a string literal (potentially insecure) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/jobs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jobs.c b/src/jobs.c -index c2c2332..dcb81c1 100644 ---- a/src/jobs.c -+++ b/src/jobs.c -@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) - goto out; - #endif - } -- col = fmtstr(s, 32, strsignal(st)); -+ col = fmtstr(s, 32, "%s", strsignal(st)); - #ifdef WCOREDUMP - if (WCOREDUMP(status)) { - col += fmtstr(s + col, 16, " (core dumped)"); --- -2.12.2 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash_0.5.8.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash_0.5.8.bb deleted file mode 100644 index 78ca60d6f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/dash/dash_0.5.8.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Small and fast POSIX-compliant shell" -HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" -SECTION = "System Environment/Shells" - -LICENSE = "BSD & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" - -inherit autotools update-alternatives - -SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz \ - file://0001-Fix-printf-format-errors-with-clang.patch \ - " -SRC_URI[md5sum] = "5c152209680dab3c319e8923f6c51378" -SRC_URI[sha256sum] = "c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f" - -EXTRA_OECONF += "--bindir=${base_bindir}" - -ALTERNATIVE_${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" -ALTERNATIVE_PRIORITY = "10" - -pkg_postinst_${PN} () { - grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells -} - -pkg_postrm_${PN} () { - printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb index 27e00a5e6..2df7db9e8 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.19.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" -SRC_URI[md5sum] = "ed6b5b82d74cbd925db2b829350e74b1" -SRC_URI[sha256sum] = "ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8" +SRC_URI[md5sum] = "49c845ed89d25b534842e40366154cb4" +SRC_URI[sha256sum] = "09857b2e8074813ac19da5d262890f722e5f7900e521a4c60354cef95eea10a7" # This isn't already added by base.bbclass do_unpack[depends] += "lzip-native:do_populate_sysroot" 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-20171209.bb index 85dede177..63c65c4fc 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-20171209.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "a39ec183517bc1feaff017d067300b8c" -SRC_URI[sha256sum] = "453095abaec288bfbc1ca9faced917e17742cff1ea45ec46210071ac153562f9" +SRC_URI[md5sum] = "f66f28beca900b54f5fc90fdcce93508" +SRC_URI[sha256sum] = "20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb new file mode 100644 index 000000000..e1a6d9508 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Simple wrapper script which proxies signals to a child" +HOMEPAGE = "https://github.com/Yelp/dumb-init/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" + +SRC_URI = "https://github.com/Yelp/dumb-init/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "4eb7f43d7823686723ff7ac1bad097cb" +SRC_URI[sha256sum] = "74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f" + +EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" + +do_install() { + install -d ${D}${base_sbindir} + install ${S}/dumb-init ${D}${base_sbindir}/ +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb deleted file mode 100644 index 9cc62a959..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efibootmgr/efibootmgr_0.15.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager." -SUMMARY = "EFI Boot Manager" -HOMEPAGE = "https://github.com/rhinstaller/efibootmgr" -SECTION = "base" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -DEPENDS = "pciutils zlib efivar" - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "5c14da22802576a99ebb854f7aa174f796f7b031" -SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \ - " -S = "${WORKDIR}/git" - -inherit pkgconfig - -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 ${B}/src/efibootmgr ${D}/${sbindir}/efibootmgr -} - -CLEANBROKEN = "1" 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 deleted file mode 100644 index 1b8815e9d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -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-efivar-fix-for-cross-compile.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 6f6ca6475..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-efivar-fix-for-cross-compile.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9a3c480af653b37e62d1be04d49fe7a60a80168f Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Fri, 25 Sep 2015 18:14:31 +0800 -Subject: [PATCH 1/2] efivar: fix for cross compile - -It builds and calls elf file makeguids to generate a header file which -doesn't work for cross compile. Fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Upstream-Status: Pending -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 5fc7887..1829d22 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,8 +29,8 @@ all : deps $(TARGETS) - ./guid-symbols.c : include/efivar/efivar-guids.h - ./guids.bin : include/efivar/efivar-guids.h - ./names.bin : include/efivar/efivar-guids.h --include/efivar/efivar-guids.h : makeguids guids.txt -- ./makeguids guids.txt guids.bin names.bin \ -+include/efivar/efivar-guids.h : guids.txt -+ makeguids guids.txt guids.bin names.bin \ - guid-symbols.c include/efivar/efivar-guids.h - - makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT --- -2.4.3 - 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 deleted file mode 100644 index 73a772186..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch +++ /dev/null @@ -1,37 +0,0 @@ -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/0003-efivar-fix-for-cross-compile.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch deleted file mode 100644 index 3f43f2a93..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0003-efivar-fix-for-cross-compile.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7ead29ca6bb5e280ae07551cc3521281ecf73682 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Sat, 7 May 2016 02:06:47 -0400 -Subject: [PATCH] Makefile: fix efivar.pc not found - -It fixes efivar.pc not found: -... -| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/ -| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ -; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ -; -| install: cannot stat 'efivar.pc': No such file or directory -| install: cannot stat 'efiboot.pc': No such file or directory -| make[1]: *** [install] Error 1 -| make[1]: Leaving directory `efivar/0.23-r0/git/src' -| make: *** [install] Error 2 -| ERROR: oe_runmake failed -... - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index c7a0ca3..ad9c427 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -78,7 +78,9 @@ install : all - ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x).$(MAJOR_VERSION);\ - ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x); ) - $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR) -- $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;) -+ $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\ -+ sed -i -e "s:@@LIBDIR@@:$(libdir):g" -e "s:@@VERSION@@:$(VERSION):g" \ -+ $(DESTDIR)$(PCDIR)/$(x); ) - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar - $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));) - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) --- -2.8.1 - 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 deleted file mode 100644 index 96d0c6b3b..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b3d35e7dd27a755df5acbe050837885914dbb28b Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 10 May 2016 11:34:50 -0400 -Subject: [PATCH] fix unknow option for gold linker - -- Revert the following patch, since oe-core work with gcc 5 -... -commit 3055a3797f16693dfdd855fa68bc57fd900dc408 -Author: Peter Jones <pjones@redhat.com> -Date: Mon Feb 15 14:15:40 2016 -0500 - - Make gcc.specs work with gcc 6 / binutils 2.26 - - Apparently binutils 2.26 gets real picky about "ld -PIC" vs "ld -fPIC". - - Signed-off-by: Peter Jones <pjones@redhat.com> -... - -- Remove unknown option '--add-needed' - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gcc.specs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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} %{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/allow-multi-definitions-for-native.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/allow-multi-definitions-for-native.patch deleted file mode 100644 index 87f555509..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/allow-multi-definitions-for-native.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Pending - -It fails to create .so file when build efivar-native: - -| lib.o:(*IND*+0x0): multiple definition of `efi_set_variable' -| lib.o:lib.c:(.text+0xa0): first defined here - -Add link option '-z muldefs' to fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/Make.rules b/Make.rules -index d9c0609..874bce0 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -20,6 +20,7 @@ include $(TOPDIR)/Make.version - $(CCLD) $(ccldflags) $(CPPFLAGS) $(SOFLAGS) \ - -Wl,-soname,$@.$(MAJOR_VERSION) \ - -Wl,--version-script=$(MAP) \ -+ -Wl,-z,muldefs \ - -o $@ $^ $(LDLIBS) - - %.o : %.c 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 deleted file mode 100644 index e3fa2e1c1..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1361225abbaba878960f970df39a4570bbc39553 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 26 May 2016 21:50:01 -0400 -Subject: [PATCH] fix compile failure with older host gcc (<=4.6) - -While host gcc version is 4.6.3 in ubuntu 1204, it -did not recognize -std=gnu11 and -Wmaybe-uninitialized. - -While host gcc version is 4.4.7 in centos6, it -did not recognize -std=gnu11, -Wmaybe-uninitialized, -and -flto. - -For native build, use -std=gnu99 to replace -std=gnu11, -and directly remove -Wmaybe-uninitialized and -flto. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gcc.specs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/gcc.specs -=================================================================== ---- git.orig/gcc.specs -+++ git/gcc.specs -@@ -2,13 +2,13 @@ - + -D_GNU_SOURCE - - *efivar_cpp_options: -- -Werror -Wall -std=gnu11 -Wextra -+ -Werror -Wall -std=gnu99 -Wextra - - *cpp_options: - + %(efivar_cpp_options) - - *cc1_options: --+ %(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} 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 deleted file mode 100644 index fc8f8c8b2..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar/musl-strndupa.patch +++ /dev/null @@ -1,17 +0,0 @@ -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.31.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.31.bb deleted file mode 100644 index 9d4cdc97b..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.31.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Tools to manipulate UEFI variables" -DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" -HOMEPAGE = "https://github.com/rhinstaller/efivar" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=6626bb1e20189cfa95f2c508ba286393" - -DEPENDS = "popt" -DEPENDS_append_class-target = " efivar-native" - -inherit pkgconfig - -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" - -SRCREV = "11324799c68193116e1dd5f94b416591bd324f90" -SRC_URI = "git://github.com/rhinstaller/efivar.git \ - file://allow-multi-definitions-for-native.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)} \ - " -SRC_URI_append_class-native = " file://fix-compile-failure-with-host-gcc-4.6.patch \ - " - -S = "${WORKDIR}/git" - -# Setting CROSS_COMPILE breaks pkgconfig, so just set AR -EXTRA_OEMAKE = "AR=${TARGET_PREFIX}gcc-ar" - -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_class-native() { - install -D -m 0755 ${B}/src/makeguids ${D}${bindir}/makeguids -} - -BBCLASSEXTEND = "native" 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 deleted file mode 100644 index 51397dc55..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch +++ /dev/null @@ -1,82 +0,0 @@ -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-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 deleted file mode 100644 index 4170fefd2..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/sst26.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch deleted file mode 100644 index 46a01529f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch +++ /dev/null @@ -1,198 +0,0 @@ ---- 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.9.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb deleted file mode 100644 index 4cdd8ad23..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb +++ /dev/null @@ -1,20 +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 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_0.12.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb index e2edd095a..99f680f9a 100644 --- 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 @@ -21,6 +21,10 @@ inherit cmake systemd EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" +# With Ninja it fails with: +# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) +OECMAKE_GENERATOR = "Unix Makefiles" + SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot.inc deleted file mode 100644 index 19ee874e2..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot.inc +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ -(text or binary) and function plotting utility." -HOMEPAGE = "http://www.gnuplot.info/" -SECTION = "console/scientific" -LICENSE = "gnuplot" -LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" -DEPENDS = "virtual/libx11 gd readline" - -inherit autotools distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -acpaths = "" - -PACKAGECONFIG ??= "cairo" -PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" -# there's compilation failure if qt4 is enabled -PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free" - -EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-tutorial \ - --disable-wxwidgets" - -do_compile_prepend() { - install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ -} - -do_install_append() { - install -d ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ -} - -PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" -DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." -SECTION_${PN}-x11 = "x11/scientific" -FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " - -FILES_${PN} += "${datadir}/texmf" -FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch new file mode 100644 index 000000000..f8f1fd00f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch @@ -0,0 +1,31 @@ +From a2ac966813fdc04b788be9c8474a4c5e36c109a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 21:53:26 +0100 +Subject: [PATCH] reduce build to conversion tools for native build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9241ce5..b24e291 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = config m4 term src docs man demo tutorial share ++SUBDIRS = docs + + EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch new file mode 100644 index 000000000..8e0b4a271 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch @@ -0,0 +1,31 @@ +From a2ac966813fdc04b788be9c8474a4c5e36c109a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 21:53:26 +0100 +Subject: [PATCH] Do not build demos +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9241ce5..b24e291 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = config m4 term src docs man demo tutorial share ++SUBDIRS = config m4 term src docs man tutorial share + + EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \ +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch new file mode 100644 index 000000000..a4039c317 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch @@ -0,0 +1,111 @@ +From 1128a98fd1676981e536d8773f363cb832cfa6bb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 22:28:56 +0100 +Subject: [PATCH] Use native tools to build docs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + docs/Makefile.am | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 3baf0c4..e82f87d 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -152,7 +152,7 @@ gnuplot-groff.ps: gnuplot.ms $(srcdir)/titlepag.ms + + ### doc2xxx dependencies + gnuplot.ms: doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ms "$(srcdir)/titlepag.ms" ++ $(AM_V_GEN) doc2ms$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ms "$(srcdir)/titlepag.ms" + + doc2ms_SOURCES = doc2ms.c termdoc.c + doc2ms_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) +@@ -173,10 +173,10 @@ pdf_figures: $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu + $(AM_V_GEN)touch $@ + + figures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2tex$(EXEEXT) -figures $(srcdir)/gnuplot.doc $@ ++ $(AM_V_GEN) doc2tex$(EXEEXT) -figures $(srcdir)/gnuplot.doc $@ + + nofigures.tex: allterm.h doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc $@ ++ $(AM_V_GEN) doc2tex$(EXEEXT) $(srcdir)/gnuplot.doc $@ + + pdf: gnuplot.pdf + pdf_nofig: nofigures.pdf +@@ -256,7 +256,7 @@ gnuplot.ps: gnuplot.dvi + hlp: gnuplot.hlp + + gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp ++ $(AM_V_GEN)doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp + + doc2hlp_SOURCES = doc2hlp.c termdoc.c + +@@ -264,14 +264,14 @@ doc2hlp_SOURCES = doc2hlp.c termdoc.c + gih: gnuplot.gih + + gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN)./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih ++ $(AM_V_GEN)doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih + + doc2gih_SOURCES = doc2gih.c termdoc.c + + # To include all terminals in the .gih file + allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc + @echo "generate gnuplot.gih with all terminals" +- $(AM_V_at)./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih ++ $(AM_V_at)alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih + + alldoc2gih_SOURCES = doc2gih.c termdoc.c + alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS) +@@ -286,7 +286,7 @@ $(srcdir)/windows/wgnuplot.hhk + wxhelp/wgnuplot.hhc wxhelp/wgnuplot.hhk wxhelp/*.html windows/*.png + + wxhelp/wgnuplot.html: doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/ ++ $(AM_V_GEN) doc2wxhtml$(EXEEXT) $(srcdir)/gnuplot.doc wxhelp/ + + #doc2wxhtml_SOURCES = windows/doc2html.c termdoc.c xref.c allterm.h + #doc2wxhtml_CPPFLAGS = -DALL_TERM_DOC -DWXHELP -I../src $(AM_CPPFLAGS) +@@ -336,7 +336,7 @@ install-info: gnuplot.info + ipf: gnuplot.ipf + + gnuplot.ipf: doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf ++ $(AM_V_GEN) doc2ipf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.ipf + + doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c + +@@ -344,7 +344,7 @@ doc2ipf_SOURCES = doc2ipf.c termdoc.c xref.c + rtf: gnuplot.rtf + + gnuplot.rtf: doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf ++ $(AM_V_GEN) doc2rtf$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rtf + + doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c + +@@ -352,13 +352,13 @@ doc2rtf_SOURCES = doc2rtf.c termdoc.c xref.c + rnh: gnuplot.rnh + + gnuplot.rnh: doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc +- $(AM_V_GEN) ./doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rnh ++ $(AM_V_GEN) doc2rnh$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.rnh + + doc2rnh_SOURCES = doc2rnh.c termdoc.c + + # this is how to check the gnuplot.doc file + check-local: checkdoc$(EXEEXT) +- $(AM_V_at)./checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \ ++ $(AM_V_at)checkdoc$(EXEEXT) < $(srcdir)/gnuplot.doc; \ + if test $$? -eq 0; then \ + echo "PASS: gnuplot.doc"; \ + else \ +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch new file mode 100644 index 000000000..7ed9e761f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch @@ -0,0 +1,42 @@ +From 577e21622475fa29fd471149cf2380c53fdbfcbd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 6 Mar 2018 22:26:48 +0100 +Subject: [PATCH] Add configure option to find qt5 native tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Pkg-config checks for target locations. With these qt5 tools as uic/moc.. +cannot be used. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cdd831a..fdd192b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1133,11 +1133,15 @@ if test "${enable_qt}" = yes ; then + else + try_qt4=yes + fi ++ AC_ARG_WITH(qt5nativesysroot, ++ AC_HELP_STRING([--with-qt5nativesysroot=PATH], [prepend path - for native qt5 tools]), ++ [QT5NATIVESYSROOT="$withval"], [QT5NATIVESYSROOT=""]) ++ + if test "x${with_qt}" != "xqt4"; then + PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport]) + if test $pkg_failed = no; then + try_qt4=no +- QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core` ++ QT5LOC=${QT5NATIVESYSROOT}`$PKG_CONFIG --variable=host_bins Qt5Core` + if test "x${QT5LOC}" != "x"; then + UIC=${QT5LOC}/uic + MOC=${QT5LOC}/moc +-- +2.14.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop index f67df9e19..1012e477f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Name=Gnuplot Comment=Plot data and function graphs -Exec=x-terminal-emulator -e gnuplot -Terminal=false +Exec=gnuplot +Terminal=true Type=Application Icon=gnuplot Categories=Science; diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch deleted file mode 100644 index 23f2cd26a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - else diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm deleted file mode 100644 index b52f9bb97..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm +++ /dev/null @@ -1,483 +0,0 @@ -/* - * $Id: dumb.trm,v 1.16 2004/04/13 17:24:16 broeker Exp $ - * - */ - -/* GNUPLOT - qtopia.trm */ - -/*[ - * Copyright 1991 - 1993, 1998, 2004 Thomas Williams, Colin Kelley - * - * Permission to use, copy, and distribute this software and its - * documentation for any purpose with or without fee is hereby granted, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. - * - * Permission to modify the software is granted, but not the right to - * distribute the complete modified source code. Modifications are to - * be distributed as patches to the released version. Permission to - * distribute binaries produced by compiling modified sources is granted, - * provided you - * 1. distribute the corresponding source modifications from the - * released version in the form of a patch file along with the binaries, - * 2. add special version identification to distinguish your version - * in addition to the base release version number, - * 3. provide your name and address as the primary contact for the - * support of your modified version, and - * 4. retain our contact information in regard to use of the base - * software. - * Permission to distribute the released version of the source code along - * with corresponding source modifications in the form of a patch file is - * granted with same provisions 2 through 4 for binary distributions. - * - * This software is provided "as is" without express or implied warranty - * to the extent permitted by applicable law. -]*/ - -/* - * This file is included by ../term.c. - * - * This terminal driver supports: - * qtopia terminals - * - * AUTHORS - * Michael Neuroth, 2004-05-16 - * INTERNET: michael.neuroth@freenet.de - * - * send your comments or suggestions to (gnuplot-info@lists.sourceforge.net). - * - */ -#include "driver.h" - -#define NO_QTOPIA_ENHANCED_SUPPORT - -#ifdef TERM_REGISTER -register_term(qtopia_driver) -#endif - -#ifdef TERM_PROTO -TERM_PUBLIC void QTOPIA_options __PROTO((void)); -TERM_PUBLIC void QTOPIA_init __PROTO((void)); -TERM_PUBLIC void QTOPIA_graphics __PROTO((void)); -TERM_PUBLIC void QTOPIA_text __PROTO((void)); -TERM_PUBLIC void QTOPIA_reset __PROTO((void)); -TERM_PUBLIC void QTOPIA_linetype __PROTO((int linetype)); -TERM_PUBLIC void QTOPIA_move __PROTO((unsigned int x, unsigned int y)); -TERM_PUBLIC void QTOPIA_point __PROTO((unsigned int x, unsigned int y, - int point)); -TERM_PUBLIC void QTOPIA_vector __PROTO((unsigned int x, unsigned int y)); -TERM_PUBLIC void QTOPIA_put_text __PROTO((unsigned int x, unsigned int y, - const char *str)); -TERM_PUBLIC void QTOPIA_arrow __PROTO((unsigned int sx, unsigned int sy, - unsigned int ex, unsigned int ey, - int head)); - -#define ENHqtopia_put_text NULL - - -#define QTOPIA_XMAX 4096 -#define QTOPIA_YMAX 4096 - -#ifdef ZAURUS -#define QTOPIA_VCHAR (QTOPIA_YMAX/25) -#define QTOPIA_HCHAR (QTOPIA_XMAX/40) -#define QTOPIA_VTIC (QTOPIA_YMAX/50) -#define QTOPIA_HTIC (QTOPIA_XMAX/40) -#else -#define QTOPIA_VCHAR (QTOPIA_YMAX/25) -#define QTOPIA_HCHAR (QTOPIA_XMAX/50) -#define QTOPIA_VTIC (QTOPIA_YMAX/100) -#define QTOPIA_HTIC (QTOPIA_XMAX/150) -#endif - -#endif /* TERM_PROTO */ - -#ifdef TERM_BODY - -/*#include <winsock2.h>*/ -/* needs: ws2_32.lib */ -#ifndef _MSC_VER -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#endif - -#define QTOPIA_MAX_BUFFER 512 -#define QTOPIA_MAX_DELAY_COUNT 20 /* * 100 ms = 2 s */ - -#ifdef _MSC_VER -#define QTOPIA_BAD_SOCKET INVALID_SOCKET /* -1 */ -#define QTOPIA_BAD_CONNECT SOCKET_ERROR -#else -#define QTOPIA_BAD_SOCKET -1 -#define QTOPIA_BAD_CONNECT -1 -#endif -#define QTOPIA_PORT_NO 5050 - -static int qtopia_client_socket = QTOPIA_BAD_SOCKET; -static unsigned short qtopia_port_no = QTOPIA_PORT_NO; -static char qtopia_host_name[QTOPIA_MAX_BUFFER+1] = { "localhost" }; - -static int OpenClient __PROTO(( int test)); -static void CloseClient(); - -static void MySleep( delay ) -int delay; -{ -#ifdef _MSC_VER - Sleep( delay ); -#else - usleep( delay ); -#endif -} - -static void InitSockets() -{ -#ifdef _MSC_VER - WORD wVersionRequested; - WSADATA wsaData; - int err; - - wVersionRequested = MAKEWORD( 2, 2 ); - - err = WSAStartup( wVersionRequested, &wsaData ); -#endif -} - -static void ExitSockets() -{ -#ifdef _MSC_VER - WSACleanup(); -#endif -} - -static int CheckForQtplot( count ) -int count; -{ - /* test (via sockets) if qtplot is allready running */ - if( !OpenClient( 1 ) ) - { - /* give qtplot a litle bit time to start... */ - if( count < QTOPIA_MAX_DELAY_COUNT ) - { - if( count == 0 ) - { -#ifdef _MSC_VER - system( "start qtplot" ); -#else - system( "qtplot&" ); -#endif - } - - MySleep(100); - - return CheckForQtplot( count+1 ); - } - else - { - return 0; - } - } - else - { - CloseClient(); - - return 1; - } -} - -static int OpenClient( test ) -int test; -{ - int len; - struct sockaddr_in address; - int result; - - /* Create a socket for the client. */ - - qtopia_client_socket = socket(AF_INET, SOCK_STREAM, 0); - - if( qtopia_client_socket != QTOPIA_BAD_SOCKET ) - { - /* Name the socket, as agreed with the server. */ - - address.sin_family = AF_INET; - address.sin_addr.s_addr = inet_addr(/*qtopia_host_name*/"127.0.0.1"); /* localhost */ - address.sin_port = htons(qtopia_port_no); - len = sizeof(address); - - /* Now connect our socket to the server's socket. */ - - result = connect(qtopia_client_socket, (struct sockaddr *)&address, len); - - if( result == QTOPIA_BAD_SOCKET ) - { - /* mark this socket as bad */ - - close( qtopia_client_socket ); - - qtopia_client_socket = QTOPIA_BAD_SOCKET; - - if( !test ) - { - fprintf( gpoutfile, "error connecting to server !\n" ); - } - return 0; /* something went wrong */ - } - } - else - { - if( !test ) - { - fprintf( gpoutfile, "error creating socket !\n" ); - } - return 0; /* something went wrong */ - } - - return 1; /* everything ist ok ! */ -} - -static void CloseClient() -{ - close( qtopia_client_socket ); -} - -static int IsClientOk() -{ - return qtopia_client_socket != QTOPIA_BAD_SOCKET; -} - -static void SendDataToSocket( sLine ) -const char * sLine; -{ - if( IsClientOk() ) - { - int send_count; - - send_count = send( qtopia_client_socket, sLine, strlen( sLine ), 0 ); - - if( send_count <= 0 ) - { - fprintf( gpoutfile, "error writing to socket str=%s!\n", sLine ); - } - /* - else - { - fprintf( gpoutfile, "wrote %d bytes\n", send_count ); - } - */ - } - else - { - /* for testing... */ - /*fprintf( gpoutfile, sLine );*/ - } -} - -/* ************************************************** */ - -enum QTOPIA_id { QTOPIA_PORT, QTOPIA_HOST, QTOPIA_OTHER }; - -static struct gen_table QTOPIA_opts[] = -{ - { "po$rt", QTOPIA_PORT }, - { "ho$st", QTOPIA_HOST }, - { NULL, QTOPIA_OTHER } -}; - -TERM_PUBLIC void -QTOPIA_options() -{ - /* this is not for the qtopia terminal ! */ - /*SendDataToSocket( "qtd options\n" );*/ - - int x, y; - struct value a; - - while (!END_OF_COMMAND) - { - switch(lookup_table(&QTOPIA_opts[0],c_token)) - { - case QTOPIA_PORT: - c_token++; - if (END_OF_COMMAND) - int_error(c_token, "expecting port number"); - qtopia_port_no = (int) real(const_express(&a)); - break; - case QTOPIA_HOST: - c_token++; - if (END_OF_COMMAND) - int_error(c_token, "expecting host name"); - if (isstring(c_token)) - quote_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); - else - copy_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); - c_token++; - break; - case QTOPIA_OTHER: - default: - break; - } - } - - sprintf(term_options, "host=%s port=%d",qtopia_host_name,qtopia_port_no); -} - - -TERM_PUBLIC void -QTOPIA_init() -{ - /* initialize lib (if necassary) */ - InitSockets(); - CheckForQtplot( 0 ); - OpenClient( 0 ); - - SendDataToSocket( "qtd init\n" ); -} - - -TERM_PUBLIC void -QTOPIA_graphics() -{ - SendDataToSocket( "qtd graphics\n" ); -} - -TERM_PUBLIC void -QTOPIA_text() -{ - SendDataToSocket( "qtd text\n" ); -} - - -TERM_PUBLIC void -QTOPIA_reset() -{ - SendDataToSocket( "qtd reset\n" ); - - /* give the qtplot a litle bit time to shutdown */ - MySleep(100); - - CloseClient(); - ExitSockets(); -} - - -TERM_PUBLIC void -QTOPIA_linetype(linetype) -int linetype; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd linetype type=%d\n",linetype ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_move(x, y) -unsigned int x, y; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd move x=%d y=%d\n",x,y ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_point(x, y, point) -unsigned int x, y; -int point; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd point x=%d y=%d point=%d\n",x,y,point ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_vector(_x, _y) -unsigned int _x, _y; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd vector x=%d y=%d\n",_x,_y ); - - SendDataToSocket( sBuffer ); -} - - -TERM_PUBLIC void -QTOPIA_put_text(x, y, str) -unsigned int x, y; -const char *str; -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd put_text x=%d y=%d str=%s\n",x,y,str ); - - SendDataToSocket( sBuffer ); -} - -/* not suported yet ! */ -TERM_PUBLIC void -QTOPIA_arrow(sx, sy, ex, ey, head) - unsigned int sx, sy, ex, ey; - int head; /* ignored */ -{ - char sBuffer[QTOPIA_MAX_BUFFER]; - - sprintf( sBuffer, "qtd arrow sx=%d sy=%d ex=%d ey=%d head=%d\n",sx,sy,ex,ey,head ); - - SendDataToSocket( sBuffer ); -} - - -#endif /* TERM_BODY */ - -#ifdef TERM_TABLE -TERM_TABLE_START(qtopia_driver) - "qtopia", "qtopia or Qt", - QTOPIA_XMAX, QTOPIA_YMAX, QTOPIA_VCHAR, QTOPIA_HCHAR, - QTOPIA_VTIC, QTOPIA_HTIC, QTOPIA_options, QTOPIA_init, QTOPIA_reset, - QTOPIA_text, null_scale, QTOPIA_graphics, QTOPIA_move, QTOPIA_vector, - QTOPIA_linetype, QTOPIA_put_text, null_text_angle, - null_justify_text, QTOPIA_point, /*QTOPIA_arrow*/0, set_font_null, - 0, /* pointsize */ - TERM_CAN_MULTIPLOT, - NULL, NULL, NULL, NULL -#ifdef USE_MOUSE - , NULL, NULL, NULL, NULL, NULL -#endif -#ifdef PM3D - , NULL, NULL, NULL, NULL -#endif -TERM_TABLE_END(qtopia_driver) - -#undef LAST_TERM -#define LAST_TERM qtopia_driver - -#endif /* TERM_TABLE */ - -#ifdef TERM_HELP -START_HELP(qtopia) -"1 qtopia", -"?commands set terminal qtopia", -"?set terminal qtopia", -"?set term qtopia", -"?terminal qtopia", -"?term qtopia", -"?qtopia", -" The `qtopia` terminal driver has no additional options.", -"", -" Syntax:", -" set terminal qtopia", -"" -END_HELP(qtopia) -#endif /* TERM_HELP */ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch deleted file mode 100644 index 8c7d1f0d3..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb deleted file mode 100644 index 42308ba0b..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" -SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053" -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb new file mode 100644 index 000000000..4cc289d3a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb @@ -0,0 +1,69 @@ +SUMMARY = "Gnuplot is a portable command-line driven graphing utility" +DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ +(text or binary) and function plotting utility." +HOMEPAGE = "http://www.gnuplot.info/" +SECTION = "console/scientific" +LICENSE = "gnuplot" +LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" +DEPENDS = "${BPN}-native virtual/libx11 gd readline" + +inherit autotools distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" +SRC_URI_append_class-target = " \ + file://0002-do-not-build-demos.patch \ + file://0003-Use-native-tools-to-build-docs.patch \ + file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ +" + +SRC_URI[archive.md5sum] = "60aedd08998160593199459dea8467fe" +SRC_URI[archive.sha256sum] = "a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1" +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" + +# for building docs (they deserve it) we need *doc2* tools native +BBCLASSEXTEND = "native" +DEPENDS_class-native = "readline-native" +PACKAGECONFIG_class-native = "" + +SRC_URI_append_class-native = "file://0001-reduce-build-to-conversion-tools-for-native-build.patch" + +do_install_class-native() { + install -d ${D}${bindir} + install ${B}/docs/*doc* ${D}${bindir} + rm ${D}${bindir}/*.o +} + +PACKAGECONFIG ??= "cairo" +PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" +PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" +PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native" + +EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ + --without-tutorial \ + --disable-wxwidgets" + +do_compile_prepend() { + install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ +} + +do_install_append_class-target() { + install -d ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ +} + +PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" +DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." +SECTION_${PN}-x11 = "x11/scientific" +FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " + +FILES_${PN} += "${datadir}/texmf" +FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch new file mode 100644 index 000000000..36fd57c9b --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch @@ -0,0 +1,32 @@ +From b04eeea777df32364df74bd63fc5b7fb05d21c8d Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Tue, 27 Mar 2018 10:21:09 +0800 +Subject: [PATCH] init.d/Makefile.am: add missing dependency + +install-data-hook should epend on install-exec-hook, or the +haveged.service might be installed incorrectly when build +with -j option. + +Upstream-Status: Inappropriate [no upstream mailing list] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + init.d/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init.d/Makefile.am b/init.d/Makefile.am +index 5940f78..07bcdf7 100644 +--- a/init.d/Makefile.am ++++ b/init.d/Makefile.am +@@ -33,7 +33,7 @@ if ENABLE_SYSTEMD + install-exec-hook: + $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; + +-install-data-hook: ++install-data-hook: install-exec-hook + if ENABLE_SYSTEMD_LOOKUP + install -p -D -m644 haveged.service $(DESTDIR)`pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; + else +-- +2.11.0 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch deleted file mode 100644 index df27bcb09..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/remove-systemd-unit-503.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/init.d/Makefile.am 2014-01-02 18:55:53.000000000 +0100 -+++ b/init.d/Makefile.am 2014-08-11 10:59:40.000000000 +0200 -@@ -34,11 +34,11 @@ - $(do_subst) < $(srcdir)/$(src_tmpl) > haveged.service; - - install-data-hook: --if ENABLE_SYSTEMD_LOOKUP -- install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; --else -- install -p -m644 haveged.service ($unit_dir)/haveged.service; --endif -- systemctl enable haveged.service; -+#if ENABLE_SYSTEMD_LOOKUP -+# install -p -m644 haveged.service `pkg-config --variable=systemdsystemunitdir systemd`/haveged.service; -+#else -+# install -p -m644 haveged.service ($unit_dir)/haveged.service; -+#endif -+# systemctl enable haveged.service; - - endif diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb index bb44c4138..05ee842f6 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb @@ -6,27 +6,35 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.issihosts.com/haveged/haveged-${PV}.tar.gz \ - file://remove-systemd-unit-503.patch \ + file://haveged-init.d-Makefile.am-add-missing-dependency.patch \ " -SRC_URI[md5sum] = "015ff58cd10607db0e0de60aeca2f5f8" -SRC_URI[sha256sum] = "9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715" +SRC_URI[md5sum] = "fb1d8b3dcbb9d06b30eccd8aa500fd31" +SRC_URI[sha256sum] = "f77d9adbdf421b61601fa29faa9ce3b479d910f73c66b9e364ba8642ccbfbe70" -inherit autotools systemd +inherit autotools update-rc.d systemd EXTRA_OECONF = "\ - --enable-init=service.redhat \ --enable-nistest=yes \ --enable-olt=yes \ --enable-threads=no \ " +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--enable-init=service.redhat --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME = "haveged" +INITSCRIPT_PARAMS_${PN} = "defaults 9" + SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "haveged.service" do_install_append() { - mkdir -p ${D}${systemd_unitdir}/system - install -p -m644 ${B}/init.d/haveged.service ${D}${systemd_unitdir}/system + # The exit status is 143 when the service is stopped + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service + fi } MIPS_INSTRUCTION_SET = "mips" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch deleted file mode 100644 index a384b05ce..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cc67246ca6839e5b3f6a286f10ed24c225b77a5e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> -Date: Thu, 4 Jul 2013 12:34:32 +0200 -Subject: [PATCH] don't strip when installing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Eric Bénard <eric@eukrea.com> - -Upstream-Status: Inappropriate [configuration] ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 159463e..735cc72 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -42,6 +42,6 @@ distclean: clean - - install: $(PRODUCT) - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) -- $(INSTALL) -s -m 755 $(PRODUCT) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(PRODUCT) $(DESTDIR)$(bindir) - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 $(PRODUCT).1 $(DESTDIR)$(mandir)/man1 --- -1.7.10.4 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb index 39df5b2b3..050b7da3d 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb @@ -6,12 +6,11 @@ DEPENDS = "ncurses" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://rigaux.org/${BP}.src.tgz \ - file://0001-don-t-strip-when-installing.patch " +SRC_URI = "git://github.com/pixel/hexedit.git \ + " -SRC_URI[md5sum] = "a5af1378d028512a9cad27a5ba3e15f9" -SRC_URI[sha256sum] = "6a126da30a77f5c0b08038aa7a881d910e3b65d13767fb54c58c983963b88dd7" +SRCREV = "800e4b2e6280531a84fd23ee0b48e16baeb90878" -inherit autotools-brokensep +S = "${WORKDIR}/git" -S = "${WORKDIR}/${BPN}" +inherit autotools-brokensep 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 cbf04734e..0f798d233 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 @@ -20,8 +20,8 @@ S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ - ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ + ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ + ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 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 deleted file mode 100644 index 3135d4d5a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 8f93cb325..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index fc708b23a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 8fec89c6f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "LevelDB is a fast key-value storage library" -DESCRIPTION = "LevelDB is a fast key-value storage library that provides an ordered mapping from string keys to string values" -HOMEPAGE = "http://leveldb.googlecode.com" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" - -SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6" -PV = "1.20+git${SRCPV}" - -SRC_URI = "git://github.com/google/${BPN}.git \ - 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 ${PARALLEL_MAKE}|| die -} - -do_install() { - 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 index 914ee99db..745883ebe 100644 --- 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 @@ -33,7 +33,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 0270c99..b7c7368 100644 +index d41a307..b036e04 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,8 @@ AC_DISABLE_STATIC @@ -45,7 +45,7 @@ index 0270c99..b7c7368 100644 AM_PATH_PYTHON AM_PROG_AR -@@ -129,7 +131,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([UDEV], [libudev >= 216]) +@@ -154,7 +156,6 @@ LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19]) 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]) @@ -53,7 +53,7 @@ index 0270c99..b7c7368 100644 ], []) -@@ -137,10 +138,6 @@ AS_IF([test "x$with_dm" != "xno" -o "x$with_lvm" != "xno" -o "x$with_lvm_dbus" ! +@@ -162,10 +163,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])], []) @@ -61,10 +61,10 @@ index 0270c99..b7c7368 100644 - [LIBBLOCKDEV_CHECK_HEADER([dmraid/dmraid.h], [], [dmraid.h not available])], - []) - - AS_IF([test "x$with_kbd" != "xno"], - [LIBBLOCKDEV_PKG_CHECK_MODULES([KMOD], [libkmod >= 19])], + AS_IF([test "x$with_part" != "xno" -o "x$with_fs" != "xno"], + [LIBBLOCKDEV_PKG_CHECK_MODULES([PARTED], [libparted >= 3.1])] []) -@@ -154,7 +151,8 @@ AS_IF([test "x$with_fs" != "xno"], +@@ -174,7 +171,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], @@ -75,5 +75,5 @@ index 0270c99..b7c7368 100644 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 +2.14.3 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 index 3d9cb6d01..ac5b5e2be 100644 --- 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 @@ -22,21 +22,22 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - src/lib/plugin_apis/dm.api | 41 ----- + src/lib/plugin_apis/dm.api | 50 ------ src/plugins/Makefile.am | 2 +- - src/plugins/dm.c | 318 ------------------------------------ + src/plugins/dm.c | 330 ------------------------------------ src/plugins/dm.h | 5 - src/python/gi/overrides/BlockDev.py | 6 - - 5 files changed, 1 insertion(+), 371 deletions(-) + 5 files changed, 1 insertion(+), 392 deletions(-) diff --git a/src/lib/plugin_apis/dm.api b/src/lib/plugin_apis/dm.api -index a885bba..ec86b80 100644 +index 04fd8d8..5d30b6a 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); +@@ -111,53 +111,3 @@ gchar* bd_dm_get_subsystem_from_name (const gchar *device_name, GError **error); + * Tech category: %BD_DM_TECH_MAP-%BD_DM_TECH_MODE_QUERY */ 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 @@ -49,6 +50,8 @@ index a885bba..ec86b80 100644 - * the member or %NULL in case of error - * - * One of @name, @uuid or @major:@minor has to be given. +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_MODE_QUERY - */ -gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error); - @@ -58,6 +61,8 @@ index a885bba..ec86b80 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully activate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_CREATE_ACTIVATE - */ -gboolean bd_dm_activate_raid_set (const gchar *name, GError **error); - @@ -67,6 +72,8 @@ index a885bba..ec86b80 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully deactivate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_REMOVE_DEACTIVATE - */ -gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error); - @@ -76,13 +83,15 @@ index a885bba..ec86b80 100644 - * @error: (out): variable to store error (if any) - * - * Returns: string representation of the @name RAID set's type +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_QUERY - */ -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 +index b69c8f7..7575f4a 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am -@@ -76,7 +76,7 @@ endif +@@ -75,7 +75,7 @@ endif if WITH_DM libbd_dm_la_CFLAGS = $(GLIB_CFLAGS) $(DEVMAPPER_CFLAGS) $(UDEV_CFLAGS) -Wall -Wextra -Werror @@ -92,10 +101,10 @@ index 6c4038f..59dc5e3 100644 # 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 +index 0e5466c..31ebe96 100644 --- a/src/plugins/dm.c +++ b/src/plugins/dm.c -@@ -21,16 +21,10 @@ +@@ -21,17 +21,11 @@ #include <unistd.h> #include <blockdev/utils.h> #include <libdevmapper.h> @@ -103,6 +112,7 @@ index 9cee742..fd7c7ba 100644 #include <libudev.h> #include "dm.h" + #include "check_deps.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) @@ -112,10 +122,11 @@ index 9cee742..fd7c7ba 100644 /** * 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 +@@ -380,327 +374,3 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a + return ret; } - +- -/** - * init_dmraid_stack: (skip) - * @@ -191,6 +202,9 @@ index 9cee742..fd7c7ba 100644 - /* if we don't have the name, we cannot check any match */ - g_return_val_if_fail (dev_name, FALSE); - +- /* g_return_val_if_fail above checks value of dev_name and returns FALSE if +- * it is NULL so we don't need to check it here */ +- /* coverity[var_deref_model] */ - if (name && strcmp (dev_name, name) != 0) { - return FALSE; - } @@ -220,8 +234,8 @@ index 9cee742..fd7c7ba 100644 - * 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; +- struct raid_set *subset = NULL; +- struct raid_dev *dev = NULL; - - if (T_GROUP(rs) || !list_empty(&(rs->sets))) { - for_each_subset (rs, subset) @@ -246,6 +260,8 @@ index 9cee742..fd7c7ba 100644 - * the member or %NULL in case of error - * - * One of @name, @uuid or @major:@minor has to be given. +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_MODE_QUERY - */ -gchar** bd_dm_get_member_raid_sets (const gchar *name, const gchar *uuid, gint major, gint minor, GError **error) { - guint64 i = 0; @@ -312,8 +328,8 @@ index 9cee742..fd7c7ba 100644 - -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 lib_context *lc = NULL; +- struct raid_set *iter_rs = NULL; - struct raid_set *match_rs = NULL; - - lc = init_dmraid_stack (error); @@ -352,6 +368,8 @@ index 9cee742..fd7c7ba 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully activate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_CREATE_ACTIVATE - */ -gboolean bd_dm_activate_raid_set (const gchar *name, GError **error) { - guint64 progress_id = 0; @@ -372,6 +390,8 @@ index 9cee742..fd7c7ba 100644 - * @error: (out): variable to store error (if any) - * - * Returns: whether the RAID set @name was successfully deactivate or not +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_REMOVE_DEACTIVATE - */ -gboolean bd_dm_deactivate_raid_set (const gchar *name, GError **error) { - guint64 progress_id = 0; @@ -392,10 +412,12 @@ index 9cee742..fd7c7ba 100644 - * @error: (out): variable to store error (if any) - * - * Returns: string representation of the @name RAID set's type +- * +- * Tech category: %BD_DM_TECH_RAID-%BD_DM_TECH_QUERY - */ -gchar* bd_dm_get_raid_set_type (const gchar *name, GError **error) { -- struct lib_context *lc; -- struct raid_set *iter_rs; +- struct lib_context *lc = NULL; +- struct raid_set *iter_rs = NULL; - struct raid_set *match_rs = NULL; - const gchar *type = NULL; - @@ -429,7 +451,7 @@ index 9cee742..fd7c7ba 100644 - return g_strdup (type); -} diff --git a/src/plugins/dm.h b/src/plugins/dm.h -index 859fb80..80acd49 100644 +index 0dce6ac..1ee3788 100644 --- a/src/plugins/dm.h +++ b/src/plugins/dm.h @@ -1,5 +1,4 @@ @@ -438,10 +460,10 @@ index 859fb80..80acd49 100644 #ifndef BD_DM #define BD_DM -@@ -35,9 +34,5 @@ gboolean bd_dm_remove (const gchar *map_name, GError **error); +@@ -48,9 +47,5 @@ gboolean bd_dm_map_exists (const gchar *map_name, gboolean live_only, gboolean a 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_subsystem_from_name (const gchar *device_name, 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); @@ -466,5 +488,5 @@ index fb3ffb4..eed0a38 100644 _loop_setup = BlockDev.loop_setup @override(BlockDev.loop_setup) -- -1.8.3.1 +2.14.3 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 index f18b56928..0b5b80912 100644 --- 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 @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index 8fbce4f..66e11e5 100644 +index b961471..2d3d251 100644 --- a/src/plugins/crypto.c +++ b/src/plugins/crypto.c @@ -22,7 +22,7 @@ @@ -25,7 +25,7 @@ index 8fbce4f..66e11e5 100644 #include <linux/random.h> #include <locale.h> diff --git a/src/plugins/part.c b/src/plugins/part.c -index 12d2ef7..3afe297 100644 +index 6b2a690..ab490d9 100644 --- a/src/plugins/part.c +++ b/src/plugins/part.c @@ -25,6 +25,7 @@ @@ -33,10 +33,10 @@ index 12d2ef7..3afe297 100644 #include <unistd.h> #include <sys/file.h> +#include <fcntl.h> + #include <sys/ioctl.h> + #include <linux/fs.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, +@@ -1354,7 +1355,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 */ @@ -46,5 +46,5 @@ index 12d2ef7..3afe297 100644 args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); g_free (mask_str); -- -1.8.3.1 +2.14.3 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 index 381893608..b214f0b05 100644 --- 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 @@ -19,17 +19,17 @@ Upstream-Status: Submitted [https://github.com/storaged-project/libblockdev/pull 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 +- + src/plugins/crypto.c | 6 +++--- + src/plugins/fs/vfat.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 +index 563093e..b961471 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 +@@ -970,7 +970,7 @@ gboolean bd_crypto_tc_open (const gchar *device, const gchar *name, const guint8 gint ret = 0; guint64 progress_id = 0; gchar *msg = NULL; @@ -38,7 +38,7 @@ index 8fbce4f..7ee7cdc 100644 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) { +@@ -1090,7 +1090,7 @@ static gchar *replace_char (gchar *str, gchar orig, gchar new) { return str; } @@ -47,7 +47,7 @@ index 8fbce4f..7ee7cdc 100644 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 +@@ -1099,7 +1099,7 @@ static gboolean write_escrow_data_file (struct libvk_volume *volume, struct libv gsize bytes_written = 0; GError *tmp_error = NULL; @@ -56,11 +56,11 @@ index 8fbce4f..7ee7cdc 100644 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) { +diff --git a/src/plugins/fs/vfat.c b/src/plugins/fs/vfat.c +index 3ed7d4a..5ff7795 100644 +--- a/src/plugins/fs/vfat.c ++++ b/src/plugins/fs/vfat.c +@@ -376,8 +376,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; @@ -72,10 +72,10 @@ index c4b6ac8..647096d 100644 PedSector start = 0; PedSector length = 0; diff --git a/src/plugins/part.c b/src/plugins/part.c -index 12d2ef7..d277688 100644 +index fed8300..6b2a690 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 +@@ -926,7 +926,7 @@ static PedPartition* add_part_to_disk (PedDevice *dev, PedDisk *disk, BDPartType return NULL; } @@ -84,7 +84,7 @@ index 12d2ef7..d277688 100644 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 +@@ -1564,7 +1564,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; @@ -94,7 +94,7 @@ index 12d2ef7..d277688 100644 gboolean ret = FALSE; guint64 progress_id = 0; diff --git a/src/utils/exec.c b/src/utils/exec.c -index 7ac44fd..0a3094c 100644 +index 11c1489..dcf87e5 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 @@ -107,5 +107,5 @@ index 7ac44fd..0a3094c 100644 gboolean err_done = FALSE; GString *stdout_data = g_string_new (NULL); -- -1.8.3.1 +2.14.3 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.16.bb index 2a923548a..0c954aa39 100644 --- 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.16.bb @@ -8,20 +8,6 @@ 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 += " \ @@ -31,6 +17,21 @@ DEPENDS += " \ libbytesize \ btrfs-tools \ " + +SRCREV = "e2e0899efe8dd3f111ff955fb6c1dc10b0bd2075" +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 \ +" + +S = "${WORKDIR}/git" + RDEPENDS_${PN} += " \ lvm2 \ " @@ -46,6 +47,5 @@ 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/libdivecomputer/files/fix-ar.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch index cc3f5d478..f65d26aae 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch @@ -2,11 +2,11 @@ configure.ac | 1 + 1 file changed, 1 insertion(+) +Index: git/configure.ac +=================================================================== --- git.orig/configure.ac +++ git/configure.ac -@@ -24,10 +24,11 @@ LT_INIT([win32-dll]) - LT_PROG_RC - +@@ -56,6 +56,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 @@ -14,5 +14,3 @@ # Enable automake silent build rules. m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - - # Checks for native Windows. diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 5bf7c6e33..7e4c330a1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -26,4 +26,6 @@ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = " --disable-static --disable-rebuilds --enable-compile-warnings=minimum" DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native" -inherit autotools pkgconfig gettext +inherit distro_features_check autotools pkgconfig gettext + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch deleted file mode 100644 index 28bc5c07d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 29 Mar 2017 16:31:38 -0700 -Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC - -Does not work during cross compile - -use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa13ae6..f4f0f46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - ) - - AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) --AC_RUN_IFELSE([AC_LANG_PROGRAM( -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <time.h>]], --[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], -+[[ -+#include <unistd.h> -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) -+ #error No monotonic clock -+#endif -+ return 0; -+ -+]])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) --- -2.12.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch new file mode 100644 index 000000000..c82f3bf01 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch @@ -0,0 +1,56 @@ +From 73d2aea33e32272bac693550e8a3b0e3ad89707f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com> +Date: Tue, 26 Dec 2017 00:02:26 +0100 +Subject: [PATCH] build: fix configure script neglecting, re-enable out-of-tree + builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For the former, a prototype and the final code got (hm, mysteriously) +intertwisted. For the latter, I am clearly guilty of (rare, anyway) +testing of the out-of-tree builds only with libqb-already-system-wide +scenario, which is rather shortsighted. + +Thanks Fabio and his ci.kronosnet.org project for spotting that. + +X-mas-present-for: Fabio M. Di Nitto <fdinitto@redhat.com> +Signed-off-by: Jan Pokorný <jpokorny@redhat.com> +--- +Upstream-Status: Backport + + configure.ac | 2 +- + lib/Makefile.am | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9900310..f9761cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -710,7 +710,7 @@ if test "x${GCC}" = xyes; then + | grep __stop___verbose | cut -d" " -f 3) + test "${verbose_start_addr}" = "${verbose_stop_addr}" \ + && gcc_has_attribute_section_visible=no \ +- || { verbose_start_type=$(${READELF} -s backup \ ++ || { verbose_start_type=$(${READELF} -s "conftest${shrext_cmds}" \ + | sed -n '/__start___verbose/{s/^\s*//p;q}' \ + | tr -s ' ' \ + | cut -d" " -f6) +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6ca6b15..b035f0b 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -101,7 +101,9 @@ endif + endif + + qblog_script.ld: %.ld: %.ld.in +- $(AM_V_GEN)$(CPP) -xc -I$(top_srcdir)/include -D_GNU_SOURCE -C -P $< \ ++ $(AM_V_GEN)$(CPP) -C -D_GNU_SOURCE -P \ ++ -I$(top_srcdir)/include -I$(top_builddir)/include \ ++ -xc $< \ + | sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \ + > $@ + +-- +2.16.2 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb index 574f6601c..73cea5e39 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb @@ -11,12 +11,14 @@ inherit autotools pkgconfig PV .= "+git${SRCPV}" -SRCREV = "608de6d59a3de0eef0fbcbd8f284acbc018daa9a" +# v1.0.3 +SRCREV = "28dff090c74b6ba8609c4797294a5afe3fe73987" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ - file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + file://0001-build-fix-configure-script-neglecting-re-enable-out-.patch \ " S = "${WORKDIR}/git" +CFLAGS += "-pthread -D_REENTRANT" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) 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 index 525437bdb..f2c661c8f 100644 --- 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 @@ -5,7 +5,7 @@ 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 \ + augeas satyr systemd \ " LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -26,6 +26,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" inherit gettext autotools python3native pkgconfig +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','gtk','',d)}" +PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3," + RDEPENDS_python3-libreport += "${PN}" do_patch[prefuncs] += "do_gen_version" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 8ad545756..2c31a21c0 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -12,7 +12,9 @@ DEPENDS = "freetype libpng jpeg expat gtk+" BBCLASSEXTEND = "native" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \ file://libwmf-0.2.8.4-intoverflow.patch \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/lssci/lsscsi_0.28.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/lssci/lsscsi_0.28.bb deleted file mode 100644 index 4b8cbaf09..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/lssci/lsscsi_0.28.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The lsscsi command lists information about SCSI devices in Linux" -HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html" -LICENSE = "GPLv2" -SECTION = "base" -LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz" - -SRC_URI[md5sum] = "4a39e3b09cd422e2cae3edbaf56b3176" -SRC_URI[sha256sum] = "025d009a1af42bc5b2fca664c44c9ecdfd754356e4a44f5c6aced2420afadd50" - -inherit autotools diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb index 15935c870..df82bef63 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb @@ -17,7 +17,9 @@ SRC_URI = "git://github.com/GNOME/gtkmathview.git \ S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" do_configure_append() { # avoid host polution inf pkg-config files diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch index 15ad03f71..83f454319 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch @@ -1,4 +1,4 @@ -From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 +From 1d1fa95c8ff7697e46343385a79a8f7e5c514a87 Mon Sep 17 00:00:00 2001 From: Zheng Xu <zheng.xu@linaro.org> Date: Fri, 2 Sep 2016 17:40:05 +0800 Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits @@ -16,11 +16,11 @@ Upstream-status: Backport 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp -index 5b386a2..38101cf 100644 +index e5ad018..4149adf 100644 --- a/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp -@@ -306,6 +306,75 @@ InitMemorySubsystem() - MOZ_CRASH(); +@@ -309,6 +309,75 @@ InitMemorySubsystem() + #endif } +static inline void * @@ -95,7 +95,7 @@ index 5b386a2..38101cf 100644 void * MapAlignedPages(size_t size, size_t alignment) { -@@ -319,12 +388,12 @@ MapAlignedPages(size_t size, size_t alignment) +@@ -322,12 +391,12 @@ MapAlignedPages(size_t size, size_t alignment) /* Special case: If we want page alignment, no further work is needed. */ if (alignment == PageSize) { @@ -110,6 +110,3 @@ index 5b386a2..38101cf 100644 if (region == MAP_FAILED) return NULL; --- -1.9.1 - 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 index 616048fac..930c04123 100644 --- 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 @@ -3,12 +3,13 @@ HOMEPAGE = "https://github.com/intel-iot-devkit/mraa" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" -SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480" -PV = "1.7.0-git${SRCPV}" +SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb" +PV = "1.9.0-git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + " S = "${WORKDIR}/git" @@ -31,7 +32,13 @@ 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 '' }" +# Note: 'nodejs' is disabled by default because the bindings +# generation currently fails with nodejs (>v7.x). +BINDINGS ??= "python" + +# nodejs isn't available for armv4/armv5 architectures +BINDINGS_armv4 ??= "python" +BINDINGS_armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb index c4778ca38..f618f02b5 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb @@ -12,6 +12,9 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" PV = "2.6.3" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch new file mode 100644 index 000000000..ae2751745 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch @@ -0,0 +1,48 @@ +From b6b1782af4aa7f9084d32e4144738dc2535c8d6f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Apr 2018 23:07:21 -0700 +Subject: [PATCH] Fix narrowing errors -Wc++11-narrowing + +Clang 6.x finds these errors + + ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka 'unsigned int') [-Wc++11-narrowing] + case E_INVALIDARG : txt = "E_INVALIDARG"; break ; + ^ + +HRESULT causes the macro to be parsed as a signed long, so we need to force it +to be checked as an unsigned long instead. + +also reported here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224930 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CPP/Windows/ErrorMsg.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp +index 99684ae..78a64ba 100644 +--- a/CPP/Windows/ErrorMsg.cpp ++++ b/CPP/Windows/ErrorMsg.cpp +@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode) + + switch(errorCode) { + case ERROR_NO_MORE_FILES : txt = "No more files"; break ; +- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; +- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +- case E_ABORT : txt = "E_ABORT"; break ; +- case E_FAIL : txt = "E_FAIL"; break ; +- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; +- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; +- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; ++ case (DWORD) E_NOTIMPL : txt = "E_NOTIMPL"; break ; ++ case (DWORD) E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; ++ case (DWORD) E_ABORT : txt = "E_ABORT"; break ; ++ case (DWORD) E_FAIL : txt = "E_FAIL"; break ; ++ case (DWORD) STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; ++ case (DWORD) E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; ++ case (DWORD) E_INVALIDARG : txt = "E_INVALIDARG"; break ; + case ERROR_DIRECTORY : txt = "Error Directory"; break ; + default: + txt = strerror(errorCode); diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch new file mode 100644 index 000000000..177d1455f --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch @@ -0,0 +1,31 @@ +p7zip: Fix CVE-2017-17969 + +[No upstream tracking] -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888297 + +Heap-based buffer overflow in 7zip + +Compress/ShrinkDecoder.cpp: Heap-based buffer overflow +in the NCompress::NShrink::CDecoder::CodeReal method +in 7-Zip before 18.00 and p7zip allows remote attackers +to cause a denial of service (out-of-bounds write) +or potentially execute arbitrary code via a crafted ZIP archive. + +Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/8316/attachment/CVE-2017-17969.patch] +CVE: CVE-2017-17969 +Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com> + +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index 67ffbc67c..d986da904 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c file://DOC/License.txt;md5=879598edf1f54dddb6930d7581357f8b" SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_all.tar.bz2 \ - file://do_not_override_compiler_and_do_not_strip.patch" + file://do_not_override_compiler_and_do_not_strip.patch \ + file://CVE-2017-17969.patch \ + file://0001-Fix-narrowing-errors-Wc-11-narrowing.patch \ + " SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f" 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 index ff88533ff..1638c41c8 100644 --- 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 @@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + # This gets us ssh-agent, which we are almost certain to want. # RDEPENDS_${PN} += "openssh-misc" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch deleted file mode 100644 index 4b6ad75cc..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- polkit-gnome-0.105/configure.ac.org 2015-05-04 22:33:03.925977953 -0700 -+++ polkit-gnome-0.105/configure.ac 2015-05-04 22:33:16.862288030 -0700 -@@ -120,6 +120,9 @@ - # Check for required packages - # *************************** - -+# check for gtk-doc -+GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) -+ - POLKIT_AGENT_REQUIRED=0.97 - POLKIT_GOBJECT_REQUIRED=0.97 - GTK_REQUIRED=3.0.0 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb deleted file mode 100644 index 8e99731bd..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "GNOME Authentication Agent for PolicyKit" -DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment" -HOMEPAGE = "http://www.packagekit.org/" -BUGTRACKER = "http://bugzilla.gnome.org/" -DEPENDS = "polkit dbus-glib gconf gtk+ intltool-native gnome-common" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \ - file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795" - -SRC_URI = "https://download.gnome.org/sources/polkit-gnome/${PV}/polkit-gnome-${PV}.tar.xz \ - file://gtk-doc-check.patch \ -" -SRC_URI[md5sum] = "50ecad37c8342fb4a52f590db7530621" -SRC_URI[sha256sum] = "1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369" - -EXTRA_OECONF = "\ - --disable-static \ -" - -DEPENDS += "gtk+3" - -inherit autotools gtk-doc pkgconfig - -FILES_${PN} += " ${datadir}/dbus-1 \ - ${datadir}/PolicyKit \ -" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb index 4025b8087..7c9f2df9d 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb @@ -38,13 +38,11 @@ do_install() { install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ - fi + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ } -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} +inherit systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "rarpd.service" 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 deleted file mode 100644 index 9b19c1a5f..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rocksdb/rocksdb_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -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/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch index 23c0f258f..ca88dd3f7 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch @@ -1,4 +1,4 @@ -From 3c3c21f4735eb215206273bc714c57c969926d3d Mon Sep 17 00:00:00 2001 +From 9739095de6ae5f844354756ae968f5f8864eb3e3 Mon Sep 17 00:00:00 2001 From: Ming Liu <peter.x.liu@external.atlascopco.com> Date: Sun, 26 Feb 2017 14:10:21 +0100 Subject: [PATCH] Include sys/time.h @@ -8,6 +8,7 @@ struct timeval is defined in sys/time.h with a musl libc. Upstream-Status: Inappropriate [musl libc specific] Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> + --- tests/msleep.c | 4 ---- 1 file changed, 4 deletions(-) @@ -28,6 +29,3 @@ index 26a8206..ca818be 100644 int main(int argc, char *argv[]) { --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch deleted file mode 100644 index 7903bb1cc..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Undefine-GLOB_BRACE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6746e3a9615d1566bf228e9012d0841b15178810 Mon Sep 17 00:00:00 2001 -From: Ming Liu <liu.ming50@gmail.com> -Date: Sun, 26 Feb 2017 13:50:33 +0100 -Subject: [PATCH] Undefine GLOB_BRACE - -GLOB_BRACE is not defined in posix and thus not implemented in musl libc. - -Fixed by defining it to 0 if it is undefined. - -Upstream-Status: Inappropriate [musl libc specific] - -Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> ---- - plugins/imfile/imfile.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c -index d20471f..f9aff81 100644 ---- a/plugins/imfile/imfile.c -+++ b/plugins/imfile/imfile.c -@@ -85,6 +85,11 @@ static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config para - - #define ADD_METADATA_UNSPECIFIED -1 - -+/* fixes build with musl libc */ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - /* this structure is used in pure polling mode as well one of the support - * structures for inotify. - */ --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch index bdcb6e22a..a248f75e5 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch @@ -1,3 +1,8 @@ +From 07ad2a1905089b9124623324a9969e4522317110 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Fri, 12 Sep 2014 03:41:11 -0400 +Subject: [PATCH] rsyslog: update configure to fix ptest + $MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then test cases fall into infinite loop with error message: @@ -6,13 +11,24 @@ test cases fall into infinite loop with error message: Update configure to fix it. -Upstream-Status: pending +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> -Kai Kang <kai.kang@windriver.com> --- -diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/testsuites/complex1.conf ---- rsyslog-7.4.4/tests/testsuites/complex1.conf 2013-08-31 00:30:41.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/complex1.conf 2013-12-18 14:28:10.644004184 +0800 + tests/testsuites/complex1.conf | 2 +- + tests/testsuites/gzipwr_large.conf | 2 +- + tests/testsuites/gzipwr_large_dynfile.conf | 2 +- + tests/testsuites/imptcp_conndrop.conf | 2 +- + tests/testsuites/imptcp_large.conf | 2 +- + tests/testsuites/imtcp_conndrop.conf | 2 +- + tests/testsuites/wr_large.conf | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/testsuites/complex1.conf b/tests/testsuites/complex1.conf +index 9b6a9f3..e00caa4 100644 +--- a/tests/testsuites/complex1.conf ++++ b/tests/testsuites/complex1.conf @@ -1,7 +1,7 @@ # complex test case with multiple actions in gzip mode # rgerhards, 2009-05-22 @@ -22,9 +38,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/t $MainMsgQueueTimeoutEnqueue 5000 -diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf ---- rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf 2012-04-04 14:29:55.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 2013-12-18 14:28:10.645004186 +0800 +diff --git a/tests/testsuites/gzipwr_large.conf b/tests/testsuites/gzipwr_large.conf +index 54ad3bb..e8247a9 100644 +--- a/tests/testsuites/gzipwr_large.conf ++++ b/tests/testsuites/gzipwr_large.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -34,9 +51,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tes $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf ---- rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf 2012-04-04 14:29:55.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 2013-12-18 14:28:10.645004186 +0800 +diff --git a/tests/testsuites/gzipwr_large_dynfile.conf b/tests/testsuites/gzipwr_large_dynfile.conf +index 3a1b255..297cb70 100644 +--- a/tests/testsuites/gzipwr_large_dynfile.conf ++++ b/tests/testsuites/gzipwr_large_dynfile.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -46,9 +64,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4 $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf ---- rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf 2013-08-31 00:30:41.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 +diff --git a/tests/testsuites/imptcp_conndrop.conf b/tests/testsuites/imptcp_conndrop.conf +index 77a5d79..d9a14a8 100644 +--- a/tests/testsuites/imptcp_conndrop.conf ++++ b/tests/testsuites/imptcp_conndrop.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -58,9 +77,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/ $ModLoad ../plugins/imptcp/.libs/imptcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf ---- rsyslog-7.4.4/tests/testsuites/imptcp_large.conf 2013-08-31 00:30:41.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 2013-12-18 14:28:10.646004189 +0800 +diff --git a/tests/testsuites/imptcp_large.conf b/tests/testsuites/imptcp_large.conf +index 77a5d79..d9a14a8 100644 +--- a/tests/testsuites/imptcp_large.conf ++++ b/tests/testsuites/imptcp_large.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -70,9 +90,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tes $ModLoad ../plugins/imptcp/.libs/imptcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf ---- rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf 2013-07-19 20:59:03.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 +diff --git a/tests/testsuites/imtcp_conndrop.conf b/tests/testsuites/imtcp_conndrop.conf +index de41bc4..7844dc7 100644 +--- a/tests/testsuites/imtcp_conndrop.conf ++++ b/tests/testsuites/imtcp_conndrop.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 @@ -82,9 +103,10 @@ diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/t $ModLoad ../plugins/imtcp/.libs/imtcp $MainMsgQueueTimeoutShutdown 10000 -diff -Nru rsyslog-7.4.4/tests/testsuites/wr_large.conf rsyslog-7.4.4.new/tests/testsuites/wr_large.conf ---- rsyslog-7.4.4/tests/testsuites/wr_large.conf 2012-04-04 14:29:55.000000000 +0800 -+++ rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 2013-12-18 14:28:10.647004190 +0800 +diff --git a/tests/testsuites/wr_large.conf b/tests/testsuites/wr_large.conf +index b64f132..b0ae264 100644 +--- a/tests/testsuites/wr_large.conf ++++ b/tests/testsuites/wr_large.conf @@ -1,7 +1,7 @@ # simple async writing test # rgerhards, 2010-03-09 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 46eddd604..162d239a1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch @@ -1,5 +1,5 @@ -From 5c3ba79177f7d1763db33c4358af2af60ff214b7 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> +From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt @@ -10,15 +10,16 @@ libgcrypt does no longer provide libgcrypt-config, and provide Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + --- configure.ac | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac -index 0f31869..d35db42 100644 +index 62178c3..b56c9c7 100644 --- a/configure.ac +++ b/configure.ac -@@ -777,20 +777,7 @@ AC_ARG_ENABLE(libgcrypt, +@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then @@ -40,6 +41,3 @@ index 0f31869..d35db42 100644 fi AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) AC_SUBST(LIBGCRYPT_CFLAGS) --- -2.8.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb index 7056e1c6a..476540d0a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb @@ -27,7 +27,6 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t " SRC_URI_append_libc-musl = " \ - file://0001-Undefine-GLOB_BRACE.patch \ file://0001-Include-sys-time-h.patch \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index c6b9f1019..10ffaaa31 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -11,6 +11,9 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://sfcb.service \ file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \ @@ -28,7 +31,7 @@ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" inherit autotools -inherit ${@bb.utils.filter('VIRTUAL-RUNTIME_init_manager', 'systemd', d)} +inherit systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" @@ -53,10 +56,8 @@ do_install() { oe_runmake DESTDIR=${D} install - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service - fi + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service install -d ${D}${sysconfdir}/init.d mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb index 0970d2a30..1a1767e11 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb @@ -22,8 +22,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d) PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" -SRC_URI[md5sum] = "093aeec3f8f39fa9a37593c4012d3156" -SRC_URI[sha256sum] = "89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc" +SRC_URI[md5sum] = "9ae2c6e7131cd2813edcc65cbe5f223f" +SRC_URI[sha256sum] = "51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054" inherit autotools update-rc.d systemd diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb new file mode 100644 index 000000000..3c019eb7c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -0,0 +1,12 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" +SRCREV = "d1248b0f22ea8dc3b9d84a61bd35a83309bdb4b4" +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" + +S = "${WORKDIR}/git" + +inherit module + +EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index bc6fec0f1..4f58281f9 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit cmake pkgconfig +OECMAKE_GENERATOR = "Unix Makefiles" + DEPENDS = "luajit zlib ncurses" RDEPENDS_${PN} = "bash" @@ -33,3 +35,7 @@ FILES_${PN} += " \ ${datadir}/zsh/* \ ${prefix}/src/* \ " + +# luajit not supported on Aarch64 +COMPATIBLE_HOST = "^(?!aarch64).*" + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch index 8b98707cd..976e0380e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch @@ -1,11 +1,21 @@ +From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 21 Nov 2011 12:00:54 +0100 +Subject: [PATCH] t1lib: add 5.1.2 # # Patch managed by http://www.holgerschurig.de/patcher.html # ---- t1lib-5.0.2/configure.in~configure.patch -+++ t1lib-5.0.2/configure.in -@@ -75,9 +75,9 @@ +--- + configure.in | 95 ++++++++++++++++++++++++------------------------------------ + 1 file changed, 38 insertions(+), 57 deletions(-) + +diff --git a/configure.in b/configure.in +index eade4c0..e649ea9 100644 +--- a/configure.in ++++ b/configure.in +@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION) T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\" @@ -18,7 +28,7 @@ dnl We want these before the checks, so the checks can modify their values. test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS) -@@ -161,6 +161,7 @@ +@@ -162,6 +162,7 @@ fi dnl **** Check for underscore on external symbols **** @@ -26,21 +36,12 @@ AC_CACHE_CHECK("whether external symbols need an underscore prefix", ac_cv_c_extern_prefix, [saved_libs=$LIBS -@@ -178,68 +179,48 @@ +@@ -179,68 +180,48 @@ then AC_DEFINE(NEED_UNDERSCORE_PREFIX) fi -dnl **** Check which ANSI integer type is 16 bit -+dnl **** Check which ANSI integer type is 16 bit -+T1_AA_TYPE16="" -+for type in short int; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then -+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" -+ T1_INT16="$type" -+ break -+ fi -+done - +- -AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type, - AC_TRY_RUN([ -int main(void) { @@ -58,21 +59,23 @@ -else - T1_AA_TYPE16="-DT1_AA_TYPE16=int" - T1_INT16="int" ++dnl **** Check which ANSI integer type is 16 bit ++T1_AA_TYPE16="" ++for type in short int; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then ++ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" ++ T1_INT16="$type" ++ break ++ fi ++done ++ +if test x"$T1_AA_TYPE16" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") fi - dnl **** Check which ANSI integer type is 32 bit -+T1_AA_TYPE32="" -+for type in int long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then -+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" -+ T1_INT32="$type" -+ break -+ fi -+done - +- -AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type, - AC_TRY_RUN([ -int main(void) { @@ -90,21 +93,22 @@ -else - T1_AA_TYPE32="-DT1_AA_TYPE32=long" - T1_INT32="long" ++T1_AA_TYPE32="" ++for type in int long; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then ++ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" ++ T1_INT32="$type" ++ break ++ fi ++done ++ +if test x"$T1_AA_TYPE32" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") fi - dnl **** Check which ANSI integer type is 64 bit -+T1_AA_TYPE64="" -+for type in long long_long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then -+ AC_MSG_WARN("$type is 64 bit") -+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" -+ break -+ fi -+done - +- -AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type, - AC_TRY_RUN([ -int main(void) { @@ -118,6 +122,15 @@ - T1_AA_TYPE64="-DT1_AA_TYPE64=long" -else - T1_AA_TYPE64= ++T1_AA_TYPE64="" ++for type in long long_long; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then ++ AC_MSG_WARN("$type is 64 bit") ++ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" ++ break ++ fi ++done ++ +if test x"$T1_AA_TYPE64" = "x"; then + AC_MSG_ERROR("Unable to determine which integer type is 64 bit.") fi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch index 8b4ce400f..bc2476bfc 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch @@ -1,3 +1,8 @@ +From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Mar 2017 23:13:36 -0800 +Subject: [PATCH] t1lib: Fix printf format string errors + Fix printf formats to use format qualifiers fixes @@ -6,20 +11,17 @@ error: format string is not a string literal (potentially insecure) [-Werror,-Wf Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending ---- a/lib/type1/objects.c -+++ b/lib/type1/objects.c -@@ -957,7 +957,7 @@ - - sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", - name, TypeFmt(expect), TypeFmt(obj->type)); -- IfTrace0(TRUE,typemsg); -+ IfTrace1(TRUE, "%s", typemsg); - - ObjectPostMortem(obj); - +--- + lib/t1lib/t1subset.c | 2 +- + lib/type1/objects.c | 2 +- + lib/type1/objects.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c +index da427b2..e76974f 100644 --- a/lib/t1lib/t1subset.c +++ b/lib/t1lib/t1subset.c -@@ -759,7 +759,7 @@ +@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID, tr_len); T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, T1LOG_DEBUG); @@ -28,9 +30,24 @@ Upstream-Status: Pending } /* compute size of output file */ +diff --git a/lib/type1/objects.c b/lib/type1/objects.c +index c413a0f..f828e6a 100644 +--- a/lib/type1/objects.c ++++ b/lib/type1/objects.c +@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict + + sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", + name, TypeFmt(expect), TypeFmt(obj->type)); +- IfTrace0(TRUE,typemsg); ++ IfTrace1(TRUE, "%s", typemsg); + + ObjectPostMortem(obj); + +diff --git a/lib/type1/objects.h b/lib/type1/objects.h +index 13cbae7..3a1d337 100644 --- a/lib/type1/objects.h +++ b/lib/type1/objects.h -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ struct xobject { /*SHARED*/ /* NDW: personally, I want to see status and error messages! */ #define IfTrace0(condition,model) \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch index e05002573..da54f87ab 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch @@ -1,12 +1,28 @@ +From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 21 Nov 2011 12:00:54 +0100 +Subject: [PATCH] t1lib: add 5.1.2 # # Patch managed by http://www.holgerschurig.de/patcher.html # ---- t1lib-5.0.2/Makefile.in~libtool -+++ t1lib-5.0.2/Makefile.in +--- + Makefile.in | 5 +++-- + examples/Makefile.in | 5 +++-- + lib/Makefile.in | 6 ++++-- + lib/t1lib/Makefile.in | 6 ++++-- + lib/type1/Makefile.in | 6 ++++-- + type1afm/Makefile.in | 6 ++++-- + xglyph/Makefile.in | 6 ++++-- + 7 files changed, 26 insertions(+), 14 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 29c3468..396c020 100644 +--- a/Makefile.in ++++ b/Makefile.in @@ -18,7 +18,8 @@ - # Last modified: 2001-04-01 + # Last modified: 2005-05-01 # -SHELL = /bin/sh @@ -15,7 +31,7 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ -@@ -150,7 +151,7 @@ +@@ -149,7 +150,7 @@ distclean: clean $(RM) examples/Makefile $(RM) xglyph/Makefile $(RM) doc/Makefile @@ -24,8 +40,10 @@ # The following two targets are for building and cleaning the python- ---- t1lib-5.0.2/examples/Makefile.in~libtool -+++ t1lib-5.0.2/examples/Makefile.in +diff --git a/examples/Makefile.in b/examples/Makefile.in +index b301db5..7a6a514 100644 +--- a/examples/Makefile.in ++++ b/examples/Makefile.in @@ -14,9 +14,10 @@ # Last modified: 2001-04-01 # @@ -39,8 +57,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/lib/Makefile.in~libtool -+++ t1lib-5.0.2/lib/Makefile.in +diff --git a/lib/Makefile.in b/lib/Makefile.in +index 89e5e86..6e0f960 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in @@ -15,8 +15,10 @@ # # Contributions by H.Kakugawa to use libtool! @@ -54,8 +74,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/lib/t1lib/Makefile.in~libtool -+++ t1lib-5.0.2/lib/t1lib/Makefile.in +diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in +index a6c2478..32434b3 100644 +--- a/lib/t1lib/Makefile.in ++++ b/lib/t1lib/Makefile.in @@ -14,8 +14,10 @@ # # Modified by H.Kakugawa to use libtool @@ -69,8 +91,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/lib/type1/Makefile.in~libtool -+++ t1lib-5.0.2/lib/type1/Makefile.in +diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in +index 241f124..42efa94 100644 +--- a/lib/type1/Makefile.in ++++ b/lib/type1/Makefile.in @@ -14,8 +14,10 @@ # # Modified by H.Kakugawa to use libtool @@ -84,8 +108,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/type1afm/Makefile.in~libtool -+++ t1lib-5.0.2/type1afm/Makefile.in +diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in +index 61611e1..9b51406 100644 +--- a/type1afm/Makefile.in ++++ b/type1afm/Makefile.in @@ -15,8 +15,10 @@ # # Modified by H.Kakugawa to use libtool @@ -99,8 +125,10 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ ---- t1lib-5.0.2/xglyph/Makefile.in~libtool -+++ t1lib-5.0.2/xglyph/Makefile.in +diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in +index 8da9b63..741334c 100644 +--- a/xglyph/Makefile.in ++++ b/xglyph/Makefile.in @@ -15,8 +15,10 @@ # # Modified by H.Kakugawa to use libtool diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch deleted file mode 100644 index ff2f6a3b6..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0553455813a1f717ef50cc911e4db73da3d23c32 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 22 Mar 2017 18:47:40 -0700 -Subject: [PATCH 1/2] Enable system malloc on all linux - -Dont trigger on being just android or glibc -internal malloc falls flat on musl based systems -as well. So switch to using system malloc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - config_f.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config_f.h b/config_f.h -index 6a632a5..0a66960 100644 ---- a/config_f.h -+++ b/config_f.h -@@ -139,7 +139,7 @@ - * This can be much slower and no memory statistics will be - * provided. - */ --#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) -+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__linux__) || defined(__OpenBSD__) || defined(__APPLE__) - # define SYSMALLOC - #else - # undef SYSMALLOC --- -2.12.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch deleted file mode 100644 index e4de6f7fe..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 60271713025f6b17dda29721be012a8428e77185 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 22 Mar 2017 18:56:49 -0700 -Subject: [PATCH 2/2] Add debian csh scripts - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - csh.cshrc | 15 +++++++++++++++ - csh.login | 8 ++++++++ - csh.logout | 1 + - 3 files changed, 24 insertions(+) - create mode 100644 csh.cshrc - create mode 100644 csh.login - create mode 100644 csh.logout - -diff --git a/csh.cshrc b/csh.cshrc -new file mode 100644 -index 0000000..29c934a ---- /dev/null -+++ b/csh.cshrc -@@ -0,0 +1,15 @@ -+# /etc/csh.cshrc: system-wide .cshrc file for csh(1) and tcsh(1) -+ -+if ($?tcsh && $?prompt) then -+ -+ bindkey "\e[1~" beginning-of-line # Home -+ bindkey "\e[7~" beginning-of-line # Home rxvt -+ bindkey "\e[2~" overwrite-mode # Ins -+ bindkey "\e[3~" delete-char # Delete -+ bindkey "\e[4~" end-of-line # End -+ bindkey "\e[8~" end-of-line # End rxvt -+ -+ set autoexpand -+ set autolist -+ set prompt = "%U%m%u:%B%~%b%# " -+endif -diff --git a/csh.login b/csh.login -new file mode 100644 -index 0000000..2455c3c ---- /dev/null -+++ b/csh.login -@@ -0,0 +1,8 @@ -+# /etc/csh.login: system-wide .login file for csh(1) and tcsh(1) -+ -+# allow for other packages/system admins to customize the shell environment -+if (-e /etc/csh/login.d && `/bin/ls /etc/csh/login.d` != "") then -+ foreach FILE (`/bin/ls /etc/csh/login.d/*`) -+ source $FILE; -+ end; -+endif -diff --git a/csh.logout b/csh.logout -new file mode 100644 -index 0000000..a207eba ---- /dev/null -+++ b/csh.logout -@@ -0,0 +1 @@ -+# /etc/csh.logout: system-wide .logout file for csh(1) and tcsh(1) --- -2.12.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb deleted file mode 100644 index b59d88f5d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ - The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ - It includes all features of 4.4BSD C shell, plus a command-line editor, \ - programmable word completion, spelling correction and more." - -HOMEPAGE = "http://www.tcsh.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" -SECTION = "base" -DEPENDS = "ncurses gettext-native" -SRC_URI = " \ - http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \ - file://0001-Enable-system-malloc-on-all-linux.patch \ - file://0002-Add-debian-csh-scripts.patch \ -" -SRC_URI[md5sum] = "59d40ef40a68e790d95e182069431834" -SRC_URI[sha256sum] = "b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d" - -EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" -inherit autotools - -do_compile_prepend() { - oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost -} - -do_install_append () { - oe_runmake install.man DESTDIR=${D} - - install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - ln -s /usr/bin/tcsh ${D}${base_bindir}/csh - install -d ${D}${sysconfdir}/csh/login.d - install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} - install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el -} - -FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" - - -pkg_postinst_${PN} () { -#!/bin/sh -e -echo /usr/bin/tcsh >> $D/etc/shells -echo /usr/bin/csh >> $D/etc/shells -} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch deleted file mode 100644 index 71782c5b9..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch +++ /dev/null @@ -1,348 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -From 07f2528d93f44fe1d8080a4225f29f4ada9f4663 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Thu, 4 Feb 2016 09:15:37 -0200 -Subject: [PATCH 1/2] Makefile for cross compile SoftFloat - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - SoftFloat-3a/build/Linux-Cross-Compile/Makefile | 274 ++++++++++++++++++++++ - SoftFloat-3a/build/Linux-Cross-Compile/platform.h | 44 ++++ - 2 files changed, 318 insertions(+) - create mode 100644 SoftFloat-3a/build/Linux-Cross-Compile/Makefile - create mode 100644 SoftFloat-3a/build/Linux-Cross-Compile/platform.h - -diff --git a/SoftFloat-3a/build/Linux-Cross-Compile/Makefile b/SoftFloat-3a/build/Linux-Cross-Compile/Makefile -new file mode 100644 -index 0000000..c4d0a60 ---- /dev/null -+++ b/SoftFloat-3a/build/Linux-Cross-Compile/Makefile -@@ -0,0 +1,274 @@ -+ -+#============================================================================= -+# -+# This Makefile is part of the SoftFloat IEEE Floating-Point Arithmetic -+# Package, Release 3a, by John R. Hauser. -+# -+# Copyright 2011, 2012, 2013, 2014 The Regents of the University of -+# California. All rights reserved. -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are met: -+# -+# 1. Redistributions of source code must retain the above copyright notice, -+# this list of conditions, and the following disclaimer. -+# -+# 2. Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions, and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# -+# 3. Neither the name of the University nor the names of its contributors -+# may be used to endorse or promote products derived from this software -+# without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY -+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE -+# DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+# -+#============================================================================= -+ -+SOURCE_DIR = ../../source -+SPECIALIZE_TYPE = 8086 -+ -+SOFTFLOAT_OPTS = -DINLINE_LEVEL=5 -DSOFTFLOAT_FAST_DIV64TO32 -fgnu89-inline -+ -+DELETE = rm -f -+C_INCLUDES = -I. -I$(SOURCE_DIR)/$(SPECIALIZE_TYPE) -I$(SOURCE_DIR)/include -+COMPILE_C = \ -+ ${CC} -c -Werror-implicit-function-declaration $(SOFTFLOAT_OPTS) \ -+ $(C_INCLUDES) -O2 -o $@ -+MAKELIB = ${AR} crs $@ -+ -+OBJ = .o -+LIB = .a -+ -+.PHONY: all -+all: softfloat$(LIB) -+ -+OBJS_PRIMITIVES = \ -+ s_compare96M$(OBJ) \ -+ s_compare128M$(OBJ) \ -+ s_shortShiftLeft64To96M$(OBJ) \ -+ s_shortShiftLeftM$(OBJ) \ -+ s_shiftLeftM$(OBJ) \ -+ s_shortShiftRightM$(OBJ) \ -+ s_shortShiftRightJam64$(OBJ) \ -+ s_shortShiftRightJamM$(OBJ) \ -+ s_shiftRightJam32$(OBJ) \ -+ s_shiftRightJam64$(OBJ) \ -+ s_shiftRightJamM$(OBJ) \ -+ s_shiftRightM$(OBJ) \ -+ s_countLeadingZeros8$(OBJ) \ -+ s_countLeadingZeros32$(OBJ) \ -+ s_countLeadingZeros64$(OBJ) \ -+ s_addM$(OBJ) \ -+ s_addCarryM$(OBJ) \ -+ s_addComplCarryM$(OBJ) \ -+ s_negXM$(OBJ) \ -+ s_sub1XM$(OBJ) \ -+ s_subM$(OBJ) \ -+ s_mul64To128M$(OBJ) \ -+ s_mul128MTo256M$(OBJ) \ -+ s_approxRecip32_1$(OBJ) \ -+ s_approxRecipSqrt32_1$(OBJ) \ -+ s_remStepMBy32$(OBJ) \ -+ -+OBJS_SPECIALIZE = \ -+ softfloat_raiseFlags$(OBJ) \ -+ s_f32UIToCommonNaN$(OBJ) \ -+ s_commonNaNToF32UI$(OBJ) \ -+ s_propagateNaNF32UI$(OBJ) \ -+ s_f64UIToCommonNaN$(OBJ) \ -+ s_commonNaNToF64UI$(OBJ) \ -+ s_propagateNaNF64UI$(OBJ) \ -+ extF80M_isSignalingNaN$(OBJ) \ -+ s_extF80MToCommonNaN$(OBJ) \ -+ s_commonNaNToExtF80M$(OBJ) \ -+ s_propagateNaNExtF80M$(OBJ) \ -+ f128M_isSignalingNaN$(OBJ) \ -+ s_f128MToCommonNaN$(OBJ) \ -+ s_commonNaNToF128M$(OBJ) \ -+ s_propagateNaNF128M$(OBJ) \ -+ -+OBJS_OTHERS = \ -+ s_roundPackToUI32$(OBJ) \ -+ s_roundPackMToUI64$(OBJ) \ -+ s_roundPackToI32$(OBJ) \ -+ s_roundPackMToI64$(OBJ) \ -+ s_normSubnormalF32Sig$(OBJ) \ -+ s_roundPackToF32$(OBJ) \ -+ s_normRoundPackToF32$(OBJ) \ -+ s_addMagsF32$(OBJ) \ -+ s_subMagsF32$(OBJ) \ -+ s_mulAddF32$(OBJ) \ -+ s_normSubnormalF64Sig$(OBJ) \ -+ s_roundPackToF64$(OBJ) \ -+ s_normRoundPackToF64$(OBJ) \ -+ s_addMagsF64$(OBJ) \ -+ s_subMagsF64$(OBJ) \ -+ s_mulAddF64$(OBJ) \ -+ s_tryPropagateNaNExtF80M$(OBJ) \ -+ s_invalidExtF80M$(OBJ) \ -+ s_normExtF80SigM$(OBJ) \ -+ s_roundPackMToExtF80M$(OBJ) \ -+ s_normRoundPackMToExtF80M$(OBJ) \ -+ s_addExtF80M$(OBJ) \ -+ s_compareNonnormExtF80M$(OBJ) \ -+ s_isNaNF128M$(OBJ) \ -+ s_tryPropagateNaNF128M$(OBJ) \ -+ s_invalidF128M$(OBJ) \ -+ s_shiftNormSigF128M$(OBJ) \ -+ s_roundPackMToF128M$(OBJ) \ -+ s_normRoundPackMToF128M$(OBJ) \ -+ s_addF128M$(OBJ) \ -+ s_mulAddF128M$(OBJ) \ -+ softfloat_state$(OBJ) \ -+ ui32_to_f32$(OBJ) \ -+ ui32_to_f64$(OBJ) \ -+ ui32_to_extF80M$(OBJ) \ -+ ui32_to_f128M$(OBJ) \ -+ ui64_to_f32$(OBJ) \ -+ ui64_to_f64$(OBJ) \ -+ ui64_to_extF80M$(OBJ) \ -+ ui64_to_f128M$(OBJ) \ -+ i32_to_f32$(OBJ) \ -+ i32_to_f64$(OBJ) \ -+ i32_to_extF80M$(OBJ) \ -+ i32_to_f128M$(OBJ) \ -+ i64_to_f32$(OBJ) \ -+ i64_to_f64$(OBJ) \ -+ i64_to_extF80M$(OBJ) \ -+ i64_to_f128M$(OBJ) \ -+ f32_to_ui32$(OBJ) \ -+ f32_to_ui64$(OBJ) \ -+ f32_to_i32$(OBJ) \ -+ f32_to_i64$(OBJ) \ -+ f32_to_ui32_r_minMag$(OBJ) \ -+ f32_to_ui64_r_minMag$(OBJ) \ -+ f32_to_i32_r_minMag$(OBJ) \ -+ f32_to_i64_r_minMag$(OBJ) \ -+ f32_to_f64$(OBJ) \ -+ f32_to_extF80M$(OBJ) \ -+ f32_to_f128M$(OBJ) \ -+ f32_roundToInt$(OBJ) \ -+ f32_add$(OBJ) \ -+ f32_sub$(OBJ) \ -+ f32_mul$(OBJ) \ -+ f32_mulAdd$(OBJ) \ -+ f32_div$(OBJ) \ -+ f32_rem$(OBJ) \ -+ f32_sqrt$(OBJ) \ -+ f32_eq$(OBJ) \ -+ f32_le$(OBJ) \ -+ f32_lt$(OBJ) \ -+ f32_eq_signaling$(OBJ) \ -+ f32_le_quiet$(OBJ) \ -+ f32_lt_quiet$(OBJ) \ -+ f32_isSignalingNaN$(OBJ) \ -+ f64_to_ui32$(OBJ) \ -+ f64_to_ui64$(OBJ) \ -+ f64_to_i32$(OBJ) \ -+ f64_to_i64$(OBJ) \ -+ f64_to_ui32_r_minMag$(OBJ) \ -+ f64_to_ui64_r_minMag$(OBJ) \ -+ f64_to_i32_r_minMag$(OBJ) \ -+ f64_to_i64_r_minMag$(OBJ) \ -+ f64_to_f32$(OBJ) \ -+ f64_to_extF80M$(OBJ) \ -+ f64_to_f128M$(OBJ) \ -+ f64_roundToInt$(OBJ) \ -+ f64_add$(OBJ) \ -+ f64_sub$(OBJ) \ -+ f64_mul$(OBJ) \ -+ f64_mulAdd$(OBJ) \ -+ f64_div$(OBJ) \ -+ f64_rem$(OBJ) \ -+ f64_sqrt$(OBJ) \ -+ f64_eq$(OBJ) \ -+ f64_le$(OBJ) \ -+ f64_lt$(OBJ) \ -+ f64_eq_signaling$(OBJ) \ -+ f64_le_quiet$(OBJ) \ -+ f64_lt_quiet$(OBJ) \ -+ f64_isSignalingNaN$(OBJ) \ -+ extF80M_to_ui32$(OBJ) \ -+ extF80M_to_ui64$(OBJ) \ -+ extF80M_to_i32$(OBJ) \ -+ extF80M_to_i64$(OBJ) \ -+ extF80M_to_ui32_r_minMag$(OBJ) \ -+ extF80M_to_ui64_r_minMag$(OBJ) \ -+ extF80M_to_i32_r_minMag$(OBJ) \ -+ extF80M_to_i64_r_minMag$(OBJ) \ -+ extF80M_to_f32$(OBJ) \ -+ extF80M_to_f64$(OBJ) \ -+ extF80M_to_f128M$(OBJ) \ -+ extF80M_roundToInt$(OBJ) \ -+ extF80M_add$(OBJ) \ -+ extF80M_sub$(OBJ) \ -+ extF80M_mul$(OBJ) \ -+ extF80M_div$(OBJ) \ -+ extF80M_rem$(OBJ) \ -+ extF80M_sqrt$(OBJ) \ -+ extF80M_eq$(OBJ) \ -+ extF80M_le$(OBJ) \ -+ extF80M_lt$(OBJ) \ -+ extF80M_eq_signaling$(OBJ) \ -+ extF80M_le_quiet$(OBJ) \ -+ extF80M_lt_quiet$(OBJ) \ -+ f128M_to_ui32$(OBJ) \ -+ f128M_to_ui64$(OBJ) \ -+ f128M_to_i32$(OBJ) \ -+ f128M_to_i64$(OBJ) \ -+ f128M_to_ui32_r_minMag$(OBJ) \ -+ f128M_to_ui64_r_minMag$(OBJ) \ -+ f128M_to_i32_r_minMag$(OBJ) \ -+ f128M_to_i64_r_minMag$(OBJ) \ -+ f128M_to_f32$(OBJ) \ -+ f128M_to_f64$(OBJ) \ -+ f128M_to_extF80M$(OBJ) \ -+ f128M_roundToInt$(OBJ) \ -+ f128M_add$(OBJ) \ -+ f128M_sub$(OBJ) \ -+ f128M_mul$(OBJ) \ -+ f128M_mulAdd$(OBJ) \ -+ f128M_div$(OBJ) \ -+ f128M_rem$(OBJ) \ -+ f128M_sqrt$(OBJ) \ -+ f128M_eq$(OBJ) \ -+ f128M_le$(OBJ) \ -+ f128M_lt$(OBJ) \ -+ f128M_eq_signaling$(OBJ) \ -+ f128M_le_quiet$(OBJ) \ -+ f128M_lt_quiet$(OBJ) \ -+ -+OBJS_ALL = $(OBJS_PRIMITIVES) $(OBJS_SPECIALIZE) $(OBJS_OTHERS) -+ -+$(OBJS_ALL): \ -+ platform.h $(SOURCE_DIR)/include/primitiveTypes.h \ -+ $(SOURCE_DIR)/include/primitives.h -+$(OBJS_SPECIALIZE) $(OBJS_OTHERS): \ -+ $(SOURCE_DIR)/include/softfloat_types.h $(SOURCE_DIR)/include/internals.h \ -+ $(SOURCE_DIR)/$(SPECIALIZE_TYPE)/specialize.h \ -+ $(SOURCE_DIR)/include/softfloat.h -+ -+$(OBJS_PRIMITIVES) $(OBJS_OTHERS): %$(OBJ): $(SOURCE_DIR)/%.c -+ $(COMPILE_C) $(SOURCE_DIR)/$*.c -+ -+$(OBJS_SPECIALIZE): %$(OBJ): $(SOURCE_DIR)/$(SPECIALIZE_TYPE)/%.c -+ $(COMPILE_C) $(SOURCE_DIR)/$(SPECIALIZE_TYPE)/$*.c -+ -+softfloat$(LIB): $(OBJS_ALL) -+ $(DELETE) $@ -+ $(MAKELIB) $^ -+ -+.PHONY: clean -+clean: -+ $(DELETE) $(OBJS_ALL) softfloat$(LIB) -+ -diff --git a/SoftFloat-3a/build/Linux-Cross-Compile/platform.h b/SoftFloat-3a/build/Linux-Cross-Compile/platform.h -new file mode 100644 -index 0000000..5e566fc ---- /dev/null -+++ b/SoftFloat-3a/build/Linux-Cross-Compile/platform.h -@@ -0,0 +1,44 @@ -+ -+/*============================================================================ -+ -+This C header file is part of the SoftFloat IEEE Floating-Point Arithmetic -+Package, Release 3a, by John R. Hauser. -+ -+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California. -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ -+ 1. Redistributions of source code must retain the above copyright notice, -+ this list of conditions, and the following disclaimer. -+ -+ 2. Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions, and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ -+ 3. Neither the name of the University nor the names of its contributors may -+ be used to endorse or promote products derived from this software without -+ specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY -+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE -+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+=============================================================================*/ -+ -+/*---------------------------------------------------------------------------- -+*----------------------------------------------------------------------------*/ -+#define LITTLEENDIAN 1 -+ -+/*---------------------------------------------------------------------------- -+*----------------------------------------------------------------------------*/ -+#define INLINE extern inline -+ --- -2.1.4 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch deleted file mode 100644 index 71ca343cc..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch +++ /dev/null @@ -1,396 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -From 9aa4a416f05967320c1aa52bdccfe105a3bf3269 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Thu, 4 Feb 2016 09:16:09 -0200 -Subject: [PATCH 2/2] Makefile for cross compile TestFloat - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - TestFloat-3a/build/Linux-Cross-Compile/Makefile | 321 ++++++++++++++++++++++ - TestFloat-3a/build/Linux-Cross-Compile/platform.h | 45 +++ - 2 files changed, 366 insertions(+) - create mode 100644 TestFloat-3a/build/Linux-Cross-Compile/Makefile - create mode 100644 TestFloat-3a/build/Linux-Cross-Compile/platform.h - -diff --git a/TestFloat-3a/build/Linux-Cross-Compile/Makefile b/TestFloat-3a/build/Linux-Cross-Compile/Makefile -new file mode 100644 -index 0000000..a89326a ---- /dev/null -+++ b/TestFloat-3a/build/Linux-Cross-Compile/Makefile -@@ -0,0 +1,321 @@ -+ -+#============================================================================= -+# -+# This Makefile is part of TestFloat, Release 3a, a package of programs for -+# testing the correctness of floating-point arithmetic complying with the IEEE -+# Standard for Floating-Point, by John R. Hauser. -+# -+# Copyright 2011, 2012, 2013, 2014, 2015 The Regents of the University of -+# California. All rights reserved. -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are met: -+# -+# 1. Redistributions of source code must retain the above copyright notice, -+# this list of conditions, and the following disclaimer. -+# -+# 2. Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions, and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# -+# 3. Neither the name of the University nor the names of its contributors -+# may be used to endorse or promote products derived from this software -+# without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY -+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE -+# DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+# -+#============================================================================= -+ -+SOURCE_DIR = ../../source -+SUBJ_SOURCE_DIR = $(SOURCE_DIR)/subj-C -+SOFTFLOAT_DIR = ../../../SoftFloat-3a -+SOFTFLOAT_INCLUDE_DIR = $(SOFTFLOAT_DIR)/source/include -+PLATFORM = Linux-Cross-Compile -+ -+SOFTFLOAT_H = \ -+ $(SOFTFLOAT_INCLUDE_DIR)/softfloat_types.h \ -+ $(SOFTFLOAT_INCLUDE_DIR)/softfloat.h -+SOFTFLOAT_LIB = $(SOFTFLOAT_DIR)/build/$(PLATFORM)/softfloat$(LIB) -+ -+TESTFLOAT_OPTS = -DEXTFLOAT80 -DFLOAT128 -DLONG_DOUBLE_IS_EXTFLOAT80 -fgnu89-inline -+ -+DELETE = rm -f -+C_INCLUDES = \ -+ -I. -I$(SUBJ_SOURCE_DIR) -I$(SOURCE_DIR) -I$(SOFTFLOAT_INCLUDE_DIR) -+COMPILE_C = \ -+ ${CC} -c -Werror-implicit-function-declaration $(TESTFLOAT_OPTS) \ -+ $(C_INCLUDES) -O2 -o $@ -+COMPILE_SLOWFLOAT_C = \ -+ ${CC} -c -Werror-implicit-function-declaration $(TESTFLOAT_OPTS) \ -+ $(C_INCLUDES) -O3 -o $@ -+MAKELIB = ${AR} crs $@ -+LINK = ${CC} -o $@ ${LDFLAGS} -+OTHER_LIBS = -lm -+ -+OBJ = .o -+LIB = .a -+EXE = -+ -+.PHONY: all -+all: \ -+ testsoftfloat$(EXE) \ -+ timesoftfloat$(EXE) \ -+ testfloat_gen$(EXE) \ -+ testfloat_ver$(EXE) \ -+ testfloat$(EXE) \ -+ -+OBJS_GENCASES = \ -+ genCases_ui32$(OBJ) \ -+ genCases_ui64$(OBJ) \ -+ genCases_i32$(OBJ) \ -+ genCases_i64$(OBJ) \ -+ genCases_f32$(OBJ) \ -+ genCases_f64$(OBJ) \ -+ genCases_extF80$(OBJ) \ -+ genCases_f128$(OBJ) \ -+ -+OBJS_WRITECASE = \ -+ writeCase_a_ui32$(OBJ) \ -+ writeCase_a_ui64$(OBJ) \ -+ writeCase_a_f32$(OBJ) \ -+ writeCase_ab_f32$(OBJ) \ -+ writeCase_abc_f32$(OBJ) \ -+ writeCase_a_f64$(OBJ) \ -+ writeCase_ab_f64$(OBJ) \ -+ writeCase_abc_f64$(OBJ) \ -+ writeCase_a_extF80M$(OBJ) \ -+ writeCase_ab_extF80M$(OBJ) \ -+ writeCase_abc_extF80M$(OBJ) \ -+ writeCase_a_f128M$(OBJ) \ -+ writeCase_ab_f128M$(OBJ) \ -+ writeCase_abc_f128M$(OBJ) \ -+ writeCase_z_bool$(OBJ) \ -+ writeCase_z_ui32$(OBJ) \ -+ writeCase_z_ui64$(OBJ) \ -+ writeCase_z_f32$(OBJ) \ -+ writeCase_z_f64$(OBJ) \ -+ writeCase_z_extF80M$(OBJ) \ -+ writeCase_z_f128M$(OBJ) \ -+ -+OBJS_TEST = \ -+ test_a_ui32_z_f32$(OBJ) \ -+ test_a_ui32_z_f64$(OBJ) \ -+ test_a_ui32_z_extF80$(OBJ) \ -+ test_a_ui32_z_f128$(OBJ) \ -+ test_a_ui64_z_f32$(OBJ) \ -+ test_a_ui64_z_f64$(OBJ) \ -+ test_a_ui64_z_extF80$(OBJ) \ -+ test_a_ui64_z_f128$(OBJ) \ -+ test_a_i32_z_f32$(OBJ) \ -+ test_a_i32_z_f64$(OBJ) \ -+ test_a_i32_z_extF80$(OBJ) \ -+ test_a_i32_z_f128$(OBJ) \ -+ test_a_i64_z_f32$(OBJ) \ -+ test_a_i64_z_f64$(OBJ) \ -+ test_a_i64_z_extF80$(OBJ) \ -+ test_a_i64_z_f128$(OBJ) \ -+ test_a_f32_z_ui32_rx$(OBJ) \ -+ test_a_f32_z_ui64_rx$(OBJ) \ -+ test_a_f32_z_i32_rx$(OBJ) \ -+ test_a_f32_z_i64_rx$(OBJ) \ -+ test_a_f32_z_ui32_x$(OBJ) \ -+ test_a_f32_z_ui64_x$(OBJ) \ -+ test_a_f32_z_i32_x$(OBJ) \ -+ test_a_f32_z_i64_x$(OBJ) \ -+ test_a_f32_z_f64$(OBJ) \ -+ test_a_f32_z_extF80$(OBJ) \ -+ test_a_f32_z_f128$(OBJ) \ -+ test_az_f32$(OBJ) \ -+ test_az_f32_rx$(OBJ) \ -+ test_abz_f32$(OBJ) \ -+ test_abcz_f32$(OBJ) \ -+ test_ab_f32_z_bool$(OBJ) \ -+ test_a_f64_z_ui32_rx$(OBJ) \ -+ test_a_f64_z_ui64_rx$(OBJ) \ -+ test_a_f64_z_i32_rx$(OBJ) \ -+ test_a_f64_z_i64_rx$(OBJ) \ -+ test_a_f64_z_ui32_x$(OBJ) \ -+ test_a_f64_z_ui64_x$(OBJ) \ -+ test_a_f64_z_i32_x$(OBJ) \ -+ test_a_f64_z_i64_x$(OBJ) \ -+ test_a_f64_z_f32$(OBJ) \ -+ test_a_f64_z_extF80$(OBJ) \ -+ test_a_f64_z_f128$(OBJ) \ -+ test_az_f64$(OBJ) \ -+ test_az_f64_rx$(OBJ) \ -+ test_abz_f64$(OBJ) \ -+ test_abcz_f64$(OBJ) \ -+ test_ab_f64_z_bool$(OBJ) \ -+ test_a_extF80_z_ui32_rx$(OBJ) \ -+ test_a_extF80_z_ui64_rx$(OBJ) \ -+ test_a_extF80_z_i32_rx$(OBJ) \ -+ test_a_extF80_z_i64_rx$(OBJ) \ -+ test_a_extF80_z_ui32_x$(OBJ) \ -+ test_a_extF80_z_ui64_x$(OBJ) \ -+ test_a_extF80_z_i32_x$(OBJ) \ -+ test_a_extF80_z_i64_x$(OBJ) \ -+ test_a_extF80_z_f32$(OBJ) \ -+ test_a_extF80_z_f64$(OBJ) \ -+ test_a_extF80_z_f128$(OBJ) \ -+ test_az_extF80$(OBJ) \ -+ test_az_extF80_rx$(OBJ) \ -+ test_abz_extF80$(OBJ) \ -+ test_ab_extF80_z_bool$(OBJ) \ -+ test_a_f128_z_ui32_rx$(OBJ) \ -+ test_a_f128_z_ui64_rx$(OBJ) \ -+ test_a_f128_z_i32_rx$(OBJ) \ -+ test_a_f128_z_i64_rx$(OBJ) \ -+ test_a_f128_z_ui32_x$(OBJ) \ -+ test_a_f128_z_ui64_x$(OBJ) \ -+ test_a_f128_z_i32_x$(OBJ) \ -+ test_a_f128_z_i64_x$(OBJ) \ -+ test_a_f128_z_f32$(OBJ) \ -+ test_a_f128_z_f64$(OBJ) \ -+ test_a_f128_z_extF80$(OBJ) \ -+ test_az_f128$(OBJ) \ -+ test_az_f128_rx$(OBJ) \ -+ test_abz_f128$(OBJ) \ -+ test_abcz_f128$(OBJ) \ -+ test_ab_f128_z_bool$(OBJ) \ -+ -+OBJS_LIB = \ -+ uint128$(OBJ) \ -+ fail$(OBJ) \ -+ functions_common$(OBJ) \ -+ functionInfos$(OBJ) \ -+ standardFunctionInfos$(OBJ) \ -+ random$(OBJ) \ -+ genCases_common$(OBJ) \ -+ $(OBJS_GENCASES) \ -+ genCases_writeTestsTotal$(OBJ) \ -+ verCases_common$(OBJ) \ -+ verCases_writeFunctionName$(OBJ) \ -+ readHex$(OBJ) \ -+ writeHex$(OBJ) \ -+ $(OBJS_WRITECASE) \ -+ testLoops_common$(OBJ) \ -+ $(OBJS_TEST) \ -+ -+uint128$(OBJ): $(SOURCE_DIR)/uint128.h -+fail$(OBJ): $(SOURCE_DIR)/fail.h -+functions_common$(OBJ): $(SOFTFLOAT_H) $(SOURCE_DIR)/functions.h -+functionInfos$(OBJ): $(SOURCE_DIR)/functions.h -+standardFunctionInfos$(OBJ): $(SOURCE_DIR)/functions.h -+random$(OBJ): $(SOURCE_DIR)/random.h -+genCases_common$(OBJ): $(SOURCE_DIR)/fail.h $(SOURCE_DIR)/genCases.h -+$(OBJS_GENCASES): \ -+ $(SOURCE_DIR)/random.h $(SOFTFLOAT_H) $(SOURCE_DIR)/genCases.h -+genCases_f128$(OBJ): $(SOURCE_DIR)/uint128.h -+genCases_writeTestsTotal$(OBJ): $(SOURCE_DIR)/genCases.h -+verCases_common$(OBJ): $(SOURCE_DIR)/verCases.h -+verCases_writeFunctionName$(OBJ): $(SOURCE_DIR)/verCases.h -+readHex$(OBJ): $(SOURCE_DIR)/readHex.h -+writeHex$(OBJ): $(SOURCE_DIR)/uint128.h $(SOFTFLOAT_H) $(SOURCE_DIR)/writeHex.h -+$(OBJS_WRITECASE): \ -+ $(SOFTFLOAT_H) $(SOURCE_DIR)/writeHex.h $(SOURCE_DIR)/writeCase.h -+testLoops_common$(OBJ): $(SOURCE_DIR)/testLoops.h -+$(OBJS_TEST): \ -+ $(SOURCE_DIR)/uint128.h $(SOFTFLOAT_H) $(SOURCE_DIR)/genCases.h \ -+ $(SOURCE_DIR)/verCases.h $(SOURCE_DIR)/writeCase.h $(SOURCE_DIR)/testLoops.h -+$(OBJS_LIB): %$(OBJ): platform.h $(SOURCE_DIR)/%.c -+ $(COMPILE_C) $(SOURCE_DIR)/$*.c -+testfloat$(LIB): $(OBJS_LIB) -+ $(MAKELIB) $^ -+ -+OBJS_TESTSOFTFLOAT = slowfloat$(OBJ) testsoftfloat$(OBJ) -+ -+slowfloat$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOFTFLOAT_H) \ -+ $(SOURCE_DIR)/slowfloat.h $(SOURCE_DIR)/slowfloat.c -+ $(COMPILE_SLOWFLOAT_C) $(SOURCE_DIR)/slowfloat.c -+testsoftfloat$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) \ -+ $(SOURCE_DIR)/slowfloat.h $(SOURCE_DIR)/functions.h \ -+ $(SOURCE_DIR)/genCases.h $(SOURCE_DIR)/verCases.h $(SOURCE_DIR)/writeCase.h \ -+ $(SOURCE_DIR)/testLoops.h $(SOURCE_DIR)/testsoftfloat.c -+ $(COMPILE_C) $(SOURCE_DIR)/testsoftfloat.c -+ -+testsoftfloat$(EXE): $(OBJS_TESTSOFTFLOAT) testfloat$(LIB) $(SOFTFLOAT_LIB) -+ $(LINK) $^ $(OTHER_LIBS) -+ -+OBJS_TIMESOFTFLOAT = timesoftfloat$(OBJ) -+ -+timesoftfloat$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) \ -+ $(SOURCE_DIR)/functions.h $(SOURCE_DIR)/timesoftfloat.c -+ $(COMPILE_C) $(SOURCE_DIR)/timesoftfloat.c -+ -+timesoftfloat$(EXE): $(OBJS_TIMESOFTFLOAT) testfloat$(LIB) $(SOFTFLOAT_LIB) -+ $(LINK) $^ $(OTHER_LIBS) -+ -+OBJS_TESTFLOAT_GEN = genLoops$(OBJ) testfloat_gen$(OBJ) -+ -+genLoops$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) \ -+ $(SOURCE_DIR)/genCases.h $(SOURCE_DIR)/writeHex.h $(SOURCE_DIR)/genLoops.h \ -+ $(SOURCE_DIR)/genLoops.c -+ $(COMPILE_C) $(SOURCE_DIR)/genLoops.c -+testfloat_gen$(OBJ): \ -+ $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) $(SOURCE_DIR)/functions.h \ -+ $(SOURCE_DIR)/genCases.h $(SOURCE_DIR)/genLoops.h \ -+ $(SOURCE_DIR)/testfloat_gen.c -+ $(COMPILE_C) $(SOURCE_DIR)/testfloat_gen.c -+ -+testfloat_gen$(EXE): $(OBJS_TESTFLOAT_GEN) testfloat$(LIB) $(SOFTFLOAT_LIB) -+ $(LINK) $^ $(OTHER_LIBS) -+ -+OBJS_TESTFLOAT_VER = verLoops$(OBJ) testfloat_ver$(OBJ) -+ -+verLoops$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) \ -+ $(SOURCE_DIR)/readHex.h $(SOURCE_DIR)/verCases.h $(SOURCE_DIR)/writeCase.h \ -+ $(SOURCE_DIR)/verLoops.h $(SOURCE_DIR)/verLoops.c -+ $(COMPILE_C) $(SOURCE_DIR)/verLoops.c -+testfloat_ver$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) \ -+ $(SOURCE_DIR)/functions.h $(SOURCE_DIR)/verCases.h \ -+ $(SOURCE_DIR)/writeCase.h $(SOURCE_DIR)/verLoops.h \ -+ $(SOURCE_DIR)/testfloat_ver.c -+ $(COMPILE_C) $(SOURCE_DIR)/testfloat_ver.c -+ -+testfloat_ver$(EXE): $(OBJS_TESTFLOAT_VER) testfloat$(LIB) $(SOFTFLOAT_LIB) -+ $(LINK) $^ $(OTHER_LIBS) -+ -+OBJS_TESTFLOAT = subjfloat$(OBJ) subjfloat_functions$(OBJ) testfloat$(OBJ) -+ -+subjfloat$(OBJ): \ -+ platform.h $(SOFTFLOAT_H) $(SUBJ_SOURCE_DIR)/subjfloat_config.h \ -+ $(SOURCE_DIR)/subjfloat.h $(SUBJ_SOURCE_DIR)/subjfloat.c -+ $(COMPILE_C) $(SUBJ_SOURCE_DIR)/subjfloat.c -+subjfloat_functions$(OBJ): \ -+ platform.h $(SUBJ_SOURCE_DIR)/subjfloat_config.h $(SOURCE_DIR)/subjfloat.h \ -+ $(SOURCE_DIR)/functions.h $(SOURCE_DIR)/subjfloat_functions.c -+ $(COMPILE_C) $(SOURCE_DIR)/subjfloat_functions.c -+testfloat$(OBJ): \ -+ platform.h $(SOURCE_DIR)/uint128.h $(SOURCE_DIR)/fail.h $(SOFTFLOAT_H) \ -+ $(SUBJ_SOURCE_DIR)/subjfloat_config.h $(SOURCE_DIR)/subjfloat.h \ -+ $(SOURCE_DIR)/functions.h $(SOURCE_DIR)/genCases.h $(SOURCE_DIR)/verCases.h \ -+ $(SOURCE_DIR)/testLoops.h $(SOURCE_DIR)/testfloat.c -+ $(COMPILE_C) $(SOURCE_DIR)/testfloat.c -+ -+testfloat$(EXE): $(OBJS_TESTFLOAT) testfloat$(LIB) $(SOFTFLOAT_LIB) -+ $(LINK) $^ $(OTHER_LIBS) -+ -+.PHONY: clean -+clean: -+ $(DELETE) $(OBJS_LIB) testfloat$(LIB) -+ $(DELETE) $(OBJS_TESTSOFTFLOAT) testsoftfloat$(EXE) -+ $(DELETE) $(OBJS_TIMESOFTFLOAT) timesoftfloat$(EXE) -+ $(DELETE) $(OBJS_TESTFLOAT_GEN) testfloat_gen$(EXE) -+ $(DELETE) $(OBJS_TESTFLOAT_VER) testfloat_ver$(EXE) -+ $(DELETE) $(OBJS_TESTFLOAT) testfloat$(EXE) -+ -diff --git a/TestFloat-3a/build/Linux-Cross-Compile/platform.h b/TestFloat-3a/build/Linux-Cross-Compile/platform.h -new file mode 100644 -index 0000000..09e63a0 ---- /dev/null -+++ b/TestFloat-3a/build/Linux-Cross-Compile/platform.h -@@ -0,0 +1,45 @@ -+ -+/*============================================================================ -+ -+This C header file is part of TestFloat, Release 3a, a package of programs for -+testing the correctness of floating-point arithmetic complying with the IEEE -+Standard for Floating-Point, by John R. Hauser. -+ -+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California. -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ -+ 1. Redistributions of source code must retain the above copyright notice, -+ this list of conditions, and the following disclaimer. -+ -+ 2. Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions, and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ -+ 3. Neither the name of the University nor the names of its contributors may -+ be used to endorse or promote products derived from this software without -+ specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY -+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE -+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+=============================================================================*/ -+ -+/*---------------------------------------------------------------------------- -+*----------------------------------------------------------------------------*/ -+#define LITTLEENDIAN 1 -+ -+/*---------------------------------------------------------------------------- -+*----------------------------------------------------------------------------*/ -+#define INLINE extern inline -+ --- -2.1.4 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/testfloat_3a.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/testfloat_3a.bb deleted file mode 100644 index 28e967762..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/testfloat/testfloat_3a.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Berkeley TestFloat is a small collection of programs for \ - testing that an implementation of binary floating-point conforms to the \ - IEEE Standard for Floating-Point Arithmetic." - -HOMEPAGE = "http://www.jhauser.us/arithmetic/TestFloat.html" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://TestFloat-${PV}/COPYING.txt;md5=e45c175a323b5727777fb6bd4b26eafc" - -SRC_URI = "\ - http://www.jhauser.us/arithmetic/TestFloat-3a.zip;name=TestFloat \ - http://www.jhauser.us/arithmetic/SoftFloat-3a.zip;name=SoftFloat \ - file://0001-Makefile-for-cross-compile-SoftFloat.patch \ - file://0002-Makefile-for-cross-compile-TestFloat.patch \ -" -SRC_URI[TestFloat.md5sum] = "5a124e85ab74c5e52da27d401cea6cc3" -SRC_URI[TestFloat.sha256sum] = "fa258b5b3c751656a372051adee4183e19ad4763032322eb7a87dfb9e2c22c75" -SRC_URI[SoftFloat.md5sum] = "e53bd4550cf99690642c41374d188517" -SRC_URI[SoftFloat.sha256sum] = "946fd23180559d60eb6683dda1cf8b142f5426dedfefb97b03c6afdfd70ee9e0" - -S = "${WORKDIR}" - -do_compile(){ - oe_runmake -C SoftFloat-${PV}/build/Linux-Cross-Compile/ - oe_runmake -C TestFloat-${PV}/build/Linux-Cross-Compile/ -} - -do_install(){ - install -d ${D}/${bindir} - install ${S}/TestFloat-${PV}/build/Linux-Cross-Compile/testfloat ${D}/${bindir} - install ${S}/TestFloat-${PV}/build/Linux-Cross-Compile/testfloat_gen ${D}/${bindir} - install ${S}/TestFloat-${PV}/build/Linux-Cross-Compile/testfloat_ver ${D}/${bindir} - install ${S}/TestFloat-${PV}/build/Linux-Cross-Compile/testsoftfloat ${D}/${bindir} - install ${S}/TestFloat-${PV}/build/Linux-Cross-Compile/timesoftfloat ${D}/${bindir} -} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch new file mode 100644 index 000000000..e49528505 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch @@ -0,0 +1,33 @@ +From 1ce892749e4f53bd0aeaa4c3ce45f80178799411 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Mar 2018 17:52:51 -0800 +Subject: [PATCH] multicast_blast/tipcc: Fix struct type for TIPC_GROUP_JOIN + +Kernel defines it as tipc_group_req and not tipc_mreq +this code was not excercised with older kernels so we +never ran into the compiler failures since TIPC_GROUP_JOIN +is only defined in kernel starting 4.15 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + multicast_blast/tipcc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/multicast_blast/tipcc.c b/multicast_blast/tipcc.c +index 90644d3..911c759 100755 +--- a/multicast_blast/tipcc.c ++++ b/multicast_blast/tipcc.c +@@ -213,7 +213,7 @@ int tipc_accept(int sd, struct tipc_addr *src) + int tipc_join(int sd, struct tipc_addr *member) + { + #ifdef TIPC_GROUP_JOIN +- struct tipc_mreq mreq = { ++ struct tipc_group_req mreq = { + .type = member->type, + .instance = member->instance, + .scope = domain2scope(member->domain) +-- +2.16.2 + 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 720aa3c2b..54ed043f4 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 @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1 SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ + file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb index d729de9bb..0a00a366e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses libxml2" SRC_URI = "http://tiptop.gforge.inria.fr/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "f1fba1e90465b0e5a3865b19133fa19d" -SRC_URI[sha256sum] = "3f07e958b40acaeab98e9eb1326c9f91b0be0a782c1cc2bd7a9e18d31fab18ca" +SRC_URI[md5sum] = "46ca0fdf0236f02dd2b96d347626d2a2" +SRC_URI[sha256sum] = "51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182" inherit autotools-brokensep EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.1.bb deleted file mode 100644 index bf21de5b1..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Terminal multiplexer" -HOMEPAGE = "http://tmux.sourceforge.net" -SECTION = "console/utils" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=8685b4455330a940fab1ff451aa941a0" - -DEPENDS = "ncurses libevent" - - -SRC_URI = "git://github.com/tmux/tmux.git;branch=master" -SRCREV ?= "310f0a960ca64fa3809545badc629c0c166c6cd2" - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb new file mode 100644 index 000000000..fba5156f6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb @@ -0,0 +1,23 @@ +SUMMARY = "Terminal multiplexer" +HOMEPAGE = "http://tmux.sourceforge.net" +SECTION = "console/utils" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107" + +DEPENDS = "ncurses libevent" + +SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" +SRC_URI[md5sum] = "d541ff392249f94c4f3635793556f827" +SRC_URI[sha256sum] = "b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," + +do_configure_prepend() { + # The 'compat' directory is needed for output during the build but it's + # not automatically created when building outside the source directory. + mkdir ${B}/compat +} 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 deleted file mode 100644 index c617d14a1..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 index 38065ce53..d742a5e46 100644 --- 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 @@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "106b6c706268522ab0168a4ddb19e89ce832e084" -PV = "1.3.0-git${SRCPV}" +SRCREV = "cc7fec9ae0228add9011bf1c2cd5e0ca2ba0d4f0" +PV = "1.6.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" @@ -26,7 +25,13 @@ 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 '' }" +# Note: 'nodejs' is disabled by default because the bindings +# generation currently fails with nodejs (>v7.x). +BINDINGS ??= "python" + +# nodejs isn't available for armv4/armv5 architectures +BINDINGS_armv4 ??= "python" +BINDINGS_armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', 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 index ee0d074de..2412bb8de 100644 --- 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 @@ -1,13 +1,23 @@ +From f71cc920528c3496b0118964ebbcf5440cda4ed1 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 16 Aug 2017 13:37:40 +0800 +Subject: [PATCH] vlock: add new recipe + 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 @@ +--- + man/vlock.1 | 5 ----- + src/vlock.sh | 5 ----- + 2 files changed, 10 deletions(-) + +diff --git a/man/vlock.1 b/man/vlock.1 +index 0d29b49..01cb944 100644 +--- a/man/vlock.1 ++++ b/man/vlock.1 +@@ -111,11 +111,6 @@ enter your password at the password prompt. If this variable is unset or set 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 @@ -19,11 +29,11 @@ Index: vlock-2.2.2/man/vlock.1 .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 @@ +diff --git a/src/vlock.sh b/src/vlock.sh +index 75f1369..f572776 100644 +--- a/src/vlock.sh ++++ b/src/vlock.sh +@@ -35,11 +35,6 @@ This TTY is now locked. ${VLOCK_ENTER_PROMPT}" 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 index 6e8a6a9fd..3a344b236 100644 --- 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 @@ -1,8 +1,21 @@ +From 17e5c8d32abc214aea408f0837be41e88bce7eb2 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 16 Aug 2017 13:37:40 +0800 +Subject: [PATCH] vlock: add new recipe + Upstream-Status: Pending written by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + Makefile | 4 ++++ + configure | 9 +++++++++ + src/vlock-main.c | 8 ++++++++ + 3 files changed, 21 insertions(+) + +diff --git a/Makefile b/Makefile +index 4eeb42a..834cd2c 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,10 @@ ifeq ($(AUTH_METHOD),shadow) @@ -16,6 +29,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 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 +diff --git a/configure b/configure +index d5d84d6..1303598 100755 --- a/configure +++ b/configure @@ -44,6 +44,7 @@ Optional Features: @@ -36,7 +51,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> pam|shadow) if [ "$2" = "yes" ] ; then if [ -n "$auth_method" ] && [ "$auth_method" != "$1" ] ; then -@@ -232,6 +232,7 @@ set_defaults() { +@@ -228,6 +232,7 @@ set_defaults() { AUTH_METHOD="pam" ENABLE_ROOT_PASSWORD="yes" ENABLE_PLUGINS="yes" @@ -44,9 +59,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> SCRIPTS="" VLOCK_GROUP="vlock" -@@ -356,10 +356,14 @@ ENABLE_PLUGINS = ${ENABLE_PLUGINS} - # which plugins should be build - MODULES = ${MODULES} +@@ -353,6 +358,10 @@ MODULES = ${MODULES} # which scripts should be installed SCRIPTS = ${SCRIPTS} @@ -57,12 +70,12 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> # root's group ROOT_GROUP = ${ROOT_GROUP} - # group for privileged plugins - VLOCK_GROUP = ${VLOCK_GROUP} +diff --git a/src/vlock-main.c b/src/vlock-main.c +index 008f6f0..108ce8b 100644 --- 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); +@@ -112,7 +112,9 @@ static void restore_terminal(void) + (void) tcsetattr(STDIN_FILENO, TCSANOW, &old_term); } +#ifdef ENABLE_FAIL_COUNT @@ -71,7 +84,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> static void auth_loop(const char *username) { -@@ -181,7 +183,9 @@ static void auth_loop(const char *userna +@@ -182,7 +184,9 @@ static void auth_loop(const char *username) } #endif @@ -81,7 +94,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> } /* Free timeouts memory. */ -@@ -189,11 +193,13 @@ static void auth_loop(const char *userna +@@ -190,11 +194,13 @@ static void auth_loop(const char *username) free(prompt_timeout); } @@ -95,7 +108,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> #ifdef USE_PLUGINS static void call_end_hook(void) -@@ -216,7 +222,9 @@ int main(int argc, char *const argv[]) +@@ -217,7 +223,9 @@ int main(int argc, char *const argv[]) if (username == NULL) fatal_perror("vlock: could not get username"); 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 index 4ce0abc71..460b29249 100644 --- 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 @@ -1,13 +1,22 @@ +From fcec4e7fe899f8c0077b3004eeccb7292a945a67 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Wed, 16 Aug 2017 13:37:40 +0800 +Subject: [PATCH] vlock: add new recipe + 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 @@ +--- + src/auth-pam.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/auth-pam.c b/src/auth-pam.c +index 5cf93f6..c5cc67a 100644 +--- a/src/auth-pam.c ++++ b/src/auth-pam.c +@@ -148,6 +148,9 @@ bool auth(const char *user, struct timespec *timeout) if (pam_status != PAM_SUCCESS) { fprintf(stderr, "vlock: %s\n", pam_strerror(pamh, pam_status)); diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/init b/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/init index 7b6cbf414..a2c9c2123 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/init +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/init @@ -34,7 +34,7 @@ start() { mem_by_cpu=$(($memtotal/$num_cpus*$factor/100*1024)) # load dependency modules - modprobe zram zram_num_devices=$num_cpus + modprobe zram num_devices=$num_cpus echo "zram devices probed successfully" # initialize the devices diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb deleted file mode 100644 index 1f5e39000..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "UNIX Shell similar to the Korn shell" -DESCRIPTION = "Zsh is a shell designed for interactive use, although it is also a \ - powerful scripting language. Many of the useful features of bash, \ - ksh, and tcsh were incorporated into zsh; many original features were added." -HOMEPAGE = "http://www.zsh.org" -SECTION = "base/shell" - -LICENSE = "zsh" -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] = "d583fbca0c2410bf9542ce8a651c26ca" -SRC_URI[sha256sum] = "3d94a590ff3c562ecf387da78ac356d6bea79b050a9ef81e3ecb9f8ee513040e" - -inherit autotools gettext update-alternatives - -EXTRA_OECONF = " \ - --bindir=${base_bindir} \ - --enable-etcdir=${sysconfdir} \ - --enable-fndir=${datadir}/${PN}/${PV}/functions \ - --enable-site-fndir=${datadir}/${PN}/site-functions \ - --with-term-lib='ncursesw ncurses' \ - --with-tcsetpgrp \ - --enable-cap \ - --enable-multibyte \ - --disable-gdbm \ - --disable-dynamic \ - zsh_cv_shared_environ=yes \ -" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -ALTERNATIVE_${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" -ALTERNATIVE_PRIORITY = "100" - -export AUTOHEADER = "true" - -do_configure () { - gnu-configize --force ${S} - oe_runconf -} - -do_install_append () { - rm -fr ${D}/usr/share -} - -pkg_postinst_${PN} () { - touch $D${sysconfdir}/shells - grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells - grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells -} - -FILES_${PN}-dbg += "\ - ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ - ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ - ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ -" |
