Skip to contentSkip to conversation

fsverity: update to 1.3

PATCH New Luca Bocassi 1 participant 2 messages Jan 20, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 fsverity: update to 1.3

From: Luca Boccassi <[email protected]>

---
 .../{fsverity-utils_1.2.bb => fsverity-utils_1.3.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-crypto/fsverity-utils/{fsverity-utils_1.2.bb => fsverity-utils_1.3.bb} (94%)
meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb renamed from meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb +1 -1
similarity index 94%
rename from meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.2.bb
rename to meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb
index 4d5dbafb3..72b742fec 100644
@@ -9,7 +9,7 @@ SECTION = "console"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220"
 
-SRCREV = "406187bb3a885e083b448b2c2aa42c22957ae629"
+SRCREV = "a92b1a54b003879322c044adf0ae3ea3e95e7348"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/2 fsverity: fix MinGW build

From: Luca Boccassi <[email protected]>

Upstream supports building a binary with MinGW but not a shared library, so remove the configure option for MinGW targets.

---
 meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb +4 -1
index 72b742fec..9b1ba4f2e 100644
@@ -16,7 +16,10 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "openssl"
 
-EXTRA_OEMAKE += "PREFIX=${prefix} USE_SHARED_LIB=1"
+EXTRA_OEMAKE_append = "PREFIX=${prefix} USE_SHARED_LIB=1"
+# We want to statically link the binary to libfsverity on native Windows
+EXTRA_OEMAKE_remove_mingw32_class-nativesdk = "USE_SHARED_LIB=1"
+EXTRA_OEMAKE_remove_mingw32_class-native = "USE_SHARED_LIB=1"
 
 do_install() {
         oe_runmake install DESTDIR=${D}
Signature · 1 line
2.29.2