From patchwork Fri Sep 15 15:34:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 30494 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 54FF0EED615 for ; Fri, 15 Sep 2023 15:34:26 +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.web10.23789.1694792059030233573 for ; Fri, 15 Sep 2023 08:34:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=II5vvDaY; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1c1ff5b741cso20890965ad.2 for ; Fri, 15 Sep 2023 08:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694792058; x=1695396858; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n6Q/mPi+S15R38uY6FUKZdthE9U3trxgQ7iz7hZTOXM=; b=II5vvDaY7L+tZGQ2pM/0q/nNUdX+peo6qVDI4kD13oamsKWtxgkcEJ7IXzUJxUD9d7 R680BiqYfTLYAgBNJRlbMfrEzNLij+a1XMt1gKy5aPbgwXSDCKOM237MiOppjZ42ztrT bsWLkwaoJ1PCHGe9nkIrdWRl69Qj9NmN+pq9p1eVVRnFTVXxCB0DGkbVTvv8kZClf8Yy AG2YGtxZ3Vl8BOrbT6u9BHduhl6+6A4MVMNdvXfsQKVEyzaabuWXvLHpp8X+PpiWNfDz dOUcdKhzwUSPaa/fc7ZlXwfxvLiN3dOgcq5r/Iax+jn63ILrnPPqRYptP7PYOySJlpuT RF4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694792058; x=1695396858; 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=n6Q/mPi+S15R38uY6FUKZdthE9U3trxgQ7iz7hZTOXM=; b=Z/yFj2RPK8obuZ3csbv9AN++aRyGm3br1nyaNDFeqAqBqpAdskbCW+ys8M9ghcLQwh gJNFPi7RZHFkxBpqwu8NbfncXiBABMExptyNMkdTN2T62qn1KhlO+Hco7VunpLfXkLI4 IO20Ct7/xJ+wz6p9z/eThva61Fvu54yT5E3AaWAvfj1VGFdy1EKQ6VYkYRf6XI+HnnCG QbUrINtJIkWN8ssySKwfNrG7EV8xCYotqunn4xvkBSsYixU0kv1h+22lnVesOruVMiun pfqiRtG86ALk+ro9wmTJLlGwYBU7SDv/v5WIo6i7lYPkpfffvONNZyDrxFLN5T8iN50w Ieuw== X-Gm-Message-State: AOJu0YzaayFlmpJgnb3764Y0XSJpI1c2sPoL8MLM3MpxXC5Lbm6YdVUv wgRnHN3/tzbr5SD7p102mhJ6no9nBVw= X-Google-Smtp-Source: AGHT+IG0xZILaZ13K83KiO6Ca31U7+1qmS/00AjKq4bpUwjGu6utpstNbWCEDj298UnYRVVWciBliA== X-Received: by 2002:a17:902:d487:b0:1c0:e630:5031 with SMTP id c7-20020a170902d48700b001c0e6305031mr1968381plg.28.1694792058159; Fri, 15 Sep 2023 08:34:18 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::4880]) by smtp.gmail.com with ESMTPSA id h3-20020a170902b94300b001b66a71a4a0sm3647309pls.32.2023.09.15.08.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:34:17 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/3] util-linux: Fix lscpu on musl Date: Fri, 15 Sep 2023 08:34:13 -0700 Message-ID: <20230915153415.3241307-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.42.0 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, 15 Sep 2023 15:34:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187678 Signed-off-by: Khem Raj --- meta/recipes-core/util-linux/util-linux.inc | 1 + ...-buffer-size-for-cpuinfo_parse_cache.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-larger-buffer-size-for-cpuinfo_parse_cache.patch diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 99ce2a24b0a..214fcb03908 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -35,6 +35,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ + file://0001-lscpu-Use-larger-buffer-size-for-cpuinfo_parse_cache.patch \ " SRC_URI[sha256sum] = "890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b" diff --git a/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-larger-buffer-size-for-cpuinfo_parse_cache.patch b/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-larger-buffer-size-for-cpuinfo_parse_cache.patch new file mode 100644 index 00000000000..6182e4b6fbf --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-lscpu-Use-larger-buffer-size-for-cpuinfo_parse_cache.patch @@ -0,0 +1,36 @@ +From 4697f1555fae2d24518ed00ac22387a258d0ca33 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 15 Sep 2023 00:18:18 -0700 +Subject: [PATCH] lscpu: Use larger buffer size for cpuinfo_parse_cache + +BUFSIZ can vary quite a bit e.g. glibc/linux systems its 8192 +but on musl/linux and OSX its 1024, on mingW it is 256, some tests e.g. +x86_64-64cpu-linux6.2.tar.gz has added really long line for cpu flags +line which is greater than 1024 characters and hence this test fails +on musl because lscpu -s reports truncated string + +Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2492] +Signed-off-by: Khem Raj +--- + sys-utils/lscpu-cputype.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c +index 3fd5f7a3c..863f63152 100644 +--- a/sys-utils/lscpu-cputype.c ++++ b/sys-utils/lscpu-cputype.c +@@ -462,7 +462,11 @@ static int cpuinfo_parse_cache(struct lscpu_cxt *cxt, int keynum, char *data) + int lscpu_read_cpuinfo(struct lscpu_cxt *cxt) + { + FILE *fp; ++#if BUFSIZ <= 1024 ++ char buf[BUFSIZ * 8]; ++#else + char buf[BUFSIZ]; ++#endif + size_t i; + struct lscpu_cputype *ct; + struct cpuinfo_parser _pr = { .cxt = cxt }, *pr = &_pr; +-- +2.42.0 + From patchwork Fri Sep 15 15:34:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 30495 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 56AB1EED616 for ; Fri, 15 Sep 2023 15:34:26 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.23790.1694792059758955976 for ; Fri, 15 Sep 2023 08:34:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RjVzmYMv; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1c43fe0c0bfso4015225ad.1 for ; Fri, 15 Sep 2023 08:34:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694792059; x=1695396859; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UP6N2Ko/23ZTaww/zhwNtvnC+3Jr/wGo/N29K13gcuU=; b=RjVzmYMvion/MgpnuRE0KgiMcn2GLjpIGM9O0prSSoQH8DyTeZLe4lCLnq5r4Rmggk WZkxA+fpTH26TRy5m+sj+w/v/D4/PLSHxt+zxwbwr+A7NreAXnMMg/nIeHxEgV6pAH+K G+haQ9C3HfFt2MftaiC/bs42RprshYVwqld+VHIm1GgcI3tYdxjcGPrBVCGkCOtnX+1N eazfA3oyk4h2SfRShSgdU3xNWjwfKgtf0uGme4ZP1NvS4UDo8NZwPBwlRJKy/mazPZdE f6PE7eXR7/FwON9168lspL1y8EYk7xIx4xdHfkpL+dGybIB0NzVTmRiKaTaigrpaozOp 1/KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694792059; x=1695396859; 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=UP6N2Ko/23ZTaww/zhwNtvnC+3Jr/wGo/N29K13gcuU=; b=UMVZGJnlKbrgeS2xLptdz56FjNzA1RFfw8kvVPVGl7/mY1J7UxTrY/x+xRuBs2Iyq0 wVgcZvg7RxBks7l2kz8u40dsZ8NNlXMkX4rpeMHSoj+dShkQYazwdoRjE/b72Tzesg2e dwoOnwVK745Bza77hlxXe+QEmDcGR81thSfNxjJc0MvAO+yTSk6vld7Ay3pc2j3FNVGD rvG5IREdE1M7rKnFBceDwSSwDiZVltEGLHimM4HgBFTkTZlEQM1BtqcxCz18LddQq0IC hqAkFGTFTxRjMHtOnXl+EuFqSZ+8FnEXcUS9hw3J2gQGaZVqja3dZzpt8XyZcRaNZNX+ 5O1w== X-Gm-Message-State: AOJu0Yzf/NUwPL9B8nMqopIl+BQKmCT/J7r+36SyTl7Dg0TUSSRm41Vt fppji12uWJfoN9xWMlGi9ka4yCTYKnk= X-Google-Smtp-Source: AGHT+IGh04VlzhKOkLaWjNV32QfLGI/lMcELnO7yeQC/V0tpnMNRsxC9i4ZmY3Sd23BDGQCaLxug+w== X-Received: by 2002:a17:902:9b83:b0:1c0:aca0:8c2d with SMTP id y3-20020a1709029b8300b001c0aca08c2dmr1472439plp.67.1694792058990; Fri, 15 Sep 2023 08:34:18 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::4880]) by smtp.gmail.com with ESMTPSA id h3-20020a170902b94300b001b66a71a4a0sm3647309pls.32.2023.09.15.08.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:34:18 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/3] util-linux: Disable failing tests on musl Date: Fri, 15 Sep 2023 08:34:14 -0700 Message-ID: <20230915153415.3241307-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230915153415.3241307-1-raj.khem@gmail.com> References: <20230915153415.3241307-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 Sep 2023 15:34:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187679 These tests need strptime with %s which is glibc specific extention Signed-off-by: Khem Raj --- meta/recipes-core/util-linux/util-linux_2.39.1.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux_2.39.1.bb b/meta/recipes-core/util-linux/util-linux_2.39.1.bb index c81405533c4..821a44a1453 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.1.bb @@ -322,3 +322,12 @@ do_install_ptest() { rm -rf ${D}${PTEST_PATH}/tests/ts/chfn fi } + +# Delete tests not working on musl +do_install_ptest:append:libc-musl() { + for t in tests/ts/col/multibyte \ + tests/ts/lib/timeutils \ + tests/ts/dmesg/limit; do + rm -rf ${D}${PTEST_PATH}/$t + done +} From patchwork Fri Sep 15 15:34:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 30496 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 57F4FEED60B for ; Fri, 15 Sep 2023 15:34:26 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.23529.1694792060868289966 for ; Fri, 15 Sep 2023 08:34:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RhCqdPxn; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1c1ff5b741cso20891375ad.2 for ; Fri, 15 Sep 2023 08:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694792060; x=1695396860; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OEYqBvKXqtoADmwSlKlnYwFCpGWC8xbkQzGDMS7GC3I=; b=RhCqdPxnzBVvnBWkhbiQnitMfvMs4+7desZKiVhBpKkDqOmnmNzC8JwBZSITpI9DnK 7gVy7EsNDADhPq+R7iPVJA7S3sNYGj9V5A+Z0Iy9Gw+GSNUr+YdA31oBKse6HAqoaOwt 4VaTUMBUe6Skmm6KSWoKktdpwbI29EVTPP9zmiGPfnqVMknQuYxlebk3QaM0vUzZ80w7 QliZY4zBL+Kfmao6ETnkFlGl36jiQT9V7n1YSbXyyhKu32N6jmj/syhvxIGjxIFxdzFg gMJ1A7HEO8gBzHNXi9zKOw8NV84MDG7pXg5g74e23eaVvr5GVgmt8VgC5dAuO8ifzjMC BlMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694792060; x=1695396860; 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=OEYqBvKXqtoADmwSlKlnYwFCpGWC8xbkQzGDMS7GC3I=; b=Y8z3oMJnHds+foFnPljXWwpEgAMmjX8G+Fuu7EmH2H867t8QR6fS1S23rRCPCkBKSt zyS277ep6qM2zLUQsg9R9lKRXLZ2ONR8UpbrtmOpL5Ks/S0JH2mxq6cJ920f5m8ZA7ox jzkmLHkB2/eOrP4WVY0+nrLruPQGU3c/FjJOXBzE95gPHC/sGc/snFWtOZRoxMRqRkMx fcHP+nHuENMAB8lrmtcW+W1lMVuQVMPZrLFh12L037HOnoO17VMAXuqUtea2CLKZ7DPB Fg4MZ+y+7AnuDdA4BMoERIAu5NSfGLXv1R9b+RhcSTP2NiXbOGItePh0vgmssOxSu5Fp S//w== X-Gm-Message-State: AOJu0YzSdNH9UGJ0c24adK3SmsnvpXtWF90w52QyMlIp/PfVfQms8w/O xAAeqCq7MYNBdPqap6R+Y+sziMwCzTA= X-Google-Smtp-Source: AGHT+IEZ98/hOY6KeCXDhahbD18+riwk0q972C9cdw3pWHsrJP1l0vuZ3e5An8oFHhyoHZWM833ySA== X-Received: by 2002:a17:902:b943:b0:1bc:61d6:5fcc with SMTP id h3-20020a170902b94300b001bc61d65fccmr1761781pls.51.1694792060061; Fri, 15 Sep 2023 08:34:20 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::4880]) by smtp.gmail.com with ESMTPSA id h3-20020a170902b94300b001b66a71a4a0sm3647309pls.32.2023.09.15.08.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:34:19 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 3/3] Revert "util-linux: scanf_cv_alloc_modifier changed from 'as' -> 'ms'" Date: Fri, 15 Sep 2023 08:34:15 -0700 Message-ID: <20230915153415.3241307-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230915153415.3241307-1-raj.khem@gmail.com> References: <20230915153415.3241307-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 Sep 2023 15:34:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187680 This was needed for uclibc, which is long gone in OE This reverts commit d3ffa39e2edcf68583fa85c191f59a54c4722abd. Signed-off-by: Khem Raj --- meta/recipes-core/util-linux/util-linux_2.39.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux_2.39.1.bb b/meta/recipes-core/util-linux/util-linux_2.39.1.bb index 821a44a1453..927037a3429 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.1.bb @@ -62,7 +62,6 @@ PACKAGESPLITFUNCS =+ "util_linux_libpackages" PACKAGES_DYNAMIC = "^${PN}-.*" -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" UTIL_LINUX_LIBDIR = "${libdir}" UTIL_LINUX_LIBDIR:class-target = "${base_libdir}" EXTRA_OECONF = "\