Patchwork Fix noquota build

login
register
mail settings
Submitter Theodore Ts'o
Date Oct. 23, 2013, 4:53 p.m.
Message ID <1382547188-30578-1-git-send-email-tytso@mit.edu>
Download mbox | patch
Permalink /patch/285711/
State Accepted
Headers show

Comments

Theodore Ts'o - Oct. 23, 2013, 4:53 p.m.
We need to build libquota even if the quota code is disabled.  This
fixes a build regression introduced by commit 43075b42bd: 'quota: fix
disabling quota, add quota tests".

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Eric Sandeen - Oct. 23, 2013, 4:55 p.m.
On 10/23/13 11:53 AM, Theodore Ts'o wrote:
> We need to build libquota even if the quota code is disabled.  This
> fixes a build regression introduced by commit 43075b42bd: 'quota: fix
> disabling quota, add quota tests".
> 
> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Should work.  Thanks Ted.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

(if you want to push it out, I'll do a coverity scan so we
can make sure we're not going backwards there, too; this bug
has been preventing those for the past week or so).

-Eric

> ---
>  Makefile.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.in b/Makefile.in
> index 95cbf1b..ef79482 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -26,7 +26,7 @@ export CHECK_CMD
>  @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
>  @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
>  @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
> -@QUOTA_CMT@QUOTA_LIB_SUBDIR= lib/quota
> +QUOTA_LIB_SUBDIR= lib/quota
>  
>  LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
>  PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - Oct. 24, 2013, 12:41 a.m.
I've pushed out the fixups to the e2fsprogs tree.

     	    	    	      	  - Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/Makefile.in b/Makefile.in
index 95cbf1b..ef79482 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@  export CHECK_CMD
 @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
 @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
 @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
-@QUOTA_CMT@QUOTA_LIB_SUBDIR= lib/quota
+QUOTA_LIB_SUBDIR= lib/quota
 
 LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
 PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po