From patchwork Sat Aug 8 13:13:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alejandro_Gonz=C3=A1lez?= X-Patchwork-Id: 1342520 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=DofaTu/k; 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 4BP2km6Sllz9sPC for ; Sat, 8 Aug 2020 23:14:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5DEDC87567; Sat, 8 Aug 2020 13:14:37 +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 81i7Tt8Pq95n; Sat, 8 Aug 2020 13:14:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 59CE18750F; Sat, 8 Aug 2020 13:14:35 +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 B74451BF404 for ; Sat, 8 Aug 2020 13:14:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF9B788BF3 for ; Sat, 8 Aug 2020 13:14:34 +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 RY1zLeynSCIY for ; Sat, 8 Aug 2020 13:14:33 +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 5FB8888BEA for ; Sat, 8 Aug 2020 13:14:33 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id a5so4079298wrm.6 for ; Sat, 08 Aug 2020 06:14:33 -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=tY+106v/5t7WETF/w88uySJFdsGS8s5KC8ltnmcE28E=; b=DofaTu/kWlXfU26XGdJHMr3cpD+im3S4dwwv9NvsOKHnP8DkLd2TIgzxfFvz3XiXJd LsAOJCMpBrXsxk9BN5L8a5CiMag6qmWRj3THPuU1zedXn4FPQDr49K0uyrPL26KJM5ii cqRlOG/5AgwG8ZTJ1D4GM7RXi1VxrmT8Lsb+CR+6+c1o3fCUDEbwcIsna0/5crbpqYv9 gc0QuopPpi3OXv28kwyyRvD6f4YFv5LA0mOP97B408a0msOpD8tdyug0QTMvsAbDDJSg gkJQnNVMszGYky0KOe+YKJLSClbz9Sei4snJC5Fg1Oy5m6MwKVAXwkInMb0R7qC+0Xub qKJw== 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=tY+106v/5t7WETF/w88uySJFdsGS8s5KC8ltnmcE28E=; b=E4Mx+nINSk4TqC7noCJsvyCQL+7pwIjrYTgGnR8/G5XckvqllSEcTbdndgUZc4tNoK NTHKDqZiGoUg/ALyflM6LdLO+dSDK0IoJlHq3S29mBqHZYidnduM8fzIgjNUtpP7fN9T 06AadpoVgqhmPBc45gWLmZw1tNdKVsTDNzHBHzm6QXlBuastS2elIfEvG7tFEnghxDfu 8TN7q8EvFuuV/8ChfetvFaxBVL7NXDWj3E7MbsNgF7tr2xkXU0oPWj6PKIYTaLJL+ZpK 9s6jnsGp/HR/6DRXvswM7e29D/tUrmwJLvVGKna+Wetv848a2uEIF3zd5z5rBAv2pVqr +6LQ== X-Gm-Message-State: AOAM532Nfks4jUL6LE0ktuEEK+r94ZbUrt2RTF4eZWl+f2Ck0f30+Zf2 jfQTIcH6DcL/vmcT+gzCs6h3i9F0 X-Google-Smtp-Source: ABdhPJwPWPwXk6kTaFrgSruhDu+W0nYzf0gn/CKuPuTiT5JkNgiAtewvsOwNic2/LFq17HpGvo8ckw== X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr16031080wrq.407.1596892471330; Sat, 08 Aug 2020 06:14:31 -0700 (PDT) Received: from pc-sobremesa.mundo-R.com (162.189.27.77.dynamic.reverse-mundo-r.com. [77.27.189.162]) by smtp.gmail.com with ESMTPSA id n5sm13522924wrx.22.2020.08.08.06.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2020 06:14:30 -0700 (PDT) From: =?utf-8?q?Alejandro_Gonz=C3=A1lez?= To: buildroot@buildroot.org Date: Sat, 8 Aug 2020 15:13:56 +0200 Message-Id: <20200808131356.852691-1-alejandro.gonzalez.correo@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/stress-ng: bump version to 0.11.17 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: Romain Naour , =?utf-8?q?Alejandro_Gonz=C3=A1lez?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit bumps stress-ng version to 0.11.17. This version includes the patch that fixes musl build at commit 03416938871388243d28621f4b59ce532231f11c, and also fixes a "Invalid syntax in conditional" build error in a Makefile. Signed-off-by: Alejandro González --- ...tress-ng.h-suppress-kernel-sysinfo.h.patch | 49 ------------------- package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/stress-ng/0001-stress-ng.h-suppress-kernel-sysinfo.h.patch diff --git a/package/stress-ng/0001-stress-ng.h-suppress-kernel-sysinfo.h.patch b/package/stress-ng/0001-stress-ng.h-suppress-kernel-sysinfo.h.patch deleted file mode 100644 index cc8b1a1b67..0000000000 --- a/package/stress-ng/0001-stress-ng.h-suppress-kernel-sysinfo.h.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8c223daf10319f15570a74ed83a1d655fdbd4a7b Mon Sep 17 00:00:00 2001 -Message-Id: <8c223daf10319f15570a74ed83a1d655fdbd4a7b.1592540443.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Fri, 19 Jun 2020 07:10:24 +0300 -Subject: [PATCH] stress-ng.h: suppress kernel sysinfo.h - -The kernel sysinfo.h (indirectly included from genetlink.h) defines -struct sysinfo. This collides with musl libc definition of the same -struct. - -Fixes this build issue: - -In file included from .../arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/kernel.h:5, - from .../arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/netlink.h:5, - from .../arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/genetlink.h:6, - from stress-ng.h:464, - from stress-access.c:25: -.../arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of ‘struct sysinfo’ - struct sysinfo { - ^~~~~~~ -In file included from stress-ng.h:389, - from stress-access.c:25: -.../arm-buildroot-linux-musleabihf/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - struct sysinfo { - ^~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/ColinIanKing/stress-ng/pull/69 - - stress-ng.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/stress-ng.h b/stress-ng.h -index 1a662938c1d9..e8aa0efe7527 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -387,6 +387,8 @@ - - #if defined(HAVE_SYS_SYSINFO_H) - #include -+/* Suppress kernel sysinfo to avoid collision with musl */ -+#define _LINUX_SYSINFO_H - #endif - - #if defined(HAVE_SYS_SYSMACROS_H) --- -2.27.0 - diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index 9993c759ba..5250a22475 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b stress-ng-0.11.14.tar.xz +sha256 860291dd3a18b985b3483190a627bbede2b5c52113766c1921001b3fb4b83af0 stress-ng-0.11.17.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 61bc07d60a..57464e9bbf 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.11.14 +STRESS_NG_VERSION = 0.11.17 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+