From nobody Sat Oct 01 14:55:01 2022 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 4Mfqrj5H3Vz4V5mR; Sat, 1 Oct 2022 14:55:01 +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 4Mfqrj4qGpz3phq; Sat, 1 Oct 2022 14:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664636101; 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=+Y/9XePv8rptfZGwexeEYFWu85nnjLFwKeCYtwrOlJY=; b=PtcLJzur1X/5wZhZSf1RTsz4tGG6pGalYoauGhWRUYmwktUICz1c20NkCUrrL5x9zQ3d8S 80eiLUdHZvQ7yz3GxBOwQeRNBjLIPpw2xTe2MQzwNprNh+iTDvhjvbOn/1Cx4IxBoz5/bi WMkuoiB/HUOtOc/HXUT7RZTC9aTBykr8duQquHNvNkqYVzeRXRrEPEaLqsE5vYzKkLnyp9 w+nHR0H60uX1dDXOrO7VHQdgBzIbi2BqZKsW17mCLZMd8TvsMLSGFwiR91eLhEaYUYPRjS p7NAx4imCdYZVBnlTDB2R1v2L+TPVQlPA23AW6PemUgSvU5148vSuGeXs5tCoQ== 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 4Mfqrj3n0dzYr1; Sat, 1 Oct 2022 14:55:01 +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 291Et1IO048731; Sat, 1 Oct 2022 14:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291Et19N048730; Sat, 1 Oct 2022 14:55:01 GMT (envelope-from git) Date: Sat, 1 Oct 2022 14:55:01 GMT Message-Id: <202210011455.291Et19N048730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 7545575ac130 - main - sysutils/e2fsprogs: 2/2 add a port for /sbin fsck'ing ext2/ext3/ext4 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7545575ac130685bb989260e03d2288a2c46c7f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664636101; 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=+Y/9XePv8rptfZGwexeEYFWu85nnjLFwKeCYtwrOlJY=; b=D1R6buP2H7HAbJDED+mqhZOikgzTmu+PV80IY2Kwhj8I/pdNICWwvINeMWn8EEjuiVFFet C3XsOyLfp7GKGhV51ZCKXxkEz5LmI0QA4zoel7V7jrFymX8XrTj+1K6+uLgsTT3W2e6vgJ L6KrAtJPBA27Hui1NTv7irIs5rq+1mHeWpINtqrl6onxemj91u2vMp6b7Z0H9TKLIsgSdQ CyREZN16N75yOG8Wa7o0raDxps2LtjRKltTkKw9yhKwkwtez5WIlZFI0CzCA5Viij60Prb FSXITECyBWifXysrDn0H3yRBg/EAVuVqZKLpK0mvj9W6E/v3EFOsR7U+9En37A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664636101; a=rsa-sha256; cv=none; b=qgjqNl7nqtXu8G62U3kuUUAf9zbSbEWmfOX7uERRFzS0x9W/5Gi/SxRqRKdDeDVXZoaKxC HI/Ip0IPn/CEwayj4CUJKjevtRlZoDMBd68YY5cEX8INiG/62a7kCEMY+aVuQ8/z159w2R MJc6r9/Rk41yG9m8ELPkC/kzpWQW6+0cBS9UTSPKQR/47KW8NTOjtFePHpdsGwiiOgxls/ 9xnICotgXLnLk3TwNNT1pgP7bPcDq7v/oNXJ8beEVQq6vYigD4VZQ1DzMhOFvmWninjByu r6CE9bLMrBi3T+Ym6gHJVyXcstDYr2cQgGZ5/CJ2pOjFwS1w0uobe0AYoIgNrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=7545575ac130685bb989260e03d2288a2c46c7f5 commit 7545575ac130685bb989260e03d2288a2c46c7f5 Author: Matthias Andree AuthorDate: 2022-10-01 14:36:47 +0000 Commit: Matthias Andree CommitDate: 2022-10-01 14:54:55 +0000 sysutils/e2fsprogs: 2/2 add a port for /sbin fsck'ing ext2/ext3/ext4 This is the second half of the e2fsprogs commit to permit having a big hier(7)-clean e2fsprogs port that does not ever reach into /sbin, now called e2fsprogs-core, and this new port that will copy from ${LOCALBASE} to /sbin so that /usr can reside on an ext2/ext3/ext4 file system and still be fsck'd at boot time. --- sysutils/Makefile | 1 + sysutils/e2fsprogs/Makefile | 21 +++++++++++++++++++++ sysutils/e2fsprogs/pkg-descr | 3 +++ sysutils/e2fsprogs/pkg-plist | 2 ++ 4 files changed, 27 insertions(+) diff --git a/sysutils/Makefile b/sysutils/Makefile index 0e98641d3346..3f425b3abc91 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -325,6 +325,7 @@ SUBDIR += dwatch-gource SUBDIR += dwatch-json SUBDIR += dwatch-pwsnoop + SUBDIR += e2fsprogs SUBDIR += e2fsprogs-core SUBDIR += e2tools SUBDIR += ebsnvme-id diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile new file mode 100644 index 000000000000..a59f478893cd --- /dev/null +++ b/sysutils/e2fsprogs/Makefile @@ -0,0 +1,21 @@ +PORTNAME= e2fsprogs +CATEGORIES= sysutils +PORTVERSION= 1.46.5 +PORTREVISION= 5 +BUILD_DEPENDS= e2fsprogs-core>=${PORTVERSION}:sysutils/e2fsprogs-core +RUN_DEPENDS= ${BUILD_DEPENDS} +DISTFILES= # empty +NO_BUILD= yes +LICENSE= GPLv2+ +USES= cpe +CPE_VENDOR= e2fsprogs_project + +MAINTAINER= mandree@FreeBSD.org +COMMENT= Wrapper to install e2fsprogs into /sbin + +do-install: + ${MKDIR} ${STAGEDIR}/sbin + ${CP} -p ${LOCALBASE}/sbin/fsck_ext2fs ${STAGEDIR}/sbin + ${CP} -p ${LOCALBASE}/sbin/e2fsck ${STAGEDIR}/sbin + +.include diff --git a/sysutils/e2fsprogs/pkg-descr b/sysutils/e2fsprogs/pkg-descr new file mode 100644 index 000000000000..6df887766576 --- /dev/null +++ b/sysutils/e2fsprogs/pkg-descr @@ -0,0 +1,3 @@ +This is a helper package that will copy and register the essential binaries +from e2fsprogs-core to /sbin, so that it is possible to have /usr in an ext2, +ext3, or ext4 file system, and still have a proper fsck in /sbin. diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist new file mode 100644 index 000000000000..796b2c90dfc4 --- /dev/null +++ b/sysutils/e2fsprogs/pkg-plist @@ -0,0 +1,2 @@ +/sbin/e2fsck +/sbin/fsck_ext2fs