From owner-dev-commits-ports-all@freebsd.org Fri Jul 9 15:15:18 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 95A5E66179A; Fri, 9 Jul 2021 15:15:18 +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 4GLxYL2fslz3r0j; Fri, 9 Jul 2021 15:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3EEE216E3E; Fri, 9 Jul 2021 15:15:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 169FFIHM011597; Fri, 9 Jul 2021 15:15:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 169FFImh011596; Fri, 9 Jul 2021 15:15:18 GMT (envelope-from git) Date: Fri, 9 Jul 2021 15:15:18 GMT Message-Id: <202107091515.169FFImh011596@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 460d8f3ed294 - main - sysutils/linuxfdisk: remove bogus ONLY_FOR_ARCHS limitation MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 460d8f3ed294b7cf3cca1e4e2c0b744e529d7cc1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jul 2021 15:15:18 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=460d8f3ed294b7cf3cca1e4e2c0b744e529d7cc1 commit 460d8f3ed294b7cf3cca1e4e2c0b744e529d7cc1 Author: Alexey Dokuchaev AuthorDate: 2021-07-09 15:12:36 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-07-09 15:13:50 +0000 sysutils/linuxfdisk: remove bogus ONLY_FOR_ARCHS limitation There is hardly anything really architecture-specific about the disk management program. It was marked as working correctly only on i386 in 17b931398cd8 back in 2003 without any explanation (albeit the phrase "bento via kris" suggests that it could be a build failure on the cluster) by abusing ONLY_FOR_ARCHS, which had only been added to since then. While here, prefer ATA to IDE when talking to a user as nowadays IDE falls out of common lexicon and means PATA disks particularly. --- sysutils/linuxfdisk/Makefile | 1 - sysutils/linuxfdisk/files/patch-FreeBSD | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sysutils/linuxfdisk/Makefile b/sysutils/linuxfdisk/Makefile index 0f15ed8c1747..66fdf9323d9f 100644 --- a/sysutils/linuxfdisk/Makefile +++ b/sysutils/linuxfdisk/Makefile @@ -16,7 +16,6 @@ LICENSE= GPLv2+ WRKSRC= ${WRKDIR}/util-linux-${PORTVERSION}/fdisk USES= tar:bzip2 -ONLY_FOR_ARCHS= i386 amd64 armv7 powerpc powerpc64 powerpc64le pre-patch: @${CP} ${FILESDIR}/linuxfdisk-Makefile ${WRKSRC}/Makefile diff --git a/sysutils/linuxfdisk/files/patch-FreeBSD b/sysutils/linuxfdisk/files/patch-FreeBSD index 4885c5491eac..130d5fca5451 100644 --- a/sysutils/linuxfdisk/files/patch-FreeBSD +++ b/sysutils/linuxfdisk/files/patch-FreeBSD @@ -243,7 +243,7 @@ diff -rNu fdisk.c fdisk.c -" or: fdisk /dev/eda (for the first PS/2 ESDI drive)\n" -" or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n" +"Usage: fdisk-linux [-l] [-b SSZ] [-u] device\n" -+"E.g.: fdisk-linux /dev/ada0 (for the first IDE disk)\n" ++"E.g.: fdisk-linux /dev/ada0 (for the first ATA disk)\n" +" or: fdisk-linux /dev/da2 (for the third SCSI disk)\n" " ...\n"); break; @@ -950,7 +950,7 @@ diff -rNu fdisk.8 fdisk.8 .fi -(/dev/hd[a-h] for IDE disks, /dev/sd[a-p] for SCSI disks, -/dev/ed[a-d] for ESDI disks, /dev/xd[ab] for XT disks). -+(/dev/adaN for IDE disks, /dev/daN for SCSI disks, N=0,1,2...) ++(/dev/adaN for ATA disks, /dev/daN for SCSI disks, N=0,1,2...) A device name refers to the entire disk. The @@ -959,12 +959,13 @@ diff -rNu fdisk.8 fdisk.8 .I device -name followed by a partition number. For example, -.B /dev/hda1 -+name followed by 's' and a partition number. For example, -+.B /dev/ada0s1 - is the first partition on the first IDE hard disk in the system. +-is the first partition on the first IDE hard disk in the system. -IDE disks can have up to 63 partitions, SCSI disks up to 15. -See also -.IR /usr/src/linux/Documentation/devices.txt . ++name followed by 's' and a partition number. For example, ++.B /dev/ada0s1 ++is the first partition on the first ATA hard disk in the system. A BSD/SUN type disklabel can describe 8 partitions, the third of which should be a `whole disk' partition.