Re: [PATCH 1/2] btrfs-progs: build: generate all dependency files
On 2017年09月14日 21:41, David Sterba wrote: > On Thu, Sep 14, 2017 at 07:10:46PM +0900, Naohiro Aota wrote: >> We're missing several dependency files like: >> >> $ diff -u <(find -name '*.o'|cut -d. -f2|sort) <(find -name '*.o.d'|cut -d. >> -f2|sort) >>--- /proc/self/fd/112017-09-14 18:17:44.460564620 +0900 >>+++ /proc/self/fd/122017-09-14 18:17:44.460564620 +0900 > > Please note that an actual diff in the changelog is understood as start > of the patch by git-am, indenting the --- or +++ lines makes it work > again. Oops, I forgot about that limitation. Thank you for the fix. > >> @@ -3,7 +3,6 @@ >> /btrfs-corrupt-block >> /btrfs-debug-tree >> /btrfs-find-root >> -/btrfs-list >> /btrfs-map-logical >> /btrfs-select-super >> /btrfstune >> @@ -29,11 +28,6 @@ >> /cmds-scrub >> /cmds-send >> /cmds-subvolume >> -/convert/common >> -/convert/main >> -/convert/source-ext2 >> -/convert/source-fs >> -/convert/source-reiserfs >> /ctree >> /dir-item >> /disk-io >> >> >> This is due to moving things out of objects and cmds_objects variables. Such >> missing dependency files cause mis-building of some source files (try touch >> utils.h; make mkfs/main.o). >> >> This patch introduce a new variable "all_objects" to keep all the objects and >> use the variable to generate proper dependency file building rules. >> >> Signed-off-by: Naohiro Aota> > Applied, thanks. > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] btrfs-progs: build: generate all dependency files
On Thu, Sep 14, 2017 at 07:10:46PM +0900, Naohiro Aota wrote: > We're missing several dependency files like: > > $ diff -u <(find -name '*.o'|cut -d. -f2|sort) <(find -name '*.o.d'|cut -d. > -f2|sort) >--- /proc/self/fd/112017-09-14 18:17:44.460564620 +0900 >+++ /proc/self/fd/122017-09-14 18:17:44.460564620 +0900 Please note that an actual diff in the changelog is understood as start of the patch by git-am, indenting the --- or +++ lines makes it work again. > @@ -3,7 +3,6 @@ > /btrfs-corrupt-block > /btrfs-debug-tree > /btrfs-find-root > -/btrfs-list > /btrfs-map-logical > /btrfs-select-super > /btrfstune > @@ -29,11 +28,6 @@ > /cmds-scrub > /cmds-send > /cmds-subvolume > -/convert/common > -/convert/main > -/convert/source-ext2 > -/convert/source-fs > -/convert/source-reiserfs > /ctree > /dir-item > /disk-io > > > This is due to moving things out of objects and cmds_objects variables. Such > missing dependency files cause mis-building of some source files (try touch > utils.h; make mkfs/main.o). > > This patch introduce a new variable "all_objects" to keep all the objects and > use the variable to generate proper dependency file building rules. > > Signed-off-by: Naohiro AotaApplied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] btrfs-progs: build: generate all dependency files
We're missing several dependency files like: $ diff -u <(find -name '*.o'|cut -d. -f2|sort) <(find -name '*.o.d'|cut -d. -f2|sort) --- /proc/self/fd/112017-09-14 18:17:44.460564620 +0900 +++ /proc/self/fd/122017-09-14 18:17:44.460564620 +0900 @@ -3,7 +3,6 @@ /btrfs-corrupt-block /btrfs-debug-tree /btrfs-find-root -/btrfs-list /btrfs-map-logical /btrfs-select-super /btrfstune @@ -29,11 +28,6 @@ /cmds-scrub /cmds-send /cmds-subvolume -/convert/common -/convert/main -/convert/source-ext2 -/convert/source-fs -/convert/source-reiserfs /ctree /dir-item /disk-io This is due to moving things out of objects and cmds_objects variables. Such missing dependency files cause mis-building of some source files (try touch utils.h; make mkfs/main.o). This patch introduce a new variable "all_objects" to keep all the objects and use the variable to generate proper dependency file building rules. Signed-off-by: Naohiro Aota--- Makefile |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a114eca..c00dff6 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,9 @@ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-l convert_objects = convert/main.o convert/common.o convert/source-fs.o \ convert/source-ext2.o convert/source-reiserfs.o mkfs_objects = mkfs/main.o mkfs/common.o +image_objects = image/main.o +all_objects = $(objects) $(cmds_objects) $(libbtrfs_objects) $(convert_objects) \ + $(mkfs_objects) $(image_objects) TESTS = fsck-tests.sh convert-tests.sh @@ -591,5 +594,5 @@ uninstall: cd $(DESTDIR)$(bindir); $(RM) -f -- btrfsck fsck.btrfs $(progs_install) ifneq ($(MAKECMDGOALS),clean) --include $(objects:.o=.o.d) $(cmds_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) +-include $(all_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) endif -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html