* [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch
@ 2016-05-19 5:13 Anand Jain
2016-05-19 5:13 ` [PATCH 1/3] btrfs-progs: fix make install failure Anand Jain
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Anand Jain @ 2016-05-19 5:13 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba, Anand Jain
Hi David,
Your latest branch integration-20160517 is failing with
make install, 1/3 will fix it. While here can you also
apply 2/3 and 3/3 as below, however they aren't related
though.
Thanks
Anand Jain (3):
btrfs-progs: fix make install failure
btrfs-progs: add clean-all to the usage
btrfs-progs: clean up commands.h
Makefile.in | 3 ++-
commands.h | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
--
2.7.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] btrfs-progs: fix make install failure
2016-05-19 5:13 [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch Anand Jain
@ 2016-05-19 5:13 ` Anand Jain
2016-05-19 12:00 ` David Sterba
2016-05-19 5:13 ` [PATCH 2/3] btrfs-progs: add clean-all to the usage Anand Jain
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Anand Jain @ 2016-05-19 5:13 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba, Anand Jain
/usr/bin/install -c -m644 -d 64-btrfs-dm.rules /usr/lib/udev/rules.d
/usr/bin/install: cannot create directory ‘64-btrfs-dm.rules’: File exists
Makefile:400: recipe for target 'install' failed
make: *** [install] Error 1
fixes: btrfs-progs: udev: add rules for dm devices
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 47e73c9fbc4e..238dd59badaf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -408,7 +408,7 @@ install: $(libs) $(progs_install) $(INSTALLDIRS)
$(INSTALL) -m755 -d $(DESTDIR)$(incdir)
$(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
ifneq ($(udevdir),)
- $(INSTALL) -m644 -d $(udev_rules) $(DESTDIR)$(udevruledir)
+ $(INSTALL) -m644 $(udev_rules) $(DESTDIR)$(udevruledir)
endif
install-static: $(progs_static) $(INSTALLDIRS)
--
2.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] btrfs-progs: fix make install failure
2016-05-19 5:13 ` [PATCH 1/3] btrfs-progs: fix make install failure Anand Jain
@ 2016-05-19 12:00 ` David Sterba
0 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2016-05-19 12:00 UTC (permalink / raw)
To: Anand Jain; +Cc: linux-btrfs, dsterba
On Thu, May 19, 2016 at 01:13:12PM +0800, Anand Jain wrote:
> /usr/bin/install -c -m644 -d 64-btrfs-dm.rules /usr/lib/udev/rules.d
> /usr/bin/install: cannot create directory ‘64-btrfs-dm.rules’: File exists
> Makefile:400: recipe for target 'install' failed
> make: *** [install] Error 1
>
> fixes: btrfs-progs: udev: add rules for dm devices
> ifneq ($(udevdir),)
> - $(INSTALL) -m644 -d $(udev_rules) $(DESTDIR)$(udevruledir)
> + $(INSTALL) -m644 $(udev_rules) $(DESTDIR)$(udevruledir)
> endif
We have to conditionally create the directory, so extra -d on the
udevrule or -D is needed. Looking at the patch we have in openSUSE, it
does the former. I'll update the patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] btrfs-progs: add clean-all to the usage
2016-05-19 5:13 [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch Anand Jain
2016-05-19 5:13 ` [PATCH 1/3] btrfs-progs: fix make install failure Anand Jain
@ 2016-05-19 5:13 ` Anand Jain
2016-05-19 5:13 ` [PATCH 3/3] btrfs-progs: clean up commands.h Anand Jain
2016-05-19 12:07 ` [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch David Sterba
3 siblings, 0 replies; 6+ messages in thread
From: Anand Jain @ 2016-05-19 5:13 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba, Anand Jain
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
Makefile.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.in b/Makefile.in
index 238dd59badaf..50b2ee5d8eba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@
# test run the full testsuite
# install install to default location (/usr/local)
# clean clean built binaries (not the documentation)
+# clean-all clean as above, clean docs and generated files
#
# Tuning by variables (environment or make arguments):
# V=1 verbose, print command lines (default: quiet)
--
2.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] btrfs-progs: clean up commands.h
2016-05-19 5:13 [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch Anand Jain
2016-05-19 5:13 ` [PATCH 1/3] btrfs-progs: fix make install failure Anand Jain
2016-05-19 5:13 ` [PATCH 2/3] btrfs-progs: add clean-all to the usage Anand Jain
@ 2016-05-19 5:13 ` Anand Jain
2016-05-19 12:07 ` [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch David Sterba
3 siblings, 0 replies; 6+ messages in thread
From: Anand Jain @ 2016-05-19 5:13 UTC (permalink / raw)
To: linux-btrfs; +Cc: dsterba, Anand Jain
This function is declared in utils.h so remove it
from commands.h
int test_issubvolume(const char *path);
This function does not exists delete the declaration
get_subvol_name(char *mnt, char *full_path);
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
commands.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/commands.h b/commands.h
index 2da093bf81a3..94229c112bc0 100644
--- a/commands.h
+++ b/commands.h
@@ -125,10 +125,4 @@ int cmd_dump_super(int argc, char **argv);
int cmd_debug_tree(int argc, char **argv);
int cmd_rescue(int argc, char **argv);
-/* subvolume exported functions */
-int test_issubvolume(const char *path);
-
-/* send.c */
-char *get_subvol_name(char *mnt, char *full_path);
-
#endif
--
2.7.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch
2016-05-19 5:13 [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch Anand Jain
` (2 preceding siblings ...)
2016-05-19 5:13 ` [PATCH 3/3] btrfs-progs: clean up commands.h Anand Jain
@ 2016-05-19 12:07 ` David Sterba
3 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2016-05-19 12:07 UTC (permalink / raw)
To: Anand Jain; +Cc: linux-btrfs, dsterba
On Thu, May 19, 2016 at 01:13:11PM +0800, Anand Jain wrote:
> Your latest branch integration-20160517 is failing with
> make install, 1/3 will fix it. While here can you also
> apply 2/3 and 3/3 as below, however they aren't related
> though.
> btrfs-progs: fix make install failure
> btrfs-progs: add clean-all to the usage
> btrfs-progs: clean up commands.h
2 and 3 applied, thanks. It's absolutelly ok to group such small misc
fixups.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-19 12:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-19 5:13 [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch Anand Jain
2016-05-19 5:13 ` [PATCH 1/3] btrfs-progs: fix make install failure Anand Jain
2016-05-19 12:00 ` David Sterba
2016-05-19 5:13 ` [PATCH 2/3] btrfs-progs: add clean-all to the usage Anand Jain
2016-05-19 5:13 ` [PATCH 3/3] btrfs-progs: clean up commands.h Anand Jain
2016-05-19 12:07 ` [PATCH 0/3] btrfs-progs: fixes on top of latest integration branch David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).