From patchwork Wed Mar 22 14:21:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21530 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 220E2C6FD1F for ; Wed, 22 Mar 2023 14:21:54 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web11.43999.1679494912486248017 for ; Wed, 22 Mar 2023 07:21:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cVjNIlN/; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so19333749pjb.0 for ; Wed, 22 Mar 2023 07:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=W1yfAWjlj+9TUZPyT9+oH7ecNuIZNPoDhAiZDJUB4qE=; b=cVjNIlN/QgfWwb9krVH+WQGIJz6UA+58CHNae4n5ullDro+gCsQjv0AJiNZREDsB7z DNn8T7wBKF63vvzz1ySf1XCbTAXMcKdfizKcSQQ09d6I5taKySZkSpz75vE5uI3whKwx OyDnw99Zi0Fyrw85PEfdQX38V/4evOCHu7OWujlKNlv1086f/sTw6NCsTzwnbY/nkNut U1dhC3rM756pzAfj3xwqtN3AF4kNK4CXEr8pXbe+55oAAb88e5njdXCVf09x0oI1WY++ rxOmD3kE+nDZEhVw0UKC2rtrihN1V7rn9VhZDFWCRpzfznN+PJBIHtFEAGmdNbzSl0ZS mwqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W1yfAWjlj+9TUZPyT9+oH7ecNuIZNPoDhAiZDJUB4qE=; b=ZotEMHByZ255Cyd+ALHK4euPwRtlFNvCJ0BUfsLRae2bGtEONTEplUt9dJ17wxSRUB EGJI1JbMHiPacWZWdoaVw7Tx6rKnja0hpyxTIwawutjr3ubIsST6i11ov80kBV0tgF2F wOOAj0pBeF+P/6b9R2bp7+HH436X5sYPiv6AKCcxFvgqsZvjJhuhSf5cMI0VhFBD36ba mlbkxoo8vJUSuWEx3n2dBHl7RyzmIiz5rYrEfwuTzgAiYepNqWSUvhF/sBdunpI8IY5B uwjRWtjQrk90rFcLesjrslhnC/+76OS0BM8fSGvlUEWfuwyWiyKDw6S1HcAIYFO3/J9B FJ6w== X-Gm-Message-State: AO0yUKUYz0QEIiF84R3sGTY+HTh9KHkDqs+1YfjrruRbE+5LEI7LejFm o5VH793mG0isE76JrnAzRtiS6gumoA6w+usVKJI= X-Google-Smtp-Source: AK7set/Nit+S0xL74iObrDDpN3NmZm3ZIISUvNulcqVTiW7Sj1gKwNtrCCA/H1i0QOwIMkhNtppDSA== X-Received: by 2002:a05:6a20:b91a:b0:d9:a792:8e3d with SMTP id fe26-20020a056a20b91a00b000d9a7928e3dmr4362415pzb.30.1679494911366; Wed, 22 Mar 2023 07:21:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.21.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:21:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/21] git: ignore CVE-2023-22743 Date: Wed, 22 Mar 2023 04:21:20 -1000 Message-Id: <70adf86b515934168a6185dcff4a8edb39a40017.1679494378.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:21:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178926 From: Chee Yang Lee Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.37.6.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/git/git_2.37.6.bb b/meta/recipes-devtools/git/git_2.37.6.bb index e6165ca37b..302db215e2 100644 --- a/meta/recipes-devtools/git/git_2.37.6.bb +++ b/meta/recipes-devtools/git/git_2.37.6.bb @@ -33,6 +33,8 @@ CVE_PRODUCT = "git-scm:git" CVE_CHECK_IGNORE += "CVE-2022-24975" # This is specific to Git-for-Windows CVE_CHECK_IGNORE += "CVE-2022-41953" +# specific to Git for Windows +CVE_CHECK_IGNORE += "CVE-2023-22743" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" From patchwork Wed Mar 22 14:21:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21535 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 1086EC6FD1C for ; Wed, 22 Mar 2023 14:22:04 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.44000.1679494914130341136 for ; Wed, 22 Mar 2023 07:21:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=fE2za4Qx; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so19324296pjz.1 for ; Wed, 22 Mar 2023 07:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LotRX52dD3jg+R7OeJHqocei05o0si0hkzxoLLF30wo=; b=fE2za4QxO4RuOB3Js7NGfPsqd4h/6F3MBGzZ0xhr9Oq1RxALhm5o6n+YmjacFgkRDu PUof9A9dbsZSB++ICfcMM4OJ01aXQkyvaV/LAi9/iAWhtKZs21HSMxIFL1O26kPHRt1s aorI0iN/LW/vwBC8Y5VDHsCk0K9mhvPqVP/DvDeOoFIhjFsec2Y42DKqKw69Z7Eoboij rA/Pq0lAvoA3uvJmpqNwGjOm84wPQSFBc/RU++CgzqiOO43QAGblj9enGjqr3YL6f4oL xgEXeBN+bnWQnee/6ggQw/kypTDeRQ40eKZo+qYzL3WsNQXS6XCYCBSML5WwaPCfvcv2 67dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LotRX52dD3jg+R7OeJHqocei05o0si0hkzxoLLF30wo=; b=yWh5N6jd3ro7/FuWgWMmP8mqLt+BPdq8Ad/m6gaFXPQo9wPTsVEsz2BfFAm3tGrAig 2P/8OCz8EnPgssqoz63GKCuTwTSGOkdwpBSuSy5ErkYlHD910WbQLaEwBXzYUrIIfcRw +BM3/HqOD5LMDANqvVTE6cpm2lD1COe0lDgbXLVsViMPTzOTR+Z40NkbTWQfbd+jMRh9 V5Y6TLQqw4OFrJvQ8RBz1uNtpU0ZXNXGzXRAtNITdQ+v7O2CtU6RMMMzHvm4twhDvs10 Kqu1U2ol/se4ZWzgIkSaWgKm5rWyoEnnRNowqk7EjkuB32BZZppxZJXntetFm3j1Y8Hc LnFA== X-Gm-Message-State: AO0yUKW29Bw3ufKVz8EZqRmXgSXB7y5MVzHB/OLGRUj4QXH8uTgPl3G7 AS03Hk5p4TrUc+X7FY7Q7yEFDgR/WoHiP7lIaZM= X-Google-Smtp-Source: AK7set/A/JsF+YO259wlUepjkBd8hPMj6RNXratNKH3h2zSd3K14a1t69q8M19z9hNybmLpLxra8yw== X-Received: by 2002:a05:6a20:4904:b0:d6:f3dd:5a88 with SMTP id ft4-20020a056a20490400b000d6f3dd5a88mr4859080pzb.5.1679494913026; Wed, 22 Mar 2023 07:21:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.21.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:21:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/21] tiff: Fix CVE-2023-0795 CVE-2023-0796 CVE-2023-0797 CVE-2023-0798 CVE-2023-0799 Date: Wed, 22 Mar 2023 04:21:21 -1000 Message-Id: <7634c800819f23f0cb1676bf46efca19e9176df1.1679494378.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178927 From: Chee Yang Lee import patch from ubuntu to fix multiple CVEs http://archive.ubuntu.com/ubuntu/pool/main/t/tiff/tiff_4.4.0-4ubuntu3.3.debian.tar.xz Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- .../CVE-2023-0795_0796_0797_0798_0799.patch | 154 ++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.4.0.bb | 1 + 2 files changed, 155 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-0795_0796_0797_0798_0799.patch diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2023-0795_0796_0797_0798_0799.patch b/meta/recipes-multimedia/libtiff/files/CVE-2023-0795_0796_0797_0798_0799.patch new file mode 100644 index 0000000000..926df680b3 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2023-0795_0796_0797_0798_0799.patch @@ -0,0 +1,154 @@ +From: Markus Koschany +Date: Tue, 21 Feb 2023 14:26:43 +0100 +Subject: CVE-2023-0795 + +This is also the fix for CVE-2023-0796, CVE-2023-0797, CVE-2023-0798, +CVE-2023-0799. + +Bug-Debian: https://bugs.debian.org/1031632 +Origin: https://gitlab.com/libtiff/libtiff/-/commit/afaabc3e50d4e5d80a94143f7e3c997e7e410f68 + +CVE: CVE-2023-0795 CVE-2023-0796 CVE-2023-0797 CVE-2023-0798 CVE-2023-0799 +Upstream-Status: Backport [import from ubuntu debian/patches/CVE-2023-0795.patch http://archive.ubuntu.com/ubuntu/pool/main/t/tiff/tiff_4.4.0-4ubuntu3.3.debian.tar.xz ] +Signed-off-by: Chee Yang Lee +--- + tools/tiffcrop.c | 51 ++++++++++++++++++++++++++++++--------------------- + 1 file changed, 30 insertions(+), 21 deletions(-) + +--- tiff-4.4.0.orig/tools/tiffcrop.c ++++ tiff-4.4.0/tools/tiffcrop.c +@@ -269,7 +269,6 @@ struct region { + uint32_t width; /* width in pixels */ + uint32_t length; /* length in pixels */ + uint32_t buffsize; /* size of buffer needed to hold the cropped region */ +- unsigned char *buffptr; /* address of start of the region */ + }; + + /* Cropping parameters from command line and image data +@@ -524,7 +523,7 @@ static int rotateContigSamples24bits(uin + static int rotateContigSamples32bits(uint16_t, uint16_t, uint16_t, uint32_t, + uint32_t, uint32_t, uint8_t *, uint8_t *); + static int rotateImage(uint16_t, struct image_data *, uint32_t *, uint32_t *, +- unsigned char **); ++ unsigned char **, int); + static int mirrorImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, + unsigned char *); + static int invertImage(uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, +@@ -5219,7 +5218,6 @@ initCropMasks (struct crop_mask *cps) + cps->regionlist[i].width = 0; + cps->regionlist[i].length = 0; + cps->regionlist[i].buffsize = 0; +- cps->regionlist[i].buffptr = NULL; + cps->zonelist[i].position = 0; + cps->zonelist[i].total = 0; + } +@@ -6551,8 +6549,13 @@ static int correct_orientation(struct i + (uint16_t) (image->adjustments & ROTATE_ANY)); + return (-1); + } +- +- if (rotateImage(rotation, image, &image->width, &image->length, work_buff_ptr)) ++ ++ /* Dummy variable in order not to switch two times the ++ * image->width,->length within rotateImage(), ++ * but switch xres, yres there. */ ++ uint32_t width = image->width; ++ uint32_t length = image->length; ++ if (rotateImage(rotation, image, &width, &length, work_buff_ptr, TRUE)) + { + TIFFError ("correct_orientation", "Unable to rotate image"); + return (-1); +@@ -6661,7 +6664,6 @@ extractCompositeRegions(struct image_dat + /* These should not be needed for composite images */ + crop->regionlist[i].width = crop_width; + crop->regionlist[i].length = crop_length; +- crop->regionlist[i].buffptr = crop_buff; + + src_rowsize = ((img_width * bps * spp) + 7) / 8; + dst_rowsize = (((crop_width * bps * count) + 7) / 8); +@@ -6900,7 +6902,6 @@ extractSeparateRegion(struct image_data + + crop->regionlist[region].width = crop_width; + crop->regionlist[region].length = crop_length; +- crop->regionlist[region].buffptr = crop_buff; + + src = read_buff; + dst = crop_buff; +@@ -7778,7 +7779,7 @@ processCropSelections(struct image_data + if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ + { + if (rotateImage(crop->rotation, image, &crop->combined_width, +- &crop->combined_length, &crop_buff)) ++ &crop->combined_length, &crop_buff, FALSE)) + { + TIFFError("processCropSelections", + "Failed to rotate composite regions by %"PRIu32" degrees", crop->rotation); +@@ -7888,7 +7889,7 @@ processCropSelections(struct image_data + * ToDo: Therefore rotateImage() and its usage has to be reworked (e.g. like mirrorImage()) !! + */ + if (rotateImage(crop->rotation, image, &crop->regionlist[i].width, +- &crop->regionlist[i].length, &crop_buff)) ++ &crop->regionlist[i].length, &crop_buff, FALSE)) + { + TIFFError("processCropSelections", + "Failed to rotate crop region by %"PRIu16" degrees", crop->rotation); +@@ -8020,7 +8021,7 @@ createCroppedImage(struct image_data *im + if (crop->crop_mode & CROP_ROTATE) /* rotate should be last as it can reallocate the buffer */ + { + if (rotateImage(crop->rotation, image, &crop->combined_width, +- &crop->combined_length, crop_buff_ptr)) ++ &crop->combined_length, crop_buff_ptr, TRUE)) + { + TIFFError("createCroppedImage", + "Failed to rotate image or cropped selection by %"PRIu16" degrees", crop->rotation); +@@ -8683,7 +8684,7 @@ rotateContigSamples32bits(uint16_t rotat + /* Rotate an image by a multiple of 90 degrees clockwise */ + static int + rotateImage(uint16_t rotation, struct image_data *image, uint32_t *img_width, +- uint32_t *img_length, unsigned char **ibuff_ptr) ++ uint32_t *img_length, unsigned char **ibuff_ptr, int rot_image_params) + { + int shift_width; + uint32_t bytes_per_pixel, bytes_per_sample; +@@ -8874,11 +8875,15 @@ rotateImage(uint16_t rotation, struct im + + *img_width = length; + *img_length = width; +- image->width = length; +- image->length = width; +- res_temp = image->xres; +- image->xres = image->yres; +- image->yres = res_temp; ++ /* Only toggle image parameters if whole input image is rotated. */ ++ if (rot_image_params) ++ { ++ image->width = length; ++ image->length = width; ++ res_temp = image->xres; ++ image->xres = image->yres; ++ image->yres = res_temp; ++ } + break; + + case 270: if ((bps % 8) == 0) /* byte aligned data */ +@@ -8951,11 +8956,15 @@ rotateImage(uint16_t rotation, struct im + + *img_width = length; + *img_length = width; +- image->width = length; +- image->length = width; +- res_temp = image->xres; +- image->xres = image->yres; +- image->yres = res_temp; ++ /* Only toggle image parameters if whole input image is rotated. */ ++ if (rot_image_params) ++ { ++ image->width = length; ++ image->length = width; ++ res_temp = image->xres; ++ image->xres = image->yres; ++ image->yres = res_temp; ++ } + break; + default: + break; diff --git a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb index 3b42dbe4a5..9df3c5a015 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb @@ -19,6 +19,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://0001-tiffcrop-subroutines-require-a-larger-buffer-fixes-2.patch \ file://CVE-2022-48281.patch \ file://CVE-2023-0800_0801_0802_0803_0804.patch \ + file://CVE-2023-0795_0796_0797_0798_0799.patch \ " SRC_URI[sha256sum] = "917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed" From patchwork Wed Mar 22 14:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21536 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 1DF64C761AF for ; Wed, 22 Mar 2023 14:22:04 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.44311.1679494915715090239 for ; Wed, 22 Mar 2023 07:21:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ubvypXQk; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id q23so5385170pfs.2 for ; Wed, 22 Mar 2023 07:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sZlkAwq0miCmi/0wk4dSavdMLZ8GnMCjZ6zjn/Naxsc=; b=ubvypXQkKK0zt1cQUCgo5BKl4rsm+RUtJJy2UsBcgblXoTrUZbIpufXaL8HXM5E37v iNCDVbwepyTR7ewpo15snT0/EkVrsPrGRz4GBhOee10vkBiP/3X6I3GA1Nei1Vjv/afG z6KKf08rbcUYhKgsxPekAGMwuGsvgLJ3VKnszey978ruJGOqObOb7Aonno56xFdEn/7l U+F5NChhdcfH8Xlrj24VlbaFo03MJwmrjMeXg1D5r3iwaU9y0fl2Fugts4hihn62DCAT ITewu1K9iq4Lmf/oQWACW8BTFIVtywZ6rQRN82bx/Si81oO8aNxF2LciRxoecfxnGvjY XE1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sZlkAwq0miCmi/0wk4dSavdMLZ8GnMCjZ6zjn/Naxsc=; b=l2Zq/AHjPO2Qok7k2XV3ohiH/jHk1mjxo3cQYjhlcobUsI8p9j7EeXgb2NMzk8BNWz ty9iAV4eqN5K1WZPEBqFuWq4e8xgPKAzJg0Yx6ANCKJXwVRLz1h8QwARIT0BamNy1x4M 4LNIjv46VG7l/vxmwE0Tept+izMhIjdhxLtMI8bDgfoUNGipyhuy4RcdpndQEIykNlK+ VOnfebZBKw1vDtsKOdOOHbjg3xAKc/t/GFPu3bWaBhDAwL0OHgdoLNttve+/olbHgtY0 rQsUVpZE5Q7aNzx7o3GDO6aI0qt4yGSS0a0PaIy2+HG7kEoCJHmZrlg7PzbJVn2Df1G4 JBXw== X-Gm-Message-State: AO0yUKX85V6YiLiFSsfE3EvnYoKIfVhIOtAsZmizwd8qdLTVFFpcOi8a jlpgTGeVAunOyUOSGjIjNr/DZ07LCfziOmlcL1o= X-Google-Smtp-Source: AK7set9oNE6zKmLGDHGWCAEsZh9eors2jEMdXAdu+I74bzQj+frxQG9I1iFyY48uqKPS8Jw7CgGxpw== X-Received: by 2002:aa7:9423:0:b0:627:f0b9:d5c1 with SMTP id y3-20020aa79423000000b00627f0b9d5c1mr3186188pfo.17.1679494914742; Wed, 22 Mar 2023 07:21:54 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.21.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:21:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/21] go: upgrade to 1.19.7 Date: Wed, 22 Mar 2023 04:21:22 -1000 Message-Id: <3bee5e8c76f7da2d967ac01dbd5e7ed8d00589d3.1679494378.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178928 From: Chee Yang Lee upgrade include fix for CVE-2022-41722 CVE-2022-41723 CVE-2022-41724 CVE-2022-41725 CVE-2023-24532 Release notes: go1.19.5 (released 2023-01-10) includes fixes to the compiler, the linker, and the crypto/x509, net/http, sync/atomic, and syscall packages. See the Go 1.19.5 milestone on our issue tracker for details. go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, mime/multipart, net/http, and path/filepath packages, as well as bug fixes to the go command, the linker, the runtime, and the crypto/x509, net/http, and time packages. See the Go 1.19.6 milestone on our issue tracker for details. go1.19.7 (released 2023-03-07) includes a security fix to the crypto/elliptic package, as well as bug fixes to the linker, the runtime, and the crypto/x509 and syscall packages. See the Go 1.19.7 milestone on our issue tracker for details. Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/{go-1.19.4.inc => go-1.19.7.inc} | 2 +- ...{go-binary-native_1.19.4.bb => go-binary-native_1.19.7.bb} | 4 ++-- ...o-cross-canadian_1.19.4.bb => go-cross-canadian_1.19.7.bb} | 0 .../go/{go-cross_1.19.4.bb => go-cross_1.19.7.bb} | 0 .../go/{go-crosssdk_1.19.4.bb => go-crosssdk_1.19.7.bb} | 0 .../go/{go-native_1.19.4.bb => go-native_1.19.7.bb} | 0 .../go/{go-runtime_1.19.4.bb => go-runtime_1.19.7.bb} | 0 meta/recipes-devtools/go/{go_1.19.4.bb => go_1.19.7.bb} | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/go/{go-1.19.4.inc => go-1.19.7.inc} (89%) rename meta/recipes-devtools/go/{go-binary-native_1.19.4.bb => go-binary-native_1.19.7.bb} (84%) rename meta/recipes-devtools/go/{go-cross-canadian_1.19.4.bb => go-cross-canadian_1.19.7.bb} (100%) rename meta/recipes-devtools/go/{go-cross_1.19.4.bb => go-cross_1.19.7.bb} (100%) rename meta/recipes-devtools/go/{go-crosssdk_1.19.4.bb => go-crosssdk_1.19.7.bb} (100%) rename meta/recipes-devtools/go/{go-native_1.19.4.bb => go-native_1.19.7.bb} (100%) rename meta/recipes-devtools/go/{go-runtime_1.19.4.bb => go-runtime_1.19.7.bb} (100%) rename meta/recipes-devtools/go/{go_1.19.4.bb => go_1.19.7.bb} (100%) diff --git a/meta/recipes-devtools/go/go-1.19.4.inc b/meta/recipes-devtools/go/go-1.19.7.inc similarity index 89% rename from meta/recipes-devtools/go/go-1.19.4.inc rename to meta/recipes-devtools/go/go-1.19.7.inc index 49349ba6ec..7d76f34bdf 100644 --- a/meta/recipes-devtools/go/go-1.19.4.inc +++ b/meta/recipes-devtools/go/go-1.19.7.inc @@ -15,4 +15,4 @@ SRC_URI += "\ file://0001-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://filter-build-paths.patch \ " -SRC_URI[main.sha256sum] = "eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368" +SRC_URI[main.sha256sum] = "775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633" diff --git a/meta/recipes-devtools/go/go-binary-native_1.19.4.bb b/meta/recipes-devtools/go/go-binary-native_1.19.7.bb similarity index 84% rename from meta/recipes-devtools/go/go-binary-native_1.19.4.bb rename to meta/recipes-devtools/go/go-binary-native_1.19.7.bb index f1208d183a..0e2c8f1b24 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.19.4.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.19.7.bb @@ -9,8 +9,8 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "c9c08f783325c4cf840a94333159cc937f05f75d36a8b307951d5bd959cf2ab8" -SRC_URI[go_linux_arm64.sha256sum] = "9df122d6baf6f2275270306b92af3b09d7973fb1259257e284dba33c0db14f1b" +SRC_URI[go_linux_amd64.sha256sum] = "7a75720c9b066ae1750f6bcc7052aba70fa3813f4223199ee2a2315fd3eb533d" +SRC_URI[go_linux_arm64.sha256sum] = "071ea7bf386fdd08df524859b878d99fc359e491e7ad65c1c1cc55b67972c882" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.19.4.bb b/meta/recipes-devtools/go/go-cross-canadian_1.19.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.19.4.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.19.7.bb diff --git a/meta/recipes-devtools/go/go-cross_1.19.4.bb b/meta/recipes-devtools/go/go-cross_1.19.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.19.4.bb rename to meta/recipes-devtools/go/go-cross_1.19.7.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.19.4.bb b/meta/recipes-devtools/go/go-crosssdk_1.19.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.19.4.bb rename to meta/recipes-devtools/go/go-crosssdk_1.19.7.bb diff --git a/meta/recipes-devtools/go/go-native_1.19.4.bb b/meta/recipes-devtools/go/go-native_1.19.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-native_1.19.4.bb rename to meta/recipes-devtools/go/go-native_1.19.7.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.19.4.bb b/meta/recipes-devtools/go/go-runtime_1.19.7.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.19.4.bb rename to meta/recipes-devtools/go/go-runtime_1.19.7.bb diff --git a/meta/recipes-devtools/go/go_1.19.4.bb b/meta/recipes-devtools/go/go_1.19.7.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.19.4.bb rename to meta/recipes-devtools/go/go_1.19.7.bb From patchwork Wed Mar 22 14:21:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21534 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 17CABC77B60 for ; Wed, 22 Mar 2023 14:22:04 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.44004.1679494917520510758 for ; Wed, 22 Mar 2023 07:21:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vFR0ogU6; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id le6so19396737plb.12 for ; Wed, 22 Mar 2023 07:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494916; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vcigD8eMN6SZ82E7iheygHWMYFvgBQ+nmytKRznAH+U=; b=vFR0ogU6v60SqtdVIriC1qv/AEJWpk5A06fNUMX/R4IlVhhmebMMTj5L3qkp8OAHwZ U3yGxN/t0SUW3lFzY1MzbYQP/WBO++4UlsaZumKQ2wLAop7rykykwBqFQyjGgW94J9Mb 6/r9HM++ZNY/Ds5sysBAn/RMTpmnQDd3iLu7K1SoaN+TaVhOdGYwLudPzGUw6jYkTcmt CHvhT8Be2eCxoZ+GpTuVGjOJ7DhaRAP+vescsjL5yuNYP5O3o7innvRzJEz5e6s4fCcR LMdfxtW5G/SfQ10cafbEZmdkdVUZ88gy2sdZxblOZyrRPQmUfhxHEGwqW6T3iTwIwADO tpdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vcigD8eMN6SZ82E7iheygHWMYFvgBQ+nmytKRznAH+U=; b=RaYWUIhAxZ2jHmoKDbg99JBRIxLi6mN3zAx+mJ49quRN18ml5zwbsY5bKF7HNdoaU4 SFz076/E+sMvmafVFd/mmc19QlE2JtlK0/RLVyxQwjMkqV0a31Xs5MIpvYb81CaZhZtw dvleLPZNPyOGxdLPe2T9nplLhdiA5CaDvkqTt7IkW4u1So3Sd3hqpiM+wPSAlGoudzce XwFlrk3Yepc1Gxm4FnNZXIUOU3cltgc0HFihOiLpyJOubxEeyJos4FUGM+wSwK8c/mGX LCo1IN7zy4r3aJjdRL0p1vSjkADLnv++dt4X1KOWSEeLvjwbd+uwjPFsfcpeWnF1qSk3 b9fg== X-Gm-Message-State: AO0yUKWCFNxKZxNtm12hsFRd/8vTWgaRjfu1/1ND179f6Zmu+2VdN4Fa YqkSlvRSkvscDACLDGjWTY7nlsOITT41OD3cjl0= X-Google-Smtp-Source: AK7set9vv8sImNT7HfAQiX08/YPMFCieH/y+Lgsz2R/V7GtCE+9hfuxlaR3dcFp6an1oRRnogNd/cQ== X-Received: by 2002:a05:6a20:47db:b0:d9:fc6c:520b with SMTP id ey27-20020a056a2047db00b000d9fc6c520bmr4754770pzb.41.1679494916583; Wed, 22 Mar 2023 07:21:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.21.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:21:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/21] libgit2: update license information Date: Wed, 22 Mar 2023 04:21:23 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178929 From: Sudip Mukherjee The LICENSE did not have complete information. Some examples of missing license: Zlib: deps/zlib/ ISC: tests/clar/clar.c LGPL-2.1-or-later: src/libgit2/xdiff/xdiffi.c CC0-1.0: src/util/rand.c Signed-off-by: Sudip Mukherjee Signed-off-by: Richard Purdie (cherry picked from commit 5560a0e15bd860a59671a66cc76ad1bb7e07c9d1) Signed-off-by: Steve Sakoman --- meta/recipes-support/libgit2/libgit2_1.5.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libgit2/libgit2_1.5.1.bb b/meta/recipes-support/libgit2/libgit2_1.5.1.bb index 59866ce385..eb7b538ece 100644 --- a/meta/recipes-support/libgit2/libgit2_1.5.1.bb +++ b/meta/recipes-support/libgit2/libgit2_1.5.1.bb @@ -1,6 +1,6 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause" +LICENSE = "GPL-2.0-with-GCC-exception & MIT & OpenSSL & BSD-3-Clause & Zlib & ISC & LGPL-2.1-or-later & CC0-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" From patchwork Wed Mar 22 14:21:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21533 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 179D4C761A6 for ; Wed, 22 Mar 2023 14:22:04 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.44007.1679494919199296907 for ; Wed, 22 Mar 2023 07:21:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qi59cQu4; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id s19so5332905pgi.0 for ; Wed, 22 Mar 2023 07:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JkKNKmblJcSbD2+fQ5Ls0RkcIvQHHFsMLj9xrlMFsi0=; b=qi59cQu4EBov1EvOejTF93SXHysch3bqBklt0cB22AFE0WRWIMfxMQsYEkDLDMmqCw nyH1WKtOWYgtUnoNGIF50aYPEnZ1L2PvzHwXmP6bh3UlCvWiQ/Kg27MWquKyrVKkRbVu enbcRYvs5ksjU8DygOIn6D8Vstvwe8JmHbX1okXe5ycKoakxcELztKS4+78FOsbJTZS+ RQxRpUkpT1goUDyNjhKetOWrqvTfLqsAOfuUikyAouTPoSJtRPZVOVhHU9WiL9UlQs8b lJrQR6TWvtIElqAyLVRSIXuqHC9aZEzLHhDGS6PZE4hxbUaaRO4BhYSHP/G86NHZ21o6 Bh9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JkKNKmblJcSbD2+fQ5Ls0RkcIvQHHFsMLj9xrlMFsi0=; b=pOZbwMWFlZRPd4GK+v76kztzNDu9sBf9gopey0WloY+58H9/Rbq5Ft59ISOGjZHLp0 uJfLVNE8xSJhRC/YMbRv4QgnRaOjhPU75jPCUEFf8++kEd0vt/Eis9IyXudE5EDZWv1C muKCHB9fovzdeMwV61DWmBBRKrva1TnpxK/PvYfYst1WvP7TJib+ndOOPHYLhVIfi4g7 SJE1xs6cnbZRIZku7pSfsKQ3GBv8uz/TMOiQiqI9mx7ua9ELrBXVIK+o1mwK7wLQPQdx g7azSPnn/K/0kIjSp5ROplUpvWZypdCo9vp/oIx+aOhZldDnTDNHzvkqQulMLvfMonyS Vt8Q== X-Gm-Message-State: AO0yUKWoKwDZ6+jRrn5o5m+X665hBWdlu+SOhKcWfy2WuToUELqnd/Tn AwgRozWhAZCZYQcPW8qYE3q9J6P3UT2EVStIH9M= X-Google-Smtp-Source: AK7set/LN2AjMsruC/gF5eoeSeWtMuFWLvC1lwXALGb4cY0L5AFQk8dGDYM0UFVDbxdknGDZTtAM8w== X-Received: by 2002:a05:6a00:d4f:b0:629:5d35:3be with SMTP id n15-20020a056a000d4f00b006295d3503bemr1747333pfv.3.1679494918216; Wed, 22 Mar 2023 07:21:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.21.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:21:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/21] image_types: fix vname var init in multiubi_mkfs() function Date: Wed, 22 Mar 2023 04:21:24 -1000 Message-Id: <705b5c51610a1d5a267a3f6559667a5f70fbadf5.1679494378.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178930 From: Romuald JEANNE As vname var is needed in multiubi_mkfs() function, we need to keep it defined and use it as parameter to the new write_ubi_config() function. See [YOCTO #15027] Signed-off-by: Romuald JEANNE Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8b5e1cce35e129b21d871ab45b03811fdb6eaf8f) Signed-off-by: Steve Sakoman --- meta/classes-recipe/image_types.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 764e6a5574..c6cb8f5336 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -157,11 +157,7 @@ UBI_VOLTYPE ?= "dynamic" UBI_IMGTYPE ?= "ubifs" write_ubi_config() { - if [ -z "$1" ]; then - local vname="" - else - local vname="_$1" - fi + local vname="$1" cat < ubinize${vname}-${IMAGE_NAME}.cfg [ubifs] @@ -183,7 +179,12 @@ multiubi_mkfs() { bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see http://www.linux-mtd.infradead.org/faq/ubifs.html for details" fi - write_ubi_config "$3" + if [ -z "$3" ]; then + local vname="" + else + local vname="_$3" + fi + write_ubi_config "${vname}" if [ -n "$vname" ]; then mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs ${mkubifs_args} From patchwork Wed Mar 22 14:21:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21531 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 0A619C6FD1F for ; Wed, 22 Mar 2023 14:22:04 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.44009.1679494920781267003 for ; Wed, 22 Mar 2023 07:22:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ka7UrP87; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id bc12so18819090plb.0 for ; Wed, 22 Mar 2023 07:22:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iW7wNNAWR0Fr34lVIxKK60TKG9wYmaMrYam0Ves1xLc=; b=ka7UrP87TtuAagFpw58B6Dwb+6YL13SHMb0Zz6O/NB0Td/d7Wqj//nk4V0bBRWnfMN Ilk2b1LhEg3+5xM2CdkiOQ7SE+Jxi50eAOq8T41hPj7XsQsQX+LVmx730g4XRCiQO1KQ wCwnwVC2zbTskhLdIcZ8AJmai6HgQpLEYJBcoxbEQnFbWI82BKsSlXZKRlQt+dEBg+wZ T+l5D2leBI38Oi9EYMMBFo4mqz1qNwhbvqX/Wku36Ltwf9NrojiYp3RkxFQminh9beo0 g55ZKq3EN2BGqtlXfJA3EQdWnLdnMj8Tcywyn8I8tn6u1ETzJwMICQra9/nfyklbFOj+ 3/TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iW7wNNAWR0Fr34lVIxKK60TKG9wYmaMrYam0Ves1xLc=; b=G64XPkvkXHvI53rBKzbmgzow6WunhxN6G244xxbAsvuWceCPXjRomHc5vSx5m4qFh5 XnmhNlaIk1dcSOkzbZwvnVzJ7lkWPnYm+5udy+alevK4Jz6TZFuYHOJlGE1OddGZibZy GIT2aXXiRwMY0X7VsL8gYNNTdUfI0rbaL4CuVBQyt5Z6ZaShux0NKNgwShXFVDP3vvdM d93nw4hK8Xn+d95U9wbdNqQDsSfnv/xhm1+Jtd8hcAMdC5yJ1zTRDQyHkTOTs3/j8xLa hhUQMmzIG61NNQlKgKDEKtMM33Qmj1ADQuAh8txr92Lnig43RYNbxF03GOdgHVPxTOiA Anig== X-Gm-Message-State: AO0yUKVLIBRcS1apekuqRjSjW2+bgI3MV+udRnKTU0SzDU3ciaUDZI+M lxlYVuDh446N9jr8vvCcCGOvUcTviafU6jrJ/ag= X-Google-Smtp-Source: AK7set/fajJAISRIWSOQ7f/8HAHIJ0mLKC2JNf1/OzeyldKM+xUSuDZ8gy5LgdT/XdBF89rysicKUg== X-Received: by 2002:a05:6a20:b214:b0:cd:5334:e25e with SMTP id eh20-20020a056a20b21400b000cd5334e25emr5282612pzb.17.1679494919871; Wed, 22 Mar 2023 07:21:59 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.21.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:21:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/21] devtool/upgrade: do not delete the workspace/recipes directory Date: Wed, 22 Mar 2023 04:21:25 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178931 From: Alexander Kanavin If it exists, there is no need to delete it, and if it does not, devtool prints an ugly traceback. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit af82e59e8f08369aabd5fa6eb43022982d4e59a7) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/upgrade.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 967d157077..6c4a62b558 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -125,11 +125,8 @@ def _write_append(rc, srctreebase, srctree, same_dir, no_same_dir, rev, copied, return af def _cleanup_on_error(rd, srctree): - rdp = os.path.split(rd)[0] # recipes folder if os.path.exists(rd): shutil.rmtree(rd) - if not len(os.listdir(rdp)): - os.rmdir(rdp) srctree = os.path.abspath(srctree) if os.path.exists(srctree): shutil.rmtree(srctree) From patchwork Wed Mar 22 14:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21532 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 0A66FC74A5B for ; Wed, 22 Mar 2023 14:22:04 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.44011.1679494922463763434 for ; Wed, 22 Mar 2023 07:22:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QnYgfyX5; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id h14so10451206pgj.7 for ; Wed, 22 Mar 2023 07:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=eFiQIhK1/idxzJjaaeyGnnyYfWh9w0oKeCx+LbMJ3l8=; b=QnYgfyX5ex9MhVjjbJoKRLfmM7cR3wraaaHkvt3KEM+0whdh3LflgBaAsr+IXVvX33 h/o9gU03LE1gWxPgdYN62B30fsBiQAyRAK2CI2DSN7pHk3XaIhrEsLWuWzo5CLjYgJeV C11KoOYMO9EFTrPV6wcNP+i1+JMj3AivXbM1wTZ5KnstZscotdRHdY3DkZNHuS7NNaLG nzPJeXXS/JdIWP1iWPZWcwVXpgH16cmKPbm/9YV+qipVARHBlIx3UeYIGt+5LG0qmxVE KGhsiPOu+IFxIEFP1v8qa+E0p4o3EZ2WNkPY5Yy+t6ps8fvo56SiXH3z/4nEzXmubTA5 YcQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eFiQIhK1/idxzJjaaeyGnnyYfWh9w0oKeCx+LbMJ3l8=; b=TiZ0CBotPVvIzA3iINZVR/w7XOT/wjmymW0RmJdvqcmtP728JvyySEFDiVM0kgOpnt pJrE/ofDPBsNLXemdI/Jlg0cZNqFjEmTx6aiuwJgdqAcoaDSshKEwJ9lcXtAObt15SKw XiyzsufBocnUuMTFR93enj7YiySGf1bHO4aiFKK3GPqGhi9PcYnMiZDNH2JfJXV3UmVx YFe1NGmR+HegcuMnK4SNZwLVMVjciO8Kr/WAvOhug/8+a5WdHIU18KObZIKsjQDapFjA 7udCLWUtoAukjJlPRzovTHyLCXpOYff4q60rGSNBMzCrNKhUzbNqkflJvzA/5yEv673c sajw== X-Gm-Message-State: AO0yUKUdCxUir6hHVIy99D7hZnmq6T9vv5xl0rB4hrEHexiYomw5PYqa YgSmr9vXNFqAjo6NbhX2JorxWO54zOImr2cJBX4= X-Google-Smtp-Source: AK7set99MSXTmJoFR1UNnydVGNQtMuYTCDpvigftnWSUTbBhYpeJT2XTUYG5hGt59Heox8tcC7HBeQ== X-Received: by 2002:a62:1916:0:b0:622:9e34:11f1 with SMTP id 22-20020a621916000000b006229e3411f1mr3070471pfz.17.1679494921472; Wed, 22 Mar 2023 07:22:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.22.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:22:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/21] systemd.bbclass: Add /usr/lib/systemd to searchpaths as well Date: Wed, 22 Mar 2023 04:21:26 -1000 Message-Id: <612e2cff28852d9d3dfc947ee07dbe4111748239.1679494378.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178932 From: Khem Raj Some packages like lirc places its unit files into $systemd_user_unitdir and also uses them in SYSTEMD_SERVICE list in recipe. This fails in do_package ERROR: Didn't find service unit 'lircmd.service', specified in SYSTEMD_SERVICE:lirc. here lircmd.service is installed in /usr/lib/systemd/system/lircmd.service Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 12808a4159835b67d8d53d32bc9135811701a779) Signed-off-by: Steve Sakoman --- meta/classes-recipe/systemd.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass index f6564c2b31..ce188a8113 100644 --- a/meta/classes-recipe/systemd.bbclass +++ b/meta/classes-recipe/systemd.bbclass @@ -152,6 +152,7 @@ python systemd_populate_packages() { def systemd_check_services(): searchpaths = [oe.path.join(d.getVar("sysconfdir"), "systemd", "system"),] searchpaths.append(d.getVar("systemd_system_unitdir")) + searchpaths.append(d.getVar("systemd_user_unitdir")) systemd_packages = d.getVar('SYSTEMD_PACKAGES') keys = 'Also' From patchwork Wed Mar 22 14:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 21538 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 0B30DC74A5B for ; Wed, 22 Mar 2023 14:22:14 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web11.44012.1679494924098682818 for ; Wed, 22 Mar 2023 07:22:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=B+hgHnZl; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id x15so8311640pjk.2 for ; Wed, 22 Mar 2023 07:22:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; t=1679494923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XlUu2xEA9LlTTRP1hUzF0BDZ6tRGM+5NZpqYeMXRjp4=; b=B+hgHnZlTFaWnDCqjLndxTw8LDBIkMo3PC00p3XQtAJS7bsOYokK1ZJmPvtXzSU6/s 9upFmdMF9xyKpqJ5iPugS54nnQQMCmV7utyI/tXY5JGlYfHxaX+exa1SafnCYYrOPWy0 IAz99vuMj7mEOsNkpFLMhgRCsKr9ZVKdMhupHAjA965mxQ+5Lsbbmxt3HjCG9o03UDN0 YHT1ka7yXVjTtjVGKIfv6cvTaT2JvA/dnSu3AKvEtCuVsRdQtGsKnCday5wjBGInVz8m foz5kDM76TWCJWEQO9B+hd41G4Xn5zy+khZc8De6h7o+DeCzl4cwB7R1fyC0wu8IYq43 q6Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XlUu2xEA9LlTTRP1hUzF0BDZ6tRGM+5NZpqYeMXRjp4=; b=TJY2WjOcpKWQzIHCtPt8B/K7R+G1/GCzu+7AMru6kS6/7qJxUrOJamGN6KRd/auBoo sGxwBdcm5/7D01b2u3UE6pMSGk+gZzPdHxySAu0lhFVy+TUNZ5Zqkgn7poaOg7nkm4Gs I2XD6TppVXm4a5zlzTA8V9GxKajeETGNyHehMVd2LWetoED8qCNiGVuaGBIJcLbwUfkB Kk3RIcQ0KVwYIdmeQr7mEESeoZeemnzyF4Es1paiDeRev5lOG5AzQBhK85ixJt3SZ3EL 6WBaLxx8cFiBQC2xCrLumVpal1vbY+8GMG50ePiTLnrEN2WoxUIqmF8XaaG4jf3pUdE1 jJ1w== X-Gm-Message-State: AO0yUKURgKZ3/foSChmzO6kSEUNuh+PznybkKEc37k11eoKsvbufhYy/ 8GC6HIwx/DMdK1ml3nwV3DFHY4gooGwVTCeJh+0= X-Google-Smtp-Source: AK7set/frgJG3yGOFpWNSkEUIUbEB2ca43Dy7+JmQ8MnEAGkEzQ05SipElvc9ACNAKkJPQEv391JmQ== X-Received: by 2002:a05:6a20:dc9e:b0:db:701:3857 with SMTP id ky30-20020a056a20dc9e00b000db07013857mr3321024pzb.34.1679494923199; Wed, 22 Mar 2023 07:22:03 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id e25-20020a62aa19000000b00627ed3e9c10sm6893524pff.137.2023.03.22.07.22.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:22:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/21] image_types: fix multiubi var init Date: Wed, 22 Mar 2023 04:21:27 -1000 Message-Id: <417b096d5cf51f5b947bccc32e6be97a93aed9d6.1679494378.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 ; Wed, 22 Mar 2023 14:22:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178933 From: Romuald Jeanne Make sure to expand all MKUBIFS_ARGS_