Skip to content

Commit

Permalink
Merge pull request #252 from truenas/NAS-130821-2
Browse files Browse the repository at this point in the history
NAS-130821 / 24.10 / Sync stable/electriceel branch with openzfs/master
  • Loading branch information
amotin authored Sep 4, 2024
2 parents 4460085 + b65aeb4 commit 45de819
Show file tree
Hide file tree
Showing 110 changed files with 6,326 additions and 1,537 deletions.
2 changes: 1 addition & 1 deletion META
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Release: 1
Release-Tags: relext
License: CDDL
Author: OpenZFS
Linux-Maximum: 6.9
Linux-Maximum: 6.10
Linux-Minimum: 3.10
4 changes: 2 additions & 2 deletions cmd/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ zfs_ids_to_path_LDADD = \
libzfs.la


zhack_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
zhack_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)

sbin_PROGRAMS += zhack
CPPCHECKTARGETS += zhack
Expand All @@ -39,7 +39,7 @@ zhack_LDADD = \


ztest_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
ztest_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
ztest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)

sbin_PROGRAMS += ztest
CPPCHECKTARGETS += ztest
Expand Down
2 changes: 1 addition & 1 deletion cmd/raidz_test/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
raidz_test_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
raidz_test_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
raidz_test_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)

bin_PROGRAMS += raidz_test
CPPCHECKTARGETS += raidz_test
Expand Down
2 changes: 1 addition & 1 deletion cmd/zdb/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
zdb_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
zdb_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
zdb_CFLAGS = $(AM_CFLAGS) $(LIBCRYPTO_CFLAGS)

sbin_PROGRAMS += zdb
Expand Down
Loading

0 comments on commit 45de819

Please sign in to comment.