mirror of
https://git.freebsd.org/ports.git
synced 2025-05-03 03:56:39 -04:00
14e733a6bb
This is the first commit that renames e2fsprogs to e2fsprogs-core, makes the necessary changes to Makefiles, strips the FLAVORs that determined how to link or copy to /sbin. The latter feature will be placed into a new e2fsprogs port that just copies two files to /sbin. A followup 2/2 commit will then add the new e2fsprogs port. This is done so that Git can properly track the rename. While here, switch from FreeBSD's dd to GNU coreutils's dd in an attempt to fix sporadic m_offset self-test failures.
81 lines
3.2 KiB
Text
81 lines
3.2 KiB
Text
--- misc/Makefile.in.orig 2021-01-29 22:02:31 UTC
|
|
+++ misc/Makefile.in
|
|
@@ -38,17 +38,17 @@ MKDIR_P = @MKDIR_P@
|
|
|
|
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
|
|
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
|
|
-USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \
|
|
+USPROGS= mklost+found e2freefrag $(UUIDD_PROG) \
|
|
$(E4DEFRAG_PROG) $(E4CRYPT_PROG)
|
|
SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
|
|
e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
|
|
- logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \
|
|
- $(UUIDD_MAN) $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ \
|
|
+ logsave.8 e2freefrag.8 e2undo.8 \
|
|
+ $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@ \
|
|
e2mmpstatus.8
|
|
FMANPAGES= mke2fs.conf.5 ext4.5
|
|
|
|
-UPROGS= chattr lsattr $(FUSE_PROG) @UUID_CMT@ uuidgen
|
|
-UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
|
|
+UPROGS= chattr lsattr $(FUSE_PROG)
|
|
+UMANPAGES= chattr.1 lsattr.1
|
|
UMANPAGES+= @FUSE_CMT@ fuse2fs.1
|
|
|
|
LPROGS= @E2INITRD_PROG@
|
|
@@ -154,14 +154,14 @@ profiled:
|
|
|
|
mke2fs.conf: $(srcdir)/mke2fs.conf.in
|
|
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
|
|
- cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf; \
|
|
+ cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf.dist; \
|
|
else \
|
|
- cp $(srcdir)/mke2fs.conf.in mke2fs.conf; \
|
|
+ cp $(srcdir)/mke2fs.conf.in mke2fs.conf.dist; \
|
|
fi
|
|
|
|
default_profile.c: mke2fs.conf $(srcdir)/profile-to-c.awk
|
|
$(E) " PROFILE_TO_C mke2fs.conf"
|
|
- $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf \
|
|
+ $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf.dist \
|
|
> default_profile.c
|
|
findsuper: findsuper.o
|
|
$(E) " LD $@"
|
|
@@ -612,34 +612,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
|
|
(cd $(DESTDIR)$(man5dir); \
|
|
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
|
|
done
|
|
- $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
|
|
- if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
|
|
- mke2fs.conf; then \
|
|
- true; \
|
|
- else \
|
|
- if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \
|
|
- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \
|
|
- $(INSTALL_DATA) mke2fs.conf \
|
|
- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \
|
|
- echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \
|
|
- echo "Check to see if you need to update your $(root_sysconfdir)/mke2fs.conf"; \
|
|
- else \
|
|
- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
|
|
- mv $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
|
|
- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old; \
|
|
- $(INSTALL_DATA) mke2fs.conf \
|
|
- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
|
|
- echo "Your mke2fs.conf is too old. Backing up old version in"; \
|
|
- echo "$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old. Please check to see"; \
|
|
- echo "if you have any local customizations that you wish to preserve."; \
|
|
- fi; \
|
|
- echo " "; \
|
|
- fi; \
|
|
- else \
|
|
- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
|
|
- $(INSTALL_DATA) mke2fs.conf \
|
|
- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
|
|
- fi
|
|
+ $(Q) $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
|
|
+ $(INSTALL_DATA) mke2fs.conf.dist \
|
|
+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist
|
|
|
|
install-strip: install
|
|
$(Q) for i in $(SPROGS); do \
|