[PATCH] misc: remove COPYING from doc/ Makefile

[PATCH] misc: remove COPYING from doc/ Makefile

[Eric Sandeen]

COPYING is gone now, so make doc-install breaks.

Fixes: 959ef98 ("xfsprogs: convert to SPDX license tags")

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

diff --git a/doc/Makefile b/doc/Makefile
index 8b870dc..83dfa38 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
-LSRCFILES = INSTALL CHANGES COPYING CREDITS sparse.txt
+LSRCFILES = INSTALL CHANGES CREDITS sparse.txt
 LDIRT = *.gz
 
 default: CHANGES.gz
@@ -21,8 +21,6 @@ install: default
 	$(INSTALL) -m 644 CHANGES.gz CREDITS $(PKG_DOC_DIR)
 ifeq ($(PKG_DISTRIBUTION), debian)
 	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
-else
-	$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)
 endif
 
 install-dev:

Re: [PATCH] misc: remove COPYING from doc/ Makefile

[Darrick J. Wong]

On Mon, Jul 30, 2018 at 10:41:54PM -0500, Eric Sandeen wrote:
> COPYING is gone now, so make doc-install breaks.
> 
> Fixes: 959ef98 ("xfsprogs: convert to SPDX license tags")
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
> 
> diff --git a/doc/Makefile b/doc/Makefile
> index 8b870dc..83dfa38 100644
> --- a/doc/Makefile
> +++ b/doc/Makefile
> @@ -5,7 +5,7 @@
>  TOPDIR = ..
>  include $(TOPDIR)/include/builddefs
>  
> -LSRCFILES = INSTALL CHANGES COPYING CREDITS sparse.txt
> +LSRCFILES = INSTALL CHANGES CREDITS sparse.txt
>  LDIRT = *.gz
>  
>  default: CHANGES.gz
> @@ -21,8 +21,6 @@ install: default
>  	$(INSTALL) -m 644 CHANGES.gz CREDITS $(PKG_DOC_DIR)
>  ifeq ($(PKG_DISTRIBUTION), debian)
>  	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
> -else
> -	$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)
>  endif
>  
>  install-dev:
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] misc: remove COPYING from doc/ Makefile

[Christoph Hellwig]

On Mon, Jul 30, 2018 at 10:41:54PM -0500, Eric Sandeen wrote:
> COPYING is gone now, so make doc-install breaks.
> 
> Fixes: 959ef98 ("xfsprogs: convert to SPDX license tags")
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

The patch itself looks good, but I think we have a deeper problem,
in that there is no actual license information anywhere in xfsprogs now.

We need to fix that up similar to the LICENSES/ directory in the kernel.
SPDX tags are good and nice, but without an explanation what they mean
in the same source tree they are useless.

Re: [PATCH] misc: remove COPYING from doc/ Makefile

[Dave Chinner]

On Tue, Jul 31, 2018 at 12:43:13AM -0700, Christoph Hellwig wrote:
> On Mon, Jul 30, 2018 at 10:41:54PM -0500, Eric Sandeen wrote:
> > COPYING is gone now, so make doc-install breaks.
> > 
> > Fixes: 959ef98 ("xfsprogs: convert to SPDX license tags")
> > 
> > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> 
> The patch itself looks good, but I think we have a deeper problem,
> in that there is no actual license information anywhere in xfsprogs now.
> 
> We need to fix that up similar to the LICENSES/ directory in the kernel.
> SPDX tags are good and nice, but without an explanation what they mean
> in the same source tree they are useless.

Sorry, what? I added that as part of my spdx conversion patch. That
patch also removed the COPYING file.

How did these changes get merged? I sent a pull request to convert
everything in xfsprogs and that had all the correct conversions and
documentation in it. here's the pull request:

https://marc.info/?l=linux-xfs&m=152948738523911&w=2

and you can see from the diffstat it did all this stuff...

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH] misc: remove COPYING from doc/ Makefile

[Christoph Hellwig]

On Tue, Jul 31, 2018 at 06:06:46PM +1000, Dave Chinner wrote:
> Sorry, what? I added that as part of my spdx conversion patch. That
> patch also removed the COPYING file.
> 
> How did these changes get merged? I sent a pull request to convert
> everything in xfsprogs and that had all the correct conversions and
> documentation in it. here's the pull request:
> 
> https://marc.info/?l=linux-xfs&m=152948738523911&w=2
> 
> and you can see from the diffstat it did all this stuff...

Ok.  I looked for license info in master but that didn't have the
whole conversion.  That master vs for-next think in the userspace
tools keeps on confusing me..

Re: [PATCH] misc: remove COPYING from doc/ Makefile

[Eric Sandeen]

On 7/31/18 3:08 AM, Christoph Hellwig wrote:
> On Tue, Jul 31, 2018 at 06:06:46PM +1000, Dave Chinner wrote:
>> Sorry, what? I added that as part of my spdx conversion patch. That
>> patch also removed the COPYING file.
>>
>> How did these changes get merged? I sent a pull request to convert
>> everything in xfsprogs and that had all the correct conversions and
>> documentation in it. here's the pull request:
>>
>> https://marc.info/?l=linux-xfs&m=152948738523911&w=2
>>
>> and you can see from the diffstat it did all this stuff...
> 
> Ok.  I looked for license info in master but that didn't have the
> whole conversion.  That master vs for-next think in the userspace
> tools keeps on confusing me..
> 

Sorry about that.

I can rethink it if needed, when I started this gig I was keeping
everything in rebaseable for-next because I feared egregious mistakes.
That's still possible but I'd like to think I'm a little better at it now ;)

-Eric