From 74d89ba0fc1186d03d87b8ca7f5470c5a7854d91 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 25 Jun 2025 22:50:03 -0400 Subject: [PATCH] upx: adjust to UNPACKDIR and bump version We fix upx to work with the oe-core changes, and bump the version to fix compatibility issues with other updates in oe-core master. Signed-off-by: Bruce Ashfield --- recipes-extended/upx/upx_git.bb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/recipes-extended/upx/upx_git.bb b/recipes-extended/upx/upx_git.bb index dde1bf9f..79cf17a9 100644 --- a/recipes-extended/upx/upx_git.bb +++ b/recipes-extended/upx/upx_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=353753597aa110e0ded3508408c6374a" # Note: DO NOT use released tarball in favor of the git repository with submodules. # it makes maintenance easier for CVEs or other issues. -SRCREV_upx = "44e4bd0b5454ff8aee1ff3376974dfe6014300d9" -PV = "4.2.4+git${SRCPV}" +SRCREV_upx = "ca97430db28bf264f4007118555c10f63be2a9c8" +PV = "5.0.1+git${SRCPV}" # SRCREVs are from: # git submodule status | awk '{ commit_hash = $1; sub(/vendor\//, "", $2); gsub("-", "_", $2); printf "SRCREV_vendor_%s = \"%s\"\n", $2, commit_hash }' @@ -26,15 +26,13 @@ SRCREV_vendor_zlib = "0a41a7d0a974d0b43afe4afe4b8025c8f144474e" # SRC_URI = "gitsm://github.com/upx/upx;protocol=https;;name=upx;branch=devel" SRCREV_FORMAT = "upx" SRC_URI = "git://github.com/upx/upx;name=upx;branch=devel;protocol=https \ - git://github.com/upx/upx-vendor-doctest;name=vendor_doctest;subdir=git/vendor/doctest;branch=upx-vendor;protocol=https \ - git://github.com/upx/upx-vendor-lzma-sdk;name=vendor_lzma_sdk;subdir=git/vendor/lzma-sdk;branch=upx-vendor;protocol=https \ - git://github.com/upx/upx-vendor-ucl;name=vendor_ucl;subdir=git/vendor/ucl;branch=upx-vendor;protocol=https \ - git://github.com/upx/upx-vendor-zlib;name=vendor_zlib;subdir=git/vendor/zlib;branch=upx-vendor;protocol=https \ - git://github.com/upx/upx-vendor-valgrind;name=vendor_valgrind;subdir=git/vendor/valgrind;branch=upx-vendor;protocol=https \ + git://github.com/upx/upx-vendor-doctest;name=vendor_doctest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/vendor/doctest;branch=upx-vendor;protocol=https \ + git://github.com/upx/upx-vendor-lzma-sdk;name=vendor_lzma_sdk;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/vendor/lzma-sdk;branch=upx-vendor;protocol=https \ + git://github.com/upx/upx-vendor-ucl;name=vendor_ucl;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/vendor/ucl;branch=upx-vendor;protocol=https \ + git://github.com/upx/upx-vendor-zlib;name=vendor_zlib;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/vendor/zlib;branch=upx-vendor;protocol=https \ + git://github.com/upx/upx-vendor-valgrind;name=vendor_valgrind;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/vendor/valgrind;branch=upx-vendor;protocol=https \ " -S = "${WORKDIR}/git" - inherit pkgconfig cmake BBCLASSEXTEND = "native"