From patchwork Thu Oct 5 16:30:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13410415 X-Patchwork-Delegate: mkubecek+ethtool@suse.cz Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 481C12AB5C for ; Thu, 5 Oct 2023 16:31:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="cu0ehBHj" Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 725E4D0AD for ; Thu, 5 Oct 2023 09:31:18 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1c5bf7871dcso9612485ad.1 for ; Thu, 05 Oct 2023 09:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1696523459; x=1697128259; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=eeJPUIIgczDHiUERrHOytGfyAq+/LuSA5t4mK5HqPC0=; b=cu0ehBHjpJusKz/J2Z62YaQCx1ds7S+3eAp052XMTE3UVSH3fSWpdIqsvc8YYkKcj5 NBP0H+UHZG+/wjZrO6Hnb5wvB1K2r87t2QddPg6kC/Ht3kZhxC41RM8Q0JuVNkHhCdN1 DneVjEFLOLPRzaJg02p7N+AEQPZLvh+C7T96U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696523459; x=1697128259; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=eeJPUIIgczDHiUERrHOytGfyAq+/LuSA5t4mK5HqPC0=; b=L6oOvscx97yKRfks3NjwiBI9PrrunQZguQH+2copg05wmiK1GjtA7r0W2p0odt6x8c 3POFnnVW3/Hs8AIYcGtMikq+jKeBZXOsNUE+8KK2jtWy0uJdXGts+pj9QlituMfB1LL0 m0E6f6ls1DQXidzuFPufox1M36lI+u+YzfSrOep6N3ISPGLmeTxaMGk5PoHjbV1Q3GDA eVMeXef56DVorCtr90UDcbDE1LtewG3g+QQzoMOP+fOEp5Nsv4IGS8UtYQDqixiwIG2G Ht1n/gNMeMW3RrhVC6pDTokwdKiG+TH3JDbshynVFEEUeGGEL2xPVOfBInQWjYGgUR18 hW3w== X-Gm-Message-State: AOJu0Yw95hezSP4sJSMa6NVgxFyQkIzCxaW0aJDPJE8keOxEpDeg16Pe tLBHRDsIkHax2Dj6wDXslmZP/WuZ9unjr70wtD2dzxg648BQ0BiL1vxCqcwV7XMWpWh7DT5B6UF 6ps/xTc2NwRY9RDhVsbrx6LHWtNOR0KfZjUbSVybVOsNjlsAZZKGUDyVZpM3mIYwl4YDa+ZluDl juydMR3OlktQ== X-Google-Smtp-Source: AGHT+IH7Sjs4j3Zkitoq222NZIkf/uDjTw1biCTmYdI5Yz5XisygYAx56CaLiwErirhSIiCVAkVQ3Q== X-Received: by 2002:a17:902:db02:b0:1c5:634f:b36c with SMTP id m2-20020a170902db0200b001c5634fb36cmr6210909plx.30.1696523458502; Thu, 05 Oct 2023 09:30:58 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id f7-20020a17090274c700b001bc445e2497sm1917654plt.79.2023.10.05.09.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 09:30:57 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org, mkubecek@suse.cz Cc: mmayer@broadcom.com, Florian Fainelli Subject: [PATCH ethtool] Add missing header files for source distribution Date: Thu, 5 Oct 2023 09:30:53 -0700 Message-Id: <20231005163053.1800218-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MIME_NO_TEXT, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: mkubecek+ethtool@suse.cz We were not listing all of the uapi header files in ethtool_SOURCES which prevented the proper construction of a distribution source tarball. This is noticeable with older kernel headers where the build would be breaking in such a way: /storage/buildroot/output/arm64/host/bin/aarch64-linux-gcc -DHAVE_CONFIG_H -I. -I./uapi -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wextra -D_POSIX_C_SOURCE=200809L -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -std=gnu11 -c -o netlink/rings.o netlink/rings.c In file included from internal.h:45, from common.c:7: ./uapi/linux/ethtool.h:1507:19: warning: implicit declaration of function '__KERNEL_DIV_ROUND_UP' [-Wimplicit-function-declaration] __u32 queue_mask[__KERNEL_DIV_ROUND_UP(MAX_NUM_QUEUE, 32)]; ^~~~~~~~~~~~~~~~~~~~~ ./uapi/linux/ethtool.h:1507:8: error: variably modified 'queue_mask' at file scope __u32 queue_mask[__KERNEL_DIV_ROUND_UP(MAX_NUM_QUEUE, 32)]; ^~~~~~~~~~ make[3]: *** [Makefile:1410: common.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Fixes: da2beb7afc25 ("update UAPI header copies") Reported-by: Markus Mayer Signed-off-by: Florian Fainelli --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ae3b667696db..b9e06ad15889 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,12 @@ man_MANS = ethtool.8 EXTRA_DIST = LICENSE ethtool.8 ethtool.spec.in aclocal.m4 ChangeLog autogen.sh sbin_PROGRAMS = ethtool -ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \ +ethtool_SOURCES = ethtool.c uapi/linux/const.h uapi/linux/ethtool.h internal.h \ uapi/linux/net_tstamp.h uapi/linux/if.h uapi/linux/hdlc/ioctl.h \ + uapi/linux/if_addr.h uapi/linux/if_ether.h uapi/linux/if_link.h \ + uapi/linux/libc-compat.h uapi/linux/net_tstamp.h uapi/linux/neighbour.h \ + uapi/linux/posix_types.h uapi/linux/rtnetlink.h uapi/linux/socket.h \ + uapi/linux/stddef.h uapi/linux/types.h \ rxclass.c common.c common.h \ json_writer.c json_writer.h json_print.c json_print.h \ list.h