Message ID | 20220826135503.20612-3-jesseevg@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | Extend Qt6 configuration | expand |
On 26/08/2022 15:54, Jesse Van Gavere wrote: > Add license hashes to the hash file and add the information into the makefile Commit messages are normally wrapped at 72 columns. > > Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com> > --- > package/qt6/qt6base/qt6base.hash | 6 ++++++ > package/qt6/qt6base/qt6base.mk | 2 ++ > 2 files changed, 8 insertions(+) > > diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash > index 31ed2494af..5efc5c2815 100644 > --- a/package/qt6/qt6base/qt6base.hash > +++ b/package/qt6/qt6base/qt6base.hash > @@ -1,2 +1,8 @@ > # Hash from: https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz.sha256 > sha256 0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 qtbase-everywhere-src-6.3.1.tar.xz > +# Hashes for license files: > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 You clearly just copied this from qt5base... However, the name has changes to LICENSE.GPL3, and the file has been reflowed and the Qt-specific blurb in the beginning has been removed. So the hash is not the same. > +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL This one also had some whitespace differences with the qt5base one. Applied to master with the hashes and filenames fixed, thanks! Regards, Arnout > diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk > index c67d94e193..7a0838b2bc 100644 > --- a/package/qt6/qt6base/qt6base.mk > +++ b/package/qt6/qt6base/qt6base.mk > @@ -7,6 +7,8 @@ > QT6BASE_VERSION = $(QT6_VERSION) > QT6BASE_SITE = $(QT6_SITE) > QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz > +QT6BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) > +QT6BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > QT6BASE_DEPENDENCIES = \ > host-ninja \ > host-qt6base \
diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 31ed2494af..5efc5c2815 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,2 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz.sha256 sha256 0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03 qtbase-everywhere-src-6.3.1.tar.xz +# Hashes for license files: +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c67d94e193..7a0838b2bc 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,6 +7,8 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz +QT6BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) +QT6BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL QT6BASE_DEPENDENCIES = \ host-ninja \ host-qt6base \
Add license hashes to the hash file and add the information into the makefile Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com> --- package/qt6/qt6base/qt6base.hash | 6 ++++++ package/qt6/qt6base/qt6base.mk | 2 ++ 2 files changed, 8 insertions(+)