From patchwork Sun Aug 1 21:46:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1512158 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=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) 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=KYF1rKTO; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GdF821jZnz9sT6 for ; Mon, 2 Aug 2021 07:46:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2AA5B838B2; Sun, 1 Aug 2021 21:46:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4aeY_9ov6lOX; Sun, 1 Aug 2021 21:46:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 6F66283848; Sun, 1 Aug 2021 21:46:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1BC111BF36B for ; Sun, 1 Aug 2021 21:46:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1875540466 for ; Sun, 1 Aug 2021 21:46:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id evuPES78nF4j for ; Sun, 1 Aug 2021 21:46:15 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8BD04403B7 for ; Sun, 1 Aug 2021 21:46:15 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id h24-20020a1ccc180000b029022e0571d1a0so9837138wmb.5 for ; Sun, 01 Aug 2021 14:46:15 -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=hkDFF3MTPW5t5z0PDslKpKaAVt4+tgpmNjtf/mnu66Y=; b=KYF1rKTO3O2UEBONugqYLqQomnrm42TOw4Zwz4m7p+RO2lCrD26mFAfQwrMN4MT3wx 6vdR9gBzL4cb+nQsFAmBurXXFxzis60TzoElH9CLtcld8GzYAN9+XUwZaQeCxtcpOQm/ CvIfu7TDHKP9HsBy1rIp0L8p77cBxlYS+hqUa82jm3Qmnp0rzfN1uMmkJfGc8UgF4FdG erud7qDvez5Y8bXLB6CSAJbDoVdkCa6bSj9ti+k4SS46MBAyZ9CRDaQ3rYskw7IC/A8c yoUYDCS9yKE4wcFlCuIxTpMn1CtJePu+rfhb5wkhcNK7ebhiu2BJslWxZZvUlqgN/IJE JhXQ== 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=hkDFF3MTPW5t5z0PDslKpKaAVt4+tgpmNjtf/mnu66Y=; b=R1ImFpcJEgQHEdbCirk5Kl/UdiLOzLwWDWSayQSzTRt6ohX62mC4cYXGw+vR88qrhv b8oGBSPa+6cceL7ueYaUoDhW6vdyzsnbBOcs3BLHcVIsib9GwPp7Z0zK4QCdYWnXz43A aQOtTpLwnm3rAMkbZXyyCM4+fTVTU89OgrXvBJ7LJbhZE8waRLP5zmOTahJgsykr6DV0 3yOJq8AFkAqDYmcUeeXlr3uCdM/LnWq00Ychsa3qn1AyOkJr5MuJ2BJCy2nfnnh1gin2 aokHy32qMhHOEimZwgNNxYAgX/dFHsJ/TYUx3Pf/ODFDVZ/SWqcSXGcv9JjsaUgJz9iQ rS3w== X-Gm-Message-State: AOAM532KCyUacqQtN01G9av4Cx6zdfIev12kJmo7ueTyRIXE7Zh8e+dr 3u1uVzeE8SznBDPzE98+ZPU/Xrvzqf44qw== X-Google-Smtp-Source: ABdhPJzQbFjHmdGjmyjVfEiGzcLE4rLlYXVzCPqtyYecsKXgVFEuKczpzmx8mEZ59kfxZZDMlAuAhw== X-Received: by 2002:a05:600c:17d8:: with SMTP id y24mr13638678wmo.91.1627854373524; Sun, 01 Aug 2021 14:46:13 -0700 (PDT) Received: from kali.home (pop.92-184-106-87.mobile.abo.orange.fr. [92.184.106.87]) by smtp.gmail.com with ESMTPSA id a16sm9348632wrx.7.2021.08.01.14.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 14:46:13 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 1 Aug 2021 23:46:00 +0200 Message-Id: <20210801214601.566970-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/irqbalance: use pkg-config to find numa 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: Karoly Kasza , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use pkg-config to find numa to avoid the following build failure when checking for numa_available: configure:9667: checking for numa_available in -lnuma configure:9692: /tmp/instance-7/output-1/host/bin/microblazeel-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lnuma >&5 /tmp/instance-7/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: /tmp/instance-7/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libnuma.a(libnuma.o): in function `numa_node_to_cpus_v1': (.text+0x2a80): undefined reference to `__atomic_fetch_and_1' /tmp/instance-7/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/9.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: /tmp/instance-7/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libnuma.a(libnuma.o): in function `numa_node_to_cpus_v2': (.text+0x2ddc): undefined reference to `__atomic_fetch_and_1' collect2: error: ld returned 1 exit status Fixes: - http://autobuild.buildroot.org/results/577a63432fba2f9ae1ed2c6c2a77c5ce54ac5521 Signed-off-by: Fabrice Fontaine --- ...igure.ac-use-pkg-config-to-find-numa.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/irqbalance/0002-configure.ac-use-pkg-config-to-find-numa.patch diff --git a/package/irqbalance/0002-configure.ac-use-pkg-config-to-find-numa.patch b/package/irqbalance/0002-configure.ac-use-pkg-config-to-find-numa.patch new file mode 100644 index 0000000000..751367ccfb --- /dev/null +++ b/package/irqbalance/0002-configure.ac-use-pkg-config-to-find-numa.patch @@ -0,0 +1,38 @@ +From 274cb8ea470a10ce46b783e77784b0eb08cf20d8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 1 Aug 2021 23:26:01 +0200 +Subject: [PATCH] configure.ac: use pkg-config to find numa + +Use pkg-config to find numa and fallback to current mechanism. +Thanks to pkg-config, numa dependencies such as -latomic will be +retrieved. + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Irqbalance/irqbalance/pull/188] +--- + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c45b9ce..50c62ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,14 @@ AC_CHECK_HEADERS([numa.h]) + + AC_CHECK_FUNCS(getopt_long) + +-AC_CHECK_LIB(numa, numa_available) ++PKG_CHECK_MODULES([NUMA], [numa], [has_numa=yes], [AC_CHECK_LIB(numa, numa_available)]) ++AS_IF([test "x$has_numa" = "xyes"], [ ++ AC_SUBST([NUMA_CFLAGS]) ++ AC_SUBST([NUMA_LIBS]) ++ LIBS="$LIBS $NUMA_LIBS" ++ AC_SUBST([LIBS]) ++]) ++ + AC_CHECK_LIB(m, floor) + + PKG_CHECK_MODULES([GLIB2], [glib-2.0], [], [AC_MSG_ERROR([glib-2.0 is required])]) +-- +2.30.2 + From patchwork Sun Aug 1 21:46:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1512159 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.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) 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=mhUpWtFU; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GdF8F6RCMz9sT6 for ; Mon, 2 Aug 2021 07:46:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CBCFB60749; Sun, 1 Aug 2021 21:46:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vcflitqa8_Bp; Sun, 1 Aug 2021 21:46:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id E1D6360697; Sun, 1 Aug 2021 21:46:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0E5CB1BF36B for ; Sun, 1 Aug 2021 21:46:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id EFF20403B7 for ; Sun, 1 Aug 2021 21:46:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lv1jLvBcHwRe for ; Sun, 1 Aug 2021 21:46:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp4.osuosl.org (Postfix) with ESMTPS id B745F403BF for ; Sun, 1 Aug 2021 21:46:18 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id h13so5612697wrp.1 for ; Sun, 01 Aug 2021 14:46:18 -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=s6U4sdqBuE6OLb5gTmy42dPgK2K8Zod/uGJrlqJR+yM=; b=mhUpWtFUiBtdggk8iW7omonxhGjXWhvvHSC+7CQG8oOptQ7rf2FyrDVX2quREb2Yj2 cjd8o/yxQHBYhr3tNXcJyuMPuzXHgZszyVPaDqVGadu2oQ1cg7NiqR7t76HiKJ0GIXLI YYbfpfR5ddEozxIrNGziFJzLLeyR6Gv9K13B3UXaMxWp8mHnjkd0EyblE8wxiatGYsm+ M4k9c+BI3MfKRDOCqNTPSuADWFWhi1djPKFM42zn0V+AWvc+4IzE6j4IM5tMp1k26wri qMOThbKPw7j5HUPL+1KSXJ8BM32g0ah1PIBnxwiTQeNRkmBxEPxQNy00CycU9GERK1i8 i59g== 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=s6U4sdqBuE6OLb5gTmy42dPgK2K8Zod/uGJrlqJR+yM=; b=fA3rL7VXnOLjOzeBROwc6IDwOB8Pw67hAPKu3cMFW7Mk+XfFU49EhYa/8GrnJOEtbs ltjcssyUepshs/uqt55CY10aLnM0NI0c2x0/fmudfbDaxdd7RZdW3si4RmPk5D/YuuQ1 NPMEgmDSmqLfYV83AZIa1bdhKgJ9S8JuTP82Y46SMVXcKuNd1UiJhLyT8NCXasywy8iy vICRrRXNG/Br7h9JESwTH79v0oW14fC12AOPDEJivA1PN7MP8yeLWE/t8pPJ0Iw+gs+S H1JY/SBQ+vYZyu4K+HIoHVcnxsK9OHb/TCE9UbpS18/bskZsjBffUK7iD5vWuE3WHOH3 yPRw== X-Gm-Message-State: AOAM530OE1lG0fJfWMkLZNZCUqI4o21s7oB1jFSUyZRgzuLRwBU6ogzs e/Jy4qseSzhP2hoR37aIMwGgJtWFewId8A== X-Google-Smtp-Source: ABdhPJzEfQyk908SBygncQ7P7erm76zpzVChw3FI5f+p05i6AjlkRyjkzrwG+zjK+WOF6lQ+ee338Q== X-Received: by 2002:a5d:6389:: with SMTP id p9mr14525468wru.1.1627854376810; Sun, 01 Aug 2021 14:46:16 -0700 (PDT) Received: from kali.home (pop.92-184-106-87.mobile.abo.orange.fr. [92.184.106.87]) by smtp.gmail.com with ESMTPSA id a16sm9348632wrx.7.2021.08.01.14.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 14:46:16 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 1 Aug 2021 23:46:01 +0200 Message-Id: <20210801214601.566970-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210801214601.566970-1-fontaine.fabrice@gmail.com> References: <20210801214601.566970-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/irqbalance: bump to version 1.8.0 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: Karoly Kasza , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Drop first patch (already in version) - Update indentation in hash file (two spaces) https://github.com/Irqbalance/irqbalance/releases/tag/v1.8.0 Signed-off-by: Fabrice Fontaine --- ...gure.ac-use-pkg-config-to-find-numa.patch} | 0 ...ix-uint64_t-printf-format-use-PRIu64.patch | 105 ------------------ package/irqbalance/irqbalance.hash | 4 +- package/irqbalance/irqbalance.mk | 2 +- 4 files changed, 3 insertions(+), 108 deletions(-) rename package/irqbalance/{0002-configure.ac-use-pkg-config-to-find-numa.patch => 0001-configure.ac-use-pkg-config-to-find-numa.patch} (100%) delete mode 100644 package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch diff --git a/package/irqbalance/0002-configure.ac-use-pkg-config-to-find-numa.patch b/package/irqbalance/0001-configure.ac-use-pkg-config-to-find-numa.patch similarity index 100% rename from package/irqbalance/0002-configure.ac-use-pkg-config-to-find-numa.patch rename to package/irqbalance/0001-configure.ac-use-pkg-config-to-find-numa.patch diff --git a/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch b/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch deleted file mode 100644 index 95a9616c71..0000000000 --- a/package/irqbalance/0001-fix-uint64_t-printf-format-use-PRIu64.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 0cdc7a22d5156440fecff14c438d4e24261ac793 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 20 Feb 2021 23:38:56 +0100 -Subject: [PATCH] fix uint64_t printf format (use PRIu64) - -Fixes (on arm 32-bit): - - $ irqbalance-ui - Invalid data sent. Unexpected token: (null)TYPE - -And strace showed the following: - - 237 sendmsg(3, {msg_name=NULL, msg_namelen=0, msg_iov=[{iov_base="stats", iov_len=5}], msg_iovlen=1, msg_control=[{cmsg_len=24, cmsg_level=SOL_SOCKET, cmsg_type=SCM_CREDENTIALS, cmsg_data={pid=237, uid=0, gid=0}}], msg_controllen=24, msg_flags=0}, 0) = 5 - 237 recv(3, "TYPE 3 NUMBER -1 LOAD 0 SAVE_MODE 0 (null)TYPE 2 NUMBER 0 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 0 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 3 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 1 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 1 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 2 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 2 LOAD 0 SAVE_MODE 0 (null)TYPE 1 NUMBER 3 LOAD 0 SAVE_MODE 0 (null)TYPE 0 NUMBER 0 LOAD 0 SAVE_MODE 0 (null)", 8192, 0) = 411 - -[backported from upstream] -Signed-off-by: Peter Seiderer ---- - cputree.c | 3 ++- - irqbalance.c | 5 +++-- - ui/ui.c | 5 +++-- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/cputree.c b/cputree.c -index fda0200..a8dba73 100644 ---- a/cputree.c -+++ b/cputree.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include - -@@ -417,7 +418,7 @@ static void dump_irq(struct irq_info *info, void *data) - indent[i] = log_indent[0]; - - indent[i] = '\0'; -- log(TO_CONSOLE, LOG_INFO, "%sInterrupt %i node_num is %d (%s/%lu:%lu) \n", indent, -+ log(TO_CONSOLE, LOG_INFO, "%sInterrupt %i node_num is %d (%s/%" PRIu64 ":%" PRIu64 ") \n", indent, - info->irq, irq_numa_node(info)->number, classes[info->class], info->load, (info->irq_count - info->last_irq_count)); - free(indent); - } -diff --git a/irqbalance.c b/irqbalance.c -index 9baa955..458bb07 100644 ---- a/irqbalance.c -+++ b/irqbalance.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_GETOPT_LONG - #include - #endif -@@ -357,7 +358,7 @@ void get_irq_data(struct irq_info *irq, void *data) - *irqdata = newptr; - - sprintf(*irqdata + strlen(*irqdata), -- "IRQ %d LOAD %lu DIFF %lu CLASS %d ", irq->irq, irq->load, -+ "IRQ %d LOAD %" PRIu64 " DIFF %" PRIu64 " CLASS %d ", irq->irq, irq->load, - (irq->irq_count - irq->last_irq_count), irq->class); - } - -@@ -395,7 +396,7 @@ void get_object_stat(struct topo_obj *object, void *data) - - *stats = newptr; - -- sprintf(*stats + strlen(*stats), "TYPE %d NUMBER %d LOAD %lu SAVE_MODE %d %s", -+ sprintf(*stats + strlen(*stats), "TYPE %d NUMBER %d LOAD %" PRIu64 " SAVE_MODE %d %s", - object->obj_type, object->number, object->load, - object->powersave_mode, irq_data ? irq_data : ""); - free(irq_data); -diff --git a/ui/ui.c b/ui/ui.c -index 06ec472..4cf68bf 100644 ---- a/ui/ui.c -+++ b/ui/ui.c -@@ -1,4 +1,5 @@ - -+#include - #include - #include "ui.h" - -@@ -563,7 +564,7 @@ void settings() - - char info[128] = "Current sleep interval between rebalancing: \0"; - uint8_t sleep_input_offset = strlen(info) + 3; -- snprintf(info + strlen(info), 128 - strlen(info), "%lu\n", setup.sleep); -+ snprintf(info + strlen(info), 128 - strlen(info), "%" PRIu64 "\n", setup.sleep); - attrset(COLOR_PAIR(1)); - mvprintw(2, 3, info); - print_all_cpus(); -@@ -588,7 +589,7 @@ void settings() - if(new_sleep != setup.sleep) { - setup.sleep = new_sleep; - char settings_data[128]; -- snprintf(settings_data, 128, "%s %lu", SET_SLEEP, new_sleep); -+ snprintf(settings_data, 128, "%s %" PRIu64, SET_SLEEP, new_sleep); - send_settings(settings_data); - } - break; --- -2.25.1 - diff --git a/package/irqbalance/irqbalance.hash b/package/irqbalance/irqbalance.hash index 587173ca65..49118f8c7d 100644 --- a/package/irqbalance/irqbalance.hash +++ b/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 28f2ad35945b93d90f4a5bad95b4c0871a0f644375f746ec16f61045b9ec970e irqbalance-1.7.0.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 2e7ddb9687a6a5cc1f41626659eac2ad9d6b5875629156b92f693bd404d8ae63 irqbalance-1.8.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index eb7c3e9f3b..1efc0b7fa2 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRQBALANCE_VERSION = 1.7.0 +IRQBALANCE_VERSION = 1.8.0 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING