Module Name: src Committed By: pgoyette Date: Mon May 20 18:14:38 UTC 2024
Modified Files: src/sys/modules: Makefile src/sys/modules/ffs: Makefile src/sys/modules/ufs: Makefile Log Message: Oooppss remove some local change that was accidentally committed To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 src/sys/modules/Makefile cvs rdiff -u -r1.24 -r1.25 src/sys/modules/ffs/Makefile cvs rdiff -u -r1.8 -r1.9 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/Makefile diff -u src/sys/modules/Makefile:1.289 src/sys/modules/Makefile:1.290 --- src/sys/modules/Makefile:1.289 Mon May 20 17:32:51 2024 +++ src/sys/modules/Makefile Mon May 20 18:14:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.289 2024/05/20 17:32:51 pgoyette Exp $ +# $NetBSD: Makefile,v 1.290 2024/05/20 18:14:38 pgoyette Exp $ .include <bsd.own.mk> @@ -513,14 +513,6 @@ SUBDIR+= virtio_pci SUBDIR+= vioscsi .endif -# We need these four locally XXX-PRG -.if ${MACHINE_ARCH} == "x86_64" -SUBDIR+= ld -SUBDIR+= ld_nvme -SUBDIR+= nvme -SUBDIR+= ksem -.endif - SUBDIR+= examples # build these regularly to avoid bit-rot .endif Index: src/sys/modules/ffs/Makefile diff -u src/sys/modules/ffs/Makefile:1.24 src/sys/modules/ffs/Makefile:1.25 --- src/sys/modules/ffs/Makefile:1.24 Sat Jun 3 08:52:58 2023 +++ src/sys/modules/ffs/Makefile Mon May 20 18:14:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2023/06/03 08:52:58 lukem Exp $ +# $NetBSD: Makefile,v 1.25 2024/05/20 18:14:38 pgoyette Exp $ .include "../Makefile.inc" @@ -6,15 +6,21 @@ KMOD= ffs CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2 -CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH +CPPFLAGS+= -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_extattr.c \ + ffs_vfsops.c ffs_vnops.c ffs_snapshot.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.8 src/sys/modules/ufs/Makefile:1.9 --- src/sys/modules/ufs/Makefile:1.8 Tue Aug 9 20:05:14 2022 +++ src/sys/modules/ufs/Makefile Mon May 20 18:14:38 2024 @@ -1,19 +1,25 @@ -# $NetBSD: Makefile,v 1.8 2022/08/09 20:05:14 pgoyette Exp $ +# $NetBSD: Makefile,v 1.9 2024/05/20 18:14:38 pgoyette Exp $ .include "../Makefile.inc" KMOD= ufs CPPFLAGS+= -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2 -CPPFLAGS+= -DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH +CPPFLAGS+= -DUFS_DIRHASH CWARNFLAGS.clang= -Wno-conversion .PATH: ${S}/ufs/ufs -SRCS+= ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \ +SRCS+= ufs_bmap.c ufs_dirhash.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>