From patchwork Wed Apr 22 20:38:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1275397 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.133; helo=hemlock.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=ejl7Tvsf; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496sj56qdvz9sSJ for ; Thu, 23 Apr 2020 06:38:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 99C13883E6; Wed, 22 Apr 2020 20:38:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XfV6QdFyHSQK; Wed, 22 Apr 2020 20:38:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D06AA88409; Wed, 22 Apr 2020 20:38:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id F27731BF423 for ; Wed, 22 Apr 2020 20:38:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EBA6088409 for ; Wed, 22 Apr 2020 20:38:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LDAEsD2GF1Q3 for ; Wed, 22 Apr 2020 20:38:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8D979883E6 for ; Wed, 22 Apr 2020 20:38:43 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id k13so4180213wrw.7 for ; Wed, 22 Apr 2020 13:38:43 -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=qCNIkDhDm+QEH7PY72g8x/UEoeBOZISoltKfJQfUXGs=; b=ejl7TvsfmRy0ioGeiFZpsG7NZsfY+KEts2AJtuqjGQZrFq8+zTT2AkLH1pxTIPw/bo 6Rsmp0sLhM4MmFRDarNwJu4dRFipKewk624nkO4/3r8X2KV59/z4n5EUOSDzwJ/zyRF7 2Bw+67n3p63xgN0a4zCGN2/2ECLmH+WRG6zbVkMmH+IWTHrZPX0196T2aB+BzciIMbbo davCsz27ZQvPo18DMaP8D+OwYOTRKg5Mnj7pmS5sruSHZf31WLuyO2+ggxK+m0DOQzEB jxz/S1I0vG4qK5aVCHlaQR1tUK/3JdA8Rg3ztZQb90YOMujc1v4znVvEgOdqx+DI04C0 idXg== 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=qCNIkDhDm+QEH7PY72g8x/UEoeBOZISoltKfJQfUXGs=; b=s2UEOtPXn9qUzMxSVt1NRIX3kZp79ulr4jssT7qe8fLbUqrfsB5tj/DocGY2TRfABR 00IQMfkVnRM71/0Q14/6sfFc9li089XZlxZPzCEjRNMPnLTKV4Ut5TEKtY7anpiCiRdl eoDuBBVfvKWnnmH11Bbhj/sqndI6NqonUEL0MtDAWqB3lHF1HuOOxLjlaXU5PwYBWh80 mY4SrBX4bEXYIZaPf6LBZw7XoKYzMXg/HkrfeiFZ8qh5J7T5MmZUf92VorW+UQlwMFrX QdG8hYsgron81+AhI3NCI7OH8gwLqov4U2gHED+2yiLaNDXIjsTxw2t/cJ17aUyxy8oL CEsA== X-Gm-Message-State: AGi0PuaCThu60BUC7PVM915Y0ECWEsm96vGp/+vQ212r7VmtSOpBkTeg 5sM8kR0OAbuwiiX4fZCXZdVNGezc X-Google-Smtp-Source: APiQypIrMkfCO/VVm0If4rHHr+NukFvAzXr+aCBIEGzsRifSbGkfDVrFkD5XRWgBLEHrKP+xHVw8Tg== X-Received: by 2002:a5d:4a4b:: with SMTP id v11mr936797wrs.32.1587587921752; Wed, 22 Apr 2020 13:38:41 -0700 (PDT) Received: from t450s.fritz.box (ip5b426f84.dynamic.kabel-deutschland.de. [91.66.111.132]) by smtp.gmail.com with ESMTPSA id x132sm548378wmg.33.2020.04.22.13.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 13:38:41 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Wed, 22 Apr 2020 22:38:29 +0200 Message-Id: <20200422203829.31227-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/fio: bump to 3.19 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: , Cc: Pierre-Jean Texier , Heiko Thiery , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - add upstream patch to fix build on musl - update indentation of hash file (two spaces) Signed-off-by: Heiko Thiery --- ...io_uring-don-t-use-rand48_r-variants.patch | 49 +++++++++++++++++++ package/fio/fio.hash | 6 +-- package/fio/fio.mk | 2 +- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch diff --git a/package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch b/package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch new file mode 100644 index 0000000000..8d6830ac81 --- /dev/null +++ b/package/fio/0001-t-io_uring-don-t-use-rand48_r-variants.patch @@ -0,0 +1,49 @@ +From 5e8865c0e08861558c1253c521dc9098d0c773ee Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Mon, 16 Mar 2020 08:30:36 -0600 +Subject: [PATCH] t/io_uring: don't use *rand48_r() variants + +Not available on all platforms. + +Signed-off-by: Jens Axboe + +[Patch from upstream +https://github.com/axboe/fio/commit/5e8865c0e08861558c1253c521dc9098d0c773ee] +Signed-off-by: Heiko Thiery +--- + t/io_uring.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/t/io_uring.c b/t/io_uring.c +index e84a2b6b..d48db1e9 100644 +--- a/t/io_uring.c ++++ b/t/io_uring.c +@@ -63,7 +63,6 @@ struct file { + struct submitter { + pthread_t thread; + int ring_fd; +- struct drand48_data rand; + struct io_sq_ring sq_ring; + struct io_uring_sqe *sqes; + struct io_cq_ring cq_ring; +@@ -170,7 +169,7 @@ static void init_io(struct submitter *s, unsigned index) + } + f->pending_ios++; + +- lrand48_r(&s->rand, &r); ++ r = lrand48(); + offset = (r % (f->max_blocks - 1)) * BS; + + if (register_files) { +@@ -286,7 +285,7 @@ static void *submitter_fn(void *data) + + printf("submitter=%d\n", gettid()); + +- srand48_r(pthread_self(), &s->rand); ++ srand48(pthread_self()); + + prepped = 0; + do { +-- +2.20.1 + diff --git a/package/fio/fio.hash b/package/fio/fio.hash index 4b6c9b8c1d..d95deb20b0 100644 --- a/package/fio/fio.hash +++ b/package/fio/fio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2aa68326266ef074ecc0892ebfe165e28c981282f345ee05f9d06f11ada3f052 fio-3.17.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE +sha256 a2f885834900f554127718716338914791f5d72800b6f9e3edf173b94b5a2e4e fio-3.19.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c MORAL-LICENSE diff --git a/package/fio/fio.mk b/package/fio/fio.mk index 5761d1c282..3ddd74eda4 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIO_VERSION = 3.17 +FIO_VERSION = 3.19 FIO_SITE = http://brick.kernel.dk/snaps FIO_LICENSE = GPL-2.0 FIO_LICENSE_FILES = COPYING MORAL-LICENSE