| Message ID | e4d64c9b-5a1a-54b5-8b69-463738c95307@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | misc: remove COPYING from doc/ Makefile | expand |
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 -- 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
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. -- 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
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.
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.. -- 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
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 -- 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
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:
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> --- -- 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