git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set zvol discard_granularity to the volblocksize.
[zfs.git]
/
config
/
rpm.am
diff --git
a/config/rpm.am
b/config/rpm.am
index
d557f77
..
c592983
100644
(file)
--- a/
config/rpm.am
+++ b/
config/rpm.am
@@
-1,18
+1,24
@@
srpm-modules:
srpm-modules:
+if CONFIG_KERNEL
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" srpm-common
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" srpm-common
+endif
srpm-utils:
srpm-utils:
+if CONFIG_USER
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" srpm-common
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" srpm-common
+endif
srpm: srpm-modules srpm-utils
rpm-modules: srpm-modules
srpm: srpm-modules srpm-utils
rpm-modules: srpm-modules
+if CONFIG_KERNEL
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common
+endif
rpm-utils: srpm-utils
rpm-utils: srpm-utils
+if CONFIG_USER
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" rpm-common
$(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" rpm-common
-
-rpm-modules: srpm-modules
+endif
rpm: rpm-modules rpm-utils
rpm: rpm-modules rpm-utils
@@
-69,6
+75,7
@@
rpm-common:
--define "require_splobj $(SPL_OBJ)" \
--define "require_splver $(SPL_VERSION)" \
--define "$(DEBUG_ZFS) 1" \
--define "require_splobj $(SPL_OBJ)" \
--define "require_splver $(SPL_VERSION)" \
--define "$(DEBUG_ZFS) 1" \
+ --define "$(DEBUG_DMU_TX) 1" \
--nodeps --rebuild $$rpmpkg || exit 1; \
cp $$rpmbuild/RPMS/*/* . || exit 1; \
$(RM) -R $$rpmbuild
--nodeps --rebuild $$rpmpkg || exit 1; \
cp $$rpmbuild/RPMS/*/* . || exit 1; \
$(RM) -R $$rpmbuild