From patchwork Wed Sep 8 21:21:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4693 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4H4Znc3qB9z3x2Y for ; Wed, 8 Sep 2021 21:21:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4H4Znb2mwGz12q; Wed, 8 Sep 2021 21:21:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4H4Znb1wYSz2xYj; Wed, 8 Sep 2021 21:21:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4H4ZnZ1QmDz2xK9 for ; Wed, 8 Sep 2021 21:21:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4H4ZnY25ctznC; Wed, 8 Sep 2021 21:21:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1631136081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fhjycLYtDuzqfMaknMeWAVI/xluYPtfkdhrIL8cbDjk=; b=bXx4kD8hI1I0ec/ekYINnFWNKouvT/9luys8D+z60n3xkyqmiInULhb+CCCv1hdo3YUCDA AFGsqZxUy6zxiqDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1631136081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fhjycLYtDuzqfMaknMeWAVI/xluYPtfkdhrIL8cbDjk=; b=g+qoS1fGTD1WjknjkoiEaVDQdeTgIDdB5GZyqEjhkQfa14JB6QYQk4xxeKex/8vAT8ld5E 8+nMMDQOfUu1bJ5FAWlS+Rq3pzJIvvn3F/zwsqiDVEjtJ7TSY6RTAtnLIfYqTO7zeIn7dW VtSPvux+SRuF2dI/CG4Q7q9x6h/eQC/ud5w3K/PCrP5JIwHeys0Sdqomg8Og4SV9sT9KW0 1CHBAVFz+clbuFgz4Y7/TcRq3eO/gIbD7Dc7xAykgHeCg02OscjpzV9c6a+ZTFWeW+oIhS tMl/A3z1WpgYk9QBXsLMUnzurFGcPthoDAhiJgYI/9OZPWAZ3dbFEuRPewk5HA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] dosfstools: Update to version 4.2 Date: Wed, 8 Sep 2021 23:21:14 +0200 Message-Id: <20210908212114.1600106-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 3.0.9 (2013) to 4.2 (2021) - Update rootfile - Program names changed in version 2.0.18 dosfslabel became fatlabel dosfsck became fsck.fat and mkdosfs became mkfs.fat - Added --enable-compat-symlinks to ./configure command to maintain original names as symlinks Signed-off-by: Adolf Belka Reviewed-by: Peter Müller --- config/rootfiles/common/dosfstools | 47 +++++++++++++++++------------- lfs/dosfstools | 9 ++++-- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools index 4b38c2926..200066aac 100644 --- a/config/rootfiles/common/dosfstools +++ b/config/rootfiles/common/dosfstools @@ -1,28 +1,33 @@ sbin/dosfsck sbin/dosfslabel +sbin/fatlabel +sbin/fsck.fat sbin/fsck.msdos sbin/fsck.vfat sbin/mkdosfs +sbin/mkfs.fat sbin/mkfs.msdos sbin/mkfs.vfat -#share -#share/doc -#share/doc/dosfstools -#share/doc/dosfstools/ANNOUNCE.mkdosfs -#share/doc/dosfstools/ChangeLog -#share/doc/dosfstools/ChangeLog.dosfsck -#share/doc/dosfstools/ChangeLog.dosfstools-2.x -#share/doc/dosfstools/ChangeLog.mkdosfs -#share/doc/dosfstools/README.dosfsck -#share/doc/dosfstools/README.dosfstools-2.x -#share/doc/dosfstools/README.mkdosfs -#share/doc/dosfstools/TODO.dosfstools-2.x -#share/man -#share/man/man8 -#share/man/man8/dosfsck.8 -#share/man/man8/dosfslabel.8 -#share/man/man8/fsck.msdos.8 -#share/man/man8/fsck.vfat.8 -#share/man/man8/mkdosfs.8 -#share/man/man8/mkfs.msdos.8 -#share/man/man8/mkfs.vfat.8 +#usr/share/doc/dosfstools +#usr/share/doc/dosfstools/ANNOUNCE.mkdosfs +#usr/share/doc/dosfstools/COPYING +#usr/share/doc/dosfstools/ChangeLog +#usr/share/doc/dosfstools/ChangeLog.dosfsck +#usr/share/doc/dosfstools/ChangeLog.dosfstools-2.x +#usr/share/doc/dosfstools/ChangeLog.mkdosfs +#usr/share/doc/dosfstools/NEWS +#usr/share/doc/dosfstools/README +#usr/share/doc/dosfstools/README.dosfsck +#usr/share/doc/dosfstools/README.dosfstools-2.x +#usr/share/doc/dosfstools/README.mkdosfs +#usr/share/doc/dosfstools/TODO.dosfstools-2.x +#usr/share/man/man8/dosfsck.8 +#usr/share/man/man8/dosfslabel.8 +#usr/share/man/man8/fatlabel.8 +#usr/share/man/man8/fsck.fat.8 +#usr/share/man/man8/fsck.msdos.8 +#usr/share/man/man8/fsck.vfat.8 +#usr/share/man/man8/mkdosfs.8 +#usr/share/man/man8/mkfs.fat.8 +#usr/share/man/man8/mkfs.msdos.8 +#usr/share/man/man8/mkfs.vfat.8 diff --git a/lfs/dosfstools b/lfs/dosfstools index 8a74661e9..49dddab6b 100644 --- a/lfs/dosfstools +++ b/lfs/dosfstools @@ -24,7 +24,7 @@ include Config -VER = 3.0.9 +VER = 4.2 THISAPP = dosfstools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bd273cf8aa6341c0b52cbac72050bcf4 +$(DL_FILE)_MD5 = 49c8e457327dc61efab5b115a27b087a install : $(TARGET) @@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i -e "s|PREFIX = /usr/local||g" Makefile + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sbindir=/sbin \ + --enable-compat-symlinks cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)