From patchwork Fri Mar 31 05:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21986 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 430AAC76196 for ; Fri, 31 Mar 2023 05:26:46 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.47931.1680240404280226134 for ; Thu, 30 Mar 2023 22:26:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YGwlJLjF; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id i9so21196008wrp.3 for ; Thu, 30 Mar 2023 22:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240402; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iM/MPB6NcJJvNkPrkJxLXlh/y/OFlVS8Di/vsHubwxA=; b=YGwlJLjFBIsJ7c/8iVZXz/1hGRtw004knEQHkLjPnbTaWtkm0329LlCEc2SBQ+kW9y Bi5lOOkYk7Tm30AU4A3fPq4G+JsR0UVA5WAlM39Sm1M5YXwYHBoU+LhC0+jvKf5QchZW sOKaHGLk9mPnsRJqlfweGUZ++hPSviTLBve6D/Gl9MYEm/xbmSOVouE33oXl4WA8ZCfu /iACGzVbQa2bhnOx1xsOq1xLk7ifXSnLBN9InhGWWY4tBD/g1usJCwM9Omigxsrzhzh0 ukM0LADIztZV9g2S9+GxEToAHSuZUQceMicN8QT75CybLRTF42ak+sfMHUuhjAmA4sk4 yEhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240402; 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=iM/MPB6NcJJvNkPrkJxLXlh/y/OFlVS8Di/vsHubwxA=; b=J3EnIvstbmUjSGopjnTPxQkB0iz4H95dN8VB94nqnSwlDGiGOnrT8m5a9IUOhR5Gqw rH63xJA3mIlU87P2n5HiFpFTVbi+v/F/C1i3uHZDxLgb3MdzZdhViXKUeqh4X+Amu6sB rQA8k8BTs3eCFvFzPDa7X+qODzfVuud9i5AeZR0JtAAS8EdKto/PM8mQLKZu4vzQ6kz+ hjiHdJn2RQkv09MoC9vRdMjf3aAOe+Vo0nnid4x9nsmVq0UZqK/a4h5wGPcc//WsSOpK L9I0cONj1yTvq0lCJS/jHskpyKTvVoArq5ZVTmkO4dHRWrNmrt6ADPkwCo2bVsRCb0wv pOFQ== X-Gm-Message-State: AAQBX9ei32OOvjxUasXpdFzWEM5P6SVeE9dXn428lZyynuJcyr6rwmwd aWmAcAcre2csnJBJ9EuZv35hS6KoF2Q= X-Google-Smtp-Source: AKy350ZbuFNgdQnkynAxcxOykooX/6A97Uel9axlgtV3GmqSQIQIU+1qD3WIH2DPSrMqKsGxZqAF9A== X-Received: by 2002:adf:e288:0:b0:2ce:a93d:882d with SMTP id v8-20020adfe288000000b002cea93d882dmr20085985wri.11.1680240402177; Thu, 30 Mar 2023 22:26:42 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:41 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/7] ffmpeg: update 5.1.2 -> 6.0 Date: Fri, 31 Mar 2023 07:26:30 +0200 Message-Id: <20230331052636.978578-1-alex@linutronix.de> X-Mailer: git-send-email 2.30.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 ; Fri, 31 Mar 2023 05:26:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179384 Add a patch to gstreamer1.0-libav to address an API compatibility fail. Signed-off-by: Alexander Kanavin --- ...c-stop-accessing-out-of-bounds-frame.patch | 89 --------------- ...c-stop-accessing-out-of-bounds-frame.patch | 108 ------------------ .../ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch | 34 ------ .../ffmpeg/{ffmpeg_5.1.2.bb => ffmpeg_6.0.bb} | 8 +- .../gstreamer1.0-libav/ffmpeg-6.0.patch | 49 ++++++++ .../gstreamer/gstreamer1.0-libav_1.22.0.bb | 4 +- 6 files changed, 54 insertions(+), 238 deletions(-) delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch rename meta/recipes-multimedia/ffmpeg/{ffmpeg_5.1.2.bb => ffmpeg_6.0.bb} (95%) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch deleted file mode 100644 index 2775a81cc86..00000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 92f9b28ed84a77138105475beba16c146bdaf984 Mon Sep 17 00:00:00 2001 -From: Paul B Mahol -Date: Sat, 12 Nov 2022 16:12:00 +0100 -Subject: [PATCH] avcodec/rpzaenc: stop accessing out of bounds frame - -Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/92f9b28ed84a77138105475beba16c146bdaf984] - -Signed-off-by: - ---- - libavcodec/rpzaenc.c | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/libavcodec/rpzaenc.c b/libavcodec/rpzaenc.c -index d710eb4f82..4ced9523e2 100644 ---- a/libavcodec/rpzaenc.c -+++ b/libavcodec/rpzaenc.c -@@ -205,7 +205,7 @@ static void get_max_component_diff(const BlockInfo *bi, const uint16_t *block_pt - - // loop thru and compare pixels - for (y = 0; y < bi->block_height; y++) { -- for (x = 0; x < bi->block_width; x++){ -+ for (x = 0; x < bi->block_width; x++) { - // TODO: optimize - min_r = FFMIN(R(block_ptr[x]), min_r); - min_g = FFMIN(G(block_ptr[x]), min_g); -@@ -278,7 +278,7 @@ static int leastsquares(const uint16_t *block_ptr, const BlockInfo *bi, - return -1; - - for (i = 0; i < bi->block_height; i++) { -- for (j = 0; j < bi->block_width; j++){ -+ for (j = 0; j < bi->block_width; j++) { - x = GET_CHAN(block_ptr[j], xchannel); - y = GET_CHAN(block_ptr[j], ychannel); - sumx += x; -@@ -325,7 +325,7 @@ static int calc_lsq_max_fit_error(const uint16_t *block_ptr, const BlockInfo *bi - int max_err = 0; - - for (i = 0; i < bi->block_height; i++) { -- for (j = 0; j < bi->block_width; j++){ -+ for (j = 0; j < bi->block_width; j++) { - int x_inc, lin_y, lin_x; - x = GET_CHAN(block_ptr[j], xchannel); - y = GET_CHAN(block_ptr[j], ychannel); -@@ -420,7 +420,9 @@ static void update_block_in_prev_frame(const uint16_t *src_pixels, - uint16_t *dest_pixels, - const BlockInfo *bi, int block_counter) - { -- for (int y = 0; y < 4; y++) { -+ const int y_size = FFMIN(4, bi->image_height - bi->row * 4); -+ -+ for (int y = 0; y < y_size; y++) { - memcpy(dest_pixels, src_pixels, 8); - dest_pixels += bi->rowstride; - src_pixels += bi->rowstride; -@@ -730,14 +732,15 @@ post_skip : - - if (err > s->sixteen_color_thresh) { // DO SIXTEEN COLOR BLOCK - uint16_t *row_ptr; -- int rgb555; -+ int y_size, rgb555; - - block_offset = get_block_info(&bi, block_counter); - - row_ptr = &src_pixels[block_offset]; -+ y_size = FFMIN(4, bi.image_height - bi.row * 4); - -- for (int y = 0; y < 4; y++) { -- for (int x = 0; x < 4; x++){ -+ for (int y = 0; y < y_size; y++) { -+ for (int x = 0; x < 4; x++) { - rgb555 = row_ptr[x] & ~0x8000; - - put_bits(&s->pb, 16, rgb555); -@@ -745,6 +748,11 @@ post_skip : - row_ptr += bi.rowstride; - } - -+ for (int y = y_size; y < 4; y++) { -+ for (int x = 0; x < 4; x++) -+ put_bits(&s->pb, 16, 0); -+ } -+ - block_counter++; - } else { // FOUR COLOR BLOCK - block_counter += encode_four_color_block(min_color, max_color, --- -2.34.1 - diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch deleted file mode 100644 index 923fc6a9c1b..00000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 13c13109759090b7f7182480d075e13b36ed8edd Mon Sep 17 00:00:00 2001 -From: Paul B Mahol -Date: Sat, 12 Nov 2022 15:19:21 +0100 -Subject: [PATCH] avcodec/smcenc: stop accessing out of bounds frame - -Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/13c13109759090b7f7182480d075e13b36ed8edd] - -Signed-off-by: - ---- - libavcodec/smcenc.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/libavcodec/smcenc.c b/libavcodec/smcenc.c -index f3d26a4e8d..33549b8ab4 100644 ---- a/libavcodec/smcenc.c -+++ b/libavcodec/smcenc.c -@@ -61,6 +61,7 @@ typedef struct SMCContext { - { \ - row_ptr += stride * 4; \ - pixel_ptr = row_ptr; \ -+ cur_y += 4; \ - } \ - } \ - } -@@ -117,6 +118,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - const uint8_t *prev_pixels = (const uint8_t *)s->prev_frame->data[0]; - uint8_t *distinct_values = s->distinct_values; - const uint8_t *pixel_ptr, *row_ptr; -+ const int height = frame->height; - const int width = frame->width; - uint8_t block_values[16]; - int block_counter = 0; -@@ -125,13 +127,14 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - int color_octet_index = 0; - int color_table_index; /* indexes to color pair, quad, or octet tables */ - int total_blocks; -+ int cur_y = 0; - - memset(s->color_pairs, 0, sizeof(s->color_pairs)); - memset(s->color_quads, 0, sizeof(s->color_quads)); - memset(s->color_octets, 0, sizeof(s->color_octets)); - - /* Number of 4x4 blocks in frame. */ -- total_blocks = ((frame->width + 3) / 4) * ((frame->height + 3) / 4); -+ total_blocks = ((width + 3) / 4) * ((height + 3) / 4); - - pixel_ptr = row_ptr = src_pixels; - -@@ -145,11 +148,13 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - int cache_index; - int distinct = 0; - int blocks = 0; -+ int frame_y = cur_y; - - while (prev_pixels && s->key_frame == 0 && block_counter + inter_skip_blocks < total_blocks) { -+ const int y_size = FFMIN(4, height - cur_y); - int compare = 0; - -- for (int y = 0; y < 4; y++) { -+ for (int y = 0; y < y_size; y++) { - const ptrdiff_t offset = pixel_ptr - src_pixels; - const uint8_t *prev_pixel_ptr = prev_pixels + offset; - -@@ -170,8 +175,10 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - - pixel_ptr = xpixel_ptr; - row_ptr = xrow_ptr; -+ cur_y = frame_y; - - while (block_counter > 0 && block_counter + intra_skip_blocks < total_blocks) { -+ const int y_size = FFMIN(4, height - cur_y); - const ptrdiff_t offset = pixel_ptr - src_pixels; - const int sy = offset / stride; - const int sx = offset % stride; -@@ -180,7 +187,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - const uint8_t *old_pixel_ptr = src_pixels + nx + ny * stride; - int compare = 0; - -- for (int y = 0; y < 4; y++) { -+ for (int y = 0; y < y_size; y++) { - compare |= memcmp(old_pixel_ptr + y * stride, pixel_ptr + y * stride, 4); - if (compare) - break; -@@ -197,9 +204,11 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - - pixel_ptr = xpixel_ptr; - row_ptr = xrow_ptr; -+ cur_y = frame_y; - - while (block_counter + coded_blocks < total_blocks && coded_blocks < 256) { -- for (int y = 0; y < 4; y++) -+ const int y_size = FFMIN(4, height - cur_y); -+ for (int y = 0; y < y_size; y++) - memcpy(block_values + y * 4, pixel_ptr + y * stride, 4); - - qsort(block_values, 16, sizeof(block_values[0]), smc_cmp_values); -@@ -224,6 +233,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, - - pixel_ptr = xpixel_ptr; - row_ptr = xrow_ptr; -+ cur_y = frame_y; - - blocks = coded_blocks; - distinct = coded_distinct; --- -2.34.1 - diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch deleted file mode 100644 index 95bd608a277..00000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/ffmpeg-fix-vulkan.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Lynne -Date: Sun, 25 Dec 2022 00:03:30 +0000 (+0100) -Subject: hwcontext_vulkan: remove optional encode/decode extensions from the list -X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690 - -hwcontext_vulkan: remove optional encode/decode extensions from the list - -They're not currently used, so they don't need to be there. -Vulkan stabilized the decode extensions less than a week ago, and their -name prefixes were changed from EXT to KHR. It's a bit too soon to be -depending on it, so rather than bumping, just remove these for now. - -Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690] ---- - -diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c -index f1db1c7291..2a9b5f4aac 100644 ---- a/libavutil/hwcontext_vulkan.c -+++ b/libavutil/hwcontext_vulkan.c -@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = { - { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY }, - { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM }, - #endif -- -- /* Video encoding/decoding */ -- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, -- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, - }; - - /* Converts return values to strings */ diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb similarity index 95% rename from meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb rename to meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb index cccd9f65abf..e4a4a0effa1 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb @@ -22,13 +22,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ - file://0001-avcodec-rpzaenc-stop-accessing-out-of-bounds-frame.patch \ - file://0001-avcodec-smcenc-stop-accessing-out-of-bounds-frame.patch \ - file://ffmpeg-fix-vulkan.patch \ - " +SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc" +SRC_URI[sha256sum] = "57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 ARM_INSTRUCTION_SET:armv4 = "arm" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch new file mode 100644 index 00000000000..0a06540fb47 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/ffmpeg-6.0.patch @@ -0,0 +1,49 @@ +From cde31d23c071ee93fae96331805f696856084254 Mon Sep 17 00:00:00 2001 +From: "U. Artie Eoff" +Date: Mon, 13 Feb 2023 17:02:01 -0500 +Subject: [PATCH] avviddec: change + AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS + +This fixes a compile error with recent upstream FFmpeg. + +The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to +AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit +7d09579190de (lavc 58.132.100). + +The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream +commit 10c9a0874cb3 (lavc 59.63.100). + +Part-of: + +Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/cde31d23c071ee93fae96331805f696856084254?merge_request_iid=3964] +Signed-off-by: Alexander Kanavin +--- + ext/libav/gstavviddec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index 43cea456ae8..6d7c4cd0de8 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -35,6 +35,10 @@ + + GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) ++#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS ++#endif ++ + #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) + + #define MAX_TS_MASK 0xff +@@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, + if (ffmpegdec->max_threads == 0) { + /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal + * to one frame per thread. We thus need to calculate the thread count ourselves */ +- if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || ++ if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || + (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) + ffmpegdec->context->thread_count = + MIN (gst_ffmpeg_auto_max_threads (), 16); +-- +GitLab diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb index 625a52ea555..d1dce6739dd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.0.bb @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ " -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ + file://ffmpeg-6.0.patch \ + " SRC_URI[sha256sum] = "0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" S = "${WORKDIR}/gst-libav-${PV}" From patchwork Fri Mar 31 05:26:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21985 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 3FC51C77B60 for ; Fri, 31 Mar 2023 05:26:46 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web11.47958.1680240404355254336 for ; Thu, 30 Mar 2023 22:26:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Vs9riKDo; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id l12so21166121wrm.10 for ; Thu, 30 Mar 2023 22:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240403; 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=MHAa95euUO4edbcJ4a99nUNuSq5kc3lZHNLYZJEI318=; b=Vs9riKDovEmYtcXr0bZ4VAq0f/rw3rK7pYLS1zAlI3pAb2wSLutAGDZTEbBLqBBMZS 0/yrSs1SX5ngdCXM6HoGSY1Si5nB6pfpfXHTSRNG51gFK8/E/r7c3C5nrNIKHJUQoEy6 8ZJBAXjo8ujxNq1roNLwoWOA7xHbosCPgUYjlyEYy7wd+CvftheycqJpu6ntKz5nBreF 4Ox1wRjsfsBnpVNXYex7hu3aCmZq98RwpLezq7x05c4GV54aGVwV0Lqz7pIhwMEUt6z+ 3EjjfmpLayPglHg/ItbuhR9Okv8oWXTBNriqCR7TDCe5U1GSRv4uS3ZBL8gCcejRmOa0 wGTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240403; 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=MHAa95euUO4edbcJ4a99nUNuSq5kc3lZHNLYZJEI318=; b=LGuZeSGemvmwZouGhRuj+ibulQOeSNjWyCb8LCunTisN88KCZitcNhfePq1CmucBa2 ne6pTJUL20LEdiaXHxisI9UT/Y75wnwq97jF5E9V+KEuH5t1Eqapqkr+Ggga/7hWb7WS 3VYDXLEhWRB/1emRfjb+g1ZdClMcbSChab7oRpC9W80Rs8jqRZff3EtAHFTSLNx04Mpi JUUWkYlie8JFK0n5MMj8Ar9KjFaDOBG1cEywqnGd55OhZauNOeL0Tmoqfu81Q8E5lxOi TXmnpaUh4Cduy8cb76zd4SZFHZ8QCo83AMQThFr1MwVLrsg7If0sANTydIWAQceqJ0gm eVOg== X-Gm-Message-State: AAQBX9cXYE879hRIcEjf+wfEzHq/mwm7Bid16qa16YHDceZviAkETdQY GhxmgMda8s+MV6w8cVZqGfSko0xc/q8= X-Google-Smtp-Source: AKy350Yi+jIYTdDNcB+vBAGDiB07dgvES7R6DjhpKXhQFU7usSpBJO4ASTTmWs2kcFx7/KrNmlJAQw== X-Received: by 2002:a05:6000:1206:b0:2d6:4733:c36f with SMTP id e6-20020a056000120600b002d64733c36fmr20582537wrx.23.1680240402698; Thu, 30 Mar 2023 22:26:42 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:42 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/7] rust: do not run separate build/install steps Date: Fri, 31 Mar 2023 07:26:31 +0200 Message-Id: <20230331052636.978578-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230331052636.978578-1-alex@linutronix.de> References: <20230331052636.978578-1-alex@linutronix.de> 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 ; Fri, 31 Mar 2023 05:26:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179385 Upstream does not actually use or test it this way; if the goal is to install items, then install target should be executed directly. In particular, in latest rust release building stage 2 items has regressed altogether (incorrect dependencies between rust-analyze tool and the libs it needs) and no one noticed. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/rust/rust_1.67.1.bb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.67.1.bb b/meta/recipes-devtools/rust/rust_1.67.1.bb index f4c6d9511db..eecb05ae026 100644 --- a/meta/recipes-devtools/rust/rust_1.67.1.bb +++ b/meta/recipes-devtools/rust/rust_1.67.1.bb @@ -221,17 +221,6 @@ FILES:${PN} += "${libdir}/*.so" FILES:${PN}-dev = "" do_compile () { - rust_runx build --stage 2 -} - -do_compile:append:class-target () { - rust_runx build --stage 2 src/tools/clippy - rust_runx build --stage 2 src/tools/rustfmt -} - -do_compile:append:class-nativesdk () { - rust_runx build --stage 2 src/tools/clippy - rust_runx build --stage 2 src/tools/rustfmt } ALLOW_EMPTY:${PN} = "1" @@ -256,6 +245,8 @@ rust_do_install() { rust_do_install:class-nativesdk() { export PSEUDO_UNLOAD=1 rust_runx install + rust_runx install clippy + rust_runx install rustfmt unset PSEUDO_UNLOAD install -d ${D}${bindir} @@ -274,6 +265,8 @@ EXTRA_TOOLS ?= "cargo-clippy clippy-driver rustfmt" rust_do_install:class-target() { export PSEUDO_UNLOAD=1 rust_runx install + rust_runx install clippy + rust_runx install rustfmt unset PSEUDO_UNLOAD install -d ${D}${bindir} From patchwork Fri Mar 31 05:26:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21984 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 3E54BC6FD18 for ; Fri, 31 Mar 2023 05:26:46 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web11.47959.1680240404715480497 for ; Thu, 30 Mar 2023 22:26:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Rnqgwg4i; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id t4so15950251wra.7 for ; Thu, 30 Mar 2023 22:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240403; 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=knHe8qXRx1mwlRtXI97oMvtXypdTpkDTv0MniGDEsJ0=; b=Rnqgwg4iqbZdK5+bXGJy8vm1zm6jJtOh1fmKweyRodiZU5buOy9QJeeFyhxKUe0mvZ PDaeFdJe96pN+vYsGq2a/2GZSWuA+4753Jx0h3/0gxok4yy0NlSee4+h11N7FH2hvis0 fZqVvn9VEt5DX8De/ZhE9M4JlTWcfKTmqLiN6WJIIdrl4NjJ8w59oHGXf52gw0hQMSut ka+zh77Gy4WeZWWRtJ5mJ/Fm7vj3y8zzckTrYt8Vfw2mrCsF1Ys1cc/1aJ0mDD7abN9U vECNGIx/9Pddc1HI4OKRUtVyz+bKBYAgMGWWgo1t7Dxm/3HAj5qp8LSLsPq8eqO2GYwq n/2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240403; 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=knHe8qXRx1mwlRtXI97oMvtXypdTpkDTv0MniGDEsJ0=; b=RjQZ2x/iSiuKUxOMDNt1nzS8n/r9E1UqtNrwwBeW2k8HJ6XkkJpsHXj7+Nwygf+z1P 7aGHvMCuyvz63aB4kP0icDd6+3eahrDaBA0hwOZGTVGcviMtuwv2BLRe8jd9n090hUBF hsptvM4w3tcqBpglB1psdopsZk/2ZtHIx0nB8TTvFNwBRpJKclJ80bKe3PweoUWP8ECP CD0/+xyuim7WdRHFSUEovVqsRQ7mzHdugdpnKn2ZkWWX4fCNWGQ++6Oa4c7Em1aSFpYd o8RRF9m5CkaeegixTKhIidbihbt9FsCBXBzsxNtwsW2qKUhcjKbFRV54YiDSIsw/cH5S UfHA== X-Gm-Message-State: AAQBX9enKTNGZfIXSplp7xS4p+BasNQn3gebc2EcsmG2qpQydjYdBuBb ORDRnz3xLtYb6q5pc+HK9blIJA4YLHs= X-Google-Smtp-Source: AKy350Z7zcogJrqTBIv4IOEyZZVKWaB5PhHqPvo8H/TO2C3n2EoSKbDDvBF/IgHCdj7MKO4HrcRw1A== X-Received: by 2002:a5d:490d:0:b0:2cc:4e58:f6d0 with SMTP id x13-20020a5d490d000000b002cc4e58f6d0mr17610201wrq.54.1680240403185; Thu, 30 Mar 2023 22:26:43 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:42 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/7] rust: install llvm item only once Date: Fri, 31 Mar 2023 07:26:32 +0200 Message-Id: <20230331052636.978578-3-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230331052636.978578-1-alex@linutronix.de> References: <20230331052636.978578-1-alex@linutronix.de> 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 ; Fri, 31 Mar 2023 05:26:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179386 Otherwise it triggers a rebuild of llvm-dependent rust pieces every time rust_runx is called, lengthening the builds without need. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/rust/rust_1.67.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rust/rust_1.67.1.bb b/meta/recipes-devtools/rust/rust_1.67.1.bb index eecb05ae026..83f9bec68a4 100644 --- a/meta/recipes-devtools/rust/rust_1.67.1.bb +++ b/meta/recipes-devtools/rust/rust_1.67.1.bb @@ -200,7 +200,7 @@ rust_runx () { # Copy the natively built llvm-config into the target so we can run it. Horrible, # but works! - if [ ${RUST_ALTERNATE_EXE_PATH_NATIVE} != ${RUST_ALTERNATE_EXE_PATH} ]; then + if [ ${RUST_ALTERNATE_EXE_PATH_NATIVE} != ${RUST_ALTERNATE_EXE_PATH} -a ! -f ${RUST_ALTERNATE_EXE_PATH} ]; then mkdir -p `dirname ${RUST_ALTERNATE_EXE_PATH}` cp ${RUST_ALTERNATE_EXE_PATH_NATIVE} ${RUST_ALTERNATE_EXE_PATH} chrpath -d ${RUST_ALTERNATE_EXE_PATH} From patchwork Fri Mar 31 05:26:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21989 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 35CF0C77B60 for ; Fri, 31 Mar 2023 05:26:56 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web10.47932.1680240405941744333 for ; Thu, 30 Mar 2023 22:26:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XwrBo5D/; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id j24so21229881wrd.0 for ; Thu, 30 Mar 2023 22:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240404; 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=L6O+1MDiKeXFr9uXZyNUxGH0BHYtFaIRHtEaMS5QirE=; b=XwrBo5D/sQ2KoI9Kgj2yYqgdam/FS1csu0vD+nw51sFMMQfP8a/yvt3BzwcEfk105B l8pEEuJ7LZzIYFFCgKmvja8LwNaLHIJmyjCZuPvxhwL6qk0ji1SBsRIC26ikG8qPiukq Yknj7asuMGP7W9A7fybd/NaLYwqCPgNFabCASrBRTFvL5EfGKlpj6QeD77rM4hdBZ/pS Kes9sAHmtaDF7SkF+HMAq+2nQHoDkxAG0025cVHgHEbhtG4usp5ue9BcSMZEqKn0tRi4 8Jdje1Ne1FCHT37BRxLqRhAyr86feSAd7BLaZH5qoH6JdyO70KJxeXlslRhienHMqBCJ Wtxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240404; 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=L6O+1MDiKeXFr9uXZyNUxGH0BHYtFaIRHtEaMS5QirE=; b=RBmz1ELcl203XvA8idjtp8NndF37d6KQdQaU+iJk61goJpWf1qkHCDIym9b1HrShCM m/PKJBjpZNCY6+AxoQjzjdu9VXHC+h0waHRIht6OrTESEKfx0PxB60d0ENY2flESJZu6 wPB52vXiAy8TlTWnihnieHTIDKg6Wo4ziEofLwNvTFWXpF9iFW8LogGDCZbVwOf7CvvY BHSyUJQwPLe9PtJL+MqkKwc0+UErJqy1YESCpxLIc1x8mSaBf2iaxitjRbcj1o5bOXqe lDhqUC7YRuz6Lxnt1f+snW3j4S6r3G9rxYUOfBdoll5tBZ2AkNV+RLqLh37D8Ngl+Gj/ WtGg== X-Gm-Message-State: AAQBX9dFVzXbfYCxhAiG8oU3Ws1esX1n/N8wQLLjOBHQlUYLTkrd4Urk tJGyi89IALODaPTDx+PmHDLIS+AIHgA= X-Google-Smtp-Source: AKy350YZNbEMfoFY0zs3UxDxsQmA2uPH/OjEW/lFXbF4EqRvBAVYrAz7FoGaQmN+AKNnBsOPF/kcIg== X-Received: by 2002:a5d:4dcb:0:b0:2ca:8da1:db96 with SMTP id f11-20020a5d4dcb000000b002ca8da1db96mr18147436wru.50.1680240403802; Thu, 30 Mar 2023 22:26:43 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:43 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/7] rust: update 1.67.1 -> 1.68.1 Date: Fri, 31 Mar 2023 07:26:33 +0200 Message-Id: <20230331052636.978578-4-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230331052636.978578-1-alex@linutronix.de> References: <20230331052636.978578-1-alex@linutronix.de> 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 ; Fri, 31 Mar 2023 05:26:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179388 Rebase patches; one of the vendored crossbeam versions has been removed upstream, and so crossbeam_atomic.patch is adjusted accordingly. Replace getrandom-open64.patch with a backport. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../rust/{cargo_1.67.1.bb => cargo_1.68.1.bb} | 0 .../rust/files/crossbeam_atomic.patch | 31 --------- .../rust/files/getrandom-open64.patch | 43 ++++++++---- ...ibstd-rs_1.67.1.bb => libstd-rs_1.68.1.bb} | 0 ....67.1.bb => rust-cross-canadian_1.68.1.bb} | 0 ...ust-llvm_1.67.1.bb => rust-llvm_1.68.1.bb} | 0 meta/recipes-devtools/rust/rust-snapshot.inc | 66 +++++++++---------- meta/recipes-devtools/rust/rust-source.inc | 2 +- .../rust/{rust_1.67.1.bb => rust_1.68.1.bb} | 0 10 files changed, 65 insertions(+), 79 deletions(-) rename meta/recipes-devtools/rust/{cargo_1.67.1.bb => cargo_1.68.1.bb} (100%) rename meta/recipes-devtools/rust/{libstd-rs_1.67.1.bb => libstd-rs_1.68.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.67.1.bb => rust-cross-canadian_1.68.1.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.67.1.bb => rust-llvm_1.68.1.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.67.1.bb => rust_1.68.1.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index ef61377491c..f9e88ca4269 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.1%" QEMUVERSION ?= "7.2%" GOVERSION ?= "1.20%" LLVMVERSION ?= "15.%" -RUSTVERSION ?= "1.67%" +RUSTVERSION ?= "1.68%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/rust/cargo_1.67.1.bb b/meta/recipes-devtools/rust/cargo_1.68.1.bb similarity index 100% rename from meta/recipes-devtools/rust/cargo_1.67.1.bb rename to meta/recipes-devtools/rust/cargo_1.68.1.bb diff --git a/meta/recipes-devtools/rust/files/crossbeam_atomic.patch b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch index 51dd3c5f65a..0a2910391e2 100644 --- a/meta/recipes-devtools/rust/files/crossbeam_atomic.patch +++ b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch @@ -48,34 +48,3 @@ Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json \ No newline at end of file +{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"108ba75398e3169c35b0e9754782391e4e4a9f9bf0ae2b216b55d836c4ac9ba8","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} \ No newline at end of file -Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.8/.cargo-checksum.json -=================================================================== ---- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.8/.cargo-checksum.json -+++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.8/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"665a9f2c5fd37c98bef7c1b6eda753b58bb925d87e5b42d7298df973d7590631","Cargo.toml":"fe22292acd6a868e65baf225f90d5678678971642814d2d8e92a03954b8bdb40","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"7e74dc72343ff57e83d0a84a9fbdd9ff1645894165909999b4c3d2fba94bc96c","no_atomic.rs":"71b5f78fd701ce604aa766dd3d825fa5bed774282aae4d6c31d7acb01b1b242f","src/atomic/atomic_cell.rs":"01185588e0e16ba81425677966d0c11887dedc4ac0d4a65991a34057c418adc4","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"d64faa1ca8896373468308031220940d988aa3a1679ea25d2291a7a7d22bc51a","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"665a9f2c5fd37c98bef7c1b6eda753b58bb925d87e5b42d7298df973d7590631","Cargo.toml":"fe22292acd6a868e65baf225f90d5678678971642814d2d8e92a03954b8bdb40","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"d983d511c89607ce89473779d1ee195e3eb509cc4d3043b9efe6aa2f94c98158","no_atomic.rs":"71b5f78fd701ce604aa766dd3d825fa5bed774282aae4d6c31d7acb01b1b242f","src/atomic/atomic_cell.rs":"01185588e0e16ba81425677966d0c11887dedc4ac0d4a65991a34057c418adc4","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"d64faa1ca8896373468308031220940d988aa3a1679ea25d2291a7a7d22bc51a","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"} -\ No newline at end of file -Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.8/build.rs -=================================================================== ---- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.8/build.rs -+++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.8/build.rs -@@ -29,7 +29,7 @@ use std::env; - include!("no_atomic.rs"); - - fn main() { -- let target = match env::var("TARGET") { -+ let mut target = match env::var("TARGET") { - Ok(target) => target, - Err(e) => { - println!( -@@ -40,6 +40,8 @@ fn main() { - return; - } - }; -+ let vendor = env::var("TARGET_VENDOR").unwrap(); -+ target = target.replace(&vendor, "-unknown"); - - // Note that this is `no_*`, not `has_*`. This allows treating - // `cfg(target_has_atomic = "ptr")` as true when the build script doesn't diff --git a/meta/recipes-devtools/rust/files/getrandom-open64.patch b/meta/recipes-devtools/rust/files/getrandom-open64.patch index 6fc981e2aa6..b35195e837e 100644 --- a/meta/recipes-devtools/rust/files/getrandom-open64.patch +++ b/meta/recipes-devtools/rust/files/getrandom-open64.patch @@ -6,24 +6,41 @@ therefore check for target env along when target OS is linux before using open64, this is more available. Latest Musl has made these namespace changes [1] +There is no need for using LFS64 open explicitly as we are only using it +for opening device files and not real files + [1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 -Upstream-Status: Submitted [https://github.com/rust-random/getrandom/pull/326] +Upstream-Status: Backport [https://github.com/rust-random/getrandom/commit/7f73e3ccc1f53bfc419e4ddcfd343766aa5837b6] Signed-off-by: Khem Raj ---- a/vendor/getrandom-0.2.0/.cargo-checksum.json -+++ b/vendor/getrandom-0.2.0/.cargo-checksum.json +Signed-off-by: Alex Kiernan +--- a/vendor/getrandom/.cargo-checksum.json ++++ b/vendor/getrandom/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"CHANGELOG.md":"4a5b61c82668507beffc7ad33f602257013263d7847cf17a246ef1128ba27950","Cargo.toml":"b59322815506cf16acd6e0cbe2634dec1be0886e686b51fa5cdf5a5ac9fdcf32","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"e0bacefbe4310c23578c65926bda6e4318750f6718bb6b97ff9a4fa9056af6a6","benches/mod.rs":"5495735ff210a50cab23c2cc84191ed910af7c30395a3d9d6095b722765b3864","build.rs":"90355b5e76dedd97d604cd83b4a0a5ab074bbd4dde9632ee2b56c87c175b1e14","src/bsd_arandom.rs":"d2ee195acd80c7d1364a369ad0d2dad46f5f9f973f9d3960367413fd87acfcd6","src/cloudabi.rs":"9201af65a607587aa8615ec92cfab9d176f4199f6799dad9ca743c51d175028b","src/custom.rs":"f75ef80ec024fe3c97c7faff79de9f7d457993ed3c5f69f21593e140c8b62790","src/error.rs":"f40aa6cb36bc024285dc2e40349fdd3754db949a307ec73831ec253549d2b0a3","src/error_impls.rs":"733ed75ab89a9d0d5a7cc7abd85f31a23d772ea9c1e7c10def1477207d19fd8b","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"cc46ee9c48ab746d2af342a242e383b8de840045d3f52fd77ee337161367a1a1","src/lib.rs":"6aff4b429e4b1a07aad2ab7148d7cc9d0987b230597649af42041508320592e0","src/linux_android.rs":"39cb80999c8534145240a350976d261b8924436bf9a4563960c7bd8c2c83c773","src/macos.rs":"b692f2fcc2319a5195f47751d5bd7dd87c7c24a61d14fa4e3dbc992ae66212b7","src/openbsd.rs":"066b2dd395c190444a658bb0b52a052eabbd68ea5a534fb729c7e5373abc0a6a","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"9c7004446fabe5a7a21c73d5a65d7e2115b5bd1d1dbb735c984cab3dba239785","src/stdweb.rs":"f140081e47cfbb61937212e7840391bce5adf7829039d732d62b82a19e567dfa","src/test_common.rs":"895d71c06722e3a6f365999d29430f37f571aeb1eb4a525777b760005c9818be","src/test_rdrand.rs":"8c8df6de836463a41808396016428bf0a2a69c715ae96e7e0e7598fcea61ace8","src/use_file.rs":"c9fe635a83614be6f303e40f98b8e678c36ac6d9724b024430d3ea1ad1510add","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"d851394bc9c43dc09afde1e03401aa6c207858ec58fdffbc5131911b116418c7","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"3413e5a391b156f5d05600f4651f7f8eb4df2c8984fca7766ca50c0cfe0b2e9c","src/wasm-bindgen.rs":"0648388724c46697a9b3c654b8d931b2bf187a3193ca1888221d4529f764e376","src/windows.rs":"39dfae2814d958993619c3654bb39745de897971aea7a414fa32f90770850ce2","src/windows_uwp.rs":"672f41a0fac79a71bfaaecad59826c948b8538f69a0133ab1c09a1865ecd6114"},"package":"ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"} +-{"files":{"CHANGELOG.md":"cb054908f44d0e7f229dcc4580bcc4f2c3e2da198c84292710f730b33cc3d5f6","Cargo.toml":"708a5d9c89443b937aa50260e26a01f9ebfdd50a7ae312956795834e3187baf3","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"7ae74633326a22fd6298d7f209fb14884277bd98049795f444945acbb2b0dfbd","benches/mod.rs":"c01b05c6d690a4b8937d25252f1385a6bff378517318ce832ea520036aabd571","src/3ds.rs":"0f48fc15f89b518fb92e06aaa4838b62dc073598e8f288df56ad1e5a9251af1e","src/bsd_arandom.rs":"d90c419d4def20f83e7535cd3f5ec07035045011a50c3652951d196a120c5d3e","src/custom.rs":"ce4640776d36872dbbd5e194bf29f6bcda3ef4549ca04fe59f5aeab1dea1d821","src/dragonfly.rs":"47f933eac189f6ea48ecf021efd0747ebce1b43d1bece6bbf72a951bab705987","src/error.rs":"ff09a7e02d7aff3e45eca6bbef6c686cc46f3c2371a0897a856e4dec4b942e46","src/error_impls.rs":"9c34832ebb99cd5e31bc5c8ffc5beb5b3fa6f7ff0226aaa1cdf8e10e6d64b324","src/espidf.rs":"19f101486584fde6dad962f4d9792de168658047312106641a5caf6866a5bbcf","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"4bad4f5c096a50338b86aeac91a937c18bc55b9555e6f34806ad13732e64523d","src/js.rs":"370610a19045012c87c986279aad6b150cd728a44015dcc5779256e4a2e6629b","src/lib.rs":"8e5c2c8edcbdbf2cee46b86d96d951cc6d5c00f7c11cfc9c27de27e756b5c4cc","src/linux_android.rs":"ec24575aa4ae71b6991290dadfdea931b05397c3faababf24bd794f1a9624835","src/macos.rs":"6c09827ad5292cd022e063efa79523bfdb50ed08b9867ebaa007cd321b8d218e","src/openbsd.rs":"450a23ead462d4a840fee4aa0bfdab1e3d88c8f48e4bb608d457429ddeca69c0","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"d52fee9dd7d661f960c01894edd563c1ff8a512c111f7803092d9aa2ff98718e","src/solid.rs":"997035d54c9762d22a5a14f54e7fbed4dd266cdeacbdf6aab7d8aee05537e8ba","src/use_file.rs":"16e42eb0a56e375c330c1ca8eb58c444e82ef3ad35230b961fdba96a02a68804","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"2a63ac0e6dab16b85c4728b79a16e0640301e8b876f151b0a1db0b4394fa219f","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"dfdd0a870581948bd03abe64d49ca4295d9cfa26e09b97a526fd5e17148ad9ca","src/windows.rs":"d0b4f2afd1959660aa9abcd9477764bd7dc0b7d7048aee748804b37963c77c6f","tests/common/mod.rs":"b6beee8f535d2d094a65711fe0af91a6fc220aa09729ed7269fe33cafdc9177f","tests/custom.rs":"9f2c0193193f6bcf641116ca0b3653b33d2015e0e98ce107ee1d1f60c5eeae3a","tests/normal.rs":"9e1c4b1e468a09ed0225370dfb6608f8b8135e0fabb09bbc1a718105164aade6","tests/rdrand.rs":"4474ccebf9d33c89288862a7e367018405968dddc55c7c6f97e21b5fe2264601"},"package":"c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"cb054908f44d0e7f229dcc4580bcc4f2c3e2da198c84292710f730b33cc3d5f6","Cargo.toml":"708a5d9c89443b937aa50260e26a01f9ebfdd50a7ae312956795834e3187baf3","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"7ae74633326a22fd6298d7f209fb14884277bd98049795f444945acbb2b0dfbd","benches/mod.rs":"c01b05c6d690a4b8937d25252f1385a6bff378517318ce832ea520036aabd571","src/3ds.rs":"0f48fc15f89b518fb92e06aaa4838b62dc073598e8f288df56ad1e5a9251af1e","src/bsd_arandom.rs":"d90c419d4def20f83e7535cd3f5ec07035045011a50c3652951d196a120c5d3e","src/custom.rs":"ce4640776d36872dbbd5e194bf29f6bcda3ef4549ca04fe59f5aeab1dea1d821","src/dragonfly.rs":"47f933eac189f6ea48ecf021efd0747ebce1b43d1bece6bbf72a951bab705987","src/error.rs":"ff09a7e02d7aff3e45eca6bbef6c686cc46f3c2371a0897a856e4dec4b942e46","src/error_impls.rs":"9c34832ebb99cd5e31bc5c8ffc5beb5b3fa6f7ff0226aaa1cdf8e10e6d64b324","src/espidf.rs":"19f101486584fde6dad962f4d9792de168658047312106641a5caf6866a5bbcf","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"4bad4f5c096a50338b86aeac91a937c18bc55b9555e6f34806ad13732e64523d","src/js.rs":"370610a19045012c87c986279aad6b150cd728a44015dcc5779256e4a2e6629b","src/lib.rs":"8e5c2c8edcbdbf2cee46b86d96d951cc6d5c00f7c11cfc9c27de27e756b5c4cc","src/linux_android.rs":"ec24575aa4ae71b6991290dadfdea931b05397c3faababf24bd794f1a9624835","src/macos.rs":"6c09827ad5292cd022e063efa79523bfdb50ed08b9867ebaa007cd321b8d218e","src/openbsd.rs":"450a23ead462d4a840fee4aa0bfdab1e3d88c8f48e4bb608d457429ddeca69c0","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"d52fee9dd7d661f960c01894edd563c1ff8a512c111f7803092d9aa2ff98718e","src/solid.rs":"997035d54c9762d22a5a14f54e7fbed4dd266cdeacbdf6aab7d8aee05537e8ba","src/use_file.rs":"16e42eb0a56e375c330c1ca8eb58c444e82ef3ad35230b961fdba96a02a68804","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"a47b20e73637fed248405650f56358f3339e511b217b7ba80e32011d8ee2ca22","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"dfdd0a870581948bd03abe64d49ca4295d9cfa26e09b97a526fd5e17148ad9ca","src/windows.rs":"d0b4f2afd1959660aa9abcd9477764bd7dc0b7d7048aee748804b37963c77c6f","tests/common/mod.rs":"b6beee8f535d2d094a65711fe0af91a6fc220aa09729ed7269fe33cafdc9177f","tests/custom.rs":"9f2c0193193f6bcf641116ca0b3653b33d2015e0e98ce107ee1d1f60c5eeae3a","tests/normal.rs":"9e1c4b1e468a09ed0225370dfb6608f8b8135e0fabb09bbc1a718105164aade6","tests/rdrand.rs":"4474ccebf9d33c89288862a7e367018405968dddc55c7c6f97e21b5fe2264601"},"package":"c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"} \ No newline at end of file -+{"files":{"CHANGELOG.md":"4a5b61c82668507beffc7ad33f602257013263d7847cf17a246ef1128ba27950","Cargo.toml":"b59322815506cf16acd6e0cbe2634dec1be0886e686b51fa5cdf5a5ac9fdcf32","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"e0bacefbe4310c23578c65926bda6e4318750f6718bb6b97ff9a4fa9056af6a6","benches/mod.rs":"5495735ff210a50cab23c2cc84191ed910af7c30395a3d9d6095b722765b3864","build.rs":"90355b5e76dedd97d604cd83b4a0a5ab074bbd4dde9632ee2b56c87c175b1e14","src/bsd_arandom.rs":"d2ee195acd80c7d1364a369ad0d2dad46f5f9f973f9d3960367413fd87acfcd6","src/cloudabi.rs":"9201af65a607587aa8615ec92cfab9d176f4199f6799dad9ca743c51d175028b","src/custom.rs":"f75ef80ec024fe3c97c7faff79de9f7d457993ed3c5f69f21593e140c8b62790","src/error.rs":"f40aa6cb36bc024285dc2e40349fdd3754db949a307ec73831ec253549d2b0a3","src/error_impls.rs":"733ed75ab89a9d0d5a7cc7abd85f31a23d772ea9c1e7c10def1477207d19fd8b","src/fuchsia.rs":"470d8509deb5b06fa6417f294c0a49e0e35a580249a5d8944c3be5aa746f64ea","src/ios.rs":"cc46ee9c48ab746d2af342a242e383b8de840045d3f52fd77ee337161367a1a1","src/lib.rs":"6aff4b429e4b1a07aad2ab7148d7cc9d0987b230597649af42041508320592e0","src/linux_android.rs":"39cb80999c8534145240a350976d261b8924436bf9a4563960c7bd8c2c83c773","src/macos.rs":"b692f2fcc2319a5195f47751d5bd7dd87c7c24a61d14fa4e3dbc992ae66212b7","src/openbsd.rs":"066b2dd395c190444a658bb0b52a052eabbd68ea5a534fb729c7e5373abc0a6a","src/rdrand.rs":"79d23183b1905d61bd9df9729dc798505a2ed750d3339e342ab144e1709827e4","src/solaris_illumos.rs":"9c7004446fabe5a7a21c73d5a65d7e2115b5bd1d1dbb735c984cab3dba239785","src/stdweb.rs":"f140081e47cfbb61937212e7840391bce5adf7829039d732d62b82a19e567dfa","src/test_common.rs":"895d71c06722e3a6f365999d29430f37f571aeb1eb4a525777b760005c9818be","src/test_rdrand.rs":"8c8df6de836463a41808396016428bf0a2a69c715ae96e7e0e7598fcea61ace8","src/use_file.rs":"c9fe635a83614be6f303e40f98b8e678c36ac6d9724b024430d3ea1ad1510add","src/util.rs":"da6964dc1523f1cb8d26365fa6a8ece46360587e6974931624b271f0c72cda8b","src/util_libc.rs":"c602b47e2958fa94443b3690faddf52a8c545689d18579c86dd8a07927c145b1","src/vxworks.rs":"a5aa0e40f890e0f35626458bb656a3340b8af3111e4bacd2e12505a8d50a3505","src/wasi.rs":"3413e5a391b156f5d05600f4651f7f8eb4df2c8984fca7766ca50c0cfe0b2e9c","src/wasm-bindgen.rs":"0648388724c46697a9b3c654b8d931b2bf187a3193ca1888221d4529f764e376","src/windows.rs":"39dfae2814d958993619c3654bb39745de897971aea7a414fa32f90770850ce2","src/windows_uwp.rs":"672f41a0fac79a71bfaaecad59826c948b8538f69a0133ab1c09a1865ecd6114"},"package":"ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"} ---- a/vendor/getrandom-0.2.0/src/util_libc.rs -+++ b/vendor/getrandom-0.2.0/src/util_libc.rs -@@ -97,7 +97,7 @@ impl Weak { +--- a/vendor/getrandom/src/util_libc.rs ++++ b/vendor/getrandom/src/util_libc.rs +@@ -135,19 +135,11 @@ impl Weak { + } } - cfg_if! { +-cfg_if! { - if #[cfg(any(target_os = "linux", target_os = "emscripten"))] { -+ if #[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "emscripten"))] { - use libc::open64 as open; - } else { - use libc::open; +- use libc::open64 as open; +- } else { +- use libc::open; +- } +-} +- + // SAFETY: path must be null terminated, FD must be manually closed. + pub unsafe fn open_readonly(path: &str) -> Result { + debug_assert_eq!(path.as_bytes().last(), Some(&0)); + loop { +- let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC); ++ let fd = libc::open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC); + if fd >= 0 { + return Ok(fd); + } diff --git a/meta/recipes-devtools/rust/libstd-rs_1.67.1.bb b/meta/recipes-devtools/rust/libstd-rs_1.68.1.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.67.1.bb rename to meta/recipes-devtools/rust/libstd-rs_1.68.1.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.67.1.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.68.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.67.1.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.68.1.bb diff --git a/meta/recipes-devtools/rust/rust-llvm_1.67.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.68.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-llvm_1.67.1.bb rename to meta/recipes-devtools/rust/rust-llvm_1.68.1.bb diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc index d5317279db6..cb49d8e7c3e 100644 --- a/meta/recipes-devtools/rust/rust-snapshot.inc +++ b/meta/recipes-devtools/rust/rust-snapshot.inc @@ -4,51 +4,51 @@ ## The exact (previous) version that has been used is specified in the source tarball. ## The version is replicated here. -SNAPSHOT_VERSION = "1.66.1" +SNAPSHOT_VERSION = "1.67.1" -SRC_URI[cargo-snapshot-aarch64.sha256sum] = "61736a6ec61a4eaa9a7b3f219d9f8166ae97c1acd54b5e904c15fb8caff06250" -SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24" -SRC_URI[rustc-snapshot-aarch64.sha256sum] = "b4d842594ba11a84712c2d1bbf7f7945cfcc2485c72861a23b488fefba5c6a45" +SRC_URI[cargo-snapshot-aarch64.sha256sum] = "b04e33d9beb3cd97501399c17ca297f0adc12a7c0ea16351b8821fc9228de477" +SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6" +SRC_URI[rustc-snapshot-aarch64.sha256sum] = "053ccc4ab81ea9c16906205c2b653a93b5b44fe4f67f9e45153a2687b7efb65a" -SRC_URI[cargo-snapshot-i686.sha256sum] = "fb0c1aa922c4e41fead9d35090769309cb45648d6f77ccbe8d2ba125a75cc2af" -SRC_URI[rust-std-snapshot-i686.sha256sum] = "b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b" -SRC_URI[rustc-snapshot-i686.sha256sum] = "e2ab464f43d6319ddb9796cbfacd444dc40f3d0e7503d672c23ecbe0daf11e1c" +SRC_URI[cargo-snapshot-i686.sha256sum] = "36db46e19e8573ea113c38d88f66def5fad848721b3c6dd69361f197b7a02f80" +SRC_URI[rust-std-snapshot-i686.sha256sum] = "aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409" +SRC_URI[rustc-snapshot-i686.sha256sum] = "0c77fde6daa80825f8cb81a5525c99db238a3ab4f0b226470964062e74603dd6" -SRC_URI[cargo-snapshot-mips.sha256sum] = "0f03d6d35b6044dc81a4d5eb9bd42c9d1e8c0e85363f960ff921ebe46294ae45" -SRC_URI[rust-std-snapshot-mips.sha256sum] = "e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568" -SRC_URI[rustc-snapshot-mips.sha256sum] = "64ad92525ae1f018e08c055d7892e0fc613437bde8cf614b1c2a8986488290e7" +SRC_URI[cargo-snapshot-mips.sha256sum] = "06778d8aedd8e7850f0175483efa015cc2eeb69e6027e3d94352d89d2a510fc5" +SRC_URI[rust-std-snapshot-mips.sha256sum] = "048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad" +SRC_URI[rustc-snapshot-mips.sha256sum] = "d3b7501acdfda6e4e9d8ee64d9de716579791d567c66f1273e601a55c2e23ca8" -SRC_URI[cargo-snapshot-mipsel.sha256sum] = "74d757a456d2fbb418c253db203c0bb3f71d797e4ab3e2804b6c594a18e0f199" -SRC_URI[rust-std-snapshot-mipsel.sha256sum] = "8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b" -SRC_URI[rustc-snapshot-mipsel.sha256sum] = "f2674d60ce52c49048e9823af57aae24bb6722e8998783819ec884222caeccf3" +SRC_URI[cargo-snapshot-mipsel.sha256sum] = "7bf800ddd0ee6b69bb66fb7cdf12ae045db025fdb866e00c62b63a1eb99f7d64" +SRC_URI[rust-std-snapshot-mipsel.sha256sum] = "94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063" +SRC_URI[rustc-snapshot-mipsel.sha256sum] = "eb34b5d901807e1e47fb6ac686571f21b2a80ad831583485872c9e9c59291776" -SRC_URI[cargo-snapshot-powerpc.sha256sum] = "f771fa4294c8e0d5d0e58129fe9d4e0913566dd43523b6f0af19a08004004df8" -SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1" -SRC_URI[rustc-snapshot-powerpc.sha256sum] = "ff16d02c100086175b9fbcfff4d3705fb4f5b58a6506ec7667dc86c56b8bb3c7" +SRC_URI[cargo-snapshot-powerpc.sha256sum] = "b134c63817805f59821024d377196f2821ae53f88d0a4a2ebdbd8152433984b0" +SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a" +SRC_URI[rustc-snapshot-powerpc.sha256sum] = "8f6212756d152f6876a6456f4d3f93ef8b4b7e5c93b96fe515cb8183c0612d7b" -SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "9a933d39e6b028e73db9cc0959af84128824e0b11554e3a0171cad7635a343c7" -SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35" -SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "f5bff79d517e2f721839462881331bdc1b8323a434f4ebe0529f93213adb2a24" +SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "2cd84deb15ed16fc4a1d8a9de45577ba4d9f245de4f7efb3dc6611eec437eef3" +SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81" +SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "bdb08b549df5d7a421637efb0be00211b5ca9cf1e4214d66eb762b92e0f9b3fe" -SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "29fa2e003f4bf3e37a3fb506d5b7ab19eb6412b5966d865e082b354637d5d84a" -SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770" -SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "3b4322b519b0f7fbcf88511b2061be1499921517d810d7696be58a16467d4589" +SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "fbad853a30437653f09001d0de797823dfa32d537163841bec1792c3267f5eab" +SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48" +SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "4a2368996acd1741200d720674101323fa951dfa580b64c8b2e9fdc09bb22534" -SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "f362cf575fde92f988d5b1fe19fd463a1905d8d2a3844168034df49b1dffb10b" -SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c" -SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "84bea70d3acb6af04ae4c0f49f904bba4e2644b92c5996aacbafd7610dd0e147" +SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "3381af9ba39068b9c5e62536125a3abb582aef15932f63cd4f90df0cccb05ac7" +SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da" +SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "916d204d727f485abbadeef914ee881cf61fa3c167741a9ed29c9f4042c99e25" -SRC_URI[cargo-snapshot-s390x.sha256sum] = "f69ea091fa1ee4871a46cb9fa1da5b81fa2980687f3bedbc4677a4a82f8da0c0" -SRC_URI[rust-std-snapshot-s390x.sha256sum] = "51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062" -SRC_URI[rustc-snapshot-s390x.sha256sum] = "25a047db8ec0627bb7054eafe6edca6ce4c473b30d6766b30cbff1c536d0673b" +SRC_URI[cargo-snapshot-s390x.sha256sum] = "78d7c2714015ecb7283b417cb265d4d604379d0720aab5f611ca1c113987c283" +SRC_URI[rust-std-snapshot-s390x.sha256sum] = "04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e" +SRC_URI[rustc-snapshot-s390x.sha256sum] = "e786d34e10069dc00774fe53bca092e537e96db6c9d5258a8b0221e4fa5a2caf" -SRC_URI[cargo-snapshot-x86_64.sha256sum] = "a636f83eb2327a66f484b9592ab305c6642df16fc80d0d1cb727e766a60da904" -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377" -SRC_URI[rustc-snapshot-x86_64.sha256sum] = "242855e2626860aede6957dc56481cc02acf8cad12fa5bbbcbd93f9c51f0b3ad" +SRC_URI[cargo-snapshot-x86_64.sha256sum] = "e744dad75de8419e7fea530c29bd56cf931b4d4de62eb4bd442bfac7b54e61ed" +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9" +SRC_URI[rustc-snapshot-x86_64.sha256sum] = "e27ec0c6d1a2b2b38e5258904c3741ddb246bff5715aa95e595f818aa77f7bee" -SRC_URI[rust-std-snapshot-i586.sha256sum] = "90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17" +SRC_URI[rust-std-snapshot-i586.sha256sum] = "22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337" -SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927" +SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7" SRC_URI += " \ ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 942978e6bf6..c8f5a5a9c4c 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -7,7 +7,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \ file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682" +SRC_URI[rust.sha256sum] = "5b8ea94085b65e75c1fa6310e2f90bd706fa80bfcb3544fe26f4037b911d9fb2" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" diff --git a/meta/recipes-devtools/rust/rust_1.67.1.bb b/meta/recipes-devtools/rust/rust_1.68.1.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.67.1.bb rename to meta/recipes-devtools/rust/rust_1.68.1.bb From patchwork Fri Mar 31 05:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21990 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 27E69C77B62 for ; Fri, 31 Mar 2023 05:26:56 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.groups.io with SMTP id smtpd.web11.47961.1680240406363229898 for ; Thu, 30 Mar 2023 22:26:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RCXebBso; spf=pass (domain: gmail.com, ip: 209.85.221.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f50.google.com with SMTP id m2so21189205wrh.6 for ; Thu, 30 Mar 2023 22:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240404; 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=ye9qoJCP8SiuEm3IVQh6WW1Jf4BNW8TXtDuJF1zpidA=; b=RCXebBsociJE61BmHs6ASNTUdy2PvPNrxljDQUPS/qz2tnK1MF+MxopOxGhxSCSvab CEMwuBFuB+5ws288PXzO/PuJvgRzt+0NOSOla4k/GPNfcaSWYHcl7tVZbOlbHo/IPLVs npIGElwHK+J2aLfRQIQiqG/S2BOn0KvWomHYC6OF7WS0elcg1jaR+woVYTKeusQ5z1gg G2URThRnlvTUsW55gF+3Xh/0xbmVdEsnhQZKrKUjnOtpvQCSIqDYZ5LHH17xO/8PXg65 gwCksPLXoUw4rt3rXluR7crdUJcyyAH/JGS9S0psUk3TvHv+uj+oN7DfZOGL11wZ7ihz T4eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240404; 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=ye9qoJCP8SiuEm3IVQh6WW1Jf4BNW8TXtDuJF1zpidA=; b=KR09cTw0x724s9VVmUETspepAcJzUu4t7v4cmbpdA59pFTKJGYh+/KN4L0ea5Riu5m HoY5p6jfZFeQXypxwh7BsK3Wzqvbkq+Xjj6fz34EE/1k+4QWZLKPio4wP54bzz9QwKDj QccrYeFC9ZRu+y+TrRKJGAfP30QXOEl7L2NoDInk3tiqHKazAN9F/pMPIG56nc89XRBP 1EZ4PQNx7JzFKkNGtyBCmdSWcpd+/+R4dHuXqprChooBtHD7JO3PHlh2AqKAxtYVlCS7 +TTCQCPIA6PMUIzDBSFKN8ouL9YKJkoNxRSPWQnj+5i5q423LSVt1XFfGoTkt03IG1RT lgFQ== X-Gm-Message-State: AAQBX9fsPfcKFsWugVZeUEyeOAiRsT+43qFKRWC8xVjVo1qrxJsIAq7W +Od0s2IInNukjYmsozbnWuohtD0Mb4s= X-Google-Smtp-Source: AKy350YH0yMJuicEeMZ2p+jjLeqK7522XrjVXEH+XfVeeOIRU/izWKu8tvHovSJ3Bk7HrOZ0FPsJRA== X-Received: by 2002:a05:6000:1a47:b0:2d8:4f02:66b6 with SMTP id t7-20020a0560001a4700b002d84f0266b6mr20736859wry.9.1680240404333; Thu, 30 Mar 2023 22:26:44 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/7] meta/recipes: ensure all recipes have a SUMMARY Date: Fri, 31 Mar 2023 07:26:34 +0200 Message-Id: <20230331052636.978578-5-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230331052636.978578-1-alex@linutronix.de> References: <20230331052636.978578-1-alex@linutronix.de> 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 ; Fri, 31 Mar 2023 05:26:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179389 DESCRIPTION is optional for now; writing good component descriptions is not easy (but appreciated). Signed-off-by: Alexander Kanavin --- meta/recipes-connectivity/inetutils/inetutils_2.4.bb | 1 + meta/recipes-core/images/core-image-ptest-all.bb | 2 +- meta/recipes-core/images/core-image-ptest-fast.bb | 2 +- meta/recipes-core/musl/musl-utils.bb | 2 +- meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb | 2 +- meta/recipes-devtools/llvm/llvm_git.bb | 2 +- meta/recipes-devtools/lua/lua_5.4.4.bb | 2 +- meta/recipes-devtools/python/python3-alabaster_0.7.13.bb | 2 +- meta/recipes-devtools/python/python3-asn1crypto_1.5.1.bb | 2 +- meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb | 2 +- meta/recipes-devtools/python/python3-attrs_22.2.0.bb | 2 +- meta/recipes-devtools/python/python3-babel_2.12.1.bb | 2 +- meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb | 2 +- meta/recipes-devtools/python/python3-dtschema_2023.1.bb | 2 +- meta/recipes-devtools/python/python3-imagesize_1.4.1.bb | 2 +- .../recipes-devtools/python/python3-importlib-metadata_6.0.0.bb | 2 +- meta/recipes-devtools/python/python3-jinja2_3.1.2.bb | 2 +- meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb | 2 +- meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb | 2 +- meta/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb | 2 +- meta/recipes-devtools/python/python3-packaging_23.0.bb | 2 +- meta/recipes-devtools/python/python3-pathlib2_2.3.7.bb | 2 +- meta/recipes-devtools/python/python3-pyelftools_0.29.bb | 2 +- meta/recipes-devtools/python/python3-pysocks_1.7.1.bb | 2 +- meta/recipes-devtools/python/python3-requests_2.28.2.bb | 2 +- meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb | 2 +- meta/recipes-devtools/python/python3-sphinx_6.1.3.bb | 2 +- .../python/python3-sphinxcontrib-applehelp_1.0.4.bb | 2 +- .../python/python3-sphinxcontrib-devhelp_1.0.2.bb | 2 +- .../python/python3-sphinxcontrib-htmlhelp_2.0.1.bb | 2 +- .../python/python3-sphinxcontrib-jsmath_1.0.1.bb | 2 +- .../python/python3-sphinxcontrib-qthelp_1.0.3.bb | 2 +- .../python/python3-sphinxcontrib-serializinghtml_1.1.5.bb | 2 +- meta/recipes-devtools/python/python3-zipp_3.15.0.bb | 2 +- meta/recipes-devtools/rust/cargo_1.68.1.bb | 2 +- meta/recipes-devtools/rust/rust-cross-canadian.inc | 1 + meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-base_1.22.0.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-good_1.22.0.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb | 2 +- meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb | 2 +- 44 files changed, 44 insertions(+), 42 deletions(-) diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.4.bb b/meta/recipes-connectivity/inetutils/inetutils_2.4.bb index 6519331141a..bcc3a0258e6 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.4.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.4.bb @@ -1,3 +1,4 @@ +SUMMARY = "The GNU inetutils are a collection of common networking utilities and servers." DESCRIPTION = "The GNU inetutils are a collection of common \ networking utilities and servers including ftp, ftpd, rcp, \ rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \ diff --git a/meta/recipes-core/images/core-image-ptest-all.bb b/meta/recipes-core/images/core-image-ptest-all.bb index c84e653d6eb..d4edb0fd058 100644 --- a/meta/recipes-core/images/core-image-ptest-all.bb +++ b/meta/recipes-core/images/core-image-ptest-all.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Recipe to trigger execution of all ptest images." +SUMMARY = "Recipe to trigger execution of all ptest images." HOMEPAGE = "https://www.yoctoproject.org/" LICENSE = "MIT" diff --git a/meta/recipes-core/images/core-image-ptest-fast.bb b/meta/recipes-core/images/core-image-ptest-fast.bb index e768afb302b..a5364e6cbf2 100644 --- a/meta/recipes-core/images/core-image-ptest-fast.bb +++ b/meta/recipes-core/images/core-image-ptest-fast.bb @@ -1,6 +1,6 @@ require core-image-ptest-all.bb -DESCRIPTION = "Recipe to trigger execution of all fast ptest images." +SUMMARY = "Recipe to trigger execution of all fast ptest images." PTESTS = "${PTESTS_FAST}" diff --git a/meta/recipes-core/musl/musl-utils.bb b/meta/recipes-core/musl/musl-utils.bb index c42dff3a537..8280333daf4 100644 --- a/meta/recipes-core/musl/musl-utils.bb +++ b/meta/recipes-core/musl/musl-utils.bb @@ -1,7 +1,7 @@ # Copyright (C) 2018 Khem Raj # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "getconf, getent and iconv implementations for musl" +SUMMARY = "getconf, getent and iconv implementations for musl" HOMEPAGE = "https://git.alpinelinux.org/cgit/aports/tree/main/musl" LICENSE = "BSD-2-Clause & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=9d08215e611db87b357e8674b4b42564" diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb index 053198ca5ec..1c4cdd5e3c0 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "C implementation of createrepo." +SUMMARY = "C implementation of createrepo." HOMEPAGE = "https://github.com/rpm-software-management/createrepo_c/wiki" LICENSE = "GPL-2.0-only" diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index f133653903e..630aca758cc 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -1,7 +1,7 @@ # Copyright (C) 2017 Khem Raj # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "The LLVM Compiler Infrastructure" +SUMMARY = "The LLVM Compiler Infrastructure" HOMEPAGE = "http://llvm.org" LICENSE = "Apache-2.0-with-LLVM-exception" SECTION = "devel" diff --git a/meta/recipes-devtools/lua/lua_5.4.4.bb b/meta/recipes-devtools/lua/lua_5.4.4.bb index a39d888ec24..4fa5c593cf2 100644 --- a/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/meta/recipes-devtools/lua/lua_5.4.4.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Lua is a powerful light-weight programming language designed \ +SUMMARY = "Lua is a powerful light-weight programming language designed \ for extending applications." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=307;endline=330;md5=79c3f6b19ad05efe24c1681f025026bb" diff --git a/meta/recipes-devtools/python/python3-alabaster_0.7.13.bb b/meta/recipes-devtools/python/python3-alabaster_0.7.13.bb index 9571137fb61..05d59febf0d 100644 --- a/meta/recipes-devtools/python/python3-alabaster_0.7.13.bb +++ b/meta/recipes-devtools/python/python3-alabaster_0.7.13.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Alabaster is a visually (c)lean, responsive, configurable theme for the Sphinx documentation system. It is Python 2+3 compatible." +SUMMARY = "Alabaster is a visually (c)lean, responsive, configurable theme for the Sphinx documentation system." HOMEPAGE = "https://alabaster.readthedocs.io/en/latest/" SECTION = "devel/python" LICENSE = "BSD-3-Clause" diff --git a/meta/recipes-devtools/python/python3-asn1crypto_1.5.1.bb b/meta/recipes-devtools/python/python3-asn1crypto_1.5.1.bb index 5fa2ed987cc..3b8c5f9fc57 100644 --- a/meta/recipes-devtools/python/python3-asn1crypto_1.5.1.bb +++ b/meta/recipes-devtools/python/python3-asn1crypto_1.5.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 structures" +SUMMARY = "A fast, pure Python library for parsing and serializing ASN.1 structures" HOMEPAGE = "https://github.com/wbond/asn1crypto" SECTION = "devel/python" LICENSE = "MIT" diff --git a/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb b/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb index f706f5d7be9..f29be378e19 100644 --- a/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb +++ b/meta/recipes-devtools/python/python3-atomicwrites_1.4.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Powerful Python library for atomic file writes" +SUMMARY = "Powerful Python library for atomic file writes" HOMEPAGE = "https://github.com/untitaker/python-atomicwrites" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=91cc36cfafeefb7863673bcfcb1d4da4" diff --git a/meta/recipes-devtools/python/python3-attrs_22.2.0.bb b/meta/recipes-devtools/python/python3-attrs_22.2.0.bb index 20dccc66399..8c1ff330e7b 100644 --- a/meta/recipes-devtools/python/python3-attrs_22.2.0.bb +++ b/meta/recipes-devtools/python/python3-attrs_22.2.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Classes Without Boilerplate" +SUMMARY = "Classes Without Boilerplate" HOMEPAGE = "http://www.attrs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5e55731824cf9205cfabeab9a0600887" diff --git a/meta/recipes-devtools/python/python3-babel_2.12.1.bb b/meta/recipes-devtools/python/python3-babel_2.12.1.bb index dfa45fbdf6e..794e1652cd6 100644 --- a/meta/recipes-devtools/python/python3-babel_2.12.1.bb +++ b/meta/recipes-devtools/python/python3-babel_2.12.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A collection of tools for internationalizing Python applications" +SUMMARY = "A collection of tools for internationalizing Python applications" HOMEPAGE = "http://babel.edgewall.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0f97d9a63e91407b4c0d01efde91cfc0" diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb b/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb index 9f5b81330bb..21f2eb6ba46 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.0.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Modern password hashing for your software and your servers." +SUMMARY = "Modern password hashing for your software and your servers." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" HOMEPAGE = "https://pypi.org/project/bcrypt/" diff --git a/meta/recipes-devtools/python/python3-dtschema_2023.1.bb b/meta/recipes-devtools/python/python3-dtschema_2023.1.bb index 9767c95d304..74ca55cf04c 100644 --- a/meta/recipes-devtools/python/python3-dtschema_2023.1.bb +++ b/meta/recipes-devtools/python/python3-dtschema_2023.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Tooling for devicetree validation using YAML and jsonschema" +SUMMARY = "Tooling for devicetree validation using YAML and jsonschema" HOMEPAGE = "https://github.com/devicetree-org/dt-schema" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=457495c8fa03540db4a576bf7869e811" diff --git a/meta/recipes-devtools/python/python3-imagesize_1.4.1.bb b/meta/recipes-devtools/python/python3-imagesize_1.4.1.bb index 34c5a43028f..4edac0a533e 100644 --- a/meta/recipes-devtools/python/python3-imagesize_1.4.1.bb +++ b/meta/recipes-devtools/python/python3-imagesize_1.4.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Parses image files’ header and return image size." +SUMMARY = "Parses image files’ header and return image size." HOMEPAGE = "https://github.com/shibukawa/imagesize_py" SECTION = "devel/python" LICENSE = "MIT" diff --git a/meta/recipes-devtools/python/python3-importlib-metadata_6.0.0.bb b/meta/recipes-devtools/python/python3-importlib-metadata_6.0.0.bb index b33a1b58589..9e72b8fc57b 100644 --- a/meta/recipes-devtools/python/python3-importlib-metadata_6.0.0.bb +++ b/meta/recipes-devtools/python/python3-importlib-metadata_6.0.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Read metadata from Python packages" +SUMMARY = "Read metadata from Python packages" HOMEPAGE = "https://pypi.org/project/importlib-metadata/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb index cd248cc0b4f..fa6d930a9c2 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python." +SUMMARY = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python." HOMEPAGE = "https://pypi.org/project/Jinja2/" LICENSE = "BSD-3-Clause" diff --git a/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb b/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb index 32420529635..d150403f8c3 100644 --- a/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb +++ b/meta/recipes-devtools/python/python3-markupsafe_2.1.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python" +SUMMARY = "Implements a XML/HTML/XHTML Markup safe string for Python" HOMEPAGE = "http://github.com/mitsuhiko/markupsafe" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" diff --git a/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb b/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb index f5d107c78db..8c33b7161bc 100644 --- a/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb +++ b/meta/recipes-devtools/python/python3-more-itertools_9.1.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "More routines for operating on iterables, beyond itertools" +SUMMARY = "More routines for operating on iterables, beyond itertools" HOMEPAGE = "https://github.com/erikrose/more-itertools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" diff --git a/meta/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb b/meta/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb index 6f3c096cf0e..6a3d6d30ae9 100644 --- a/meta/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb +++ b/meta/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL" +SUMMARY = "Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL" HOMEPAGE = "https://github.com/cedadev/ndg_httpsclient/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://MANIFEST.in;md5=ce22c0cd986d2de3f7073cd6b5523ae0" diff --git a/meta/recipes-devtools/python/python3-packaging_23.0.bb b/meta/recipes-devtools/python/python3-packaging_23.0.bb index 7b69c880c14..612174f45e0 100644 --- a/meta/recipes-devtools/python/python3-packaging_23.0.bb +++ b/meta/recipes-devtools/python/python3-packaging_23.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Core utilities for Python packages" +SUMMARY = "Core utilities for Python packages" HOMEPAGE = "https://github.com/pypa/packaging" LICENSE = "Apache-2.0 | BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" diff --git a/meta/recipes-devtools/python/python3-pathlib2_2.3.7.bb b/meta/recipes-devtools/python/python3-pathlib2_2.3.7.bb index 673b5c7ef09..92285d1d72f 100644 --- a/meta/recipes-devtools/python/python3-pathlib2_2.3.7.bb +++ b/meta/recipes-devtools/python/python3-pathlib2_2.3.7.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Object-oriented filesystem paths" +SUMMARY = "Object-oriented filesystem paths" HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2dc08586cce3ab91bfa091b655c0e440" diff --git a/meta/recipes-devtools/python/python3-pyelftools_0.29.bb b/meta/recipes-devtools/python/python3-pyelftools_0.29.bb index 2199e9ff8ef..c55682e2eaf 100644 --- a/meta/recipes-devtools/python/python3-pyelftools_0.29.bb +++ b/meta/recipes-devtools/python/python3-pyelftools_0.29.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "pyelftools is a pure-Python library for parsing and analyzing ELF files and DWARF debugging information" +SUMMARY = "pyelftools is a pure-Python library for parsing and analyzing ELF files and DWARF debugging information" HOMEPAGE = "https://github.com/eliben/pyelftools" SECTION = "devel/python" LICENSE = "PD" diff --git a/meta/recipes-devtools/python/python3-pysocks_1.7.1.bb b/meta/recipes-devtools/python/python3-pysocks_1.7.1.bb index 91444017031..b77bf0fb8d8 100644 --- a/meta/recipes-devtools/python/python3-pysocks_1.7.1.bb +++ b/meta/recipes-devtools/python/python3-pysocks_1.7.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A Python SOCKS client module" +SUMMARY = "A Python SOCKS client module" HOMEPAGE = "http://python-requests.org" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1d457bcffb9661b45f799d4efee72f16" diff --git a/meta/recipes-devtools/python/python3-requests_2.28.2.bb b/meta/recipes-devtools/python/python3-requests_2.28.2.bb index 2f397ddaadf..8ab1ec01212 100644 --- a/meta/recipes-devtools/python/python3-requests_2.28.2.bb +++ b/meta/recipes-devtools/python/python3-requests_2.28.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Python HTTP for Humans." +SUMMARY = "Python HTTP for Humans." HOMEPAGE = "http://python-requests.org" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" diff --git a/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb b/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb index 0845646978b..e8a422b2e79 100644 --- a/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb +++ b/meta/recipes-devtools/python/python3-sphinx-rtd-theme_1.2.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Sphinx Theme reader" +SUMMARY = "Sphinx Theme reader" HOMEPAGE = "https://github.com/readthedocs/sphinx_rtd_theme" SECTION = "devel/python" LICENSE = "MIT & OFL-1.1" diff --git a/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb index f75988a6a0d..0de19af8d9a 100644 --- a/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb +++ b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Python documentation generator" +SUMMARY = "Python documentation generator" HOMEPAGE = "http://sphinx-doc.org/" SECTION = "devel/python" LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause" diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb index 4d14216c524..e352601466d 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books" +SUMMARY = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books" HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5" diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb index 7b7bda78071..0d034366e7a 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-devhelp_1.0.2.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." +SUMMARY = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd30d9972a142c857a80c9f312e92b93" diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb index 39589881daa..bf034fb6849 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" +SUMMARY = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24dce5ef6a13563241c24bc366f48886" diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-jsmath_1.0.1.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-jsmath_1.0.1.bb index 863458a1dc5..7c11cfeec53 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-jsmath_1.0.1.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-jsmath_1.0.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A sphinx extension which renders display math in HTML via JavaScript" +SUMMARY = "A sphinx extension which renders display math in HTML via JavaScript" HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0064c10bd544bcffccbc67a41c108d3" diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb index 8ebfbba7410..41d2b6187b7 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-qthelp_1.0.3.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Is a sphinx extension which outputs QtHelp document." +SUMMARY = "Is a sphinx extension which outputs QtHelp document." HOMEPAGE = "http://babel.edgewall.org/" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f7a83b72ea86d04827575ec0b63430eb" diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb index 71dde37593f..7fa6d8aeb7a 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-serializinghtml_1.1.5.bb @@ -1,4 +1,4 @@ -DESCRIPTION = 'sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized" HTML files (json and pickle).' +SUMMARY = 'sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized" HTML files (json and pickle).' HOMEPAGE = "https://www.sphinx-doc.org" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=32a84ac5cd3bbd10c4d479233ad588b6" diff --git a/meta/recipes-devtools/python/python3-zipp_3.15.0.bb b/meta/recipes-devtools/python/python3-zipp_3.15.0.bb index 5b42dd8139b..45654ff6f1c 100644 --- a/meta/recipes-devtools/python/python3-zipp_3.15.0.bb +++ b/meta/recipes-devtools/python/python3-zipp_3.15.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Backport of pathlib-compatible object wrapper for zip files" +SUMMARY = "Backport of pathlib-compatible object wrapper for zip files" HOMEPAGE = "https://github.com/jaraco/zipp" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" diff --git a/meta/recipes-devtools/rust/cargo_1.68.1.bb b/meta/recipes-devtools/rust/cargo_1.68.1.bb index 2b2394e898b..a5c10641066 100644 --- a/meta/recipes-devtools/rust/cargo_1.68.1.bb +++ b/meta/recipes-devtools/rust/cargo_1.68.1.bb @@ -1,4 +1,4 @@ -SUMMARY ?= "Cargo, a package manager for Rust." +SUMMARY = "Cargo, a package manager for Rust." HOMEPAGE = "https://crates.io" LICENSE = "MIT | Apache-2.0" SECTION = "devel" diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index 17f933959f5..8d0dc6a4e26 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc @@ -1,3 +1,4 @@ +SUMMARY = "Rust compiler and runtime libaries (cross-canadian for ${TARGET_ARCH} target)" PN = "rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" inherit rust-target-config diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index d0de035921f..5483ecc307b 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "This is a simple example recipe that cross-compiles a Go program." +SUMMARY = "This is a simple example recipe that cross-compiles a Go program." SECTION = "examples" HOMEPAGE = "https://golang.org/" diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 05babf4c91e..7e70cf1f040 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "The Vulkan Samples is collection of resources to help develop optimized Vulkan applications." +SUMMARY = "The Vulkan Samples is collection of resources to help develop optimized Vulkan applications." HOMEPAGE = "https://www.khronos.org/vulkan/" BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Samples/issues" LICENSE = "Apache-2.0" diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb index c869274d09f..974fcba876a 100644 --- a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb +++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Wrapper for tooling for devicetree validation using YAML and jsonschema" +SUMMARY = "Wrapper for tooling for devicetree validation using YAML and jsonschema" HOMEPAGE = "https://yoctoproject.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb index b9fc17f3e95..bb6bcb45b05 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.bb @@ -1,7 +1,7 @@ require gstreamer1.0-plugins-common.inc require gstreamer1.0-plugins-license.inc -DESCRIPTION = "'Bad' GStreamer plugins and helper libraries " +SUMMARY = "'Bad' GStreamer plugins and helper libraries " HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb index 01ef63c104f..91c072accd8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.bb @@ -1,6 +1,6 @@ require gstreamer1.0-plugins-common.inc -DESCRIPTION = "'Base' GStreamer plugins and helper libraries" +SUMMARY = "'Base' GStreamer plugins and helper libraries" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues" LICENSE = "LGPL-2.1-or-later" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb index ef4d82c598f..67a6a224048 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.bb @@ -1,6 +1,6 @@ require gstreamer1.0-plugins-common.inc -DESCRIPTION = "'Good' GStreamer plugins" +SUMMARY = "'Good' GStreamer plugins" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb index 9c384fea5c5..35baaea3043 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb @@ -1,7 +1,7 @@ require gstreamer1.0-plugins-common.inc require gstreamer1.0-plugins-license.inc -DESCRIPTION = "'Ugly GStreamer plugins" +SUMMARY = "'Ugly GStreamer plugins" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly/-/issues" diff --git a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb index 7bd66f63cf2..9dff9706630 100644 --- a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb +++ b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.76.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +SUMMARY = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" From patchwork Fri Mar 31 05:26:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21987 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 2728EC6FD18 for ; Fri, 31 Mar 2023 05:26:56 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web11.47959.1680240404715480497 for ; Thu, 30 Mar 2023 22:26:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=QdziUm4x; spf=pass (domain: gmail.com, ip: 209.85.221.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f46.google.com with SMTP id t4so15950306wra.7 for ; Thu, 30 Mar 2023 22:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240405; 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=MVZ7P8nu3gHOdYnH7PabS1edKddumbrCw7vxRb07xdg=; b=QdziUm4xnF3XufVt+Txp8QMS9ebqBTlVouS1KKGsNNwuuAMHTUGGObyfZbV+sLpKZO bw/08Kox6P/vDEZZM68eWsa14FQIqYfSHgFnLR2gUJWFN1ltwaL3Ey88NjNvi51nM+id TtBaAl306Lf2OFKWWhSwyWU+o7tpxwRjMlp5K6Cgl6Q3O7vJNrgRRuCu6l3vEdLF6o36 IycsI6LMAPK3w+tKrxtEbygIINUhZjwyQQKKBw03xxsfvmpKQngfoT6awVdhf7f7S/OC 8GhDNG2CD2K8FiYRIgLmTHO4O5tqE1souOD1YUWaiEPSPlnGpJ6yBJnhjOWDAXuB1ajq pbuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240405; 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=MVZ7P8nu3gHOdYnH7PabS1edKddumbrCw7vxRb07xdg=; b=y2qavRvwbNa5d7Y30zdeeW5GKdxpr2SmKpGpVaAlAC8/BYRUaDKQmMSSW7u8XG+WG9 cT8uKyOit21j/UO/p9Ha5Ya1/0+xJfdwEtkCqbQ7nLlV+kusFaX79gNHmtKZsIZmAWkN 29aZxyn6+or1sC5EYivODp82pF6Z5I9tAgNvkbDrXCcKdqpfdLCw8n1nGqaJ0YH6rLmU YMDT5w8RKLAD+ahwsSusblcSCRW1rm8mU9TW3N9l2CFUt44A/kukaoLy2haU6A4Ejct4 ad7TQ+0ZHIxG/3szCk6mtf0vJXVWyoCxzM88/MrAWAZYvCtRWPNSyxg7sNYF0nsgT+TU 5dzw== X-Gm-Message-State: AAQBX9evshvSFUC1p50rFZ0bNXri0gZ8B4HIGxrKaZHBPja8sAJdLAwL 4aFwBxWgvFJZROb8w56VaG6rApBKpYU= X-Google-Smtp-Source: AKy350bqv9rjsg9q6qzcSgLwGCeuvw+DltcrVMT37luPrrlpF3wLJc56TmqXOgoHShjQZKocxjeC8A== X-Received: by 2002:adf:eb4c:0:b0:2ce:ae05:4436 with SMTP id u12-20020adfeb4c000000b002ceae054436mr19057116wrn.41.1680240404882; Thu, 30 Mar 2023 22:26:44 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:44 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/7] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only) Date: Fri, 31 Mar 2023 07:26:35 +0200 Message-Id: <20230331052636.978578-6-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230331052636.978578-1-alex@linutronix.de> References: <20230331052636.978578-1-alex@linutronix.de> 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 ; Fri, 31 Mar 2023 05:26:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179387 This was done in a selftest, but that is too late and creates friction in integration as errors are not seen until autobuilder fails. Bonus fix: SUMMARY check wasn't even working, as in the absence of one set in the recipe there is a default value set from bitbake.conf. I left DESCRIPTION check out for now, as many recipes don't actually have it, and it's set from SUMMARY (plus a dot) if absent. Signed-off-by: Alexander Kanavin --- meta/classes-global/insane.bbclass | 27 +++++++++++++++- meta/lib/oeqa/selftest/cases/distrodata.py | 36 ---------------------- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index ee34d5208d1..64ad76c48e9 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -44,7 +44,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ already-stripped installed-vs-shipped ldflags compile-host-path \ install-host-path pn-overrides unknown-configure-option \ useless-rpaths rpaths staticdev empty-dirs \ - patch-fuzz patch-status-core\ + patch-fuzz patch-status-core missing-metadata \ " # Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}" @@ -1481,6 +1481,28 @@ python do_qa_unpack() { unpack_check_src_uri(d.getVar('PN'), d) } +python do_qa_fetch() { + def test_missing_metadata(d): + fn = d.getVar("FILE") + if not '/meta/recipes-' in fn: + # We are only interested in OE-Core + return + pn = d.getVar('BPN') + srcfile = d.getVar('SRC_URI').split() + # Check that SUMMARY is not the same as the default from bitbake.conf + if d.getVar('SUMMARY') == d.expand("${PN} version ${PV}-${PR}"): + oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a SUMMARY. Please add an entry.".format(pn, fn), d) + if not d.getVar('HOMEPAGE'): + if srcfile and srcfile[0].startswith('file') or not d.getVar('SRC_URI'): + # We are only interested in recipes SRC_URI fetched from external sources + pass + else: + oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a HOMEPAGE. Please add an entry.".format(pn, fn), d) + + test_missing_metadata(d) + oe.qa.exit_if_errors(d) +} + # Check for patch fuzz do_patch[postfuncs] += "do_qa_patch " @@ -1492,6 +1514,9 @@ do_configure[postfuncs] += "do_qa_configure " # Check does S exist. do_unpack[postfuncs] += "do_qa_unpack" +# Check basic recipe metadata (e.g. SUMMARY/HOMEPAGE/RECIPE_MAINTAINER) +do_fetch[postfuncs] += "do_qa_fetch" + python () { import re diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py index b5554a6c3c3..b443f2d3af6 100644 --- a/meta/lib/oeqa/selftest/cases/distrodata.py +++ b/meta/lib/oeqa/selftest/cases/distrodata.py @@ -39,42 +39,6 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re """ + "\n".join(regressed_successes) self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg) - def test_missing_homepg(self): - """ - Summary: Test for oe-core recipes that don't have a HOMEPAGE or DESCRIPTION - Expected: All oe-core recipes should have a DESCRIPTION entry - Expected: All oe-core recipes should have a HOMEPAGE entry except for recipes that are not fetched from external sources. - Product: oe-core - """ - with bb.tinfoil.Tinfoil() as tinfoil: - tinfoil.prepare(config_only=False) - no_description = [] - no_homepage = [] - for fn in tinfoil.all_recipe_files(variants=False): - if not '/meta/recipes-' in fn: - # We are only interested in OE-Core - continue - rd = tinfoil.parse_recipe_file(fn, appends=False) - pn = rd.getVar('BPN') - srcfile = rd.getVar('SRC_URI').split() - #Since DESCRIPTION defaults to SUMMARY if not set, we are only interested in recipes without DESCRIPTION or SUMMARY - if not (rd.getVar('SUMMARY') or rd.getVar('DESCRIPTION')): - no_description.append((pn, fn)) - if not rd.getVar('HOMEPAGE'): - if srcfile and srcfile[0].startswith('file') or not rd.getVar('SRC_URI'): - # We are only interested in recipes SRC_URI fetched from external sources - continue - no_homepage.append((pn, fn)) - if no_homepage: - self.fail(""" -The following recipes do not have a HOMEPAGE. Please add an entry for HOMEPAGE in the recipe. -""" + "\n".join(['%s (%s)' % i for i in no_homepage])) - - if no_description: - self.fail(""" -The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIPTION in the recipe. -""" + "\n".join(['%s (%s)' % i for i in no_description])) - def test_maintainers(self): """ Summary: Test that oe-core recipes have a maintainer and entries in maintainers list have a recipe From patchwork Fri Mar 31 05:26:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 21988 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 20548C76196 for ; Fri, 31 Mar 2023 05:26:56 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web10.47933.1680240406967191737 for ; Thu, 30 Mar 2023 22:26:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Vn0SvKmJ; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id m2so21189222wrh.6 for ; Thu, 30 Mar 2023 22:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680240405; 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=4PGP7TR3dliRGV9nzuFkfUHpF1Ujpa4mHA/9tFhw328=; b=Vn0SvKmJ/5HPgyNOE8zXkEI0clkcJzf+WfGNAa4MJzMcbmGdCEmIHsch+Y3waZglsf M32Navd2t/vIH9MVOouOESjWwY58HkC1hIJaONMo1hcxu+5+IpNAcK6y2w1FeONCi2hV iJPsuKW8Hi1ksiRK40qy9QDE4sn9uI5qYzDMBpTm9r0kXfakJ843YjftTagL7WpaOh7L dzRd5NGHLr3v4RFVdf3sXJQYbo/fb7AZN1Sq0Dg3+nZ37SvrN2xdApCECOO+3x+me3BO r3//gRau4uXZgx8siWZGv7GHhs3XS6lAD8ZsVnZMJ4TjTn1FneTMTc3hLCS/Jm4/Fvao VdCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680240405; 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=4PGP7TR3dliRGV9nzuFkfUHpF1Ujpa4mHA/9tFhw328=; b=xeKoTcWK5oxlJXLcen9cmga6lekrBQVrYUUCRbU+lX/t4+7O9KyWaNeV/z9yinbf9H 4bq0CiOOzb+JzAu5JABymgHmI5eZJ1qeDMRQ1oB33vvvWV+Vj0mKebgONIwWAGlJD/AV amUT/p29boiZoSL5HVH0MUktMFkpkQZnD//dVqWBo/LSKzowF9vBoo173hwA281iSW9c 01nkne9fGQ4ANfm1hoKBc2ZDIUOrfvmu3An2YQHnwzQ5d5dQPCXbgSngnwnIZwgPgWbJ 3fRGYsAXShq4i/n7/XYSR6U8rHQDlKTpFOc3jWQJilZNwFh8/DVM+tuALvrEHHWG9+Um 83Ww== X-Gm-Message-State: AAQBX9cEZOolE2vmM7oMVR33gkN/ALs6PfDA3YDWewdx8UtiZEIJ3ul7 8gdLVwO49n3ejw2uRO2ce0j5u5lc+Rs= X-Google-Smtp-Source: AKy350ZJ1EXi/BEcEV+JNDMBJUKpb4GiLbRiO6SsSxa37j64kCt633NSLTm3tPfbC2j92hO/qtPjzA== X-Received: by 2002:a5d:4848:0:b0:2ce:a9e9:490b with SMTP id n8-20020a5d4848000000b002cea9e9490bmr18608843wrs.31.1680240405383; Thu, 30 Mar 2023 22:26:45 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id l5-20020a5d5265000000b002e55cc69169sm1146902wrc.38.2023.03.30.22.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 22:26:45 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 7/7] insane.bbclass: add a RECIPE_MAINTAINER check (oe-core recipes only) Date: Fri, 31 Mar 2023 07:26:36 +0200 Message-Id: <20230331052636.978578-7-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230331052636.978578-1-alex@linutronix.de> References: <20230331052636.978578-1-alex@linutronix.de> 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 ; Fri, 31 Mar 2023 05:26:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179390 Absent maintainer entries are as well a frequent source of friction, as they are checked only in selftest, and so aren revealed until autobuilder runs. The selftest is retained as it also checks for obsolete entries in maintainers.inc (not possible to do in insane class). The insane check also looks up entries in a different way than selftest (from actual filenames), and so additional lines in maintainer.inc are needed; I took the opportunity to adjust and clean up exception lists in selftest to match. Signed-off-by: Alexander Kanavin --- meta/classes-global/insane.bbclass | 12 ++++++++++++ meta/conf/distro/include/maintainers.inc | 16 ++++++++++++++++ meta/lib/oeqa/selftest/cases/distrodata.py | 6 +++--- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 64ad76c48e9..dacbd431e53 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -1499,7 +1499,19 @@ python do_qa_fetch() { else: oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not contain a HOMEPAGE. Please add an entry.".format(pn, fn), d) + def test_missing_maintainer(d): + fn = d.getVar("FILE") + if not '/meta/recipes-' in fn: + # We are only interested in OE-Core + return + # PN or BPN are not suitable as they are tweaked to match class variants, and it's not possible + # to map them back to the actual original item in recipe filename. + pn = os.path.splitext(os.path.basename(d.getVar('FILE')))[0].split('_')[0] + if not d.getVar('RECIPE_MAINTAINER:pn-{}'.format(pn)): + oe.qa.handle_error("missing-metadata", "Recipe {} in {} does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc.".format(pn, fn), d) + test_missing_metadata(d) + test_missing_maintainer(d) oe.qa.exit_if_errors(d) } diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 682ec2cfdfb..1af6ccdbb71 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -62,9 +62,12 @@ RECIPE_MAINTAINER:pn-bash-completion = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj " RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj " +RECIPE_MAINTAINER:pn-gcc-source = "Khem Raj " RECIPE_MAINTAINER:pn-gcc-source-12.2.0 = "Khem Raj " RECIPE_MAINTAINER:pn-gconf = "Ross Burton " RECIPE_MAINTAINER:pn-gcr3 = "Markus Volk " RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gdb = "Khem Raj " +RECIPE_MAINTAINER:pn-gdb-cross = "Khem Raj " RECIPE_MAINTAINER:pn-gdb-cross-${TARGET_ARCH} = "Khem Raj " +RECIPE_MAINTAINER:pn-gdb-cross-canadian = "Khem Raj " RECIPE_MAINTAINER:pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj " RECIPE_MAINTAINER:pn-gdbm = "Alexander Kanavin " RECIPE_MAINTAINER:pn-gdk-pixbuf = "Ross Burton " @@ -221,8 +227,11 @@ RECIPE_MAINTAINER:pn-gnupg = "Hongxu Jia " RECIPE_MAINTAINER:pn-gnutls = "Unassigned " RECIPE_MAINTAINER:pn-go = "Khem Raj " RECIPE_MAINTAINER:pn-go-binary-native = "Khem Raj " +RECIPE_MAINTAINER:pn-go-cross = "Khem Raj " RECIPE_MAINTAINER:pn-go-cross-${TUNE_PKGARCH} = "Khem Raj " +RECIPE_MAINTAINER:pn-go-cross-canadian = "Khem Raj " RECIPE_MAINTAINER:pn-go-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj " +RECIPE_MAINTAINER:pn-go-crosssdk = "Khem Raj " RECIPE_MAINTAINER:pn-go-crosssdk-${SDK_SYS} = "Khem Raj " RECIPE_MAINTAINER:pn-go-helloworld = "Khem Raj " RECIPE_MAINTAINER:pn-go-native = "Khem Raj " @@ -278,6 +287,9 @@ RECIPE_MAINTAINER:pn-initramfs-live-install = "Anuj Mittal """ def is_exception(pkg): - exceptions = ["packagegroup-", "initramfs-", "systemd-machine-units", "target-sdk-provides-dummy"] + exceptions = ["packagegroup-",] for i in exceptions: if i in pkg: return True return False def is_maintainer_exception(entry): - exceptions = ["musl", "newlib", "linux-yocto", "linux-dummy", "mesa-gl", "libgfortran", - "cve-update-db-native", "rust"] + exceptions = ["musl", "newlib", "linux-yocto", "linux-dummy", "mesa-gl", "libgfortran", "libx11-compose-data", + "cve-update-db-native", "gdb-cross", "binutils-cross", "go-cross", "gcc-source","rust-cross",] for i in exceptions: if i in entry: return True