[PATCH 0/2] btrfs-progs: Fix progs_extra build failures

[PATCH 0/2] btrfs-progs: Fix progs_extra build failures

[Hans van Kranenburg]

Alternatively, it might be a better idea to just remove the deprecated source
files, since this is not the first time build failures in them went unnoticed.

Hans van Kranenburg (2):
  btrfs-progs: Fix progs_extra build dependencies
  btrfs-progs: Fix build of btrfs-calc-size

 Makefile          | 2 +-
 btrfs-calc-size.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.11.0

[PATCH 1/2] btrfs-progs: Fix progs_extra build dependencies

[Hans van Kranenburg]

The Makefile does not have a dependency path that builds dependencies
for tools listed in progs_extra.

E.g. doing make btrfs-show-super in a clean build environment results in:
    gcc: error: cmds-inspect-dump-super.o: No such file or directory
    Makefile:389: recipe for target 'btrfs-show-super' failed

Signed-off-by: Hans van Kranenburg <hans@knorrie.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 30a0ee22..390b138f 100644
--- a/Makefile
+++ b/Makefile
@@ -220,7 +220,7 @@ cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
 CHECKER_FLAGS += $(btrfs_convert_cflags)
 
 # collect values of the variables above
-standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs)))),$($(dep)))
+standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs) $(progs_extra)))),$($(dep)))
 
 SUBDIRS =
 BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))
-- 
2.11.0

Re: [PATCH 1/2] btrfs-progs: Fix progs_extra build dependencies

[Hugo Mills]

[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]

On Sat, Dec 23, 2017 at 09:52:37PM +0100, Hans van Kranenburg wrote:
> The Makefile does not have a dependency path that builds dependencies
> for tools listed in progs_extra.
> 
> E.g. doing make btrfs-show-super in a clean build environment results in:
>     gcc: error: cmds-inspect-dump-super.o: No such file or directory
>     Makefile:389: recipe for target 'btrfs-show-super' failed
> 
> Signed-off-by: Hans van Kranenburg <hans@knorrie.org>

   Hans and I worked this one out between us on IRC. Not sure if you
need this, but here it is:

Signed-off-by: Hugo Mills <hugo@carfax.org.uk>

   Hugo.

> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 30a0ee22..390b138f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -220,7 +220,7 @@ cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
>  CHECKER_FLAGS += $(btrfs_convert_cflags)
>  
>  # collect values of the variables above
> -standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs)))),$($(dep)))
> +standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs) $(progs_extra)))),$($(dep)))
>  
>  SUBDIRS =
>  BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))

-- 
Hugo Mills             | My code is never released, it escapes from the git
hugo@... carfax.org.uk | repo and kills a few beta testers on the way out.
http://carfax.org.uk/  |
PGP: E2AB1DE4          |                                             Diablo-D3

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 2/2] btrfs-progs: Fix build of btrfs-calc-size

[Hans van Kranenburg]

Build would fail because it couldn't find the usage function.

Signed-off-by: Hans van Kranenburg <hans@knorrie.org>
---
 btrfs-calc-size.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/btrfs-calc-size.c b/btrfs-calc-size.c
index 1ac7c785..d2d68ab2 100644
--- a/btrfs-calc-size.c
+++ b/btrfs-calc-size.c
@@ -19,6 +19,7 @@
 #include "volumes.h"
 #include "utils.h"
 #include "commands.h"
+#include "help.h"
 
 int main(int argc, char **argv)
 {
-- 
2.11.0

Re: [PATCH 0/2] btrfs-progs: Fix progs_extra build failures

[David Sterba]

On Sat, Dec 23, 2017 at 09:52:36PM +0100, Hans van Kranenburg wrote:
> Alternatively, it might be a better idea to just remove the deprecated source
> files, since this is not the first time build failures in them went unnoticed.

btrfs-show-super and btrfs-calc-size have been deprecated since
2016-11-22, maybe it's time to remove them from git. I'll apply the
patches, with Hugo's S-O-B line, thanks.