Prepping up master to work with upcoming Zeus 3.0
cover Prepping up master to work with upcoming Zeus 3.0
The first patchset of fixes to get master into shape to work with upcoming Zeus 3.0 Yocto Project release, using gcc9 toolchain.
There will be another set with more hacks to disable broken components.
Denys Dmytriyenko (32):
toolchain-gcc: update to match current internal toolchain versions
meta-toolchain-arago: tar_sdk() was renamed to archive_sdk() upstream sourceipk.bbclass: avoid adding duplicate ${PN}-src
uboot-sign: sync up with upstream
kernel-fitimage: replace tabs with spaces in python code external-*-bfd-version: replace tabs with spaces in python code nativesdk-buildtools-perl-dummy: list additional modules
strace: drop 4.26 that was temporarily overlayed due to k4.19 api
ipsec-tools: drop local bbappend, ipsec-tools is deprecated and
removed
llvm: replace obsolete ${COREBASE}/LICENSE, point to proper MIT
license
openssl10: remove bbappend and local patches
libnl: update bbappend 3.4.0 -> 3.5.0
mbedtls: update bbappend 2.13.0 -> 2.16.2
weston: update bbappend 5.0.0 -> 7.0.0
weston: our patches need rebasing for 7.0.0, disable for now
weston-conf: rename 5.0.0 -> 7.0.0 to match main weston version
linux-firmware: update bbappend to be version-agnostic
iproute2: overlay 4.19 locally for now, as upstream moved to 5.2
python-numpy: overlay last version compatible with python2
opencv: switch from python3 to python2 for now due to issues with 3.7
systemd: sysinit.target.wants no longer exists
ltp-ddt: backport fixes for glibc >2.28
point-cloud-viewer: binary-only package, skip file-rdeps QA checks
machine_features_check: class for checking MACHINE_FEATURES flags
opencv: require "dsp" machine feature barcode-roi,packagegroups,matrix: require "dsp" machine feature armnn,packagegroups: require "dsp" machine feature voxelsdk,packagegroups: require "dsp" machine feature
branding-core: temp disable "dsp" and "mmip" machine features due to
breakage
packagegroup-*-graphics: disable wayland-ivi-extension packagegroup-*-graphics: disable chromium-wayland packagegroup-*-qte: qtwebkit-examples no longer exists
meta-arago-distro/classes/kernel-fitimage.bbclass | 6 +-
.../classes/machine_features_check.bbclass | 31 ++
meta-arago-distro/classes/sourceipk.bbclass | 4 +-
meta-arago-distro/classes/uboot-sign.bbclass | 126 +++--
.../conf/distro/include/branding-core.inc | 4 +
.../conf/distro/include/toolchain-gcc.inc | 12 +-
.../recipes-apps/voxelsdk/voxelsdk_%.bbappend | 3 +
.../recipes-connectivity/iproute2/iproute2.inc | 54 ++
.../iproute2/0001-ip-Remove-unneed-header.patch | 30 ++
.../0001-libc-compat.h-add-musl-workaround.patch | 41 ++
.../iproute2/iproute2/configure-cross.patch | 32 ++
.../iproute2/iproute2_4.19.0.bb | 14 +
...tls_2.13.0.bbappend => mbedtls_2.16.2.bbappend} | 0
...1-Add-AF_ALG-interface-support-to-OpenSSL.patch | 578 ---------------------
...todev-Fix-issue-with-signature-generation.patch | 445 ----------------
...cryptodev.c-to-make-SHA1-and-MD5-work-wit.patch | 59 ---
...0002-cryptodev-allow-copying-EVP-contexts.patch | 202 -------
.../openssl10/0004-Sample-AF_ALG-openssl.cnf.patch | 36 --
...ev-Add-SHA224-initialization-to-cryptodev.patch | 27 -
...dd-AES-CBC-CTR-modes-for-128-192-256-bit-.patch | 142 -----
.../openssl/openssl10_%.bbappend | 27 -
.../packagegroup-arago-tisdk-addons-sdk-target.bb | 9 +-
.../packagegroup-arago-tisdk-addons.bb | 9 +-
.../packagegroup-arago-tisdk-graphics.bb | 14 +-
...packagegroup-arago-tisdk-multimedia-sdk-host.bb | 12 +-
...ckagegroup-arago-tisdk-multimedia-sdk-target.bb | 12 +-
.../packagegroups/packagegroup-arago-tisdk-qte.bb | 3 -
.../recipes-core/systemd/systemd_%.bbappend | 2 +-
...h-usr-and-so-on-for-libraries-by-default-.patch | 77 +++
.../files/0001-npy_cpu-Add-riscv-support.patch | 24 +
.../python-numpy/files/aarch64/_numpyconfig.h | 32 ++
.../python-numpy/files/aarch64/config.h | 139 +++++
.../python-numpy/files/arm/config.h | 21 +
.../python-numpy/files/arm/numpyconfig.h | 17 +
.../python-numpy/files/armeb/config.h | 21 +
.../python-numpy/files/armeb/numpyconfig.h | 17 +
.../files/mipsarchn32eb/_numpyconfig.h | 31 ++
.../python-numpy/files/mipsarchn32eb/config.h | 139 +++++
.../files/mipsarchn32el/_numpyconfig.h | 31 ++
.../python-numpy/files/mipsarchn32el/config.h | 138 +++++
.../files/mipsarchn64eb/_numpyconfig.h | 32 ++
.../python-numpy/files/mipsarchn64eb/config.h | 139 +++++
.../files/mipsarchn64el/_numpyconfig.h | 32 ++
.../python-numpy/files/mipsarchn64el/config.h | 138 +++++
.../files/mipsarcho32eb/_numpyconfig.h | 32 ++
.../python-numpy/files/mipsarcho32eb/config.h | 139 +++++
.../python-numpy/files/mipsarcho32el/config.h | 21 +
.../python-numpy/files/mipsarcho32el/numpyconfig.h | 18 +
.../python-numpy/files/powerpc/_numpyconfig.h | 32 ++
.../python-numpy/files/powerpc/config.h | 139 +++++
.../python-numpy/files/powerpc64/_numpyconfig.h | 32 ++
.../python-numpy/files/powerpc64/config.h | 139 +++++
.../python-numpy/files/riscv64/_numpyconfig.h | 32 ++
.../python-numpy/files/riscv64/config.h | 139 +++++
.../python-numpy/files/x86-64/_numpyconfig.h | 32 ++
.../python-numpy/files/x86-64/config.h | 139 +++++
.../python-numpy/files/x86/config.h | 108 ++++
.../python-numpy/files/x86/numpyconfig.h | 24 +
.../recipes-devtools/python-numpy/python-numpy.inc | 116 +++++
.../python-numpy/python-numpy_1.16.3.bb | 10 +
.../python-numpy/python3-numpy_1.16.3.bb | 3 +
...hen-using-non-glibc-libc-implementation-o.patch | 34 --
.../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 47 --
.../strace/strace/0001-mips-o32-fix-build.patch | 98 ----
...tion-Check-for-mips-and-alpha-before-usin.patch | 34 --
.../strace/strace/Makefile-ptest.patch | 49 --
.../strace/strace/disable-git-version-gen.patch | 37 --
.../strace/strace/mips-SIGEMT.patch | 33 --
...-robust-test-for-m32-mx32-compile-support.patch | 45 --
.../recipes-devtools/strace/strace/run-ptest | 2 -
.../strace/strace/update-gawk-paths.patch | 127 -----
.../recipes-devtools/strace/strace_4.26.bb | 57 --
.../{weston-conf_5.0.0.bb => weston-conf_7.0.0.bb} | 0
.../recipes-graphics/wayland/weston_5.0.0.bbappend | 31 --
.../recipes-graphics/wayland/weston_7.0.0.bbappend | 29 ++
...ware_git.bbappend => linux-firmware_%.bbappend} | 0
.../recipes-support/armnn/armnn_%.bbappend | 3 +
.../ipsec-tools/ipsec-tools_%.bbappend | 3 -
.../{libnl_3.4.0.bbappend => libnl_3.5.0.bbappend} | 0
.../recipes-support/opencv/opencv_%.bbappend | 3 +
.../recipes-support/opencv/opencv_3.1.bbappend | 3 +
.../recipes-apps/barcode-demo/barcode-roi_git.bb | 4 +
.../point-cloud-viewer/point-cloud-viewer_git.bb | 2 +-
meta-arago-extras/recipes-core/llvm/llvm-common.bb | 4 +-
.../matrix/matrix-gui-machinevision-demos_2.0.bb | 6 +-
.../recipes-core/meta/external-arm-bfd-version.inc | 6 +-
.../meta/external-linaro-bfd-version.inc | 6 +-
.../recipes-core/meta/meta-toolchain-arago.bb | 2 +-
.../meta/nativesdk-buildtools-perl-dummy.bbappend | 4 +
...re-time-check-for-getdents-getdents64-API.patch | 72 +++
...name-getcpu-to-avoid-conflict-with-glibc-.patch | 57 ++
...-check-for-RES_USE_INET6-during-configure.patch | 68 +++
.../recipes-devtools/ltp-ddt/ltp-ddt_20190305.bb | 3 +
93 files changed, 2775 insertions(+), 2211 deletions(-)
create mode 100644 meta-arago-distro/classes/machine_features_check.bbclass
create mode 100644 meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend
create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2.inc
create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/configure-cross.patch
create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2_4.19.0.bb
rename meta-arago-distro/recipes-connectivity/mbedtls/{mbedtls_2.13.0.bbappend => mbedtls_2.16.2.bbappend} (100%)
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0001-Add-AF_ALG-interface-support-to-OpenSSL.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0001-cryptodev-Fix-issue-with-signature-generation.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0002-Modify-eng_cryptodev.c-to-make-SHA1-and-MD5-work-wit.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0002-cryptodev-allow-copying-EVP-contexts.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0004-Sample-AF_ALG-openssl.cnf.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0009-eng_cryptodev-Add-SHA224-initialization-to-cryptodev.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0011-cryptodev-Add-AES-CBC-CTR-modes-for-128-192-256-bit-.patch
delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/aarch64/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/arm/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/arm/numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/armeb/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/armeb/numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc64/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/riscv64/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86-64/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86/config.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86/numpyconfig.h
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/python-numpy.inc
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/Makefile-ptest.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/disable-git-version-gen.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/mips-SIGEMT.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
delete mode 100755 meta-arago-distro/recipes-devtools/strace/strace/run-ptest
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/update-gawk-paths.patch
delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace_4.26.bb
rename meta-arago-distro/recipes-graphics/wayland/{weston-conf_5.0.0.bb => weston-conf_7.0.0.bb} (100%)
delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend
create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston_7.0.0.bbappend
rename meta-arago-distro/recipes-kernel/linux-firmware/{linux-firmware_git.bbappend => linux-firmware_%.bbappend} (100%)
create mode 100644 meta-arago-distro/recipes-support/armnn/armnn_%.bbappend
delete mode 100644 meta-arago-distro/recipes-support/ipsec-tools/ipsec-tools_%.bbappend
rename meta-arago-distro/recipes-support/libnl/{libnl_3.4.0.bbappend => libnl_3.5.0.bbappend} (100%)
create mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0002-check-for-RES_USE_INET6-during-configure.patchSignature · 1 line
2.7.4
PATCH 1/32 toolchain-gcc: update to match current internal toolchain versions
--- meta-arago-distro/conf/distro/include/toolchain-gcc.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arago-distro/conf/distro/include/toolchain-gcc.inc +6 -6
@@ -13,9 +13,9 @@ PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "binutil PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" # Set Cross and SDK toolchain preferences -SDKGCCVERSION ?= "8%" -SDKBINUVERSION ?= "2.31%" -SDKGLIBCVERSION ?= "2.28%" +SDKGCCVERSION ?= "9%" +SDKBINUVERSION ?= "2.32%" +SDKGLIBCVERSION ?= "2.30%" SDKLINUXLIBCVERSION ?= "4.19%" PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
@@ -32,9 +32,9 @@ PREFERRED_VERSION_nativesdk-glibc-initial ?= "${SDKGLIBCVERSION}" # Set target toolchain preferences to match Cross/SDK by default # Can be overwritten globally, if needed -GCCVERSION ?= "8%" -BINUVERSION ?= "2.31%" -GLIBCVERSION ?= "2.28%" +GCCVERSION ?= "9%" +BINUVERSION ?= "2.32%" +GLIBCVERSION ?= "2.30%" LINUXLIBCVERSION ?= "4.19%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
Signature · 1 line
2.7.4
PATCH 2/32 meta-toolchain-arago: tar_sdk() was renamed to archive_sdk() upstream
In reply to Denys Dmytriyenko--- meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +1 -1
@@ -149,7 +149,7 @@ cleanup_toolchain_packages() { fi } -fakeroot tar_sdk() { +fakeroot archive_sdk() { # Package it up mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT}/${SDKPATH}
Signature · 1 line
2.7.4
PATCH 3/32 sourceipk.bbclass: avoid adding duplicate ${PN}-src
In reply to Denys Dmytriyenko--- meta-arago-distro/classes/sourceipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/classes/sourceipk.bbclass +2 -2
@@ -290,9 +290,9 @@ INSANE_SKIP_${PN}-src += "${@oe.utils.conditional("${CREATE_SRCIPK}", "0", "", " python __anonymous () { if d.getVar("CREATE_SRCIPK") != "0": + if '${PN}-src' not in d.getVar("PACKAGES", False): + d.appendVar('PACKAGES', ' ${PN}-src') pn = d.getVar("PN") - - d.appendVar('PACKAGES', ' %s-src' % (pn)) d.setVar('FILES_%s-src' % (pn), '${SRCIPK_INSTALL_DIR}') }
Signature · 1 line
2.7.4
PATCH 4/32 uboot-sign: sync up with upstream
In reply to Denys Dmytriyenko--- meta-arago-distro/classes/uboot-sign.bbclass | 126 +++++++++++++++++---------- 1 file changed, 81 insertions(+), 45 deletions(-)
meta-arago-distro/classes/uboot-sign.bbclass +81 -45
@@ -19,13 +19,17 @@ # The tasks sequence is set as below, using DEPLOY_IMAGE_DIR as common place to # treat the device tree blob: # -# u-boot:do_deploy_dtb -# u-boot:do_deploy -# virtual/kernel:do_assemble_fitimage -# u-boot:do_concat_dtb -# u-boot:do_install +# * u-boot:do_install_append +# Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for +# signing, and kernel will deploy UBOOT_DTB_BINARY after signs it. # -# For more details on signature process, please refer to U-boot documentation. +# * virtual/kernel:do_assemble_fitimage +# Sign the image +# +# * u-boot:do_deploy[postfuncs] +# Deploy files like UBOOT_DTB_IMAGE, UBOOT_DTB_SYMLINK and others. +# +# For more details on signature process, please refer to U-Boot documentation. # Signature activation. UBOOT_SIGN_ENABLE ?= "0"
@@ -38,58 +42,90 @@ UBOOT_NODTB_IMAGE ?= "u-boot-nodtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_NODTB_BINARY ?= "u-boot-nodtb.${UBOOT_SUFFIX}" UBOOT_NODTB_SYMLINK ?= "u-boot-nodtb-${MACHINE}.${UBOOT_SUFFIX}" -# -# Following is relevant only for u-boot recipes: -# - -do_deploy_dtb () { - mkdir -p ${DEPLOYDIR} - cd ${DEPLOYDIR} +# Functions in this bbclass is for u-boot only +UBOOT_PN = "${@d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'}" - if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then - install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE} - rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK} - ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK} - ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY} +concat_dtb_helper() { + if [ -e "${UBOOT_DTB_BINARY}" ]; then + ln -sf ${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_BINARY} + ln -sf ${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_SYMLINK} fi - if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then - install ${B}/${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} - rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK} - ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK} - ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY} + + if [ -f "${UBOOT_NODTB_BINARY}" ]; then + install ${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} + ln -sf ${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_SYMLINK} + ln -sf ${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_BINARY} fi -} -do_concat_dtb () { # Concatenate U-Boot w/o DTB & DTB with public key # (cf. kernel-fitimage.bbclass for more details) - if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ]; then - if [ "x${UBOOT_SUFFIX}" = "ximg" -o "x${UBOOT_SUFFIX}" = "xrom" ] && \ - [ -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then + deployed_uboot_dtb_binary='${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}' + if [ "x${UBOOT_SUFFIX}" = "ximg" -o "x${UBOOT_SUFFIX}" = "xrom" ] && \ + [ -e "$deployed_uboot_dtb_binary" ]; then + oe_runmake EXT_DTB=$deployed_uboot_dtb_binary + install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then + cd ${DEPLOYDIR} + cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE} + else + bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." + fi +} + +concat_dtb() { + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then + mkdir -p ${DEPLOYDIR} + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + CONFIG_B_PATH="${config}" + cd ${B}/${config} + concat_dtb_helper + done + else + CONFIG_B_PATH="" cd ${B} - oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE} - install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} - elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then - cd ${DEPLOYDIR} - cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE} + concat_dtb_helper + fi + fi +} + +# Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for +# signing, and kernel will deploy UBOOT_DTB_BINARY after signs it. +install_helper() { + if [ -f "${UBOOT_DTB_BINARY}" ]; then + install -d ${D}${datadir} + # UBOOT_DTB_BINARY is a symlink to UBOOT_DTB_IMAGE, so we + # need both of them. + install ${UBOOT_DTB_BINARY} ${D}${datadir}/${UBOOT_DTB_IMAGE} + ln -sf ${UBOOT_DTB_IMAGE} ${D}${datadir}/${UBOOT_DTB_BINARY} + else + bbwarn "${UBOOT_DTB_BINARY} not found" + fi +} + +do_install_append() { + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + cd ${B}/${config} + install_helper + done else - bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." + cd ${B} + install_helper fi fi } python () { - uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' - if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == uboot_pn: - kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel') + if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == d.getVar('UBOOT_PN') and d.getVar('UBOOT_DTB_BINARY'): + kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel') - # u-boot.dtb and u-boot-nodtb.bin are deployed _before_ do_deploy - # Thus, do_deploy_setscene will also populate them in DEPLOY_IMAGE_DIR - bb.build.addtask('do_deploy_dtb', 'do_deploy', 'do_compile', d) + # Make "bitbake u-boot -cdeploy" deploys the signed u-boot.dtb + d.appendVarFlag('do_deploy', 'depends', ' %s:do_deploy' % kernel_pn) - # do_concat_dtb is scheduled _before_ do_install as it overwrite the - # u-boot.bin in both DEPLOYDIR and DEPLOY_IMAGE_DIR. - bb.build.addtask('do_concat_dtb', 'do_install', None, d) - d.appendVarFlag('do_concat_dtb', 'depends', ' %s:do_assemble_fitimage' % kernel_pn) + # kernerl's do_deploy is a litle special, so we can't use + # do_deploy_append, otherwise it would override + # kernel_do_deploy. + d.appendVarFlag('do_deploy', 'prefuncs', ' concat_dtb') }
Signature · 1 line
2.7.4
PATCH 5/32 kernel-fitimage: replace tabs with spaces in python code
In reply to Denys Dmytriyenko--- meta-arago-distro/classes/kernel-fitimage.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-arago-distro/classes/kernel-fitimage.bbclass +3 -3
@@ -25,9 +25,9 @@ python __anonymous () { else: replacementtype = "zImage" - # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal - # to kernel.bbclass . We have to override it, since we pack zImage - # (at least for now) into the fitImage . + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We have to override it, since we pack zImage + # (at least for now) into the fitImage . typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" if 'fitImage' in typeformake.split(): d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', replacementtype))
Signature · 1 line
2.7.4
PATCH 6/32 external-*-bfd-version: replace tabs with spaces in python code
In reply to Denys Dmytriyenko--- meta-arago-extras/recipes-core/meta/external-arm-bfd-version.inc | 6 +++--- meta-arago-extras/recipes-core/meta/external-linaro-bfd-version.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
meta-arago-extras/recipes-core/meta/external-arm-bfd-version.inc +3 -3
@@ -1,8 +1,8 @@ TOOLCHAIN_PATH ??= "${STAGING_BINDIR_TOOLCHAIN}" def eat_get_bfd_version(d): - import subprocess,os,bb - if os.path.exists(d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as'): - return subprocess.Popen([d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as', '-v', '--version'], stderr=subprocess.STDOUT,stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[3] + import subprocess,os,bb + if os.path.exists(d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as'): + return subprocess.Popen([d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as', '-v', '--version'], stderr=subprocess.STDOUT,stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[3] EAT_VER_BFD := "${@eat_get_bfd_version(d)}"
meta-arago-extras/recipes-core/meta/external-linaro-bfd-version.inc +3 -3
@@ -1,8 +1,8 @@ TOOLCHAIN_PATH ??= "${STAGING_BINDIR_TOOLCHAIN}" def elt_get_bfd_version(d): - import subprocess,os,bb - if os.path.exists(d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as'): - return subprocess.Popen([d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as', '-v', '--version'], stderr=subprocess.STDOUT,stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[3] + import subprocess,os,bb + if os.path.exists(d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as'): + return subprocess.Popen([d.getVar('TOOLCHAIN_PATH')+'/bin/'+d.getVar('TARGET_PREFIX')+'as', '-v', '--version'], stderr=subprocess.STDOUT,stdout=subprocess.PIPE).communicate()[0].splitlines()[0].split()[3] ELT_VER_BFD := "${@elt_get_bfd_version(d)}"
Signature · 1 line
2.7.4
PATCH 7/32 nativesdk-buildtools-perl-dummy: list additional modules
In reply to Denys Dmytriyenko--- .../recipes-core/meta/nativesdk-buildtools-perl-dummy.bbappend | 4 ++++ 1 file changed, 4 insertions(+)
meta-arago-extras/recipes-core/meta/nativesdk-buildtools-perl-dummy.bbappend +4 -0
@@ -10,10 +10,14 @@ DUMMYPROVIDES += "\ nativesdk-perl-module-file-copy \ nativesdk-perl-module-file-find \ nativesdk-perl-module-file-glob \ + nativesdk-perl-module-file-spec \ + nativesdk-perl-module-file-spec-unix \ nativesdk-perl-module-file-stat \ nativesdk-perl-module-getopt-long \ nativesdk-perl-module-io-file \ + nativesdk-perl-module-overloading \ nativesdk-perl-module-posix \ + nativesdk-perl-module-symbol \ nativesdk-perl-module-thread-queue \ nativesdk-perl-module-threads \ "
Signature · 1 line
2.7.4
PATCH 8/32 strace: drop 4.26 that was temporarily overlayed due to k4.19 api
In reply to Denys Dmytriyenko--- ...hen-using-non-glibc-libc-implementation-o.patch | 34 ------ .../0001-caps-abbrev.awk-fix-gawk-s-path.patch | 47 -------- .../strace/strace/0001-mips-o32-fix-build.patch | 98 ---------------- ...tion-Check-for-mips-and-alpha-before-usin.patch | 34 ------ .../strace/strace/Makefile-ptest.patch | 49 -------- .../strace/strace/disable-git-version-gen.patch | 37 ------ .../strace/strace/mips-SIGEMT.patch | 33 ------ ...-robust-test-for-m32-mx32-compile-support.patch | 45 -------- .../recipes-devtools/strace/strace/run-ptest | 2 - .../strace/strace/update-gawk-paths.patch | 127 --------------------- .../recipes-devtools/strace/strace_4.26.bb | 57 --------- 11 files changed, 563 deletions(-) delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/Makefile-ptest.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/disable-git-version-gen.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/mips-SIGEMT.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch delete mode 100755 meta-arago-distro/recipes-devtools/strace/strace/run-ptest delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace/update-gawk-paths.patch delete mode 100644 meta-arago-distro/recipes-devtools/strace/strace_4.26.bb
meta-arago-distro/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 30 Apr 2016 16:23:56 +0000 -Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc - -glibc includes the kernel header into its own header for macros -musl does not - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - ---- - ptrace.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ptrace.h b/ptrace.h -index 89d4b95..b3f45bb 100644 ---- a/ptrace.h -+++ b/ptrace.h -@@ -30,7 +30,13 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - #endif - --#include <linux/ptrace.h> -+#if defined(POWERPC) && !defined(__GLIBC__) -+#define pt_regs uapi_pt_regs -+#endif -+# include <linux/ptrace.h> -+#if defined(POWERPC) && !defined(__GLIBC__) -+# undef pt_regs -+#endif - - #ifdef HAVE_STRUCT_IA64_FPREG - # undef ia64_fpreg
meta-arago-distro/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch deleted +0 -47
47 lines not on this page · raw message
meta-arago-distro/recipes-devtools/strace/strace/0001-mips-o32-fix-build.patch deleted +0 -98
98 lines not on this page · raw message
meta-arago-distro/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 879ae71c472ce522f1b3514d2abf6ad49b4acc07 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 18 Sep 2017 22:51:32 -0700 -Subject: [PATCH] tests/sigaction: Check for mips and alpha before using - sa_restorer - -local structure does not define restorer member for mips and alpha -in definition, we need to match that assumption here where they are -being set - -Fixes -| ../../strace-4.18/tests/sigaction.c:177:36: error: 'struct_set_sa {aka struct set_sa}' has no member named 'restorer' -| # define SA_RESTORER_ARGS , new_act->restorer - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> - ---- - tests/sigaction.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/sigaction.c b/tests/sigaction.c -index 95be197..54819f9 100644 ---- a/tests/sigaction.c -+++ b/tests/sigaction.c -@@ -156,7 +156,7 @@ main(void) - sigdelset(mask.libc, SIGHUP); - - memcpy(new_act->mask, mask.old, sizeof(mask.old)); --#ifdef SA_RESTORER -+#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA) - new_act->flags = SA_RESTORER; - new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL; - # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
meta-arago-distro/recipes-devtools/strace/strace/Makefile-ptest.patch deleted +0 -49
49 lines not on this page · raw message
meta-arago-distro/recipes-devtools/strace/strace/disable-git-version-gen.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From ed30a4fc4dc264ce5f5881462e03ae13c921bfed Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <[email protected]> -Date: Mon, 18 Jan 2016 13:33:50 -0800 -Subject: [PATCH] strace: remove need for scripts - -git-version-gen copyright-year-gen file-date-gen are not included in -tarball releases, so we need to avoid attempts to call them. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andre McCurdy <[email protected]> -Signed-off-by: Anuj Mittal <[email protected]> - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8045ebd..4319709 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12,12 +12,12 @@ - - AC_PREREQ(2.57) - AC_INIT([strace], -- m4_esyscmd([./git-version-gen .tarball-version]), -+ m4_esyscmd_s([cat .tarball-version]), - [[email protected]], - [strace], - [https://strace.io]) --m4_define([copyright_year], m4_esyscmd([./copyright-year-gen .year])) --m4_define([manpage_date], m4_esyscmd([./file-date-gen strace.1.in])) -+m4_define([copyright_year], m4_esyscmd_s([cat .year])) -+m4_define([manpage_date], m4_esyscmd_s([cat .strace.1.in.date])) - AC_COPYRIGHT([Copyright (c) 1999-]copyright_year[ The strace developers.]) - AC_CONFIG_SRCDIR([strace.c]) - AC_CONFIG_AUX_DIR([.])
meta-arago-distro/recipes-devtools/strace/strace/mips-SIGEMT.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 20c184a7ab3fb7be67fb7626c411e756ea61d2f5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 7 Aug 2016 23:47:57 -0700 -Subject: [PATCH] strace: Fix build with mips/mips64 on musl - -SIGEMT is not defined everywhere e.g musl does -not define it. Therefore check it being defined -before using it. - -Fixes errors e.g. -../../strace-4.13/tests/signal2name.c:45:7: error: 'SIGEMT' undeclared (first use in this function) - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending - ---- - tests/signal2name.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/signal2name.c b/tests/signal2name.c -index 1d8e7c5..6722aa1 100644 ---- a/tests/signal2name.c -+++ b/tests/signal2name.c -@@ -49,7 +49,9 @@ signal2name(int sig) - CASE(SIGEMT); - CASE(SIGLOST); - #elif defined MIPS -+#ifdef SIGEMT - CASE(SIGEMT); -+#endif - CASE(SIGIOT); - CASE(SIGPWR); - #else
meta-arago-distro/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch deleted +0 -45
45 lines not on this page · raw message
meta-arago-distro/recipes-devtools/strace/strace/run-ptest deleted +0 -2
@@ -1,2 +0,0 @@ -#!/bin/sh -make -B -C tests -k test-suite.log
meta-arago-distro/recipes-devtools/strace/strace/update-gawk-paths.patch deleted +0 -127
127 lines not on this page · raw message
meta-arago-distro/recipes-devtools/strace/strace_4.26.bb deleted +0 -57
57 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 9/32 ipsec-tools: drop local bbappend, ipsec-tools is deprecated and removed
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-support/ipsec-tools/ipsec-tools_%.bbappend | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 meta-arago-distro/recipes-support/ipsec-tools/ipsec-tools_%.bbappend
meta-arago-distro/recipes-support/ipsec-tools/ipsec-tools_%.bbappend deleted +0 -3
@@ -1,3 +0,0 @@ -PR_append = ".arago0" - -PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
2.7.4
PATCH 10/32 llvm: replace obsolete ${COREBASE}/LICENSE, point to proper MIT license
In reply to Denys Dmytriyenko--- meta-arago-extras/recipes-core/llvm/llvm-common.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta-arago-extras/recipes-core/llvm/llvm-common.bb +1 -3
@@ -1,8 +1,6 @@ SUMMARY = "Helper script for OE's llvm support" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ -" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "file://llvm-config"
Signature · 1 line
2.7.4
PATCH 11/32 openssl10: remove bbappend and local patches
In reply to Denys DmytriyenkoOpenSSL 1.0 is no longer supported or maintained, dropped from upstream.
--- ...1-Add-AF_ALG-interface-support-to-OpenSSL.patch | 578 --------------------- ...todev-Fix-issue-with-signature-generation.patch | 445 ---------------- ...cryptodev.c-to-make-SHA1-and-MD5-work-wit.patch | 59 --- ...0002-cryptodev-allow-copying-EVP-contexts.patch | 202 ------- .../openssl10/0004-Sample-AF_ALG-openssl.cnf.patch | 36 -- ...ev-Add-SHA224-initialization-to-cryptodev.patch | 27 - ...dd-AES-CBC-CTR-modes-for-128-192-256-bit-.patch | 142 ----- .../openssl/openssl10_%.bbappend | 27 - 8 files changed, 1516 deletions(-) delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0001-Add-AF_ALG-interface-support-to-OpenSSL.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0001-cryptodev-Fix-issue-with-signature-generation.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0002-Modify-eng_cryptodev.c-to-make-SHA1-and-MD5-work-wit.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0002-cryptodev-allow-copying-EVP-contexts.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0004-Sample-AF_ALG-openssl.cnf.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0009-eng_cryptodev-Add-SHA224-initialization-to-cryptodev.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10/0011-cryptodev-Add-AES-CBC-CTR-modes-for-128-192-256-bit-.patch delete mode 100644 meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend
meta-arago-distro/recipes-connectivity/openssl/openssl10/0001-Add-AF_ALG-interface-support-to-OpenSSL.patch deleted +0 -578
@@ -1,578 +0,0 @@ -From 71ca205e8798c04b39b8a9981a05d6ec97b4df2c Mon Sep 17 00:00:00 2001 -From: Joel A Fernandes <[email protected]> -Date: Fri, 29 Mar 2013 07:58:44 -0500 -Subject: [PATCH 01/11] Add AF_ALG interface support to OpenSSL. - -Kernel uses AF_ALG interface to directly talk to crypto API as an alternative to the -out-of-kernel-tree OCF/cryptodev interfaces. Add af_alg engine support to OpenSSL. - -Signed-off-by: Joel A Fernandes <[email protected]> ---- - engines/Makefile | 8 +- - engines/e_af_alg.c | 521 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 526 insertions(+), 3 deletions(-) - create mode 100644 engines/e_af_alg.c - -diff --git a/engines/Makefile b/engines/Makefile -index 2fa9534..f46c9f5 100644 ---- a/engines/Makefile -+++ b/engines/Makefile -@@ -26,7 +26,7 @@ TEST= - APPS= - - LIB=$(TOP)/libcrypto.a --LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi -+LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi af_alg - - LIBSRC= e_4758cca.c \ - e_aep.c \ -@@ -38,7 +38,8 @@ LIBSRC= e_4758cca.c \ - e_sureware.c \ - e_ubsec.c \ - e_padlock.c \ -- e_capi.c -+ e_capi.c \ -+ e_af_alg.c - LIBOBJ= e_4758cca.o \ - e_aep.o \ - e_atalla.o \ -@@ -49,7 +50,8 @@ LIBOBJ= e_4758cca.o \ - e_sureware.o \ - e_ubsec.o \ - e_padlock.o \ -- e_capi.o -+ e_capi.o \ -+ e_af_alg.o - - SRC= $(LIBSRC) - -diff --git a/engines/e_af_alg.c b/engines/e_af_alg.c -new file mode 100644 -index 0000000..e253e07 ---- /dev/null -+++ b/engines/e_af_alg.c -@@ -0,0 +1,521 @@ -+/* Written by Markus Koetter ([email protected]) for the OpenSSL -+ * project. -+ */ -+/* ==================================================================== -+ * Copyright (c) 2011 The OpenSSL Project. 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. All advertising materials mentioning features or use of this -+ * software must display the following acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" -+ * -+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -+ * endorse or promote products derived from this software without -+ * prior written permission. For written permission, please contact -+ * [email protected]. -+ * -+ * 5. Products derived from this software may not be called "OpenSSL" -+ * nor may "OpenSSL" appear in their names without prior written -+ * permission of the OpenSSL Project. -+ * -+ * 6. Redistributions of any form whatsoever must retain the following -+ * acknowledgment: -+ * "This product includes software developed by the OpenSSL Project -+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -+ * EXPRESSED 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 OpenSSL PROJECT OR -+ * ITS 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. -+ * ==================================================================== -+ */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <stdint.h> -+#include <assert.h> -+#include <memory.h> -+#include <openssl/aes.h> -+#include <openssl/engine.h> -+#include <sys/socket.h> -+#include <linux/if_alg.h> -+#include <unistd.h> -+#include <sys/param.h> -+#include <ctype.h> -+#include <stdbool.h> -+ -+#ifndef AF_ALG -+#define AF_ALG 38 -+#endif -+ -+#ifndef SOL_ALG -+#define SOL_ALG 279 -+#endif -+ -+/* Socket options */ -+#define ALG_SET_KEY 1 -+#define ALG_SET_IV 2 -+#define ALG_SET_OP 3 -+ -+/* Operations */ -+#define ALG_OP_DECRYPT 0 -+#define ALG_OP_ENCRYPT 1 -+ -+#define AES_KEY_SIZE_128 16 -+#define AES_KEY_SIZE_192 24 -+#define AES_KEY_SIZE_256 32 -+ -+static int af_alg_ciphers (ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid); -+static int af_alg_aes_ciphers(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, const unsigned char *in_arg, unsigned int nbytes); -+ -+static int af_alg_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid); -+ -+#define DYNAMIC_ENGINE -+#define AF_ALG_ENGINE_ID "af_alg" -+#define AF_ALG_ENGINE_NAME "use AF_ALG for AES crypto" -+ -+#define EVP_CIPHER_block_size_CBC AES_BLOCK_SIZE -+ -+static bool nid_in_nids(int nid, int nids[], int num) -+{ -+ int i=0; -+ for( i=0;i<num;i++ ) -+ if( nids[i] == nid ) -+ return true; -+ return false; -+} -+ -+struct af_alg_cipher_data -+{ -+ int tfmfd; -+ int op; -+ __u32 type; -+}; -+ -+static int af_alg_cipher_all_nids[] = { -+ NID_aes_128_cbc, -+ NID_aes_192_cbc, -+ NID_aes_256_cbc, -+}; -+static int af_alg_cipher_all_nids_num = (sizeof(af_alg_cipher_all_nids)/sizeof(af_alg_cipher_all_nids[0])); -+static int *af_alg_digest_nids = NULL; -+static int af_alg_digest_nids_num = 0; -+ -+static int af_alg_digest_all_nids[] = { -+ NID_sha1, -+}; -+static int af_alg_digest_all_nids_num = sizeof(af_alg_digest_all_nids)/sizeof(af_alg_digest_all_nids[0]); -+static int *af_alg_cipher_nids = NULL; -+static int af_alg_cipher_nids_num = 0; -+ -+ -+int af_alg_init(ENGINE * engine) -+{ -+ int sock; -+ if((sock = socket(AF_ALG, SOCK_SEQPACKET, 0)) == -1) -+ return 0; -+ close(sock); -+ return 1; -+} -+ -+int af_alg_finish(ENGINE * engine) -+{ -+ return 1; -+} -+/* The definitions for control commands specific to this engine */ -+#define AF_ALG_CMD_CIPHERS ENGINE_CMD_BASE -+#define AF_ALG_CMD_DIGESTS (ENGINE_CMD_BASE + 1) -+ -+static const ENGINE_CMD_DEFN af_alg_cmd_defns[] = { -+ {AF_ALG_CMD_CIPHERS,"CIPHERS","which ciphers to run",ENGINE_CMD_FLAG_STRING}, -+ {AF_ALG_CMD_DIGESTS,"DIGESTS","which digests to run",ENGINE_CMD_FLAG_STRING}, -+ {0, NULL, NULL, 0} -+}; -+static int cipher_nid(const EVP_CIPHER *c) -+{ -+ return EVP_CIPHER_nid(c); -+} -+static int digest_nid(const EVP_MD *d) -+{ -+ return EVP_MD_type(d); -+} -+static bool names_to_nids(const char *names, const void*(*by_name)(const char *), int (*to_nid)(const void *), int **rnids, int *rnum, int *nids, int num) -+{ -+ char *str, *r; -+ char *c = NULL; -+ r = str = strdup(names); -+ while( (c = strtok_r(r, " ", &r)) != NULL ) -+ { -+ const void *ec = by_name(c); -+ if( ec == NULL ) -+ /* the cipher/digest is unknown */ -+ return false; -+ -+ if( nid_in_nids(to_nid(ec), nids, num) == false ) -+ /* we do not support the cipher */ -+ return false; -+ -+ if((*rnids = realloc(*rnids, (*rnum+1)*sizeof(int))) == NULL) -+ return false; -+ (*rnids)[*rnum]=to_nid(ec); -+ *rnum = *rnum+1; -+ } -+ return true; -+} -+ -+static int af_alg_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) -+{ -+ OpenSSL_add_all_algorithms(); -+ switch( cmd ) -+ { -+ case AF_ALG_CMD_CIPHERS: -+ if( p == NULL ) -+ return 1; -+ if( names_to_nids(p, (void *)EVP_get_cipherbyname, (void *)cipher_nid, &af_alg_cipher_nids, &af_alg_cipher_nids_num, af_alg_cipher_all_nids, af_alg_cipher_all_nids_num) == false ) -+ return 0; -+ ENGINE_unregister_ciphers(e); -+ ENGINE_register_ciphers(e); -+ return 1; -+ case AF_ALG_CMD_DIGESTS: -+ if( p == NULL ) -+ return 1; -+ if( names_to_nids(p, (void *)EVP_get_digestbyname, (void *)digest_nid, &af_alg_digest_nids, &af_alg_digest_nids_num, af_alg_digest_all_nids, af_alg_digest_all_nids_num) == false ) -+ return 0; -+ ENGINE_unregister_digests(e); -+ ENGINE_register_digests(e); -+ return 1; -+ default: -+ break; -+ } -+ return 0; -+} -+ -+static int af_alg_bind_helper(ENGINE * e) -+{ -+ if( !ENGINE_set_id(e, AF_ALG_ENGINE_ID) || -+ !ENGINE_set_init_function(e, af_alg_init) || -+ !ENGINE_set_finish_function(e, af_alg_finish) || -+ !ENGINE_set_name(e, AF_ALG_ENGINE_NAME) || -+ !ENGINE_set_ciphers (e, af_alg_ciphers) || -+ !ENGINE_set_digests (e, af_alg_digests) || -+ !ENGINE_set_ctrl_function(e, af_alg_ctrl) || -+ !ENGINE_set_cmd_defns(e, af_alg_cmd_defns)) -+ return 0; -+ return 1; -+} -+ -+ENGINE *ENGINE_af_alg(void) -+{ -+ ENGINE *eng = ENGINE_new(); -+ if( !eng ) -+ return NULL; -+ -+ if( !af_alg_bind_helper(eng) ) -+ { -+ ENGINE_free(eng); -+ return NULL; -+ } -+ return eng; -+} -+ -+static int af_alg_bind_fn(ENGINE *e, const char *id) -+{ -+ if( id && (strcmp(id, AF_ALG_ENGINE_ID) != 0) ) -+ return 0; -+ -+ if( !af_alg_bind_helper(e) ) -+ return 0; -+ -+ return 1; -+} -+ -+IMPLEMENT_DYNAMIC_CHECK_FN() -+IMPLEMENT_DYNAMIC_BIND_FN(af_alg_bind_fn) -+ -+static int af_alg_aes_init_key (EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc) -+{ -+ int keylen = EVP_CIPHER_CTX_key_length(ctx); -+ struct af_alg_cipher_data *acd = (struct af_alg_cipher_data *)ctx->cipher_data; -+ -+ struct sockaddr_alg sa = { -+ .salg_family = AF_ALG, -+ .salg_type = "skcipher", -+ .salg_name = "cbc(aes)", -+ }; -+ -+ acd->op = -1; -+ -+ if( ctx->encrypt ) -+ acd->type = ALG_OP_ENCRYPT; -+ else -+ acd->type = ALG_OP_DECRYPT; -+ -+ if((acd->tfmfd = socket(AF_ALG, SOCK_SEQPACKET, 0)) == -1) -+ return 0; -+ -+ if( bind(acd->tfmfd, (struct sockaddr*)&sa, sizeof(sa)) == -1 ) -+ return 0; -+ -+ if (setsockopt(acd->tfmfd, SOL_ALG, ALG_SET_KEY, key, keylen) == -1) -+ return 0; -+ -+ return 1; -+} -+ -+int af_alg_aes_cleanup_key(EVP_CIPHER_CTX *ctx) -+{ -+ struct af_alg_cipher_data *acd = (struct af_alg_cipher_data *)ctx->cipher_data; -+ if( acd->tfmfd != -1 ) -+ close(acd->tfmfd); -+ if( acd->op != -1 ) -+ close(acd->op); -+ return 1; -+} -+ -+#define DECLARE_AES_EVP(ksize,lmode,umode) \ -+static const EVP_CIPHER af_alg_aes_##ksize##_##lmode = { \ -+ .nid = NID_aes_##ksize##_##lmode, \ -+ .block_size = EVP_CIPHER_block_size_##umode, \ -+ .key_len = AES_KEY_SIZE_##ksize, \ -+ .iv_len = AES_BLOCK_SIZE, \ -+ .flags = 0 | EVP_CIPH_##umode##_MODE, \ -+ .init = af_alg_aes_init_key, \ -+ .do_cipher = af_alg_aes_ciphers, \ -+ .cleanup = af_alg_aes_cleanup_key, \ -+ .ctx_size = sizeof(struct af_alg_cipher_data), \ -+ .set_asn1_parameters = EVP_CIPHER_set_asn1_iv, \ -+ .get_asn1_parameters = EVP_CIPHER_get_asn1_iv, \ -+ .ctrl = NULL, \ -+ .app_data = NULL \ -+} -+ -+DECLARE_AES_EVP(128,cbc,CBC); -+DECLARE_AES_EVP(192,cbc,CBC); -+DECLARE_AES_EVP(256,cbc,CBC); -+ -+static int af_alg_aes_ciphers(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, const unsigned char *in_arg, unsigned int nbytes) -+{ -+ struct af_alg_cipher_data *acd = (struct af_alg_cipher_data *)ctx->cipher_data; -+ struct msghdr msg = {}; -+ struct cmsghdr *cmsg; -+ struct af_alg_iv *ivm; -+ struct iovec iov; -+ char buf[CMSG_SPACE(sizeof(acd->type)) + CMSG_SPACE(offsetof(struct af_alg_iv, iv) + AES_BLOCK_SIZE)]; -+ ssize_t len; -+ unsigned char save_iv[AES_BLOCK_SIZE]; -+ -+ memset(buf, 0, sizeof(buf)); -+ -+ msg.msg_control = buf; -+ msg.msg_controllen = 0; -+ msg.msg_controllen = sizeof(buf); -+ if( acd->op == -1 ) -+ { -+ if((acd->op = accept(acd->tfmfd, NULL, 0)) == -1) -+ return 0; -+ } -+ /* set operation type encrypt|decrypt */ -+ cmsg = CMSG_FIRSTHDR(&msg); -+ cmsg->cmsg_level = SOL_ALG; -+ cmsg->cmsg_type = ALG_SET_OP; -+ cmsg->cmsg_len = CMSG_LEN(4); -+ memcpy(CMSG_DATA(cmsg),&acd->type, 4); -+ -+ /* set IV - or update if it was set before */ -+ if(!ctx->encrypt) -+ memcpy(save_iv, in_arg + nbytes - AES_BLOCK_SIZE, AES_BLOCK_SIZE); -+ -+ cmsg = CMSG_NXTHDR(&msg, cmsg); -+ cmsg->cmsg_level = SOL_ALG; -+ cmsg->cmsg_type = ALG_SET_IV; -+ cmsg->cmsg_len = CMSG_LEN(offsetof(struct af_alg_iv, iv) + AES_BLOCK_SIZE); -+ ivm = (void*)CMSG_DATA(cmsg); -+ ivm->ivlen = AES_BLOCK_SIZE; -+ memcpy(ivm->iv, ctx->iv, AES_BLOCK_SIZE); -+ -+ msg.msg_iov = &iov; -+ msg.msg_iovlen = 1; -+ -+ unsigned int todo = nbytes; -+ unsigned int done = 0; -+ while( todo-done > 0 ) -+ { -+ iov.iov_base = (void *)(in_arg + done); -+ iov.iov_len = todo-done; -+ -+ if((len = sendmsg(acd->op, &msg, 0)) == -1) -+ return 0; -+ -+ if (read(acd->op, out_arg+done, len) != len) -+ return 0; -+ -+ /* do not update IV for following chunks */ -+ msg.msg_controllen = 0; -+ done += len; -+ } -+ -+ /* copy IV for next iteration */ -+ if(ctx->encrypt) -+ memcpy(ctx->iv, out_arg + done - AES_BLOCK_SIZE, AES_BLOCK_SIZE); -+ else -+ memcpy(ctx->iv, save_iv, AES_BLOCK_SIZE); -+ return 1; -+} -+ -+static int af_alg_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid) -+{ -+ if( !cipher ) -+ { -+ *nids = af_alg_cipher_nids; -+ return af_alg_cipher_nids_num; -+ } -+ -+ if( ! nid_in_nids(nid, af_alg_cipher_nids, af_alg_cipher_nids_num) ) -+ return 0; -+ -+ switch( nid ) -+ { -+ case NID_aes_128_cbc: -+ *cipher = &af_alg_aes_128_cbc; -+ break; -+ case NID_aes_192_cbc: -+ *cipher = &af_alg_aes_192_cbc; -+ break; -+ case NID_aes_256_cbc: -+ *cipher = &af_alg_aes_256_cbc; -+ break; -+ default: -+ *cipher = NULL; -+ } -+ return(*cipher != 0); -+} -+ -+struct af_alg_digest_data -+{ -+ int tfmfd; -+ int opfd; -+}; -+ -+#define DIGEST_DATA(ctx) ((struct af_alg_digest_data*)(ctx->md_data)) -+ -+static int af_alg_sha1_init(EVP_MD_CTX *ctx) -+{ -+ struct af_alg_digest_data *ddata = DIGEST_DATA(ctx); -+ struct sockaddr_alg sa = { -+ .salg_family = AF_ALG, -+ .salg_type = "hash", -+ .salg_name = "sha1" -+ }; -+ -+ if( (ddata->tfmfd = socket(AF_ALG, SOCK_SEQPACKET, 0)) == -1 ) -+ return 0; -+ -+ if( bind(ddata->tfmfd, (struct sockaddr *)&sa, sizeof(sa)) != 0 ) -+ return 0; -+ -+ if( (ddata->opfd = accept(ddata->tfmfd,NULL,0)) == -1 ) -+ return 0; -+ -+ return 1; -+} -+ -+static int af_alg_sha1_update(EVP_MD_CTX *ctx, const void *data, size_t length) -+{ -+ struct af_alg_digest_data *ddata = DIGEST_DATA(ctx); -+ ssize_t r; -+ r = send(ddata->opfd, data, length, MSG_MORE); -+ if( r < 0 || (size_t)r < length ) -+ return 0; -+ return 1; -+} -+ -+static int af_alg_sha1_final(EVP_MD_CTX *ctx, unsigned char *md) -+{ -+ struct af_alg_digest_data *ddata = DIGEST_DATA(ctx); -+ if( read(ddata->opfd, md, SHA_DIGEST_LENGTH) != SHA_DIGEST_LENGTH ) -+ return 0; -+ -+ return 1; -+} -+ -+static int af_alg_sha1_copy(EVP_MD_CTX *_to,const EVP_MD_CTX *_from) -+{ -+ struct af_alg_digest_data *from = DIGEST_DATA(_from); -+ struct af_alg_digest_data *to = DIGEST_DATA(_to); -+ if( (to->opfd = accept(from->opfd, NULL, 0)) == -1 ) -+ return 0; -+ if( (to->tfmfd = accept(from->tfmfd, NULL, 0)) == -1 ) -+ return 0; -+ return 1; -+} -+ -+static int af_alg_sha1_cleanup(EVP_MD_CTX *ctx) -+{ -+ struct af_alg_digest_data *ddata = DIGEST_DATA(ctx); -+ if( ddata->opfd != -1 ) -+ close(ddata->opfd); -+ if( ddata->tfmfd != -1 ) -+ close(ddata->tfmfd); -+ return 0; -+} -+ -+#define DECLARE_MD_SHA(digest) \ -+static const EVP_MD af_alg_##digest##_md = { \ -+ NID_##digest, \ -+ NID_##digest##WithRSAEncryption, \ -+ SHA_DIGEST_LENGTH, \ -+ 0, \ -+ af_alg_##digest##_init, \ -+ af_alg_##digest##_update, \ -+ af_alg_##digest##_final, \ -+ af_alg_##digest##_copy, \ -+ af_alg_##digest##_cleanup, \ -+ EVP_PKEY_RSA_method, \ -+ SHA_CBLOCK, \ -+ sizeof(struct af_alg_digest_data), \ -+}; -+ -+DECLARE_MD_SHA(sha1) -+ -+static int af_alg_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) -+{ -+ if( !digest ) -+ { -+ *nids = af_alg_digest_nids; -+ return af_alg_digest_nids_num; -+ } -+ -+ if( nid_in_nids(nid, af_alg_digest_nids, af_alg_digest_nids_num) == false ) -+ return 0; -+ -+ switch( nid ) -+ { -+ case NID_sha1: -+ *digest = &af_alg_sha1_md; -+ break; -+ default: -+ *digest = NULL; -+ } -+ return (*digest != NULL); -+} -+ --- -1.8.3.2 -
meta-arago-distro/recipes-connectivity/openssl/openssl10/0001-cryptodev-Fix-issue-with-signature-generation.patch deleted +0 -445
445 lines not on this page · raw message
meta-arago-distro/recipes-connectivity/openssl/openssl10/0002-Modify-eng_cryptodev.c-to-make-SHA1-and-MD5-work-wit.patch deleted +0 -59
59 lines not on this page · raw message
meta-arago-distro/recipes-connectivity/openssl/openssl10/0002-cryptodev-allow-copying-EVP-contexts.patch deleted +0 -202
202 lines not on this page · raw message
meta-arago-distro/recipes-connectivity/openssl/openssl10/0004-Sample-AF_ALG-openssl.cnf.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From a790ddb9694aff023fdcdbcfadf0b11ee9781b87 Mon Sep 17 00:00:00 2001 -From: Joel A Fernandes <[email protected]> -Date: Sun, 31 Mar 2013 07:33:27 -0500 -Subject: [PATCH 04/11] Sample AF_ALG openssl.cnf To be copied to - /usr/lib/ssl/openssl.cnf - -Specifies which algorithms to register for AF_ALG - -Signed-off-by: Joel A Fernandes <[email protected]> ---- - engines/af_alg_openssl.cnf | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - create mode 100644 engines/af_alg_openssl.cnf - -diff --git a/engines/af_alg_openssl.cnf b/engines/af_alg_openssl.cnf -new file mode 100644 -index 0000000..138ed16 ---- /dev/null -+++ b/engines/af_alg_openssl.cnf -@@ -0,0 +1,13 @@ -+openssl_conf = openssl_def -+ -+[openssl_def] -+engines = openssl_engines -+ -+[openssl_engines] -+af_alg = af_alg_engine -+ -+[af_alg_engine] -+default_algorithms = ALL -+CIPHERS=aes-128-cbc -+DIGESTS=sha1 -+ --- -1.8.3.2 -
meta-arago-distro/recipes-connectivity/openssl/openssl10/0009-eng_cryptodev-Add-SHA224-initialization-to-cryptodev.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 67f8fdee6e979173c7c6793593147030df6aaa40 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Tue, 8 Sep 2015 17:19:57 -0400 -Subject: [PATCH] eng_cryptodev: Add SHA224 initialization to cryptodev engine. - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - crypto/engine/eng_cryptodev.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c -index b7bff89..3cd4bcf 100644 ---- a/crypto/engine/eng_cryptodev.c -+++ b/crypto/engine/eng_cryptodev.c -@@ -216,6 +216,9 @@ static struct { - CRYPTO_SHA1, NID_sha1, 20 - }, - { -+ CRYPTO_SHA2_224, NID_sha224, 28 -+ }, -+ { - CRYPTO_SHA2_256, NID_sha256, 32 - }, - { --- -2.2.0 -
meta-arago-distro/recipes-connectivity/openssl/openssl10/0011-cryptodev-Add-AES-CBC-CTR-modes-for-128-192-256-bit-.patch deleted +0 -142
142 lines not on this page · raw message
meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend deleted +0 -27
@@ -1,27 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PR_append = ".arago0" - -DEPENDS += "cryptodev-linux" -RDEPENDS_${PN}_class-target += "cryptodev-module" - -CRYPTODEV_AFALG_PATCHES = " \ - file://0001-cryptodev-Fix-issue-with-signature-generation.patch \ - file://0001-Add-AF_ALG-interface-support-to-OpenSSL.patch \ - file://0004-Sample-AF_ALG-openssl.cnf.patch \ - file://0009-eng_cryptodev-Add-SHA224-initialization-to-cryptodev.patch \ -" - -SRC_URI += "${CRYPTODEV_AFALG_PATCHES}" - -# override this from upstream to preserve engine libs, binaries and config -# w/o clashing with 1.1 -openssl_package_preprocess () { - for file in `find ${PKGD} -name *.h -o -name *.pc`; do - rm $file - done - rm ${PKGD}${libdir}/*.so - mv ${PKGD}${bindir}/openssl ${PKGD}${bindir}/openssl10 - mv ${PKGD}${bindir}/c_rehash ${PKGD}${bindir}/c_rehash10 - mv ${PKGD}${sysconfdir}/ssl/openssl.cnf ${PKGD}${sysconfdir}/ssl/openssl10.cnf -}
Signature · 1 line
2.7.4
PATCH 12/32 libnl: update bbappend 3.4.0 -> 3.5.0
In reply to Denys Dmytriyenko---
.../recipes-support/libnl/{libnl_3.4.0.bbappend => libnl_3.5.0.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-arago-distro/recipes-support/libnl/{libnl_3.4.0.bbappend => libnl_3.5.0.bbappend} (100%)meta-arago-distro/recipes-support/libnl/libnl_3.5.0.bbappend renamed from meta-arago-distro/recipes-support/libnl/libnl_3.4.0.bbappend +0 -0
Signature · 1 line
2.7.4
PATCH 13/32 mbedtls: update bbappend 2.13.0 -> 2.16.2
In reply to Denys Dmytriyenko---
.../mbedtls/{mbedtls_2.13.0.bbappend => mbedtls_2.16.2.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-arago-distro/recipes-connectivity/mbedtls/{mbedtls_2.13.0.bbappend => mbedtls_2.16.2.bbappend} (100%)meta-arago-distro/recipes-connectivity/mbedtls/mbedtls_2.16.2.bbappend renamed from meta-arago-distro/recipes-connectivity/mbedtls/mbedtls_2.13.0.bbappend +0 -0
Signature · 1 line
2.7.4
PATCH 14/32 weston: update bbappend 5.0.0 -> 7.0.0
In reply to Denys Dmytriyenko---
.../wayland/{weston_5.0.0.bbappend => weston_7.0.0.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-arago-distro/recipes-graphics/wayland/{weston_5.0.0.bbappend => weston_7.0.0.bbappend} (100%)meta-arago-distro/recipes-graphics/wayland/weston_7.0.0.bbappend renamed from meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend +0 -0
Signature · 1 line
2.7.4
PATCH 15/32 weston: our patches need rebasing for 7.0.0, disable for now
In reply to Denys Dmytriyenko--- .../recipes-graphics/wayland/weston_7.0.0.bbappend | 42 +++++++++++----------- 1 file changed, 20 insertions(+), 22 deletions(-)
meta-arago-distro/recipes-graphics/wayland/weston_7.0.0.bbappend +20 -22
@@ -1,6 +1,4 @@ -# When configured for fbdev compositor, make it the default -PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev" -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/libgbm mtdev" +PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/libgbm mtdev" PR_append = ".arago34"
@@ -8,24 +6,24 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" RDEPENDS_${PN} += "weston-conf" -SRC_URI += " \ - file://0002-weston-Allow-visual_id-to-be-0.patch \ - file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ - file://0004-weston-Fix-touch-screen-crash-issue.patch \ - file://0005-weston-drm-fix-dual-display-issue.patch \ - file://0001-protocol-add-weston-debug.xml.patch \ - file://0002-libweston-add-weston_debug-API-and-implementation.patch \ - file://0003-compositor-add-option-to-enable-weston_debug.patch \ - file://0004-clients-add-weston-debug.patch \ - file://0005-compositor-offer-logs-via-weston-debug.patch \ - file://0006-xwm-dump_property-to-use-FILE-internally.patch \ - file://0007-xwm-move-FILE-to-the-callers-of-dump_property.patch \ - file://0008-xwm-convert-WM_DEBUG-into-a-weston-debug-scope.patch \ - file://0009-compositor-protocol-logger.patch \ - file://0010-compositor-Add-weston_layer_mask_is_infinite.patch \ - file://0011-compositor-Add-scene-graph-debug-scope.patch \ - file://0012-compositor-drm-Add-backend-pointer-to-drm_output.patch \ - file://0013-compositor-drm-Add-drm-backend-log-debug-scope.patch \ -" +#SRC_URI += " \ +# file://0002-weston-Allow-visual_id-to-be-0.patch \ +# file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \ +# file://0004-weston-Fix-touch-screen-crash-issue.patch \ +# file://0005-weston-drm-fix-dual-display-issue.patch \ +# file://0001-protocol-add-weston-debug.xml.patch \ +# file://0002-libweston-add-weston_debug-API-and-implementation.patch \ +# file://0003-compositor-add-option-to-enable-weston_debug.patch \ +# file://0004-clients-add-weston-debug.patch \ +# file://0005-compositor-offer-logs-via-weston-debug.patch \ +# file://0006-xwm-dump_property-to-use-FILE-internally.patch \ +# file://0007-xwm-move-FILE-to-the-callers-of-dump_property.patch \ +# file://0008-xwm-convert-WM_DEBUG-into-a-weston-debug-scope.patch \ +# file://0009-compositor-protocol-logger.patch \ +# file://0010-compositor-Add-weston_layer_mask_is_infinite.patch \ +# file://0011-compositor-Add-scene-graph-debug-scope.patch \ +# file://0012-compositor-drm-Add-backend-pointer-to-drm_output.patch \ +# file://0013-compositor-drm-Add-drm-backend-log-debug-scope.patch \ +#" INHIBIT_PACKAGE_STRIP = "1"
Signature · 1 line
2.7.4
PATCH 16/32 weston-conf: rename 5.0.0 -> 7.0.0 to match main weston version
In reply to Denys Dmytriyenko---
.../wayland/{weston-conf_5.0.0.bb => weston-conf_7.0.0.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-arago-distro/recipes-graphics/wayland/{weston-conf_5.0.0.bb => weston-conf_7.0.0.bb} (100%)meta-arago-distro/recipes-graphics/wayland/weston-conf_7.0.0.bb renamed from meta-arago-distro/recipes-graphics/wayland/weston-conf_5.0.0.bb +0 -0
Signature · 1 line
2.7.4
PATCH 17/32 linux-firmware: update bbappend to be version-agnostic
In reply to Denys Dmytriyenko---
.../{linux-firmware_git.bbappend => linux-firmware_%.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-arago-distro/recipes-kernel/linux-firmware/{linux-firmware_git.bbappend => linux-firmware_%.bbappend} (100%)meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware_%.bbappend renamed from meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +0 -0
Signature · 1 line
2.7.4
PATCH 18/32 iproute2: overlay 4.19 locally for now, as upstream moved to 5.2
In reply to Denys Dmytriyenko--- .../recipes-connectivity/iproute2/iproute2.inc | 54 ++++++++++++++++++++++ .../iproute2/0001-ip-Remove-unneed-header.patch | 30 ++++++++++++ .../0001-libc-compat.h-add-musl-workaround.patch | 41 ++++++++++++++++ .../iproute2/iproute2/configure-cross.patch | 32 +++++++++++++ .../iproute2/iproute2_4.19.0.bb | 14 ++++++ 5 files changed, 171 insertions(+) create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2.inc create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/configure-cross.patch create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2_4.19.0.bb
meta-arago-distro/recipes-connectivity/iproute2/iproute2.inc new file +54 -0
@@ -0,0 +1,54 @@ +SUMMARY = "TCP / IP networking and traffic control utilities" +DESCRIPTION = "Iproute2 is a collection of utilities for controlling \ +TCP / IP networking and traffic control in Linux. Of the utilities ip \ +and tc are the most important. ip controls IPv4 and IPv6 \ +configuration and tc stands for traffic control." +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +SECTION = "base" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" + +DEPENDS = "flex-native bison-native iptables elfutils libcap" + +inherit update-alternatives bash-completion pkgconfig + +CLEANBROKEN = "1" + +PACKAGECONFIG ??= "tipc" +PACKAGECONFIG[tipc] = ",,libmnl," + +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" + +do_configure_append () { + sh configure ${STAGING_INCDIR} + # Explicitly disable ATM support + sed -i -e '/TC_CONFIG_ATM/d' config.mk +} + +do_install () { + oe_runmake DESTDIR=${D} install + mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2 + install -d ${D}${datadir} + mv ${D}/share/* ${D}${datadir}/ || true + rm ${D}/share -rf || true +} + +# The .so files in iproute2-tc are modules, not traditional libraries +INSANE_SKIP_${PN}-tc = "dev-so" + +PACKAGES =+ "${PN}-tc ${PN}-lnstat ${PN}-ifstat ${PN}-genl ${PN}-rtacct ${PN}-nstat ${PN}-ss ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +FILES_${PN}-tc = "${base_sbindir}/tc* \ + ${libdir}/tc/*.so" +FILES_${PN}-lnstat = "${base_sbindir}/lnstat ${base_sbindir}/ctstat ${base_sbindir}/rtstat" +FILES_${PN}-ifstat = "${base_sbindir}/ifstat" +FILES_${PN}-genl = "${base_sbindir}/genl" +FILES_${PN}-rtacct = "${base_sbindir}/rtacct" +FILES_${PN}-nstat = "${base_sbindir}/nstat" +FILES_${PN}-ss = "${base_sbindir}/ss" +FILES_${PN}-tipc = "${base_sbindir}/tipc" + +ALTERNATIVE_${PN} = "ip" +ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" +ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" +ALTERNATIVE_PRIORITY = "100"
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae <[email protected]> +Date: Mon, 13 Nov 2017 15:59:35 +0000 +Subject: [PATCH] ip: Remove unneed header + +Fix redefinition of struct ethhdr with a suitably patched musl libc +that suppresses the kernel if_ether.h. + +Signed-off-by: Changhyeok Bae <[email protected]> + +Upstream-Status: Pending [[email protected]] +--- + ip/iplink_bridge.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c +index cccdec1..f065b22 100644 +--- a/ip/iplink_bridge.c ++++ b/ip/iplink_bridge.c +@@ -13,7 +13,6 @@ + #include <stdlib.h> + #include <string.h> + #include <netinet/in.h> +-#include <netinet/ether.h> + #include <linux/if_link.h> + #include <linux/if_bridge.h> + #include <net/if.h> +-- +2.7.4 +
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch new file +41 -0
41 lines not on this page · raw message
meta-arago-distro/recipes-connectivity/iproute2/iproute2/configure-cross.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <[email protected]> +Date: Thu, 3 Nov 2011 10:46:16 +0100 +Subject: [PATCH] make configure cross compile safe + +According to Kevin Tian: +Upstream-Status: Pending + +Signed-off-by: Koen Kooi <[email protected]> +Signed-off-by: Shane Wang <[email protected]> + +Index: iproute2-4.14.1/configure +=================================================================== +--- iproute2-4.14.1.orig/configure ++++ iproute2-4.14.1/configure +@@ -2,6 +2,7 @@ + # This is not an autoconf generated configure + # + INCLUDE=${1:-"$PWD/include"} ++SYSROOT=$1 + + # Output file which is input to Makefile + CONFIG=config.mk +@@ -195,7 +196,7 @@ check_ipt_lib_dir() + return + fi + +- for dir in /lib /usr/lib /usr/local/lib ++ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib + do + for file in $dir/{xtables,iptables}/lib*t_*so ; do + if [ -f $file ]; then
meta-arago-distro/recipes-connectivity/iproute2/iproute2_4.19.0.bb new file +14 -0
@@ -0,0 +1,14 @@ +require iproute2.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ + file://configure-cross.patch \ + file://0001-libc-compat.h-add-musl-workaround.patch \ + file://0001-ip-Remove-unneed-header.patch \ + " + +SRC_URI[md5sum] = "67eeebacaac4515cab73dfd2fc796af3" +SRC_URI[sha256sum] = "d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984" + +# CFLAGS are computed in Makefile and reference CCOPTS +# +EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'"
Signature · 1 line
2.7.4
PATCH 19/32 python-numpy: overlay last version compatible with python2
In reply to Denys DmytriyenkoRequired for our old version of opencl.
--- ...h-usr-and-so-on-for-libraries-by-default-.patch | 77 ++++++++++++ .../files/0001-npy_cpu-Add-riscv-support.patch | 24 ++++ .../python-numpy/files/aarch64/_numpyconfig.h | 32 +++++ .../python-numpy/files/aarch64/config.h | 139 +++++++++++++++++++++ .../python-numpy/files/arm/config.h | 21 ++++ .../python-numpy/files/arm/numpyconfig.h | 17 +++ .../python-numpy/files/armeb/config.h | 21 ++++ .../python-numpy/files/armeb/numpyconfig.h | 17 +++ .../files/mipsarchn32eb/_numpyconfig.h | 31 +++++ .../python-numpy/files/mipsarchn32eb/config.h | 139 +++++++++++++++++++++ .../files/mipsarchn32el/_numpyconfig.h | 31 +++++ .../python-numpy/files/mipsarchn32el/config.h | 138 ++++++++++++++++++++ .../files/mipsarchn64eb/_numpyconfig.h | 32 +++++ .../python-numpy/files/mipsarchn64eb/config.h | 139 +++++++++++++++++++++ .../files/mipsarchn64el/_numpyconfig.h | 32 +++++ .../python-numpy/files/mipsarchn64el/config.h | 138 ++++++++++++++++++++ .../files/mipsarcho32eb/_numpyconfig.h | 32 +++++ .../python-numpy/files/mipsarcho32eb/config.h | 139 +++++++++++++++++++++ .../python-numpy/files/mipsarcho32el/config.h | 21 ++++ .../python-numpy/files/mipsarcho32el/numpyconfig.h | 18 +++ .../python-numpy/files/powerpc/_numpyconfig.h | 32 +++++ .../python-numpy/files/powerpc/config.h | 139 +++++++++++++++++++++ .../python-numpy/files/powerpc64/_numpyconfig.h | 32 +++++ .../python-numpy/files/powerpc64/config.h | 139 +++++++++++++++++++++ .../python-numpy/files/riscv64/_numpyconfig.h | 32 +++++ .../python-numpy/files/riscv64/config.h | 139 +++++++++++++++++++++ .../python-numpy/files/x86-64/_numpyconfig.h | 32 +++++ .../python-numpy/files/x86-64/config.h | 139 +++++++++++++++++++++ .../python-numpy/files/x86/config.h | 108 ++++++++++++++++ .../python-numpy/files/x86/numpyconfig.h | 24 ++++ .../recipes-devtools/python-numpy/python-numpy.inc | 116 +++++++++++++++++ .../python-numpy/python-numpy_1.16.3.bb | 10 ++ .../python-numpy/python3-numpy_1.16.3.bb | 3 + 33 files changed, 2183 insertions(+) create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/aarch64/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/arm/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/arm/numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/armeb/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/armeb/numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32el/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64el/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32el/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/powerpc64/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/riscv64/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86-64/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86/config.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/files/x86/numpyconfig.h create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/python-numpy.inc create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/python-numpy_1.16.3.bb create mode 100644 meta-arago-distro/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
meta-arago-distro/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch new file +77 -0
@@ -0,0 +1,77 @@ +From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 10 Dec 2015 13:20:30 +0200 +Subject: [PATCH] Don't search /usr and so on for libraries by default to + + avoid host contamination. + +Upstream-Status: Inappropriate (As the code stands, this is a hack) +Signed-off-by: Ross Burton <[email protected]> +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + numpy/distutils/system_info.py | 50 ++++------------------------------ + 1 file changed, 6 insertions(+), 44 deletions(-) + +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index 2424943..bf56a6d 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -274,51 +274,13 @@ if sys.platform == 'win32': + add_system_root(os.path.join(conda_dir, 'Library')) + + else: +- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', +- '/opt/local/lib', '/sw/lib'], platform_bits) + default_runtime_dirs = [] +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- # path of umfpack under macports +- '/opt/local/include/ufsparse', +- '/opt/local/include', '/sw/include', +- '/usr/include/suitesparse'] +- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] +- +- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', +- '/usr/lib'], platform_bits) +- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', +- '/usr/include'] +- +- if os.path.exists('/usr/lib/X11'): +- globbed_x11_dir = glob('/usr/lib/*/libX11.so') +- if globbed_x11_dir: +- x11_so_dir = os.path.split(globbed_x11_dir[0])[0] +- default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11']) +- default_x11_include_dirs.extend(['/usr/lib/X11/include', +- '/usr/include/X11']) +- +- import subprocess as sp +- tmp = None +- try: +- # Explicitly open/close file to avoid ResourceWarning when +- # tests are run in debug mode Python 3. +- tmp = open(os.devnull, 'w') +- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, +- stderr=tmp) +- except (OSError, DistutilsError): +- # OSError if gcc is not installed, or SandboxViolation (DistutilsError +- # subclass) if an old setuptools bug is triggered (see gh-3160). +- pass +- else: +- triplet = str(p.communicate()[0].decode().strip()) +- if p.returncode == 0: +- # gcc supports the "-print-multiarch" option +- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] +- default_lib_dirs += [os.path.join("/usr/lib/", triplet)] +- finally: +- if tmp is not None: +- tmp.close() ++ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) ++ default_include_dirs = ['/deaddir/include'] ++ default_src_dirs = ['.', '/deaddir/src'] ++ ++ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) ++ default_x11_include_dirs = ['/deaddir/include'] + + if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: + default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
meta-arago-distro/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch new file +24 -0
@@ -0,0 +1,24 @@ +From 629891f67601275c9c4de0bb01afcf1a8c44fa3f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 16 Mar 2018 19:55:21 -0700 +Subject: [PATCH] npy_cpu: Add riscv support + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761] +--- + numpy/core/include/numpy/npy_cpu.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h +index 5edd8f4..e1e4796 100644 +--- a/numpy/core/include/numpy/npy_cpu.h ++++ b/numpy/core/include/numpy/npy_cpu.h +@@ -96,6 +96,8 @@ + #define NPY_CPU_OR1K + #elif defined(__mc68000__) + #define NPY_CPU_M68K ++#elif defined(__riscv) ++ #define NPY_CPU_RISCV + #elif defined(__arc__) && defined(__LITTLE_ENDIAN__) + #define NPY_CPU_ARCEL + #elif defined(__arc__) && defined(__BIG_ENDIAN__)
meta-arago-distro/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/aarch64/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/arm/config.h new file +21 -0
@@ -0,0 +1,21 @@ +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ +/* #define SIZEOF_SHORT 2 */ +/* #define SIZEOF_INT 4 */ +/* #define SIZEOF_LONG 4 */ +/* #define SIZEOF_FLOAT 4 */ +/* #define SIZEOF_DOUBLE 8 */ +#define SIZEOF_LONG_DOUBLE 12 +#define SIZEOF_PY_INTPTR_T 4 +/* #define SIZEOF_LONG_LONG 8 */ +#define SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +#define MATHLIB m +#define HAVE_FLOAT_FUNCS +#define HAVE_LOG1P +#define HAVE_EXPM1 +#define HAVE_INVERSE_HYPERBOLIC +#define HAVE_INVERSE_HYPERBOLIC_FLOAT +#define HAVE_ISNAN +#define HAVE_ISINF +#define HAVE_RINT +
meta-arago-distro/recipes-devtools/python-numpy/files/arm/numpyconfig.h new file +17 -0
@@ -0,0 +1,17 @@ +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ +/* +* * This file is generated by numpy/core/setup.pyc. DO NOT EDIT +* */ +#define NPY_SIZEOF_SHORT 2 +#define NPY_SIZEOF_INT 4 +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_LONGDOUBLE 12 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_NO_SMP 0 + +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +
meta-arago-distro/recipes-devtools/python-numpy/files/armeb/config.h new file +21 -0
@@ -0,0 +1,21 @@ +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ +/* #define SIZEOF_SHORT 2 */ +/* #define SIZEOF_INT 4 */ +/* #define SIZEOF_LONG 4 */ +/* #define SIZEOF_FLOAT 4 */ +/* #define SIZEOF_DOUBLE 8 */ +#define SIZEOF_LONG_DOUBLE 12 +#define SIZEOF_PY_INTPTR_T 4 +/* #define SIZEOF_LONG_LONG 8 */ +#define SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +#define MATHLIB m +#define HAVE_FLOAT_FUNCS +#define HAVE_LOG1P +#define HAVE_EXPM1 +#define HAVE_INVERSE_HYPERBOLIC +#define HAVE_INVERSE_HYPERBOLIC_FLOAT +#define HAVE_ISNAN +#define HAVE_ISINF +#define HAVE_RINT +
meta-arago-distro/recipes-devtools/python-numpy/files/armeb/numpyconfig.h new file +17 -0
@@ -0,0 +1,17 @@ +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ +/* +* * This file is generated by numpy/core/setup.pyc. DO NOT EDIT +* */ +#define NPY_SIZEOF_SHORT 2 +#define NPY_SIZEOF_INT 4 +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_LONGDOUBLE 12 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_NO_SMP 0 + +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h new file +31 -0
@@ -0,0 +1,31 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h new file +31 -0
@@ -0,0 +1,31 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn32el/config.h new file +138 -0
138 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarchn64el/config.h new file +138 -0
138 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 8 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 16 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32el/config.h new file +21 -0
@@ -0,0 +1,21 @@ +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ +/* #define SIZEOF_SHORT 2 */ +/* #define SIZEOF_INT 4 */ +/* #define SIZEOF_LONG 4 */ +/* #define SIZEOF_FLOAT 4 */ +/* #define SIZEOF_DOUBLE 8 */ +#define SIZEOF_LONG_DOUBLE 12 +#define SIZEOF_PY_INTPTR_T 4 +/* #define SIZEOF_LONG_LONG 8 */ +#define SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +#define MATHLIB m +#define HAVE_FLOAT_FUNCS +#define HAVE_LOG1P +#define HAVE_EXPM1 +#define HAVE_INVERSE_HYPERBOLIC +#define HAVE_INVERSE_HYPERBOLIC_FLOAT +#define HAVE_ISNAN +#define HAVE_ISINF +#define HAVE_RINT +
meta-arago-distro/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h new file +18 -0
@@ -0,0 +1,18 @@ +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ +/* +* * This file is generated by numpy/core/setup.pyc. DO NOT EDIT +* */ +#define NPY_SIZEOF_SHORT 2 +#define NPY_SIZEOF_INT 4 +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_LONGDOUBLE 12 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_NO_SMP 0 + +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_OFF_T 8 +/* #define CHAR_BIT 8 */ +
meta-arago-distro/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/powerpc/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/powerpc64/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/riscv64/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h new file +32 -0
@@ -0,0 +1,32 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_OFF_T 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_ENABLE_SEPARATE_COMPILATION 1 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden"))) +#define NPY_ABI_VERSION 0x01000009 +#define NPY_API_VERSION 0x0000000A + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif
meta-arago-distro/recipes-devtools/python-numpy/files/x86-64/config.h new file +139 -0
139 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/x86/config.h new file +108 -0
108 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/files/x86/numpyconfig.h new file +24 -0
@@ -0,0 +1,24 @@ +#ifndef _NPY_NUMPYCONFIG_H_ +#define _NPY_NUMPYCONFIG_H_ + +#include "_numpyconfig.h" + +/* +* On Mac OS X, because there is only one configuration stage for all the archs +* in universal builds, any macro which depends on the arch needs to be +* harcoded +*/ +#ifdef __APPLE__ +#undef NPY_SIZEOF_LONG +#undef NPY_SIZEOF_PY_INTPTR_T + +#ifdef __LP64__ +#define NPY_SIZEOF_LONG 8 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#else +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#endif +#endif + +#endif
meta-arago-distro/recipes-devtools/python-numpy/python-numpy.inc new file +116 -0
116 lines not on this page · raw message
meta-arago-distro/recipes-devtools/python-numpy/python-numpy_1.16.3.bb new file +10 -0
@@ -0,0 +1,10 @@ +inherit setuptools +require python-numpy.inc + +RDEPENDS_${PN}_class-target_append = " \ + ${PYTHON_PN}-subprocess \ +" + +do_install_append(){ + rm ${D}/${bindir}/f2py +}
meta-arago-distro/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb new file +3 -0
@@ -0,0 +1,3 @@ +inherit setuptools3 +require python-numpy.inc +
Signature · 1 line
2.7.4
PATCH 20/32 opencv: switch from python3 to python2 for now due to issues with 3.7
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend | 3 +++ 1 file changed, 3 insertions(+)
meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend +3 -0
@@ -24,6 +24,9 @@ PACKAGECONFIG_append = " ${PACKAGECONFIG_QTWAYLAND} \ ${@bb.utils.contains('MACHINE_FEATURES','dsp','opencl', '', d)} \ " +PACKAGECONFIG_remove = "python3" +PACKAGECONFIG_append = " python2" + inherit cmake_qt5 PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON -DCMAKE_CXX_FLAGS_RELEASE="${CMAKE_CXX_FLAGS_RELEASE} -DCV_TIOPENCL -DCV_TIOPENCL_ENABLE_PROGRAM_COUNT -DMAX_PROGRAM_HASH_SIZE=50" -DCMAKE_C_FLAGS_RELEASE="${CMAKE_C_FLAGS_RELEASE} -DCV_TIOPENCL -DCV_TIOPENCL_ENABLE_PROGRAM_COUNT -DMAX_PROGRAM_HASH_SIZE=50" -DWITH_OPENCLAMDFFT=OFF -DWITH_OPENCLAMDBLAS=OFF,-DWITH_OPENCL=OFF,cmem opencl,"
Signature · 1 line
2.7.4
PATCH 21/32 systemd: sysinit.target.wants no longer exists
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-core/systemd/systemd_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/recipes-core/systemd/systemd_%.bbappend +1 -1
@@ -33,7 +33,7 @@ do_install_append() { install -d ${D}${sysconfdir}/systemd/system/ install -m 0644 ${WORKDIR}/sync-clocks.service ${D}${sysconfdir}/systemd/system/ - ln -sf ../sync-clocks.service ${D}${sysconfdir}/systemd/system/sysinit.target.wants/sync-clocks.service + ln -sf ../sync-clocks.service ${D}${sysconfdir}/systemd/system/multi-user.target.wants/sync-clocks.service # Allow automount from udev install -m 0644 ${D}${systemd_system_unitdir}/systemd-udevd.service ${D}${sysconfdir}/systemd/system/
Signature · 1 line
2.7.4
PATCH 22/32 ltp-ddt: backport fixes for glibc >2.28
In reply to Denys Dmytriyenko--- ...re-time-check-for-getdents-getdents64-API.patch | 72 ++++++++++++++++++++++ ...name-getcpu-to-avoid-conflict-with-glibc-.patch | 57 +++++++++++++++++ ...-check-for-RES_USE_INET6-during-configure.patch | 68 ++++++++++++++++++++ .../recipes-devtools/ltp-ddt/ltp-ddt_20190305.bb | 3 + 4 files changed, 200 insertions(+) create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0001-Add-configure-time-check-for-getdents-getdents64-API.patch create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch create mode 100644 meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0002-check-for-RES_USE_INET6-during-configure.patch
meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0001-Add-configure-time-check-for-getdents-getdents64-API.patch new file +72 -0
@@ -0,0 +1,72 @@ +From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 26 Jul 2019 10:32:29 -0700 +Subject: [PATCH 1/2] Add configure time check for getdents/getdents64 APIs + +glibc 2.30 has added wrapper for getdents64 this will help in detecting +right condition to use fallback + +Check for getdents API as well while here + +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2019-July/012954.html] +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 2 ++ + testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,8 @@ AC_CHECK_HEADERS([ \ + AC_CHECK_FUNCS([ \ + profil \ + ustat \ ++ getdents \ ++ getdents64 \ + ]) + + # Tools knobs +--- a/testcases/kernel/syscalls/getdents/getdents.h ++++ b/testcases/kernel/syscalls/getdents/getdents.h +@@ -23,7 +23,7 @@ + #include <stdint.h> + #include "test.h" + #include "lapi/syscalls.h" +- ++#include "config.h" + /* + * See fs/compat.c struct compat_linux_dirent + */ +@@ -34,12 +34,17 @@ struct linux_dirent { + char d_name[]; + }; + ++#if HAVE_GETDENTS ++#include <unistd.h> ++#else + static inline int + getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size) + { + return ltp_syscall(__NR_getdents, fd, dirp, size); + } + ++#endif /* HAVE_GETDENTS */ ++ + struct linux_dirent64 { + uint64_t d_ino; + int64_t d_off; +@@ -48,10 +53,13 @@ struct linux_dirent64 { + char d_name[]; + }; + ++#if HAVE_GETDENTS64 ++#include <unistd.h> ++#else + static inline int + getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsigned int size) + { + return ltp_syscall(__NR_getdents64, fd, dirp64, size); + } +- ++#endif /* HAVE_GETDENTS64 */ + #endif /* GETDENTS_H */
meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch new file +57 -0
57 lines not on this page · raw message
meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt/0002-check-for-RES_USE_INET6-during-configure.patch new file +68 -0
68 lines not on this page · raw message
meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_20190305.bb +3 -0
@@ -43,7 +43,10 @@ SRCREV = "2a01542a86a76c925f70cf0090350ac2799d4edb" BRANCH ?= "master" SRC_URI = "git://arago-project.org/git/projects/test-automation/ltp-ddt.git;branch=${BRANCH} \ + file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \ + file://0002-check-for-RES_USE_INET6-during-configure.patch \ file://0003-Add-knob-to-control-tirpc-support.patch \ + file://0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.7.4
PATCH 23/32 point-cloud-viewer: binary-only package, skip file-rdeps QA checks
In reply to Denys Dmytriyenko--- .../recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +1 -1
@@ -31,4 +31,4 @@ FILES_${PN} += "\ ${datadir}/ti/pointclouds \ " -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP_${PN} = "already-stripped file-rdeps"
Signature · 1 line
2.7.4
PATCH 24/32 machine_features_check: class for checking MACHINE_FEATURES flags
In reply to Denys Dmytriyenko--- .../classes/machine_features_check.bbclass | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta-arago-distro/classes/machine_features_check.bbclass
meta-arago-distro/classes/machine_features_check.bbclass new file +31 -0
@@ -0,0 +1,31 @@ +# Allow checking of required and conflicting MACHINE_FEATURES +# +# ANY_OF_MACHINE_FEATURES: ensure at least one item on this list is included +# in MACHINE_FEATURES. +# REQUIRED_MACHINE_FEATURES: ensure every item on this list is included +# in MACHINE_FEATURES. +# CONFLICT_MACHINE_FEATURES: ensure no item in this list is included in +# MACHINE_FEATURES. +# Derived from OE-Core distro_features_check.bbclass + +python () { + # Assume at least one var is set. + machine_features = set((d.getVar('MACHINE_FEATURES') or '').split()) + + any_of_machine_features = set((d.getVar('ANY_OF_MACHINE_FEATURES') or '').split()) + if any_of_machine_features: + if set.isdisjoint(any_of_machine_features, machine_features): + raise bb.parse.SkipRecipe("one of '%s' needs to be in MACHINE_FEATURES" % ' '.join(any_of_machine_features)) + + required_machine_features = set((d.getVar('REQUIRED_MACHINE_FEATURES') or '').split()) + if required_machine_features: + missing = set.difference(required_machine_features, machine_features) + if missing: + raise bb.parse.SkipRecipe("missing required machine feature%s '%s' (not in MACHINE_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing))) + + conflict_machine_features = set((d.getVar('CONFLICT_MACHINE_FEATURES') or '').split()) + if conflict_machine_features: + conflicts = set.intersection(conflict_machine_features, machine_features) + if conflicts: + raise bb.parse.SkipRecipe("conflicting machine feature%s '%s' (in MACHINE_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts))) +}
Signature · 1 line
2.7.4
PATCH 25/32 opencv: require "dsp" machine feature
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
meta-arago-distro/recipes-support/opencv/opencv_%.bbappend new file +3 -0
@@ -0,0 +1,3 @@ +inherit machine_features_check + +REQUIRED_MACHINE_FEATURES = "dsp"
Signature · 1 line
2.7.4
Re: [EXTERNAL] [master][PATCH 25/32] opencv: require "dsp" machine feature
Is this necessary?
In the 3.1 bbappend we configure with opencl only if dsp is in the MACHINE_FEATURES. That way we can still use opencv even if the dsp is not a MACHINE_FEATURE.
Quoted 15 lines · Denys Dmytriyenko
Signed-off-by Denys Dmytriyenko <[email protected]>--- meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 3 +++ 1 file changed, 3 insertions(+)create mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
meta-arago-distro/recipes-support/opencv/opencv_%.bbappend new file +3
-0@@ -0,0 +1,3 @@ +inherit machine_features_check + +REQUIRED_MACHINE_FEATURES = "dsp"
Re: [EXTERNAL] [master][PATCH 25/32] opencv: require "dsp" machine feature
It may not be necessary, but I was not able to build the other opencv dependencies when opencl is not enabled. This could be a hack for now.
Quoted 22 lines · Jacob Stiffler
Is this necessary?
In the 3.1 bbappend we configure with opencl only if dsp is in the
MACHINE_FEATURES. That way we can still use opencv even if the dsp is not aMACHINE_FEATURE.Quoted 15 lines · Denys Dmytriyenko
Signed-off-by Denys Dmytriyenko <[email protected]>--- meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappendmeta-arago-distro/recipes-support/opencv/opencv_%.bbappend new file +3
-0@@ -0,0 +1,3 @@ +inherit machine_features_check + +REQUIRED_MACHINE_FEATURES = "dsp"
PATCH 26/32 barcode-roi, packagegroups, matrix: require "dsp" machine feature
In reply to Denys Dmytriyenko--- .../packagegroup-arago-tisdk-multimedia-sdk-host.bb | 12 +++++++----- .../packagegroup-arago-tisdk-multimedia-sdk-target.bb | 12 +++++++----- .../recipes-apps/barcode-demo/barcode-roi_git.bb | 4 ++++ .../matrix/matrix-gui-machinevision-demos_2.0.bb | 6 ++++-- 4 files changed, 22 insertions(+), 12 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb +7 -5
@@ -6,29 +6,31 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +BARCODE_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'barcode-roi-src', '', d)}" + MULTIMEDIA = "" MULTIMEDIA_append_ti43x = " \ dual-camera-demo-src \ image-gallery-src \ - barcode-roi-src \ + ${BARCODE_PKG} \ " -MULTIMEDIA_append_ti33x = " barcode-roi-src" +MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}" -MULTIMEDIA_append_am65xx = " barcode-roi-src" +MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}" MULTIMEDIA_append_omap-a15 = " \ dual-camera-demo-src \ image-gallery-src \ - barcode-roi-src \ + ${BARCODE_PKG} \ " MULTIMEDIA_append_dra7xx = " \ ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'qt-opencv-opencl-opengl-multithreaded-src', '', d)} \ " -MULTIMEDIA_append_keystone = " barcode-roi-src" +MULTIMEDIA_append_keystone = " ${BARCODE_PKG}" #Demo doesn't work on 3.14 # ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src image-gallery-src', d)}
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb +7 -5
@@ -6,6 +6,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +BARCODE_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'barcode-roi-dev', '', d)}" + MULTIMEDIA = "" MULTIMEDIA_append_dra7xx = " \
@@ -14,15 +16,15 @@ MULTIMEDIA_append_dra7xx = " \ ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ " -MULTIMEDIA_append_ti33x = " barcode-roi-dev" -MULTIMEDIA_append_ti43x = " barcode-roi-dev" -MULTIMEDIA_append_omap-a15 = " barcode-roi-dev" -MULTIMEDIA_append_am65xx = " barcode-roi-dev" +MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}" +MULTIMEDIA_append_ti43x = " ${BARCODE_PKG}" +MULTIMEDIA_append_omap-a15 = " ${BARCODE_PKG}" +MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}" MULTIMEDIA_append_keystone = " \ hevc-arm-decoder-dev \ hevc-arm-decoder-staticdev \ - barcode-roi-dev \ + ${BARCODE_PKG} \ " RDEPENDS_${PN} = "\
meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb +4 -0
@@ -2,6 +2,10 @@ DESCRIPTION = "Barcode demo to detect region of interest" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://detect_barcode.cpp;beginline=1;endline=25;md5=babab64d39715b3671dd16bcb4f4917b" +inherit machine_features_check + +REQUIRED_MACHINE_FEATURES = "dsp" + DEPENDS += "opencv" PV = "01.00.00"
meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb +4 -2
@@ -12,6 +12,8 @@ S = "${WORKDIR}/git/machinevision_apps" # Make sure machinevision submenu and app images has been installed MACHINEVISION_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-machinevision" +BARCODE_RDEPENDS = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'barcode-roi', '', d)}" + FILES_${PN} += "${MATRIX_BASE_DIR}/*" PACKAGES = "matrix-machinevision-demo-dlp3dscanner \
@@ -30,12 +32,12 @@ RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \ RDEPENDS_matrix-machinevision-demo-barcoderoi = " \ ${MACHINEVISION_RDEPENDS} \ - barcode-roi \ + ${BARCODE_RDEPENDS} \ " RDEPENDS_matrix-machinevision-demo-barcoderoi-f2f = " \ ${MACHINEVISION_RDEPENDS} \ - barcode-roi \ + ${BARCODE_RDEPENDS} \ " RDEPENDS_matrix-machinevision-demo-simplepeopletracking = " \
Signature · 1 line
2.7.4
PATCH 27/32 armnn, packagegroups: require "dsp" machine feature
In reply to Denys Dmytriyenko--- .../packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb | 2 +- .../recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb | 2 +- meta-arago-distro/recipes-support/armnn/armnn_%.bbappend | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 meta-arago-distro/recipes-support/armnn/armnn_%.bbappend
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +1 -1
@@ -153,7 +153,7 @@ EXTRA_LIBS_append_k2e = " libulm-staticdev \ gdbserver-c6x-dev \ " -ARMNN_PACKAGES = "armnn-dev" +ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn-dev', '', d)}" EXTRA_PACKAGES = "" EXTRA_PACKAGES_append_ti33x = " voxelsdk-dev \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +1 -1
@@ -148,7 +148,7 @@ EXTRA_PACKAGES_omapl138 = " \ protobuf \ " -ARMNN_PACKAGES = "armnn" +ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn', '', d)}" EXTRA_PACKAGES_append_ti33x = " voxelsdk \ arm-compute-library \
meta-arago-distro/recipes-support/armnn/armnn_%.bbappend new file +3 -0
@@ -0,0 +1,3 @@ +inherit machine_features_check + +REQUIRED_MACHINE_FEATURES = "dsp"
Signature · 1 line
2.7.4
PATCH 28/32 voxelsdk, packagegroups: require "dsp" machine feature
In reply to Denys Dmytriyenko--- meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend | 3 +++ .../packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb | 7 ++++--- .../recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb | 7 ++++--- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend
meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend new file +3 -0
@@ -0,0 +1,3 @@ +inherit machine_features_check + +REQUIRED_MACHINE_FEATURES = "dsp"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +4 -3
@@ -154,19 +154,20 @@ EXTRA_LIBS_append_k2e = " libulm-staticdev \ " ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn-dev', '', d)}" +VOXEL_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'voxelsdk-dev', '', d)}" EXTRA_PACKAGES = "" -EXTRA_PACKAGES_append_ti33x = " voxelsdk-dev \ +EXTRA_PACKAGES_append_ti33x = " ${VOXEL_PACKAGES} \ arm-compute-library-dev \ ${ARMNN_PACKAGES} \ pdm-anomaly-detection-dev \ " -EXTRA_PACKAGES_append_ti43x = " voxelsdk-dev \ +EXTRA_PACKAGES_append_ti43x = " ${VOXEL_PACKAGES} \ arm-compute-library-dev \ ${ARMNN_PACKAGES} \ pdm-anomaly-detection-dev \ " -EXTRA_PACKAGES_append_omap-a15 = " voxelsdk-dev \ +EXTRA_PACKAGES_append_omap-a15 = " ${VOXEL_PACKAGES} \ arm-compute-library-dev \ ${ARMNN_PACKAGES} \ pdm-anomaly-detection-dev \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +4 -3
@@ -149,20 +149,21 @@ EXTRA_PACKAGES_omapl138 = " \ " ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn', '', d)}" +VOXEL_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'voxelsdk', '', d)}" -EXTRA_PACKAGES_append_ti33x = " voxelsdk \ +EXTRA_PACKAGES_append_ti33x = " ${VOXEL_PACKAGES} \ arm-compute-library \ ${ARMNN_PACKAGES} \ pdm-anomaly-detection \ " -EXTRA_PACKAGES_append_ti43x = " voxelsdk \ +EXTRA_PACKAGES_append_ti43x = " ${VOXEL_PACKAGES} \ arm-compute-library \ ${ARMNN_PACKAGES} \ pdm-anomaly-detection \ " -EXTRA_PACKAGES_append_omap-a15 = " voxelsdk \ +EXTRA_PACKAGES_append_omap-a15 = " ${VOXEL_PACKAGES} \ big-data-ipc-demo-linux \ big-data-ipc-demo-linux-firmware \ arm-compute-library \
Signature · 1 line
2.7.4
PATCH 29/32 branding-core: temp disable "dsp" and "mmip" machine features due to breakage
In reply to Denys Dmytriyenko--- meta-arago-distro/conf/distro/include/branding-core.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta-arago-distro/conf/distro/include/branding-core.inc +4 -0
@@ -11,3 +11,7 @@ ALTERNATIVE_PRIORITY_pn-opencl-monitor-ipu = "1" # Raise priority for sample IPC FW images ALTERNATIVE_PRIORITY_pn-ti-ipc-rtos = "15" + +# Temporarily disable "dsp" and "mmip" machine features for all SOCs +MACHINE_FEATURES := "${@d.getVar('MACHINE_FEATURES', True).replace('dsp', '')}" +MACHINE_FEATURES := "${@d.getVar('MACHINE_FEATURES', True).replace('mmip', '')}"
Signature · 1 line
2.7.4
PATCH 30/32 packagegroup-*-graphics: disable wayland-ivi-extension
In reply to Denys Dmytriyenko--- .../recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +1 -1
@@ -6,11 +6,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +# wayland-ivi-extension GRAPHICS_WAYLAND = "\ weston \ weston-init \ weston-examples \ - wayland-ivi-extension \ " GRAPHICS_WAYLAND_append_omap-a15 = "\
Signature · 1 line
2.7.4
PATCH 31/32 packagegroup-*-graphics: disable chromium-wayland
In reply to Denys Dmytriyenko--- .../packagegroups/packagegroup-arago-tisdk-graphics.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +6 -6
@@ -13,13 +13,13 @@ GRAPHICS_WAYLAND = "\ weston-examples \ " -GRAPHICS_WAYLAND_append_omap-a15 = "\ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \ -" +#GRAPHICS_WAYLAND_append_omap-a15 = "\ +# ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \ +#" -GRAPHICS_WAYLAND_append_k3 = "\ - ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \ -" +#GRAPHICS_WAYLAND_append_k3 = "\ +# ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \ +#" GRAPHICS_RDEPENDS = "\ ${PREFERRED_PROVIDER_virtual/libgbm} \
Signature · 1 line
2.7.4
PATCH 32/32 packagegroup-*-qte: qtwebkit-examples no longer exists
In reply to Denys Dmytriyenko--- .../recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb | 3 --- 1 file changed, 3 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +0 -3
@@ -22,13 +22,10 @@ QT5_DEMOS = "\ qtscript-examples \ qtsvg-examples \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \ - qtwebkit-examples-examples \ qtserialport-examples \ qtcharts-examples \ " -#QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" -# #QT5_DEMOS_remove_k3 = "\ # qtwebbrowser \ # qtwebbrowser-examples \
Signature · 1 line
2.7.4