From patchwork Tue Jul 30 10:24:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 47026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A7D2C3DA61 for ; Tue, 30 Jul 2024 10:25:29 +0000 (UTC) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by mx.groups.io with SMTP id smtpd.web10.14481.1722335120832087798 for ; Tue, 30 Jul 2024 03:25:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=kpzqnF//; spf=pass (domain: linaro.org, ip: 209.85.208.172, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2f149845fbaso3537331fa.3 for ; Tue, 30 Jul 2024 03:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722335119; x=1722939919; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WFF7A4QAOz5iQPx2n4jlT82zAlUAFLUarqvArz7D4RQ=; b=kpzqnF//PDJ7xhh6OknalVMNUvuGb61vvvadj4SzcqqBA1uGJPOHp2NdJGGLKpW0Ut PO6f/Y6GyAEIUVC2Tca5hI/zabDtxqDpcI6mV0jDTx2wMlMFViTs4u8Z7iAugGNBGMnb Doxc0d0o9jEsA0RKwmNBJAT6Yb+Mz5RPd6XyJ0QF5On7zKTJ89cEa9YNTNNO+U+tYKtP dHoy9Iayw1fzoG8Fb1BbM6jeLKN7/V2xbpGFI2QED0mEgTtQy1bSwCVOiuzgBPTq2mpU cB1rl2n2LM2riCvRR6rt1PIy6nofuIf1nvQGSVu3T2ioXke3nR3XS9hNRtd5YGC3fTXL X05g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722335119; x=1722939919; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WFF7A4QAOz5iQPx2n4jlT82zAlUAFLUarqvArz7D4RQ=; b=K0u6kjBIhTxsVi5AyIpTxFilOm42GEuv34XqOKFYaruVT6OE4IuwcZqgo8i8nXG3r7 D8tagfS9w+Jm7Bqpxn53bIUQQhOU4C1XB2eTWi3IwONlMLCGQOuwiV8+rLrzA4E91Uc3 P5jigDk98EbeTdC1tSUs+BloRLo/NWwgYtf7kx0jQ1zkmYkoFQS35K/75vI/oeoO4H16 x/sDNhsHAFK0pBZhGpozrxGJSPuwNoUY5DjeVZpVhQjJqaPCs5iGbS1AT8uPY4GzK/Br l8kHlYN58Cqg4Q+fSzKQpa/oVZKY7qn0M+p953QDLaKemRLkCqlJUxLqfO3iRUT1+G8M U0Vw== X-Gm-Message-State: AOJu0Yw7GnukjF0iTvdjUNSqLVSzUI+IgQNZ5Grm3eYaMxk2WDX/vGc7 KFCuA9aeiHKc61E0q+lIGH6++9GTb3abk2SIern8DDGX2ZYyhHpsZOsKXS4JmHWFI6wL+/EvjqQ C X-Google-Smtp-Source: AGHT+IFZNeyjgPYQfzZ7JLvICssDJO6pJ+QA0VaJFQLOGQgKpV/E6IWEZ4heOxfn4XZkciWNsFszUw== X-Received: by 2002:a05:6512:3e0e:b0:52c:c9bb:2ba4 with SMTP id 2adb3069b0e04-5309b2b6e87mr8432830e87.46.1722335118605; Tue, 30 Jul 2024 03:25:18 -0700 (PDT) Received: from localhost.localdomain (87-100-245-199.bb.dnainternet.fi. [87.100.245.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd5bc4a46sm1861969e87.17.2024.07.30.03.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 03:25:18 -0700 (PDT) From: Mikko Rapeli To: meta-arm@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH v2 1/4] optee-os: asm debug prefix fixes Date: Tue, 30 Jul 2024 13:24:56 +0300 Message-ID: <20240730102459.148826-1-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 30 Jul 2024 10:25:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5928 The .S files compiled by optee-os were including absolute path of the recipe git tree. Fix this by applying CFLAGS with correct debug prefix maps to AFLAGS used by optee makefiles. Fixes optee-os and optee-os-tadevkit buildpaths QA errors. Signed-off-by: Mikko Rapeli --- meta-arm/recipes-security/optee/optee-os.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index e9f252e3..d5a12642 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -24,6 +24,7 @@ EXTRA_OEMAKE += " \ CFG_${OPTEE_CORE}_core=y \ CROSS_COMPILE_core=${HOST_PREFIX} \ CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \ + AFLAGS="${CFLAGS}" \ ta-targets=ta_${OPTEE_ARCH} \ O=${B} \ " From patchwork Tue Jul 30 10:24:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 47027 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AFB2C52CDC for ; Tue, 30 Jul 2024 10:25:29 +0000 (UTC) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mx.groups.io with SMTP id smtpd.web11.14643.1722335123397162505 for ; Tue, 30 Jul 2024 03:25:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=wowhFMGC; spf=pass (domain: linaro.org, ip: 209.85.167.48, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52efa9500e0so5353297e87.3 for ; Tue, 30 Jul 2024 03:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722335121; x=1722939921; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KSOE2MsV/c0fwuFEGs9OB1elEGnFWRjfRaXYzMiqzq4=; b=wowhFMGCpjM+t/rg1QixYrHTdngFXUWXG/NADgA07M1HXFjhtwzGCOvk49SOI8kQOI bu5DzLufHinvjCxh559x5IIxXWlPeZv00hMW/gVJ837Kq87O/rItL9dWaVHMQ/nCQcD1 SaycvYUP1nf4uDp1vMd447UTPweilhMzuijLZEwNNgpF18ozHPNpC8+b9U4lwomiDDjl EZSUKZDcjkNYETeQGvJaOuHvZjzC7AxUjqcBItYmJIAcLVw0YRsSH/kD4jaAk6EXUmBH dyrFabtsyEKsrObWRVFcrw+0U+aTEq/T3T351i8XkjTRMOA0nQLPuXTl/TtQQLuMhlCq BCEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722335121; x=1722939921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KSOE2MsV/c0fwuFEGs9OB1elEGnFWRjfRaXYzMiqzq4=; b=tWn+kfBTi91qs+b8QTKclt2qWg3QYaE6sB/QOp1pGeK/nTnnPhMO79uYSIcYEA9iP6 NZCxvVUDTXuv9yREVFZKtIdVzRHnbyv2yEyPU0RamH9ZFIvlqRsYB8inFYITjroOg1fb 9zO4OADr95fGGedSdiB2KvcQu3wov/FAVH7Hb9sErtTBYLI+vxHFzT7vPRPWBrWvqMHZ KpHNqOWjRyqfGm+QWMC9QcfQP13SBAv/Z7TBFaIJz619YJfQ3Bu7yPV3z4b1Gt3LAWHn aKyG5Dp/1OZAbfvsyXLuuSh3SQTSN/HmhIJapGxHoBFEYFIUCpEgSmPbfrBsRdZbMO3b 29Qg== X-Gm-Message-State: AOJu0Yz7FJsoMra1izpy858vJt8FNg0C4A0g84/lhfB4uIJzJIWlLYqX 3EHhr8NcvDtJG+bM1fqCK7xEZuFptciT0epFlc2wWgZJu1aePElmDZVyK2HdrZNbxW1yqp6JNdB P X-Google-Smtp-Source: AGHT+IEIlCsoNKrx/dJWdhRnPKXUNxDNrIc3DQPXP13D8Dls7/JDknPQ6mS6zaoM7anYvNWfUQpuYw== X-Received: by 2002:a05:6512:3e15:b0:52c:e28f:4da6 with SMTP id 2adb3069b0e04-5309b2c54fbmr8213269e87.51.1722335121487; Tue, 30 Jul 2024 03:25:21 -0700 (PDT) Received: from localhost.localdomain (87-100-245-199.bb.dnainternet.fi. [87.100.245.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd5bc4a46sm1861969e87.17.2024.07.30.03.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 03:25:20 -0700 (PDT) From: Mikko Rapeli To: meta-arm@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH v2 2/4] optee-os: remove absolute paths Date: Tue, 30 Jul 2024 13:24:57 +0300 Message-ID: <20240730102459.148826-2-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730102459.148826-1-mikko.rapeli@linaro.org> References: <20240730102459.148826-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 30 Jul 2024 10:25:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5929 Change optee-os build scripts to not use absolute build time paths in generated header files and scripts. Two patches are backports from master/4.3. Signed-off-by: Mikko Rapeli --- ...not-use-full-path-to-generate-guard-.patch | 45 ++++++++++++++++ ....mk-remove-absolute-build-time-paths.patch | 53 +++++++++++++++++++ .../recipes-security/optee/optee-os_4.2.0.bb | 4 +- 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-security/optee/optee-os/0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch create mode 100644 meta-arm/recipes-security/optee/optee-os/0001-mk-compile.mk-remove-absolute-build-time-paths.patch diff --git a/meta-arm/recipes-security/optee/optee-os/0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch b/meta-arm/recipes-security/optee/optee-os/0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch new file mode 100644 index 00000000..29719b45 --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-os/0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch @@ -0,0 +1,45 @@ +From c8a2a6529dc3ff609281ef4fe5c5bc949c805b5c Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Thu, 6 Jun 2024 11:42:46 +0200 +Subject: [PATCH] checkconf.mk: do not use full path to generate guard symbol + in conf.h + +The combination of building with -g3 (which emits definitions of all +defined preprocessor macros to the debug info) and using a full path +to define the name of this preprocessor guard means that the output is +not binary reproducible across different build hosts. For example, in +my Yocto build, the string + + __home_ravi_yocto_tmp_glibc_work_stm32mp135fdk_oe_linux_gnueabi_optee_os_stm32mp_3_19_0_stm32mp_r1_1_build_stm32mp135f_dk_include_generated_conf_h_ + +appears in several build artifacts. Another developer or buildbot +would not build in some /home/ravi/... directory. + +In order to increase binary reproducibility, only use the path sans +the $(out-dir)/ prefix of the conf.h file. + +Reviewed-by: Jens Wiklander +Signed-off-by: Rasmus Villemoes +--- + mk/checkconf.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Upstream-Status: Backport [c8a2a6529dc3ff609281ef4fe5c5bc949c805b5c] + +diff --git a/mk/checkconf.mk b/mk/checkconf.mk +index 449b1c2b8..bb08d6b15 100644 +--- a/mk/checkconf.mk ++++ b/mk/checkconf.mk +@@ -17,7 +17,8 @@ define check-conf-h + cnf='$(strip $(foreach var, \ + $(call cfg-vars-by-prefix,$1), \ + $(call cfg-make-define,$(var))))'; \ +- guard="_`echo $@ | tr -- -/.+ _`_"; \ ++ guardpath="$(patsubst $(out-dir)/%,%,$@)" \ ++ guard="_`echo "$${guardpath}" | tr -- -/.+ _`_"; \ + mkdir -p $(dir $@); \ + echo "#ifndef $${guard}" >$@.tmp; \ + echo "#define $${guard}" >>$@.tmp; \ +-- +2.34.1 + diff --git a/meta-arm/recipes-security/optee/optee-os/0001-mk-compile.mk-remove-absolute-build-time-paths.patch b/meta-arm/recipes-security/optee/optee-os/0001-mk-compile.mk-remove-absolute-build-time-paths.patch new file mode 100644 index 00000000..63fb63a2 --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-os/0001-mk-compile.mk-remove-absolute-build-time-paths.patch @@ -0,0 +1,53 @@ +From 29b84ae5b277b85cd7244acde077694e6643fcde Mon Sep 17 00:00:00 2001 +From: Mikko Rapeli +Date: Thu, 18 Jul 2024 07:54:18 +0000 +Subject: [PATCH] mk/compile.mk: remove absolute build time paths + +Some generated files get a __FILE_ID__ which include absolute +build time paths. Remove the paths and use plain file name. +Fixes yocto QA check. + +Problem/bug: + +$ strings ../image/lib/firmware/tee.elf | grep mikko +__FILE_ID__ +_home_mikko_build_core_ta_pub_key_c +__FILE_ID__ +_home_mikko_build_core_ldelf_hex_c +__FILE_ID__ +_home_mikko_build_core_early_ta_fd02c9da_306c_48c7_a49c_bbd827ae86ee_c + +With this patch: + +$ strings ../image/lib/firmware/tee.elf | grep mikko +$ strings ../image/lib/firmware/tee.elf | grep FILE_ID | egrep \ +"core_ta_pub_key_c|core_ldelf_hex_c|core_early_ta_fd02c9da_306c_4" +__FILE_ID__ core_ta_pub_key_c +__FILE_ID__ core_ldelf_hex_c +__FILE_ID__ core_early_ta_fd02c9da_306c_48c7_a49c_bbd827ae86ee_c + +Reviewed-by: Jens Wiklander +Acked-by: Jerome Forissier +Signed-off-by: Mikko Rapeli +--- + mk/compile.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-Status: Backport + +diff --git a/mk/compile.mk b/mk/compile.mk +index b3d807ba4..338535bf3 100644 +--- a/mk/compile.mk ++++ b/mk/compile.mk +@@ -120,7 +120,7 @@ comp-cppflags-$2 = $$(filter-out $$(CPPFLAGS_REMOVE) $$(cppflags-remove) \ + $$(addprefix -I,$$(incdirs-$2)) \ + $$(cppflags$$(comp-sm-$2)) \ + $$(cppflags-lib$$(comp-lib-$2)) $$(cppflags-$2)) \ +- -D__FILE_ID__=$$(subst -,_,$$(subst /,_,$$(subst .,_,$1))) ++ -D__FILE_ID__=$$(subst -,_,$$(subst /,_,$$(subst .,_,$$(patsubst $$(out-dir)/%,%,$1)))) + + comp-flags-$2 += -MD -MF $$(comp-dep-$2) -MT $$@ + comp-flags-$2 += $$(comp-cppflags-$2) +-- +2.34.1 + diff --git a/meta-arm/recipes-security/optee/optee-os_4.2.0.bb b/meta-arm/recipes-security/optee/optee-os_4.2.0.bb index 8ae219f4..cee024af 100644 --- a/meta-arm/recipes-security/optee/optee-os_4.2.0.bb +++ b/meta-arm/recipes-security/optee/optee-os_4.2.0.bb @@ -7,4 +7,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRCREV = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea" SRC_URI += " \ file://0003-optee-enable-clang-support.patch \ - " + file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \ + file://0001-mk-compile.mk-remove-absolute-build-time-paths.patch \ +" From patchwork Tue Jul 30 10:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 47028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E4DAC49EA1 for ; Tue, 30 Jul 2024 10:25:29 +0000 (UTC) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mx.groups.io with SMTP id smtpd.web11.14644.1722335125187628913 for ; Tue, 30 Jul 2024 03:25:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=MBPKl/Xv; spf=pass (domain: linaro.org, ip: 209.85.167.48, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52f04b3cb33so9874307e87.0 for ; Tue, 30 Jul 2024 03:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722335123; x=1722939923; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/shhQlkqxlG8mLSsWEdxp0crruvg58Rnl10L3e4o4h8=; b=MBPKl/XvC2IiaJTju8FMetSHWeiKHglwad4Bq9MLB2B74x8TJLKJRtgzAWSpikWhMU EVQKvFtGgX7xOSQU6IOoyQcu6goEhBlepIWGpQ34AICj6IM1RcDrlXZzBW8UTl0tQ3VR Nf32a4ecpvdaPgdq/1qY71owRCaPspeosuoHR/vQDpxOkOLq0VqesM1Ly9KwePAxZP5+ DkRNwfTqPtxjB2G8ynmI7skBORUCd97+b9mFFHKJ/CjhRrt7GRsM1FpCA7qmkvYs253+ 8oyWZYlNMqWIxI5c+yvgqSMR4Qd1U93/7kPLZi+m37Gog+S9vTTwFmf3gNQEyFcF6aGm +8bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722335123; x=1722939923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/shhQlkqxlG8mLSsWEdxp0crruvg58Rnl10L3e4o4h8=; b=oMIVDedcaEzLwM3bXqUGJj9x8U/arr4OKMbVii0l4EOIyn8PSlwhYBS9FCIbP0dA5/ oa3vsNBRL5INc1YrMZZOhASakWhcymK2hlfILXzVQVX3YPJXxu4hNVx9ooz/8NPbqCy1 +ssWL2vZi0bFo/dw2km2EFS0lSz9EbJIuGs9PN4Sal7b56w7q0qjRni/QQCCgosuNJU+ C73w60ZwywjPEL2sPnv38iTEvmabWs3c0SHtY3mdMUcZIOBvWDDXjOKRpl3LtGrlKo6h SYMkxyv+aKBMoXtA/dFRZqSnfbbVf6J5JgbWZ6T4189FWq/yp1vuP+MpK5ljWOnZkIQs /2tA== X-Gm-Message-State: AOJu0YwzG2melny1fIpUbbUqAbPG5YD0EugHlo/uxnjojy3fWdndrw24 Tlbz2/is80mLY47iIEYS4r8B4mFcJ38bJ51TGFnpVxWK3HxsQu3ZChOyoaAFggQTkvYFfLNl/Sf g X-Google-Smtp-Source: AGHT+IEAny64e0b3pZnjlQMbzIHSsVa3XfpY3C4HbM2fq2GxiPdap/yENUwG0LLhgiu5n9cmosKKhw== X-Received: by 2002:a05:6512:1296:b0:52e:933f:f1fa with SMTP id 2adb3069b0e04-5309b2e0b62mr9216514e87.61.1722335123150; Tue, 30 Jul 2024 03:25:23 -0700 (PDT) Received: from localhost.localdomain (87-100-245-199.bb.dnainternet.fi. [87.100.245.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd5bc4a46sm1861969e87.17.2024.07.30.03.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 03:25:22 -0700 (PDT) From: Mikko Rapeli To: meta-arm@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH v2 3/4] optee-os-tadevkit: remove buildpaths INSANE_SKIP Date: Tue, 30 Jul 2024 13:24:58 +0300 Message-ID: <20240730102459.148826-3-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730102459.148826-1-mikko.rapeli@linaro.org> References: <20240730102459.148826-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 30 Jul 2024 10:25:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5930 Embedded build paths are now removed and test passes. Signed-off-by: Mikko Rapeli --- meta-arm/recipes-security/optee/optee-os-tadevkit_4.2.0.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.2.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.2.0.bb index 961d5251..2e43254a 100644 --- a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.2.0.bb +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.2.0.bb @@ -20,9 +20,6 @@ do_deploy() { FILES:${PN} = "${includedir}/optee/" -# Build paths are currently embedded -INSANE_SKIP:${PN}-dev += "buildpaths" - # Include extra headers needed by SPMC tests to TA DEVKIT. # Supported after op-tee v3.20 EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \ From patchwork Tue Jul 30 10:24:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Rapeli X-Patchwork-Id: 47025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B7E2C3DA7F for ; Tue, 30 Jul 2024 10:25:29 +0000 (UTC) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web10.14483.1722335126785123205 for ; Tue, 30 Jul 2024 03:25:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Ot+G03NC; spf=pass (domain: linaro.org, ip: 209.85.167.43, mailfrom: mikko.rapeli@linaro.org) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-52efbb55d24so6595792e87.1 for ; Tue, 30 Jul 2024 03:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722335125; x=1722939925; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hXuA7SxtFxgdzU0ho9XMm94Pn1rL+xqGX3FVBsNq3Ao=; b=Ot+G03NC5BcisiXTF0K6P3QP0iyg8sJw1BR8wqk9ZsEJSclZyA5tTazgAU9wfQpr2C /2en8P0nL2FyIMKgH+x7ugwsiq58y2qbxmedMwWteMqNaiVk6qI27Xu3A4hxPcEv1x96 /tnsq8NsqSoST8CRaHYaviYeWwoRfH/2zSHeNnS0w+4IlP7sMjPVS/6+YsTol5NUl3vF WjIRKzCwnQD7WfTZQsEYksDfMWuWQul3UmVhNmPapmB3IG0zROSCS1kEZhDM4xjIE7nH lcQ9P3nhtErBi/NWyVoQJ1Zkq054MgQ5wK4pL/WPXKnByeQ+utvAlQRLn25hi81PMD/I AuJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722335125; x=1722939925; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hXuA7SxtFxgdzU0ho9XMm94Pn1rL+xqGX3FVBsNq3Ao=; b=j/NKMj22O2M8JYOV3igMwJ5DtuNkPIvNYt3WjlAEN2WGe8ccJbg1X6MijEFfnugBve mDaP5DykFx3cmaWPnKlvozmRsbKp3ibK+fPX07Eggl6udEfxbcPMyJNcaFeJhip3I5yU +NBEn5RNXhS6ieGiQKSKoPop9E12T1VXzw5WQPo8onqeo67iHUN5ympubIzMwr/wKOrs Imef8+EdSN+n54DwuHKMIuR626PvCvEx+CKGcJFLrFnKo7KdRz7qg/pBHl39gOonfRpu NWgQaKptEtSLHF6XW4ML/vDamhyQCtIsOb4A55yinyjNh5yrX6/80sQWm16JSDPuxB3w MQgQ== X-Gm-Message-State: AOJu0YzXi4BYWcsdCEql2CrDd37JOe7gz9eCpq+0KeWEDCGzKJ1/W9pF affQ7my7O3K5j2+9namFDnd65u3h0X68ei03AZ/0Z4ISrPUbzBbKmJupYWka3C85+Dh8sLiOTlZ W X-Google-Smtp-Source: AGHT+IF87fSFJebKkuTwdbd3idpKlAL2zNptGnq05wBP64WYU7L+BrEaN++V2lAHBGaZdDpbUNn5Vg== X-Received: by 2002:a19:5f44:0:b0:52e:7df0:9a78 with SMTP id 2adb3069b0e04-5309b29c9a5mr8231294e87.32.1722335124817; Tue, 30 Jul 2024 03:25:24 -0700 (PDT) Received: from localhost.localdomain (87-100-245-199.bb.dnainternet.fi. [87.100.245.199]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd5bc4a46sm1861969e87.17.2024.07.30.03.25.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jul 2024 03:25:24 -0700 (PDT) From: Mikko Rapeli To: meta-arm@lists.yoctoproject.org Cc: Mikko Rapeli Subject: [PATCH v2 4/4] optee-os: remove buildpaths INSANE_SKIP Date: Tue, 30 Jul 2024 13:24:59 +0300 Message-ID: <20240730102459.148826-4-mikko.rapeli@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730102459.148826-1-mikko.rapeli@linaro.org> References: <20240730102459.148826-1-mikko.rapeli@linaro.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 30 Jul 2024 10:25:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5931 Embedded build paths are now removed and test passes. Signed-off-by: Mikko Rapeli --- meta-arm/recipes-security/optee/optee-os.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index d5a12642..5a89e5ba 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -76,7 +76,5 @@ FILES:${PN}-ta = "${nonarch_base_libdir}/optee_armtz/*" # note: "textrel" is not triggered on all archs INSANE_SKIP:${PN} = "textrel" -# Build paths are currently embedded -INSANE_SKIP:${PN} += "buildpaths" INSANE_SKIP:${PN}-dev = "staticdev" INHIBIT_PACKAGE_STRIP = "1"