From patchwork Tue May 23 22:06:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24348 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 65FCCC7EE23 for ; Tue, 23 May 2023 22:06:43 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.16378.1684879600214472136 for ; Tue, 23 May 2023 15:06:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=RC1rFDKK; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1ae3f6e5d70so1803275ad.1 for ; Tue, 23 May 2023 15:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684879599; x=1687471599; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sJjIJRJMIZSn66IwcomAuFlsIaf8b4zM78uSqnyBu4A=; b=RC1rFDKKa/dKvLSvZzYQNNlSEWfBeYJQskD2o/2krLWZ4lo3e2QZXx4iArd98HhZ5L 0rZkUf/+jeITtV6pLMsUxKN+A+KtkVFuV8dPn7ZVyFpZKsdcKW0Cd4ixtNMLLpAomQKH Ij2La++56o3YdQKdTBhw22NdE7zVDxo8yamDmqRYqJcyzLfKEUaBq0ylGg9PRTyX2vr5 hxUrSpRqpgccgJj7XhzjAuiOa8z3OX1h65Qm+MRV4dRPu39QSptudfI/1uou+83T/vuM akliFily0fzS7Xyj3R8riaioOIvzHk/JMahrZTC4s22yHpadm+3XbPZLPNoVdYbtb0NU Vvtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684879599; x=1687471599; 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=sJjIJRJMIZSn66IwcomAuFlsIaf8b4zM78uSqnyBu4A=; b=hGngAz5fVkWHYUHqZTCw0php14ZKGiSVCOtpOChlb6ivRoQA974QxJdF6mElrg4M3h NaSVyZOtSCp2pIDnhIUeLre9Fq1s3fyc2KKxpZ5R8/sruBfwqTxndvzj8OtN5g0TRXoi hgIixWU2w8LV9ITEWa1HeuIR3bned64rcUaxVw+YDL7yJY5cyjXpk5Kev5x0+4HS9Ad2 7LxcjP8xFGLftNcDUTCkE9y8V/u9jvC6Rn1aaMSmfnIpRRz7xdslqQcgxUfkQmQdnkeE JDb1q2IXfVoxLR3eP7w9RJpEHGoT3Xw/vj8cP8A1RPUeR30IWhddR915evkGvtdcc/qq bknw== X-Gm-Message-State: AC+VfDxFbhCNO0WJG6Thcxu+A3xKcxumsShTrB/azYgJVGrZ77VSW/Os muPrs6HE0QgYPpEwlq20M+Vrpp3fDNU= X-Google-Smtp-Source: ACHHUZ4i2kMePk+5633M2v98l56TpjXQc/YT0lNvghIrYfYThfhLf/NcMjDffOq3Y80KvV266BdXYQ== X-Received: by 2002:a17:902:f815:b0:1ac:aaf6:ee3a with SMTP id ix21-20020a170902f81500b001acaaf6ee3amr14003959plb.32.1684879599208; Tue, 23 May 2023 15:06:39 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c675]) by smtp.gmail.com with ESMTPSA id l12-20020a170902d34c00b001aaea39043dsm7238191plk.41.2023.05.23.15.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 15:06:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH v2 1/3] aom: Upgrade to 3.6.1 Date: Tue, 23 May 2023 15:06:35 -0700 Message-Id: <20230523220637.946337-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 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, 23 May 2023 22:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102746 Switch to using nasm instead of yasm on x86 builds for asm optimizations. This is to enable reproducible builds even though yasm is preferred but it encodes FILE directive in ELF to absolute path of asm files and results in buildpath warnings, there is no way to remove it without editing the final binaries. nasm provides --reproducible option to handle it nicely License-Update: Fixes a typo [1] [1] https://aomedia.googlesource.com/aom/+/f97c63026174df67bc08c75fa72bf0ad01ca1a98 Signed-off-by: Khem Raj --- ...neon-Provide-prototypes-for-missing-.patch | 83 ++++++++++++++++--- .../aom/{aom_3.4.0.bb => aom_3.6.1.bb} | 15 ++-- 2 files changed, 79 insertions(+), 19 deletions(-) rename meta-multimedia/recipes-multimedia/aom/{aom_3.4.0.bb => aom_3.6.1.bb} (75%) diff --git a/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch b/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch index 100507cdec..8a8350ec57 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch +++ b/meta-multimedia/recipes-multimedia/aom/aom/0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch @@ -1,6 +1,6 @@ -From c33e07f78982acfb0574a84fb523f8591e55c50e Mon Sep 17 00:00:00 2001 +From 35c1ed84a158354c37e329bad0e236b156836ac7 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Sun, 11 Sep 2022 19:46:28 -0700 +Date: Tue, 23 May 2023 14:59:26 -0700 Subject: [PATCH] subpel_variance_neon: Provide prototypes for missing functions @@ -11,18 +11,19 @@ larations [-Wimplicit-function-declaration] | ^ Upstream-Status: Pending + Signed-off-by: Khem Raj --- - aom_dsp/arm/subpel_variance_neon.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + aom_dsp/arm/subpel_variance_neon.c | 76 ++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) diff --git a/aom_dsp/arm/subpel_variance_neon.c b/aom_dsp/arm/subpel_variance_neon.c -index 4ecf891cbeb..859168ea0c5 100644 +index a05886066c4..ea6bada224d 100644 --- a/aom_dsp/arm/subpel_variance_neon.c +++ b/aom_dsp/arm/subpel_variance_neon.c -@@ -20,6 +20,22 @@ - #include "aom_dsp/aom_filter.h" +@@ -20,6 +20,82 @@ #include "aom_dsp/variance.h" + #include "aom_dsp/arm/mem_neon.h" +extern unsigned int aom_variance8x8_neon(const uint8_t *a, int a_stride, + const uint8_t *b, int b_stride, @@ -32,17 +33,77 @@ index 4ecf891cbeb..859168ea0c5 100644 + const uint8_t *b, int b_stride, + unsigned int *sse); + ++extern unsigned int aom_variance16x32_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance16x64_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance32x8_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance32x16_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ +extern unsigned int aom_variance32x32_neon(const uint8_t *a, int a_stride, + const uint8_t *b, int b_stride, + unsigned int *sse); + ++extern unsigned int aom_variance32x64_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance32x128_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance64x8_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance64x16_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance64x32_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ +extern unsigned int aom_variance64x64_neon(const uint8_t *a, int a_stride, + const uint8_t *b, int b_stride, + unsigned int *sse); + - // Load 2 sets of 4 bytes when alignment is not guaranteed. - static INLINE uint8x8_t load_unaligned_u8(const uint8_t *buf, int stride) { - uint32_t a; ++extern unsigned int aom_variance64x128_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x8_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x16_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x32_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x64_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ ++extern unsigned int aom_variance128x128_neon(const uint8_t *a, int a_stride, ++ const uint8_t *b, int b_stride, ++ unsigned int *sse); ++ + static void var_filter_block2d_bil_w4(const uint8_t *src_ptr, uint8_t *dst_ptr, + int src_stride, int pixel_step, + int dst_height, int filter_offset) { -- -2.37.3 +2.40.1 diff --git a/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb similarity index 75% rename from meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb rename to meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb index 9cd6f7a9e9..ff7f0d0902 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom_3.4.0.bb +++ b/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb @@ -3,23 +3,22 @@ DESCRIPTION = "Alliance for Open Media AV1 codec library" LICENSE = "BSD-2-Clause & AOM-Patent-License-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ - file://PATENTS;md5=e69ad12202bd20da3c76a5d3648cfa83 \ + file://PATENTS;md5=a111d47497d3bb49e04eef71377eb8ba \ " - +SRCREV = "7ade96172b95adc91a5d85bf80c90989cd543ee8" SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main \ - file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch \ - " - -SRCREV = "fd0c9275d36930a6eea6d3c35972e7cf9c512944" + file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch" S = "${WORKDIR}/git" inherit cmake pkgconfig -DEPENDS = " yasm-native" + +DEPENDS = " nasm-native" EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ + -DAOM_AS_FLAGS=--reproducible \ -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ " - +CMAKE_VERBOSE = "VERBOSE=1" CFLAGS:append:libc-musl = " -D_GNU_SOURCE" EXTRA_OECMAKE:append:arm = " ${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}" From patchwork Tue May 23 22:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24346 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 64579C7EE26 for ; Tue, 23 May 2023 22:06:43 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.16583.1684879600702000485 for ; Tue, 23 May 2023 15:06:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=KMdDlQin; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1ae763f9a94so1434155ad.3 for ; Tue, 23 May 2023 15:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684879600; x=1687471600; 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=lUW8q0+bVKuMLGWiKHWkHuAejp2CVfzxKnsvDMYrS7E=; b=KMdDlQinzU3zQwbs4vHuymigK9DLP0wZhhb1sBOitF5kVQzm6hoxOMGkpfHd8OoDBO eFhlSpSoRXqAGDMqZ9CVX6G5tT+DJoxnxQzFiQfh27VTV0xZuQ8cv6RhmAdzDRE2RAdI LAPTnrPZZ2EhLSY70QB8YT5QpQReYPFWcmoiaiuRZB0iA218mRPN5q7i77gaMbR3NKCG VBabbVKK9dyoGIxych0Mja5KKjHXRf0JInSWxzot2iU5CkN6x43uO/vpQJcMZjDJjU3A EK6GyXkH6xDXi8tP8t6q6QZl2Y3uyh90Wb9vTHfx5TNr/K/WAd9UDObj9vaNuEVoptwF Y0Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684879600; x=1687471600; 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=lUW8q0+bVKuMLGWiKHWkHuAejp2CVfzxKnsvDMYrS7E=; b=ZYBMQ7QgGxtwfVgQstS92WiWU2JymTuSSsBw8IBiPfVNamzSoQHUOD+p7j9G2XxEaB W7gCDv6q8/CVRnujDK+Y4j7m9T6rOvts8YGr7gX/Gv2PNyv+D8e8llf2jx7NRBF4oPB+ ikdW3od/6yFuAlRvWsvJ8TMHM54j176VeY3URWQJUwxdlPTXe8ddB4eRjmpdzHiBsxA8 +wpx/thLOcOmNq+y4uQ6PTYRNmmIpRmZZ4AvNHe4v8AKrt5c1TdSklKXvGIVKBX9Ci3Z SKXxCDRm2jWjNxHxEPW44NDCQhEdvT0yhUPQ+UGTKtKdgqfLeSYNyyFdAfq42KDlChOD YRdw== X-Gm-Message-State: AC+VfDyLi3e3OsvU0TjFKmwUXCnonkN6D3YwQ9aPYjV5madkPlzMJ51a JevYgngYuFYRW0LYsDmL6TO8RlYVhYs= X-Google-Smtp-Source: ACHHUZ63ckUi8a0sXZvSffFaXIno7D2I56rmusbyYldGthzPRRZrrXPuVWsFCl65UKD68kcOsiMANQ== X-Received: by 2002:a17:902:b118:b0:1ae:5fe0:dded with SMTP id q24-20020a170902b11800b001ae5fe0ddedmr14319839plr.7.1684879599829; Tue, 23 May 2023 15:06:39 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c675]) by smtp.gmail.com with ESMTPSA id l12-20020a170902d34c00b001aaea39043dsm7238191plk.41.2023.05.23.15.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 15:06:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-multimedia][PATCH v2 2/3] aom: Pass nasm flags via toochain.cmake Date: Tue, 23 May 2023 15:06:36 -0700 Message-Id: <20230523220637.946337-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230523220637.946337-1-raj.khem@gmail.com> References: <20230523220637.946337-1-raj.khem@gmail.com> 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, 23 May 2023 22:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102747 Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb b/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb index ff7f0d0902..45dd487f30 100644 --- a/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb +++ b/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb @@ -15,10 +15,13 @@ inherit cmake pkgconfig DEPENDS = " nasm-native" -EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ - -DAOM_AS_FLAGS=--reproducible \ - -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ + -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ " CMAKE_VERBOSE = "VERBOSE=1" CFLAGS:append:libc-musl = " -D_GNU_SOURCE" EXTRA_OECMAKE:append:arm = " ${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}" + +do_generate_toolchain_file:append() { + echo "set(AOM_AS_FLAGS --debug-prefix-map ${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR})" >> ${WORKDIR}/toolchain.cmake +} From patchwork Tue May 23 22:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24347 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 650F1C7EE29 for ; Tue, 23 May 2023 22:06:43 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web10.16584.1684879602034952416 for ; Tue, 23 May 2023 15:06:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=lvC3lyMv; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ae8ecb4f9aso1548095ad.1 for ; Tue, 23 May 2023 15:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684879601; x=1687471601; 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=0T2BnoOIMiR4xuM/l9GbLMA/oAzZTSo7MDLmg5EdlnA=; b=lvC3lyMvX9zjuV9mp2vUHUDiVinodto4xmb85/qmhH0ekLLzwCfcRWWJAqG5YIUJeH nRjawCTQFus3pxjyQFObgIF+yOEl7FC7JAVDhAwFcovmbosLJES/e3rjeK+tJCDvW/m2 h0mqZ3n7Pat/46Ng3+xI4WqN0E2J/io6+Ju7jEC6uxadPhbVLAvbeClmVl5fTZvXmfN8 j4aLknOIBAm/dJqISOC9But8IR4D+nBy4jektS5lZbSKkyKPdV+1UZuzSwJ63odh2QTR vwudk/+76p0m+AM/VjDTgGvw7hxSi72/vve0eq9cYwZw93H8I09xgvx/KqITr4hhQpmS pbyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684879601; x=1687471601; 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=0T2BnoOIMiR4xuM/l9GbLMA/oAzZTSo7MDLmg5EdlnA=; b=iQLFFtAVBmob0tnlgw7zMkbbsyJtkPFDXkJW6A1rhnsSjm4OiK/8/kv922xipfNOtN 4ATzpOc7fDBak4OSHWQoBNKgmDsqw+sfyMewH8zbpA2TRNPJ4bu7kztGEcS3nnWbADHL HPfLC/XG5m/0AzNLOg/FTdhtXa30GEs6XOORIkVh4v4zTpZ2Py4IaNkQRMvaKpudErHc ahgAwIZtjs16SIKqIrCYQfJys5y5ZCRTjZqgSr2Y77KX/S1zXZKDMLS6aGxAH5mWeRVI v8qFDD4jCC0EPPmyXLfw2Dj9L7kQJz5rcelxmF9UGzFBaZC4ABAxzcd1FWFyDHzW3Oqv e+Bg== X-Gm-Message-State: AC+VfDy/fnqFD1x4pCCEz9lP1EpOUd8txmZFb+GtAsabYi4ETtesI+qV fkHLIIerUC1NnHjWY/p21y8i+YUsavc= X-Google-Smtp-Source: ACHHUZ5oy7en6yyhQp15vDnvbxJLK0h+Cq6N387GDwuYsMwQ7D7g3QHoBgbfZwCzle9JKE9xuavInQ== X-Received: by 2002:a17:902:cec3:b0:1ae:8bd9:e015 with SMTP id d3-20020a170902cec300b001ae8bd9e015mr15363156plg.5.1684879601034; Tue, 23 May 2023 15:06:41 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::c675]) by smtp.gmail.com with ESMTPSA id l12-20020a170902d34c00b001aaea39043dsm7238191plk.41.2023.05.23.15.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 15:06:40 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH v2 3/3] uml-utilities: Fix references to TMPDIR Date: Tue, 23 May 2023 15:06:37 -0700 Message-Id: <20230523220637.946337-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230523220637.946337-1-raj.khem@gmail.com> References: <20230523220637.946337-1-raj.khem@gmail.com> 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, 23 May 2023 22:06:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102748 Pass CFLAGS from environment Fixes WARNING: uml-utilities-20040406-r1 do_package_qa: QA Issue: File /usr/lib/uml/.debug/port-helper in package uml-utilities-dbg contains reference to TMPDIR Signed-off-by: Khem Raj --- .../0001-cow.c-Replace-stat64-with-stat.patch | 34 +++++ ...ppend-to-CFLAGS-instead-of-re-assign.patch | 122 ++++++++++++++++++ .../uml-utilities/uml-utilities_20040406.bb | 2 + 3 files changed, 158 insertions(+) create mode 100644 meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch create mode 100644 meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch new file mode 100644 index 0000000000..348d7ce104 --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch @@ -0,0 +1,34 @@ +From c4f85268da6c30b0aec3d9a0e951b2088887cff4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 22 May 2023 18:35:37 -0700 +Subject: [PATCH] cow.c: Replace stat64 with stat + +LFS64 is deprecated in latest musl and this fails to build +therefore switch to using stat API which is same as stat64 these days + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj +--- + moo/cow.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/moo/cow.c ++++ b/moo/cow.c +@@ -161,7 +161,7 @@ int write_cow_header(char *cow_file, int + int sectorsize, int alignment, long long *size) + { + struct cow_header_v3 *header; +- struct stat64 buf; ++ struct stat buf; + int err; + + err = cow_seek_file(fd, 0); +@@ -192,7 +192,7 @@ int write_cow_header(char *cow_file, int + backing_file)) + goto out_free; + +- err = stat64(header->backing_file, &buf); ++ err = stat(header->backing_file, &buf); + if(err < 0){ + cow_printf("Stat of backing file '%s' failed, errno = %d\n", + header->backing_file, errno); diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch new file mode 100644 index 0000000000..1962e84c7e --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch @@ -0,0 +1,122 @@ +From ac72fffe639d564f59ec1e1eafde83980acef1b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 23 May 2023 14:40:31 -0700 +Subject: [PATCH] makefiles: Append to CFLAGS instead of re-assign + +This helps in inserting yocto provided CFLAGS from build environment + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj +--- + jailtest/Makefile | 2 +- + mconsole/Makefile | 2 +- + moo/Makefile | 2 +- + port-helper/Makefile | 2 +- + tunctl/Makefile | 2 +- + uml_net/Makefile | 2 +- + uml_router/Makefile | 2 +- + watchdog/Makefile | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/jailtest/Makefile b/jailtest/Makefile +index 610ca1a..025fca9 100644 +--- a/jailtest/Makefile ++++ b/jailtest/Makefile +@@ -1,6 +1,6 @@ + OBJS = jailtest.o + BIN = jailtest +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +diff --git a/mconsole/Makefile b/mconsole/Makefile +index 9818d8a..74a2560 100644 +--- a/mconsole/Makefile ++++ b/mconsole/Makefile +@@ -1,6 +1,6 @@ + BIN = uml_mconsole + OBJS = $(BIN).o +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +diff --git a/moo/Makefile b/moo/Makefile +index 6cdb591..60d300d 100644 +--- a/moo/Makefile ++++ b/moo/Makefile +@@ -3,7 +3,7 @@ BIN = uml_moo uml_mkcow + uml_moo_OBJS = uml_moo.o cow.o + uml_mkcow_OBJS = uml_mkcow.o cow.o + +-CFLAGS = -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE ++CFLAGS += -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + + BIN_DIR ?= /usr/bin + +diff --git a/port-helper/Makefile b/port-helper/Makefile +index 8e33bdf..8b695f3 100644 +--- a/port-helper/Makefile ++++ b/port-helper/Makefile +@@ -1,6 +1,6 @@ + OBJS = port-helper.o + BIN = port-helper +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + LIB_DIR ?= /usr/lib/uml + +diff --git a/tunctl/Makefile b/tunctl/Makefile +index 743bfea..a39ad2b 100644 +--- a/tunctl/Makefile ++++ b/tunctl/Makefile +@@ -1,6 +1,6 @@ + OBJS = tunctl.o + BIN = tunctl +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +diff --git a/uml_net/Makefile b/uml_net/Makefile +index 36efec6..2e1ad0e 100644 +--- a/uml_net/Makefile ++++ b/uml_net/Makefile +@@ -1,7 +1,7 @@ + TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) + + BIN = uml_net +-CFLAGS = -g -Wall $(TUNTAP) ++CFLAGS += -g -Wall $(TUNTAP) + + BIN_DIR ?= /usr/bin + +diff --git a/uml_router/Makefile b/uml_router/Makefile +index b7b5401..e399ea5 100644 +--- a/uml_router/Makefile ++++ b/uml_router/Makefile +@@ -2,7 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) + + OBJS = hash.o port.o uml_switch.o + BIN = uml_switch +-CFLAGS = -g -Wall $(TUNTAP) ++CFLAGS += -g -Wall $(TUNTAP) + + BIN_DIR ?= /usr/bin + +diff --git a/watchdog/Makefile b/watchdog/Makefile +index c26fd9f..5178cc6 100644 +--- a/watchdog/Makefile ++++ b/watchdog/Makefile +@@ -1,6 +1,6 @@ + BIN = uml_watchdog + OBJS = $(BIN).o +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall + + BIN_DIR ?= /usr/bin + +-- +2.40.1 + diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 35ae5f777d..54bc1b21f1 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -8,6 +8,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_ file://unstrip.patch \ file://0001-include-required-system-header-files-for-fd_set-and-.patch \ file://0001-Add-missing-standard-headers-for-str-and-exit-APIs.patch \ + file://0001-cow.c-Replace-stat64-with-stat.patch \ + file://0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch \ " SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"