From patchwork Fri Oct 2 22:10:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1376118 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V2s9IMup; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C34256PtXz9sSf for ; Sat, 3 Oct 2020 08:10:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7A4B086978; Fri, 2 Oct 2020 22:10:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gzrl5opKhGIh; Fri, 2 Oct 2020 22:10:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2487E868C5; Fri, 2 Oct 2020 22:10:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 60F081BF3A7 for ; Fri, 2 Oct 2020 22:10:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5AA5E86D06 for ; Fri, 2 Oct 2020 22:10:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GDa7zhbKdiCu for ; Fri, 2 Oct 2020 22:10:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id E0CF886C7E for ; Fri, 2 Oct 2020 22:10:45 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id t17so3144866wmi.4 for ; Fri, 02 Oct 2020 15:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KqvD45t9rcusY7o3Uv77xCVL5ZnzrfANlV62+H/gvNU=; b=V2s9IMupxgNdeVm0mJoT+7FguKepVhFXHW7VSHFT0awz5wrOg6f1nzeOSH+tX0XWnM rrWdMY/bSwsSAYpQC9nfAvA9b74YG1E1TTqDjD3Wz3ISTOchUxofOi73EuawpyIfvFiC m3Er45wTLx4V00vwXheKSToMWOhTM1IplqvwzvvspqOhyVgrNBD6ca29APh/xcg7lh8O QhiIg7qSR8iUShpUky4ySZfDe4q+urN1LQwy+z+1CpXg7WoUcXbVWZmz8H8KI9n2v17t xqTA/dKqfcJs5cpNTx4D3HzwQPIA0+34xL980LuYKWOztfa6XDQGttJMwhuN4LiHY1LC Mx+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KqvD45t9rcusY7o3Uv77xCVL5ZnzrfANlV62+H/gvNU=; b=M13mAKKlSXCqMYC4lvQds9fGmQmOZpBKV+h1Wn9O+OyXw635MkKcJ4t34oEuIJ+Cko DPY2TaVGCQ3U1nRFlefykdLemvRxBHPSXXHL7N0lKPTD7ArmGTDQPLv6LetWCSqLot1p 5Z2cxbjX4hhDx7z/4x/yb1E/fFF+CXEulnSH0LZVY91m/o/sdg28rDtGXdhal5H26fz/ KOz8bYawZD414kJcK54SDmkQFSztRfpAM8a5WmZ0KSqIl4hQ7VnkWVmab9gF/IDApoUG ORBgc1Hi85wiUfXB4kHybW2HUylnD6RYAUWF1CEkreWXitD2HXHkoukRI4PfSPT4qhUn W45g== X-Gm-Message-State: AOAM533NQz+BOO++OhAJY3u5oP38HlppWlpbJ0OtxsBBZVvXCYopOh9q B2SpV3sIu5Tx3bGUVeRyc8uvNPAc5wEI0w== X-Google-Smtp-Source: ABdhPJyn5QPMqwv2WK9Li6o1mjfXnansb4ZUDnamtLwGieDmQ07/TlSJUJtnsyIshzCJFZmXAinVmg== X-Received: by 2002:a1c:7205:: with SMTP id n5mr5125545wmc.175.1601676643953; Fri, 02 Oct 2020 15:10:43 -0700 (PDT) Received: from dell5510.suse.de ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id 92sm3290014wra.19.2020.10.02.15.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 15:10:43 -0700 (PDT) From: Petr Vorel To: buildroot@buildroot.org Date: Sat, 3 Oct 2020 00:10:31 +0200 Message-Id: <20201002221032.5627-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/ltp-testsuite: Fix m68k build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Backport upstream proposal for fix. Fixes: br-m68k-68040-full failure. Signed-off-by: Petr Vorel --- I haven't found this in autobuild [1], there are just problems with fanotify tests missing MAX_HANDLE_SZ, which are fixed in next version (second patch). Kind regards, Petr [1] http://autobuild.buildroot.net/index.php?reason=ltp-testsuite-20200515 ...01-cacheflush01-Rewrite-into-new-API.patch | 225 ++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch diff --git a/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch b/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch new file mode 100644 index 0000000000..f9815624b9 --- /dev/null +++ b/package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch @@ -0,0 +1,225 @@ +From 48edd768850825a4d01e5e5e737122333fc55cdf Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Fri, 2 Oct 2020 21:29:58 +0200 +Subject: [PATCH] cacheflush01: Rewrite into new API + +This syscall is currently (v5.9) supported on these architectures: +arc, csky, mips, m68k, nds32, sh + +constants are missing for m68k, not sure if the testcase is valid for it. +Untested. + +Test for __LTP__NR_INVALID_SYSCALL saves adding autotools check for +. + +Signed-off-by: Petr Vorel +--- +[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201002202416.28972-1-petr.vorel@gmail.com/ ] + .../kernel/syscalls/cacheflush/cacheflush01.c | 173 ++++-------------- + 1 file changed, 40 insertions(+), 133 deletions(-) + +diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c +index 29cf2014a..6ad8b953a 100644 +--- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c ++++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c +@@ -1,157 +1,64 @@ +-/******************************************************************************/ +-/* Copyright (c) Maxin John , 2009 */ +-/* LKML Reference: http://lkml.org/lkml/2009/4/9/203 */ +-/* This program is free software; you can redistribute it and/or modify */ +-/* it under the terms of the GNU General Public License as published by */ +-/* the Free Software Foundation; either version 2 of the License, or */ +-/* (at your option) any later version. */ +-/* */ +-/* This program is distributed in the hope that it will be useful, */ +-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ +-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ +-/* the GNU General Public License for more details. */ +-/* */ +-/* You should have received a copy of the GNU General Public License */ +-/* along with this program; if not, write to the Free Software */ +-/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +-/* */ +-/******************************************************************************/ +-/******************************************************************************/ +-/* */ +-/* File: cacheflush01.c */ +-/* */ +-/* Description: The cacheflush_check() syscall */ +-/* Tests EINVAL error of cacheflush system call. */ +-/* Its expected behaviour is cacheflush() should return -EINVAL */ +-/* when cache parameter is not one of ICACHE, DCACHE, or BCACHE. */ +-/* */ +-/* Usage: */ +-/* cacheflush01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ +-/* where, -c n : Run n copies concurrently. */ +-/* -e : Turn on errno logging. */ +-/* -i n : Execute test n times. */ +-/* -I x : Execute test for x seconds. */ +-/* -P x : Pause for x seconds between iterations. */ +-/* -t : Turn on syscall timing. */ +-/* */ +-/* Total Tests: 1 */ +-/* */ +-/* Test Name: cacheflush01 */ +-/******************************************************************************/ ++// SPDX-License-Identifier: GPL-2.0-or-later + +-#include +-#include +-#include +-#include +- +-#include "test.h" ++#include "tst_test.h" + #include "lapi/syscalls.h" + + #if __NR_cacheflush != __LTP__NR_INVALID_SYSCALL ++ + #include +-#else ++ ++/* ++ * m68k does not have these constants ++ */ ++ + #ifndef ICACHE +-#define ICACHE (1<<0) /* flush instruction cache */ ++# define ICACHE (1<<0) + #endif ++ + #ifndef DCACHE +-#define DCACHE (1<<1) /* writeback and flush data cache */ ++# define DCACHE (1<<1) + #endif ++ + #ifndef BCACHE +-#define BCACHE (ICACHE|DCACHE) /* flush both caches */ +-#endif ++# define BCACHE (ICACHE|DCACHE) + #endif + +-char *TCID = "cacheflush01"; +-int TST_TOTAL = 1; ++#define CACHE_DESC(x) .cache = x, .desc = #x + +-/* Extern Global Functions */ +-/******************************************************************************/ +-/* */ +-/* Function: cleanup */ +-/* */ +-/* Description: Performs all one time clean up for this test on successful */ +-/* completion, premature exit or failure. Closes all temporary */ +-/* files, removes all temporary directories exits the test with */ +-/* appropriate return code by calling tst_exit() function. */ +-/* */ +-/* Input: None. */ +-/* */ +-/* Output: None. */ +-/* */ +-/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ +-/* On success - Exits calling tst_exit(). With '0' return code. */ +-/* */ +-/******************************************************************************/ +-void cleanup(void) +-{ ++static struct test_case_t { ++ int cache; ++ const char *desc; ++} test_cases[] = { ++ { CACHE_DESC(ICACHE) }, ++ { CACHE_DESC(DCACHE) }, ++ { CACHE_DESC(BCACHE) }, ++}; + +- tst_rmdir(); +-} ++static char *addr; + +-/* Local Functions */ +-/******************************************************************************/ +-/* */ +-/* Function: setup */ +-/* */ +-/* Description: Performs all one time setup for this test. This function is */ +-/* typically used to capture signals, create temporary dirs */ +-/* and temporary files that may be used in the course of this */ +-/* test. */ +-/* */ +-/* Input: None. */ +-/* */ +-/* Output: None. */ +-/* */ +-/* Return: On failure - Exits by calling cleanup(). */ +-/* On success - returns 0. */ +-/* */ +-/******************************************************************************/ +-void setup(void) ++static void setup(void) + { +- /* Capture signals if any */ +- /* Create temporary directories */ +- TEST_PAUSE; +- tst_tmpdir(); ++ addr = SAFE_MALLOC(getpagesize()); + } + +-int main(int ac, char **av) ++static void test_cacheflush(unsigned int i) + { ++ struct test_case_t *tc = &test_cases[i]; + +- char *addr = NULL; +- +- tst_parse_opts(ac, av, NULL, NULL); +- +- setup(); +- +- tst_count = 0; +- /* Create some user address range */ +- addr = malloc(getpagesize()); +- if (addr == NULL) { +- tst_brkm(TFAIL | TTERRNO, cleanup, "malloc failed"); +- } +- +- /* Invokes cacheflush() with proper parameters */ +- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), ICACHE)); +- if (TEST_RETURN == 0) { +- tst_resm(TPASS, "passed with no errno"); +- } else { +- tst_resm(TFAIL, "failed with unexpected errno"); +- } +- +- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), DCACHE)); +- if (TEST_RETURN == 0) { +- tst_resm(TPASS, "passed with no errno"); ++ TEST(tst_syscall(__NR_cacheflush, addr, getpagesize(), tc->cache)); ++ if (TST_RET == 0) { ++ tst_res(TPASS, "%s passed", tc->desc); + } else { +- tst_resm(TFAIL, "failed with unexpected errno"); ++ tst_res(TFAIL | TTERRNO, "%s failed", tc->desc); + } ++} + +- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), BCACHE)); +- if (TEST_RETURN == 0) { +- tst_resm(TPASS, "passed with no errno"); +- } else { +- tst_resm(TFAIL, "failed with unexpected errno"); +- } ++static struct tst_test test = { ++ .setup = setup, ++ .test = test_cacheflush, ++ .tcnt = ARRAY_SIZE(test_cases), ++}; + +- cleanup(); +- tst_exit(); +-} ++#else ++ TST_TEST_TCONF("system doesn't support cacheflush()"); ++#endif +-- +2.28.0 + From patchwork Fri Oct 2 22:10:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1376119 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=P/V76Zdj; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C342B2X9yz9sRR for ; Sat, 3 Oct 2020 08:10:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 29CDF8695E; Fri, 2 Oct 2020 22:10:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vdwykBd5t3zi; Fri, 2 Oct 2020 22:10:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 280D186966; Fri, 2 Oct 2020 22:10:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B84AC1BF3A7 for ; Fri, 2 Oct 2020 22:10:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC08886C7E for ; Fri, 2 Oct 2020 22:10:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DOpUOvXXhq6P for ; Fri, 2 Oct 2020 22:10:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id D747186CCC for ; Fri, 2 Oct 2020 22:10:46 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id e16so3330066wrm.2 for ; Fri, 02 Oct 2020 15:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X1YIcjAUG/Hr8ojkWn9d+EyGBln931UXUaeOznNXeeo=; b=P/V76ZdjE+88EvGXUKfGOTCsO74bN27E8YmaoWPuRjvN3gmUJeNONaWwT/F0Y8qZ9m G3ESg72It2SRPfoNjgVz2+OWSQbpwDwf2x9C1HWiEl6rSIOzJkyC6dhGRudDTqCL/IAE iefPkPU7QTj/CbwnEHgpRYefZwCQZ+VG5EAWxI1Wqchy9L+L+XscajKRI2JkHSva4vd7 VPZ8LmTAKqRBN3lE3C7+hn18bTu2/3QSgmVANQaKNJhGowuje7YdAPGoo0Ldn099QOEr 5f8XvupZQH1H+iy1yThXm4Oh6RpVy327TOZmQjkEHzTPJD7FUWUNYBleYc74Ml9Cecwa i/gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X1YIcjAUG/Hr8ojkWn9d+EyGBln931UXUaeOznNXeeo=; b=He2SNwSECL8An5AiS7S2GPNjoKqhTiIkY5LGSRc/xhwu6/fMGHPTWkeBN1tb0xm31b j62XA7PPXvxgKBRmRsNkYsL9ZAxJUonMSZyg0ygV3Xk8GZ5cNBtV5A0rZy8xyRtS7hjB aAMuVjeDxkn750vYo/2RMU5e9E78WGQ+xuFTvZTzrJge8G+MugOKfcOxqyexM4XdxsGW HPedRW5smBZR9krQ4262anrbWxitpT5eFOZU9LLV/GBO+n0EyahYMMaf4v61/zuIeq+p QJkslVdKPYPH8GO4DhhypgJItA2sL1qn5uXHQYESyRYLen667MZu7rACue2oggByBPeM fkZg== X-Gm-Message-State: AOAM530NHLb2mDHrv79BFWgFWqQX5qhzVl+D7ahDAcnksRVgULrC8IFO u3aJPrATJWnbUCV8Vy8JgRcrbC08No7ycQ== X-Google-Smtp-Source: ABdhPJz0pnGDWw+z1Z7cLPvH2DMxhF8uUxIJ+NoGTxvLvxpnm5S1Gel/yacTTaKimAUnPScObU1oog== X-Received: by 2002:adf:de11:: with SMTP id b17mr5201152wrm.82.1601676644769; Fri, 02 Oct 2020 15:10:44 -0700 (PDT) Received: from dell5510.suse.de ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id 92sm3290014wra.19.2020.10.02.15.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 15:10:44 -0700 (PDT) From: Petr Vorel To: buildroot@buildroot.org Date: Sat, 3 Oct 2020 00:10:32 +0200 Message-Id: <20201002221032.5627-2-petr.vorel@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201002221032.5627-1-petr.vorel@gmail.com> References: <20201002221032.5627-1-petr.vorel@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/ltp-testsuite: bump to version 20200930 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop patch form this version add 2 new patches for fixing build. Signed-off-by: Petr Vorel --- ...001-fanotify.h-fix-build-with-uclibc.patch | 41 ---- ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 203 ++++++++++++++++++ package/ltp-testsuite/ltp-testsuite.hash | 4 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 4 files changed, 206 insertions(+), 44 deletions(-) delete mode 100644 package/ltp-testsuite/0001-fanotify.h-fix-build-with-uclibc.patch create mode 100644 package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch diff --git a/package/ltp-testsuite/0001-fanotify.h-fix-build-with-uclibc.patch b/package/ltp-testsuite/0001-fanotify.h-fix-build-with-uclibc.patch deleted file mode 100644 index 5531756970..0000000000 --- a/package/ltp-testsuite/0001-fanotify.h-fix-build-with-uclibc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cb11e718ce04261cb6ff4c09442b949da33b8797 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 5 Sep 2020 17:55:45 +0200 -Subject: [PATCH] fanotify.h: fix build with uclibc - -MAX_HANDLE_SZ is used since version 20200515 and -https://github.com/linux-test-project/ltp/commit/d20a3e8f9a794e0659277acfa9fbcf7454ba4631 - -However, it is not defined by uclibc, so define it if needed to avoid -the following build failure: - -fanotify.h:171:11: error: 'MAX_HANDLE_SZ' undeclared here (not in a function) - 171 | char buf[MAX_HANDLE_SZ]; - -Fixes: - - http://autobuild.buildroot.org/results/fb0a67b15482e76b379b4b4d9c43b45bb0fccae1 - -Signed-off-by: Fabrice Fontaine -Reviewed-by: Cyril Hrubis -[Retrieved from: -https://github.com/linux-test-project/ltp/commit/cb11e718ce04261cb6ff4c09442b949da33b8797] ---- - testcases/kernel/syscalls/fanotify/fanotify.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h -index a9a431ca2f..d271578e97 100644 ---- a/testcases/kernel/syscalls/fanotify/fanotify.h -+++ b/testcases/kernel/syscalls/fanotify/fanotify.h -@@ -139,6 +139,11 @@ struct fanotify_event_info_fid { - #endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID_FSID___VAL */ - - #ifdef HAVE_NAME_TO_HANDLE_AT -+ -+#ifndef MAX_HANDLE_SZ -+#define MAX_HANDLE_SZ 128 -+#endif -+ - /* - * Helper function used to obtain fsid and file_handle for a given path. - * Used by test files correlated to FAN_REPORT_FID functionality. diff --git a/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch new file mode 100644 index 0000000000..f1b6743f21 --- /dev/null +++ b/package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -0,0 +1,203 @@ +From ac3e262cba81889c0bb04ce87a50a1709f2726e7 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Thu, 1 Oct 2020 23:28:39 +0200 +Subject: [PATCH] lapi: Add sysinfo.h to fix build with MUSL libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The reason is to avoid indirect include when using +some network headers: or others -> +-> + +This indirect include causes on MUSL redefinition of struct sysinfo when +included both and some of UAPI headers: + +In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, + from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, + from ../include/tst_netlink.h:14, + from tst_crypto.c:13: +x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of ‘struct sysinfo’ + struct sysinfo { + ^~~~~~~ +In file included from ../include/tst_safe_macros.h:15, + from ../include/tst_test.h:93, + from tst_crypto.c:11: +x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + +Signed-off-by: Petr Vorel +[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel@gmail.com/ ] +--- + include/lapi/sysinfo.h | 22 +++++++++++++++++++ + include/tst_safe_macros.h | 2 +- + lib/safe_macros.c | 2 +- + lib/tst_memutils.c | 2 +- + testcases/kernel/mem/mtest01/mtest01.c | 2 +- + testcases/kernel/syscalls/madvise/madvise06.c | 2 +- + testcases/kernel/syscalls/sysinfo/sysinfo01.c | 2 +- + testcases/kernel/syscalls/sysinfo/sysinfo02.c | 2 +- + testcases/kernel/syscalls/sysinfo/sysinfo03.c | 2 +- + 9 files changed, 30 insertions(+), 8 deletions(-) + create mode 100644 include/lapi/sysinfo.h + +diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h +new file mode 100644 +index 000000000..d0e0e93d7 +--- /dev/null ++++ b/include/lapi/sysinfo.h +@@ -0,0 +1,22 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later ++/* ++ * Copyright (c) 2020 Petr Vorel ++ */ ++ ++#ifndef SYSINFO_H__ ++ ++/* ++ * Don't use as it breaks build MUSL toolchain. ++ * Use instead. ++ * ++ * Some kernel UAPI headers do indirect include: ++ * or others -> -> ++ * ++ * This indirect include causes on MUSL redefinition of struct sysinfo when ++ * included both and some of UAPI headers: ++ */ ++#include ++ ++#define SYSINFO_H__ ++ ++#endif /* SYSINFO_H__ */ +diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h +index 053c3bcf9..61ea2076d 100644 +--- a/include/tst_safe_macros.h ++++ b/include/tst_safe_macros.h +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/lib/safe_macros.c b/lib/safe_macros.c +index 4f48d7529..d8ee03dae 100644 +--- a/lib/safe_macros.c ++++ b/lib/safe_macros.c +@@ -11,7 +11,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -23,6 +22,7 @@ + #include + #include "test.h" + #include "safe_macros.h" ++#include "lapi/sysinfo.h" + + char *safe_basename(const char *file, const int lineno, + void (*cleanup_fn) (void), char *path) +diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c +index f134d90c9..647db951e 100644 +--- a/lib/tst_memutils.c ++++ b/lib/tst_memutils.c +@@ -5,11 +5,11 @@ + + #include + #include +-#include + #include + + #define TST_NO_DEFAULT_MAIN + #include "tst_test.h" ++#include "lapi/sysinfo.h" + + #define BLOCKSIZE (16 * 1024 * 1024) + +diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c +index f08d3943f..9b4d856f8 100644 +--- a/testcases/kernel/mem/mtest01/mtest01.c ++++ b/testcases/kernel/mem/mtest01/mtest01.c +@@ -20,7 +20,6 @@ + */ + + #include +-#include + #include + #include + #include +@@ -29,6 +28,7 @@ + #include + + #include "lapi/abisize.h" ++#include "lapi/sysinfo.h" + #include "tst_test.h" + + #define FIVE_HUNDRED_MB (500ULL*1024*1024) +diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c +index f76f3f6aa..b2613670b 100644 +--- a/testcases/kernel/syscalls/madvise/madvise06.c ++++ b/testcases/kernel/syscalls/madvise/madvise06.c +@@ -24,8 +24,8 @@ + #include + #include + #include +-#include + #include "tst_test.h" ++#include "lapi/sysinfo.h" + + #define CHUNK_SZ (400*1024*1024L) + #define CHUNK_PAGES (CHUNK_SZ / pg_sz) +diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c +index 2ea44a2be..a95066bf5 100644 +--- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c ++++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c +@@ -69,9 +69,9 @@ + #include + #include + #include +-#include + + #include "test.h" ++#include "lapi/sysinfo.h" + + void setup(); + void cleanup(); +diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c +index 678b8f1d3..5ce65d20e 100644 +--- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c ++++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c +@@ -65,10 +65,10 @@ + #include + #include + #include +-#include + #include + + #include "test.h" ++#include "lapi/sysinfo.h" + + #define INVALID_ADDRESS ((uintptr_t)-1) + +diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c +index af7cb6421..3b61a05b1 100644 +--- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c ++++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c +@@ -13,9 +13,9 @@ + + */ + +-#include + #include "lapi/namespaces_constants.h" + #include "lapi/posix_clocks.h" ++#include "lapi/sysinfo.h" + #include "tst_test.h" + + static int offsets[] = { +-- +2.28.0 + diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index eb349e2929..9dce0405df 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20200515/ltp-full-20200515.tar.xz.sha1 -sha1 7b3932b46295328c64d6f235bc54fa68806b9ede ltp-full-20200515.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20200930/ltp-full-20200930.tar.xz.sha1 +sha1 f380c7afe71e03eabb1de668c0399267042cb0f7 ltp-full-20200930.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 4cee77bcd0..a9a3173c4b 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20200515 +LTP_TESTSUITE_VERSION = 20200930 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+