From a0c1e9831a7c5c572cfbe62e09d597893299b98c Mon Sep 17 00:00:00 2001 From: pgoyette Date: Wed, 22 May 2024 17:20:45 +0000 Subject: [PATCH] Remove some more accidental local changes --- sys/modules/ffs/Makefile | 12 +++--------- sys/modules/ufs/Makefile | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/sys/modules/ffs/Makefile b/sys/modules/ffs/Makefile index ed27691c2186..24475a33bc85 100644 --- a/sys/modules/ffs/Makefile +++ b/sys/modules/ffs/Makefile @@ -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 diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile index 56d6874577e2..87a624b1e773 100644 --- a/sys/modules/ufs/Makefile +++ b/sys/modules/ufs/Makefile @@ -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