From nobody Sat Sep 30 15:10:32 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RyVyd0L70z4wBdS; Sat, 30 Sep 2023 15:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RyVyc6gZjz4N6S; Sat, 30 Sep 2023 15:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696086632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSWZ4WQndRPnATUbKiuAh1zHoMbhqtFp0FScPiEHqqU=; b=deLPfV2kQc6RVOB9YRluFk30J+gS/JC6FniE3TOCkt9gtJwAiXSLFo+lEeDgKVmqrmc0a7 /cmfvpNVn6lIIktSAp/AhkeLHwBOk49crLLcZqybKBWZJHf7TtqE4nxJloU7d92zj8ZZnz ERE+JxS3LZUjaFOwngVchMC+2G0rOtgxxxiVIdfhpgFrmeTFmgJtQd8mrd2k51wzkGL+ki iYiu0l64V3byRgE0J9b5OoWAuAmSYDIZG426URetuFB91H9GbJKUp3k0kYKieb2LAAy70t wiA37z1SNFUCsCxOk0wnAul+xJ98nRSR7KXwDhLykjU6M0FurrFhP0Q1GUIYiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696086632; a=rsa-sha256; cv=none; b=gMYfkYKFLSWiwhdzoTg3G+yZqbg5YC60hdr4yeuEzRrawwUv6lho4CAuhNqD1NfxcLFd+s NHRta7h6MUHtpi8GTICz9vLZ9Pts4zuXbYOtv7Vqp+NELGe3fng+beijaKr89rg/FwErtJ 0py5XgwOzZxRGl87nG+hAv+wtCi7Xv7M4Jie6lgTUI9K5vYPWlQ5ysJQ2LiA7A+DrdQfbj maxpxYGAHZ25sXV2PoQtOi1K8CN9eZjxImVsrgZ6rNOnH3WguBDlv/vUFPGeMkBMKk9s4C x5It0ob1ttSX+NkwExHGUUi06F8Bp2+brmecfF6uJVwTpbqHfg4WG3ZoRG1fJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696086632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSWZ4WQndRPnATUbKiuAh1zHoMbhqtFp0FScPiEHqqU=; b=ozO9SkEj1hGuhBmNy3+ku0WPYG8YA+ooYOlcZ2L1EwsJpQanUZFcaPP4nLZzZT0H115l1R agRgNMQ5GosqLlIRqQG3VTrsMsfNNoowGylE1S48b3D7gwM8NoK4p/b9rMrjHQmSrIv/V+ FAi0vnkEybc4VtdwcJNUevdrLeXqG98Q+ECj4uozVcLvW86p+BqjnEVVDOhI+wUYroWhJq H3ohNfgS6NYRWgCcKDF6SvJ4Kl72IZuXTSTV+RJOx6QHy7hT2zQNognEiFtzN3p4bexRpK DIAeeG+qkFmrcpYqvGgxYAelNAMsCJAv2+FdDBrAUBaiF1EKriMeFqTjvzwmYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RyVyc5nVKzryj; Sat, 30 Sep 2023 15:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38UFAWsv070335; Sat, 30 Sep 2023 15:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38UFAWEH070332; Sat, 30 Sep 2023 15:10:32 GMT (envelope-from git) Date: Sat, 30 Sep 2023 15:10:32 GMT Message-Id: <202309301510.38UFAWEH070332@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: e717a9367f81 - main - net/intel-*-kmod: Remove MAX_NETMAP_OSVERSION List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e717a9367f81224bf402a7b739d9b0e4a06c390b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e717a9367f81224bf402a7b739d9b0e4a06c390b commit e717a9367f81224bf402a7b739d9b0e4a06c390b Author: Muhammad Moinur Rahman AuthorDate: 2023-09-30 12:57:27 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-30 15:10:20 +0000 net/intel-*-kmod: Remove MAX_NETMAP_OSVERSION ALl the version mentioned here for MAX_NETMAP_OSVERSION are unsupported by the ports tree. So remove the check and also remove the OPTION NETMAP_AUTO. Approved by: portmgr (blanket) --- net/intel-em-kmod/Makefile | 2 -- net/intel-igb-kmod/Makefile | 2 -- net/intel-ixl-kmod/Makefile | 12 ++---------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/net/intel-em-kmod/Makefile b/net/intel-em-kmod/Makefile index a1b5762493c3..e916c48512bd 100644 --- a/net/intel-em-kmod/Makefile +++ b/net/intel-em-kmod/Makefile @@ -9,8 +9,6 @@ COMMENT= Gigabit FreeBSD Base Drivers for Intel(R) Ethernet BROKEN_armv6= fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99 -MAX_NETMAP_OSVERSION= 1199999 # Doesn't build w/NETMAP on 12 - MASTERDIR= ${.CURDIR}/../intel-ixl-kmod PKGDIR= ${.CURDIR} DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/net/intel-igb-kmod/Makefile b/net/intel-igb-kmod/Makefile index e9cbe341c92f..898ade9c2733 100644 --- a/net/intel-igb-kmod/Makefile +++ b/net/intel-igb-kmod/Makefile @@ -9,8 +9,6 @@ COMMENT= NIC Driver for Intel(R) 82575/6 and 82580-Based cards BROKEN_armv6= fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99 -MAX_NETMAP_OSVERSION= 1199999 # Doesn't build w/NETMAP on 12 - MASTERDIR= ${.CURDIR}/../intel-ixl-kmod PKGDIR= ${.CURDIR} DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/net/intel-ixl-kmod/Makefile b/net/intel-ixl-kmod/Makefile index faba4ed0a3a1..5186968deb71 100644 --- a/net/intel-ixl-kmod/Makefile +++ b/net/intel-ixl-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME?= ixl PORTVERSION?= 1.13.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net MASTER_SITES?= https://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ \ http://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ @@ -17,10 +17,8 @@ LICENSE= BSD2CLAUSE USES= kmod OPTIONS_SINGLE= NETMAP -OPTIONS_SINGLE_NETMAP= NETMAP_AUTO NETMAP_ON NETMAP_OFF -OPTIONS_DEFAULT= NETMAP_AUTO +OPTIONS_SINGLE_NETMAP= NETMAP_ON NETMAP_OFF -NETMAP_AUTO_DESC= Enable netmap(4) support on supported OS versions NETMAP_ON_DESC= Enable netmap(4) support unconditionally NETMAP_OFF_DESC= Disable netmap(4) support unconditionally @@ -41,8 +39,6 @@ MAKE_ENV+= WERROR="" PLIST_FILES+= man/man4/${link}.4.gz .endfor -MAX_NETMAP_OSVERSION?= 1200500 # Maximum OSVERSION for which NETMAP support works - .include # Fixup for slave ports that use this as a master port. sbruno @@ -51,10 +47,6 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le riscv64 ONLY_FOR_ARCHS_REASON= only supported on 32-bit architectures .endif -.if ${PORT_OPTIONS:MNETMAP_AUTO} && ${OSVERSION} <= ${MAX_NETMAP_OSVERSION} -CFLAGS+= -DDEV_NETMAP -.endif - do-install: ${INSTALL_KLD} ${WRKSRC}/if_${PORTNAME}.ko ${STAGEDIR}${KMODDIR}/if_${PORTNAME}_updated.ko ${INSTALL_MAN} ${WRKSRC}/${MANPAGENAME}.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/