* [Buildroot] [git commit] package/x11r7/xdriver_xf86-video-nouveau: bump version to 1.0.15
From: Thomas Petazzoni @ 2017-04-29 15:07 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=e591cf43b1d985001fd384486a3e4ab609fceac4
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash | 8 ++++----
.../xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
index 7a0c923..5b69e4e 100644
--- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
+++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
@@ -1,4 +1,4 @@
-# From https://lists.x.org/archives/xorg-announce/2017-March/002783.html
-md5 c57c89e1a3c9bc319d26f2e11c80e7fb xf86-video-nouveau-1.0.14.tar.bz2
-sha1 6c5c46d6e0d8595b71e2a1df6879ab5d650f2097 xf86-video-nouveau-1.0.14.tar.bz2
-sha256 4ddff99b3cc49f16cdcf99f6e1c5856b6f06589ec98376cedb5754100afe31c1 xf86-video-nouveau-1.0.14.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-April/002796.html
+md5 717203cb87029cddcbccf7398f9ad8c3 xf86-video-nouveau-1.0.15.tar.bz2
+sha1 ed699a59ea509550f60019eef1e092ed0ccdea08 xf86-video-nouveau-1.0.15.tar.bz2
+sha256 aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c xf86-video-nouveau-1.0.15.tar.bz2
diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
index 3e2d787..e3969a2 100644
--- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
+++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.14
+XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.15
XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] mke2img: Sanity check block size and fail if zero or missing.
From: J Evans @ 2017-04-29 14:58 UTC (permalink / raw)
To: buildroot
Signed-off-by: J Evans <g4@novadsp.com>
---
package/mke2img/mke2img | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/mke2img/mke2img b/package/mke2img/mke2img
index b773aa9..0a3ed6c 100755
--- a/package/mke2img/mke2img
+++ b/package/mke2img/mke2img
@@ -39,10 +39,16 @@ main() {
# Sanity checks
if [ -z "${root_dir}" ]; then
- error "you must specify a root directory with '-d'\n"
+ error "Error: you must specify a root directory with '-d'\n"
fi
if [ -z "${image}" ]; then
- error "you must specify an output image file with '-o'\n"
+ error "Error: you must specify an output image file with '-o'\n"
+ fi
+ if [ -z "${nb_blocks}" ]; then
+ error "Error: you must specify a file system block count with '-b'. This cannot be zero, e.g. 61440 == 60MB\n"
+ fi
+ if [ "${nb_blocks}" -eq 0]; then
+ error "Error: The file system block count size cannot be zero. e.g. 61440 == 60MB \n"
fi
case "${gen}:${rev}" in
2:0|2:1|3:1|4:1)
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH] package/protobuf: depend on gcc >= 4.5
From: Mario Rugiero @ 2017-04-29 14:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170429143136.3da63d52@free-electrons.com>
2017-04-29 9:31 GMT-03:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Hello,
>
> On Wed, 26 Apr 2017 13:28:50 -0300, mrugiero at gmail.com wrote:
>> From: "Mario J. Rugiero" <mrugiero@gmail.com>
>>
>> Protobuf hits a bug in gcc < 4.5 which breaks the build.
>> See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189
>
> This bug is marked as FIXED, and it has been fixed since many years.
>
> What is the actual problem you are seeing? Is there a reference to an
> autobuilder issue?
>
> I've tried to build with gcc 4.3, and indeed I'm getting:
>
> ./google/protobuf/metadata.h: In constructor 'google::protobuf::internal::InternalMetadataWithArena::InternalMetadataWithArena(google::protobuf::Arena*)':
> ./google/protobuf/metadata.h:175: error: class 'google::protobuf::internal::InternalMetadataWithArena' does not have any field named 'InternalMetadataWithArenaBase'
> ./google/protobuf/metadata.h: In constructor 'google::protobuf::internal::InternalMetadataWithArenaLite::InternalMetadataWithArenaLite(google::protobuf::Arena*)':
> ./google/protobuf/metadata.h:204: error: class 'google::protobuf::internal::InternalMetadataWithArenaLite' does not have any field named 'InternalMetadataWithArenaBase'
>
> Is this the issue we're talking about ?
Exactly.
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-nouveau: bump version to 1.0.15
From: Bernd Kuhls @ 2017-04-29 14:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash | 8 ++++----
.../xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
index 7a0c92331..5b69e4e29 100644
--- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
+++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
@@ -1,4 +1,4 @@
-# From https://lists.x.org/archives/xorg-announce/2017-March/002783.html
-md5 c57c89e1a3c9bc319d26f2e11c80e7fb xf86-video-nouveau-1.0.14.tar.bz2
-sha1 6c5c46d6e0d8595b71e2a1df6879ab5d650f2097 xf86-video-nouveau-1.0.14.tar.bz2
-sha256 4ddff99b3cc49f16cdcf99f6e1c5856b6f06589ec98376cedb5754100afe31c1 xf86-video-nouveau-1.0.14.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-April/002796.html
+md5 717203cb87029cddcbccf7398f9ad8c3 xf86-video-nouveau-1.0.15.tar.bz2
+sha1 ed699a59ea509550f60019eef1e092ed0ccdea08 xf86-video-nouveau-1.0.15.tar.bz2
+sha256 aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c xf86-video-nouveau-1.0.15.tar.bz2
diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
index 3e2d787af..e3969a264 100644
--- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
+++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.14
+XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.15
XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT
--
2.11.0
^ permalink raw reply related
* [Buildroot] libcurl: propagate buildroot debugging option
From: Thomas Petazzoni @ 2017-04-29 14:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <6e5e28bc-b89a-931e-be6c-98c2ebb5434f@awox.com>
Hello,
On Tue, 25 Apr 2017 17:42:16 +0200, Olivier Valentin wrote:
> When buildroot has debugging enabled, let libcurl configure
> its build accordingly.
>
> Signed-off-by: Olivier Valentin <ovalentin@awox.com>
Thanks, but since commit
https://git.buildroot.org/buildroot/commit/?id=0552a367dbdc27a211daaac3359d81dd537e384f,
we no longer pass --enable-debug/--disable-debug to packages. Indeed,
we have realized that packages are not consistent in what they do when
--enable-debug/--disable-debug is passed.
So, BR2_ENABLE_DEBUG is nowadays *only* to get packages built with
debugging symbols, and this is controlled by adding "-g" to CFLAGS.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH v2] package/kodi: fix path to binary
From: Thomas Petazzoni @ 2017-04-29 14:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170423064708.10159-1-yann.morin.1998@free.fr>
Hello,
On Sun, 23 Apr 2017 08:47:08 +0200, Yann E. MORIN wrote:
> Since XBMC was renamed to Kodi, upstream is progressively propagating
> the rename to directories and files, and in some cases kept a legacy
> symlink xbmc->kodi, like /usr/lib/xbmc pointing to /usr/lib/kodi.
>
> In 62165ae (package/kodi: Fix path to binary in service), the path was
> changed to use the new canonical path, but the init script was left out.
> This was not seen previously, because of the legacy symlink.
>
> But with the advent of Kodi 17 (Krypton), that legacy symlink is no
> more, and the init script no longer works.
>
> Do for the init script what was done two years ago for the service file.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
> Cc: Marcus Hoffmann <m.hoffmann@cartelsol.com>
>
> ---
> Changes v1 -> v2:
> - typoes (Marcus)
> ---
> package/kodi/S50kodi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/kodi: fix path to binary
From: Thomas Petazzoni @ 2017-04-29 14:09 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=230187adaadd7264af73df110ebcc74bb1337202
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Since XBMC was renamed to Kodi, upstream is progressively propagating
the rename to directories and files, and in some cases kept a legacy
symlink xbmc->kodi, like /usr/lib/xbmc pointing to /usr/lib/kodi.
In 62165ae (package/kodi: Fix path to binary in service), the path was
changed to use the new canonical path, but the init script was left out.
This was not seen previously, because of the legacy symlink.
But with the advent of Kodi 17 (Krypton), that legacy symlink is no
more, and the init script no longer works.
Do for the init script what was done two years ago for the service file.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Marcus Hoffmann <m.hoffmann@cartelsol.com>
Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/kodi/S50kodi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/kodi/S50kodi b/package/kodi/S50kodi
index f00c59c..0afe7a6 100755
--- a/package/kodi/S50kodi
+++ b/package/kodi/S50kodi
@@ -4,7 +4,7 @@
#
BIN=/usr/bin/br-kodi
-KODI=/usr/lib/xbmc/kodi.bin
+KODI=/usr/lib/kodi/kodi.bin
KODI_ARGS="--standalone -fs -n"
PIDFILE=/var/run/kodi.pid
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 17.0.5
From: Thomas Petazzoni @ 2017-04-29 14:08 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170429135248.32443-1-bernd.kuhls@t-online.de>
Hello,
On Sat, 29 Apr 2017 15:52:48 +0200, Bernd Kuhls wrote:
> Added all hashes provided by upstream.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/mesa3d-headers/mesa3d-headers.mk | 2 +-
> package/mesa3d/mesa3d.hash | 7 +++++--
> package/mesa3d/mesa3d.mk | 2 +-
> 3 files changed, 7 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.5.8
From: Thomas Petazzoni @ 2017-04-29 14:08 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170429140207.6142-1-bernd.kuhls@t-online.de>
Hello,
On Sat, 29 Apr 2017 16:02:07 +0200, Bernd Kuhls wrote:
> Version bump includes a regression fix:
> https://www.samba.org/samba/history/samba-4.5.8.html
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/samba4/samba4.hash | 2 +-
> package/samba4/samba4.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/samba4: bump version to 4.5.8
From: Thomas Petazzoni @ 2017-04-29 14:07 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=67c25f897dd61802ea97c83619ca5dace8ba7c27
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Version bump includes a regression fix:
https://www.samba.org/samba/history/samba-4.5.8.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/samba4/samba4.hash | 2 +-
package/samba4/samba4.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash
index 71d24f7..0a2a548 100644
--- a/package/samba4/samba4.hash
+++ b/package/samba4/samba4.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 samba-4.5.7.tar.gz
+sha256 f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0 samba-4.5.8.tar.gz
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index 130b661..4de69a0 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SAMBA4_VERSION = 4.5.7
+SAMBA4_VERSION = 4.5.8
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
^ permalink raw reply related
* [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 17.0.5
From: Thomas Petazzoni @ 2017-04-29 14:07 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=749c9c8982944e273fd557514e63328cc95b5ea1
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Added all hashes provided by upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 2 +-
package/mesa3d/mesa3d.hash | 7 +++++--
package/mesa3d/mesa3d.mk | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
--git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 0dd262c..d0dceb7 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 17.0.3
+MESA3D_HEADERS_VERSION = 17.0.5
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index 1ac8d86..3e10178 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2017-April/000315.html
-sha512 0bcf1609b54fdabb30ec0a500b78e039bd50060c2c7f5a2e57fca29e1a311fb785dadc3cd311018ebe8020d1cc6320181ece2d2aa39d2f215b0ebf2cb0a55165 mesa-17.0.3.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2017-April/000322.html
+md5 5587b6b693260e3a3125f60fed6a625d mesa-17.0.5.tar.xz
+sha1 030fe080bb53377e44ece3f99b969af08e4a4ff8 mesa-17.0.5.tar.xz
+sha256 668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe mesa-17.0.5.tar.xz
+sha512 942fa62c9098bcd030856cd622696eae418f292addb912e1d558cf27d396f25c3f2000dae97a12d1ff233f1ea157497259442082005035bb27b9bafb2cfc33c3 mesa-17.0.5.tar.xz
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 2e65288..b26d677 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 17.0.3
+MESA3D_VERSION = 17.0.5
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos
^ permalink raw reply related
* [Buildroot] [PATCH 00/29] qt, qt5: only ever use the free/opensource licenses
From: Thomas Petazzoni @ 2017-04-29 14:06 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1492979449.git.yann.morin.1998@free.fr>
Hello,
On Sun, 23 Apr 2017 22:31:12 +0200, Yann E. MORIN wrote:
> Yann E. MORIN (29):
> package/qt: default to approved license
> package/qt5base: default to approved license
> package/qt: always use the opensource license
> package/qt5base: always use the opensource license
> package/qt53d: always use the opensource license
> package/qt5canvas: always use the opensource license
> package/qt5connectivity: always use the opensource license
> package/qt5declarative: always use the opensource license
> package/qt5enginio: always use the opensource license
> package/qt5graphicaleffects: always use the opensource license
> package/qt5imageformats: always use the opensource license
> package/qt5location: always use the opensource license
> package/qt5multimedia: always use the opensource license
> package/qt5quickcontrols: always use the opensource license
> package/qt5quickcontrols2: always use the opensource license
> package/qt5script: always use the opensource license
> package/qt5sensors: always use the opensource license
> package/qt5serialbus: always use the opensource license
> package/qt5serialport: always use the opensource license
> package/qt5svg: always use the opensource license
> package/qt5tools: always use the opensource license
> package/qt5webchannel: always use the opensource license
> package/qt5webkit: always use the opensource license
> package/qt5websockets: always use the opensource license
> package/qt5x11extras: always use the opensource license
> package/qt5xmlpatterns: always use the opensource license
> configs: drop Qt/Qt5 license approval option
> package/qt: drop option for license approved
> package/qt5: drop option for license approved
Series applied. As suggested by Arnout, I've dropped the legacy
handling in the last two patches, as it doesn't serve any purpose.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.5.8
From: Bernd Kuhls @ 2017-04-29 14:02 UTC (permalink / raw)
To: buildroot
Version bump includes a regression fix:
https://www.samba.org/samba/history/samba-4.5.8.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/samba4/samba4.hash | 2 +-
package/samba4/samba4.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash
index 71d24f7fe..0a2a548a1 100644
--- a/package/samba4/samba4.hash
+++ b/package/samba4/samba4.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 samba-4.5.7.tar.gz
+sha256 f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0 samba-4.5.8.tar.gz
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index 130b661c6..4de69a0fa 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SAMBA4_VERSION = 4.5.7
+SAMBA4_VERSION = 4.5.8
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
--
2.11.0
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5: drop option for license approved
From: Thomas Petazzoni @ 2017-04-29 13:57 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=6836f2a70acd259a846c88968924d60afef8cc16
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As stated in previous commits, Buildroot only ever uses the free
license, and we do not have a click-wrap approval for any such free
license for any other package.
The option to approve the license now has no prompt and is no longer
used anywhere.
Legacy handling is not added because it is not useful: when the option
was enabled, it meant "accept the open source license", which is now the
default and only existing behavior.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
[Thomas: remove legacy handling as suggested by Arnout.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5base/Config.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 044aa5d..4796fdb 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -27,10 +27,6 @@ config BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS
E.g. to remove the Windows Vista style option, add the option
-no-feature-style_windowsvista.
-config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
- bool
- default y
-
config BR2_PACKAGE_QT5BASE_CONFIG_FILE
string "Config file"
help
^ permalink raw reply related
* [Buildroot] [git commit] package/qt: drop option for license approved
From: Thomas Petazzoni @ 2017-04-29 13:56 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=b550e8bee29cc2559f973e309f3f8f6827fde49e
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As stated in previous commits, Buildroot only ever uses the free
license, and we do not have a click-wrap approval for any such free
license for any other package.
The option to approve the license now has no prompt and is no longer
used anywhere.
Legacy handling is not added because it is not useful: when the option
was enabled, it meant "accept the open source license", which is now the
default and only existing behavior.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
[Thomas: remove legacy handling as suggested by Arnout.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt/Config.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 5f07bd2..d3a01da 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -99,10 +99,6 @@ config BR2_PACKAGE_QT_STATIC
endchoice
-config BR2_PACKAGE_QT_LICENSE_APPROVED
- bool
- default y
-
config BR2_PACKAGE_QT_CONFIG_FILE
string "Config file"
help
^ permalink raw reply related
* [Buildroot] [git commit] configs: drop Qt/Qt5 license approval option
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=7bdaebb39d23d9782601fea7964b68fbcc509178
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/beaglebone_qt5_defconfig | 1 -
configs/firefly_rk3288_demo_defconfig | 1 -
2 files changed, 2 deletions(-)
diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig
index cdf8b96..b65ca40 100644
--- a/configs/beaglebone_qt5_defconfig
+++ b/configs/beaglebone_qt5_defconfig
@@ -17,7 +17,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk"
BR2_PACKAGE_FBV=y
BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_EXAMPLES=y
BR2_PACKAGE_QT5BASE_EGLFS=y
BR2_PACKAGE_QT5QUICKCONTROLS=y
diff --git a/configs/firefly_rk3288_demo_defconfig b/configs/firefly_rk3288_demo_defconfig
index c2de701..0f4dd36 100644
--- a/configs/firefly_rk3288_demo_defconfig
+++ b/configs/firefly_rk3288_demo_defconfig
@@ -19,7 +19,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_EXAMPLES=y
BR2_PACKAGE_QT5BASE_GUI=y
BR2_PACKAGE_QT5BASE_EGLFS=y
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5xmlpatterns: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=77fb756a387dc36ef957b6dffcea889bb7509824
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5xmlpatterns will be there to be consulted as
well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 123e1ab..fabca21 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -10,7 +10,6 @@ QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).t
QT5XMLPATTERNS_DEPENDENCIES = qt5base
QT5XMLPATTERNS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
@@ -21,10 +20,6 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples)
endif
-else
-QT5XMLPATTERNS_LICENSE = Commercial license
-QT5XMLPATTERNS_REDISTRIBUTE = NO
-endif
define QT5XMLPATTERNS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5x11extras: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=a16e8bd7bdb09ba9affaec7098d772999848ede3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5x11extras will be there to be consulted as
well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 5 -----
1 file changed, 5 deletions(-)
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 7dc371c..00667c7 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -10,7 +10,6 @@ QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz
QT5X11EXTRAS_DEPENDENCIES = qt5base
QT5X11EXTRAS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
@@ -18,10 +17,6 @@ else
QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
-else
-QT5X11EXTRAS_LICENSE = Commercial license
-QT5X11EXTRAS_REDISTRIBUTE = NO
-endif
define QT5X11EXTRAS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5websockets: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=288288e0c1790ec4f07648a2b8a7229fd7b2615c
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5websockets will be there to be consulted as
well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5websockets/qt5websockets.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index bcbc56f..af87435 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -10,7 +10,6 @@ QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.
QT5WEBSOCKETS_DEPENDENCIES = qt5base
QT5WEBSOCKETS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
@@ -21,10 +20,6 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3-Clause (examples)
endif
-else
-QT5WEBSOCKETS_LICENSE = Commercial license
-QT5WEBSOCKETS_REDISTRIBUTE = NO
-endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5WEBSOCKETS_DEPENDENCIES += qt5declarative
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5webkit: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=fe3f8f35bd241e437cfb5e10b679cf24e3586945
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5webkit will be there to be consulted as well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5webkit/qt5webkit.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 295d24d..d435192 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -14,15 +14,10 @@ QT5WEBKIT_INSTALL_STAGING = YES
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
# in the archive.
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
-else
-QT5WEBKIT_LICENSE = LGPL-2.1+ (WebCore), Commercial license
-QT5WEBKIT_REDISTRIBUTE = NO
-endif
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5webchannel: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=4ff182f30cd18f87254ed3d2a30007c91ee7a2f6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5webchannel will be there to be consulted as
well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5webchannel/qt5webchannel.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index e12e945..791f4a9 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -10,7 +10,6 @@ QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.
QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
QT5WEBCHANNEL_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
@@ -21,10 +20,6 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3-Clause (examples)
endif
-else
-QT5WEBCHANNEL_LICENSE = Commercial license
-QT5WEBCHANNEL_REDISTRIBUTE = NO
-endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5WEBCHANNEL_DEPENDENCIES += qt5declarative
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5tools: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=99d58c95e6f817d2f44042c78fd53bedee00baa3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5tools will be there to be consulted as well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5tools/qt5tools.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index c7d2e8f..7d5353a 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -19,7 +19,6 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5TOOLS_DEPENDENCIES += qt5declarative
endif
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
@@ -27,10 +26,6 @@ else
QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
-else
-QT5TOOLS_LICENSE = Commercial license
-QT5TOOLS_REDISTRIBUTE = NO
-endif
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
linguist/lconvert linguist/lrelease linguist/lupdate
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5svg: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=be3278f5ee65b5dcd629cf58e820538ed64d76f4
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5svg will be there to be consulted as well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5svg/qt5svg.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 8986332..4395961 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -10,7 +10,6 @@ QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz
QT5SVG_DEPENDENCIES = qt5base
QT5SVG_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
@@ -18,10 +17,6 @@ else
QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
-else
-QT5SVG_LICENSE = Commercial license
-QT5SVG_REDISTRIBUTE = NO
-endif
define QT5SVG_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5serialport: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=821d911487c12d78221ecb72be0e09c83e7ae5eb
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5serialport will be there to be consulted as
well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5serialport/qt5serialport.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 1a137fd..cf41019 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -10,7 +10,6 @@ QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.
QT5SERIALPORT_DEPENDENCIES = qt5base
QT5SERIALPORT_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
@@ -18,10 +17,6 @@ else
QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
-else
-QT5SERIALPORT_LICENSE = Commercial license
-QT5SERIALPORT_REDISTRIBUTE = NO
-endif
define QT5SERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
^ permalink raw reply related
* [Buildroot] [git commit] package/qt5serialbus: always use the opensource license
From: Thomas Petazzoni @ 2017-04-29 13:53 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=768c62a1d9cd144f2424f665da8ff5c29bae0d18
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We never ask the user to confirm their assent about the use of a free
license; there is no reason we do so for Qt.
The output of legal-info is there to gather all the licenses used in a
build; the license for qt5serialbus will be there to be consulted as
well.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/qt5/qt5serialbus/qt5serialbus.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index 05ca181..24fe8b1 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -10,13 +10,8 @@ QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz
QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
QT5SERIALBUS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5SERIALBUS_LICENSE = Commercial license
-QT5SERIALBUS_REDISTRIBUTE = NO
-endif
define QT5SERIALBUS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox