Module Name: src
Committed By: pgoyette
Date: Wed May 22 17:20:45 UTC 2024
Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile
Log Message:
Remove some more accidental local changes
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.25 src/sys/modules/ffs/Makefile:1.26
--- src/sys/modules/ffs/Makefile:1.25 Mon May 20 18:14:38 2024
+++ src/sys/modules/ffs/Makefile Wed May 22 17:20:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/05/20 18:14:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.26 2024/05/22 17:20:45 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,21 +6,15 @@
KMOD= ffs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACl -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
COPTS.ffs_appleufs.c+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
- ffs_vfsops.c ffs_vnops.c ffs_snapshot.c \
+ ffs_vfsops.c ffs_vnops.c ffs_snapshot.c ffs_extattr.c \
ffs_bswap.c ffs_wapbl.c ffs_appleufs.c ffs_quota2.c
-#CPPFLAGS+= -DUFS_EXTATTR
-#SRCS+= ffs_extattr.c
-
-#CPPFLAGS+= -DUFS_ACL
-#SRCS+= ufs_acl.c
-
WARNS= 3
.include <bsd.kmodule.mk>
Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.9 src/sys/modules/ufs/Makefile:1.10
--- src/sys/modules/ufs/Makefile:1.9 Mon May 20 18:14:38 2024
+++ src/sys/modules/ufs/Makefile Wed May 22 17:20:45 2024
@@ -1,25 +1,19 @@
-# $NetBSD: Makefile,v 1.9 2024/05/20 18:14:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.10 2024/05/22 17:20:45 pgoyette Exp $
.include "../Makefile.inc"
KMOD= ufs
CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+= -DUFS_DIRHASH
+CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
CWARNFLAGS.clang= -Wno-conversion
.PATH: ${S}/ufs/ufs
-SRCS+= ufs_bmap.c ufs_dirhash.c ufs_inode.c \
+SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
ufs_vfsops.c ufs_vnops.c quota1_subr.c quota2_subr.c
-#CPPFLAGS+= -DUFS_ACL
-#SRCS+= ufs_acl.c
-
-#CPPFLAGS+= -DUFS_EXTATTR
-#SRCS+= ufs_extattr.c
-
WARNS= 3
.include <bsd.kmodule.mk>
