diff --git a/recipes/core/busybox.yaml b/recipes/core/busybox.yaml index 46d1d4b1..4b0c916f 100644 --- a/recipes/core/busybox.yaml +++ b/recipes/core/busybox.yaml @@ -62,7 +62,7 @@ buildScript: | popd #build if [[ -f build/busybox_unstripped ]] ; then - mkdir install/bin/.debug + mkdir -p install/bin/.debug cp build/busybox_unstripped install/bin/.debug/busybox ${CROSS_COMPILE}objcopy --add-gnu-debuglink=install/bin/.debug/busybox install/bin/busybox fi diff --git a/recipes/libs/double-conversion.yaml b/recipes/libs/double-conversion.yaml index 956aaae3..da2b2cff 100644 --- a/recipes/libs/double-conversion.yaml +++ b/recipes/libs/double-conversion.yaml @@ -1,4 +1,4 @@ -inherit: [cmake] +inherit: ['cmake-3'] metaEnvironment: PKG_VERSION: "3.3.0" diff --git a/recipes/libs/jsonc.yaml b/recipes/libs/jsonc.yaml index b255a0db..78d635b2 100644 --- a/recipes/libs/jsonc.yaml +++ b/recipes/libs/jsonc.yaml @@ -1,4 +1,4 @@ -inherit: [cmake] +inherit: ['cmake-3'] metaEnvironment: PKG_DESCRIPTION: "A JSON implementation in C" diff --git a/recipes/libs/yajl.yaml b/recipes/libs/yajl.yaml index 58d00cb7..4e55869a 100644 --- a/recipes/libs/yajl.yaml +++ b/recipes/libs/yajl.yaml @@ -1,4 +1,4 @@ -inherit: [cmake] +inherit: ['cmake-3'] metaEnvironment: PKG_VERSION: "2.1.0" diff --git a/recipes/utils/efitools.yaml b/recipes/utils/efitools.yaml index da05ee6f..bd1b1369 100644 --- a/recipes/utils/efitools.yaml +++ b/recipes/utils/efitools.yaml @@ -16,7 +16,7 @@ depends: depends: - use: [tools] depends: - - libs::openssl + - libs::openssl-tool - utils::sbsigntools - name: utils::xxd diff --git a/recipes/utils/strace.yaml b/recipes/utils/strace.yaml index 0e32c673..a21d3427 100644 --- a/recipes/utils/strace.yaml +++ b/recipes/utils/strace.yaml @@ -1,13 +1,13 @@ inherit: [autotools] metaEnvironment: - PKG_VERSION: "6.10" + PKG_VERSION: "6.18" PKG_LICENSE: "LGPL-2.1-or-later" checkoutSCM: scm: url url: https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz - digestSHA256: 765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07 + digestSHA256: 0ad5dcba973a69e779650ef1cb335b12ee60716fc7326609895bd33e6d2a7325 stripComponents: 1 buildTools: [host-toolchain] diff --git a/recipes/utils/tidy.yaml b/recipes/utils/tidy.yaml index 580ee558..ad28971a 100644 --- a/recipes/utils/tidy.yaml +++ b/recipes/utils/tidy.yaml @@ -1,4 +1,4 @@ -inherit: [cmake] +inherit: ['cmake-3'] metaEnvironment: PKG_VERSION: "5.8.0" diff --git a/tests/buildall/recipes/all.yaml b/tests/buildall/recipes/all.yaml index 69924601..68203b48 100644 --- a/tests/buildall/recipes/all.yaml +++ b/tests/buildall/recipes/all.yaml @@ -70,6 +70,12 @@ depends: - libs::mtdev-tgt - libs::nettle-tgt - libs::npth-tgt + - libs::openssl + - name: libs::openssl + environment: + OPENSSL_no_sse2: "1" + alias: libs::openssl-no-sse2 + use: [result] # don't use the deps as they are causing incompatible variants... - libs::pango-tgt - libs::pcre2-tgt - libs::pixman-tgt