* [Buildroot] [PATCH 2/2] package/sngrep: fix static build with gnutls
From: Thomas Petazzoni @ 2017-05-23 14:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170520162751.30809-2-romain.naour@gmail.com>
Hello,
On Sat, 20 May 2017 18:27:51 +0200, Romain Naour wrote:
> diff --git a/package/sngrep/0003-configure.ac-switch-to-pkg-config-to-find-gnutls.patch b/package/sngrep/0003-configure.ac-switch-to-pkg-config-to-find-gnutls.patch
> new file mode 100644
> index 0000000..67b21a2
> --- /dev/null
> +++ b/package/sngrep/0003-configure.ac-switch-to-pkg-config-to-find-gnutls.patch
> @@ -0,0 +1,60 @@
> +From b0428b0279b03d88520b79b651f692d9aea65f8c Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +Date: Sat, 20 May 2017 15:00:16 +0200
> +Subject: [PATCH] configure.ac: switch to pkg-config to find gnutls.
This patch looks good, but the description could use some improvement.
> +Like for openssl in patch [1] and for the same reason,
> +use pkg-config to find gnutls.
> +
> +gnutls can be linked with :
> + -lintl -lgmp -lunistring -lhogweed -lnettle -ltasn1 -lz
And ?
> ++ AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no])
> ++ if test "x${LIBGCRYPT_CONFIG}" = "xno"; then
> ++ AC_MSG_FAILURE([libgcrypt-config not found in PATH])
Use AC_MSG_ERROR() here.
> ++ fi
> ++ AC_CHECK_LIB(
> ++ [gcrypt],
> ++ [gcry_md_map_name],
> ++ [LIBGCRYPT_CFLAGS="`${LIBGCRYPT_CONFIG} --cflags`"
> ++ LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`"
> ++ ],
> ++ [AC_MSG_ERROR([ You need to have libgcrypt installed to compile sngrep])],
> ++ [`${LIBGCRYPT_CONFIG} --libs --cflags`]
> ++ )
I don't understand what you're doing here. What about instead:
- If LIBGCRYPT_CONFIG != no, use it to assign LIBGCRYPT_{CFLAGS,LIBS}
- If LIBGCRYPT_CONFIG == no, fall back to AC_CHECK_LIB
What do you think ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/2] package/sngrep: add libgcrypt missing dependencies
From: Thomas Petazzoni @ 2017-05-23 14:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170520162751.30809-1-romain.naour@gmail.com>
Hello,
On Sat, 20 May 2017 18:27:50 +0200, Romain Naour wrote:
> Even if libgcrypt is selected at Kconfig level, it's missing from
> Makefile level.
>
> Fixes:
> http://autobuild.buildroot.net/results/36c/36c28e7e49b31ed2398a67db2e9b08e3aad5a3ee
Could you explain how this build failure apparently related to ncurses
has something to do with the gnutls/libgcrypt issue ?
The patch itself looks good, but the relation with this particular
build failure isn't really clear. Could you clarify?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/1] checkpolicy: remove -lfl from LDLIBS patch.
From: Thomas Petazzoni @ 2017-05-23 14:16 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170520152229.22752-1-Adamduskett@outlook.com>
Hello,
On Sat, 20 May 2017 11:22:29 -0400, Adam Duskett wrote:
> from: https://patchwork.kernel.org/patch/9450549/
Please do not use from: <something> at the beginning of the commit log,
because Git believes this is the "Author".
Besides that: applied on next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] checkpolicy: add patch to fix flex related build failure
From: Thomas Petazzoni @ 2017-05-23 13:50 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=b869760f11f148a06027e63c0d0bbccb55a217f3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
When building checkpolicy/test, the linker reports the following error:
cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a -L/usr/src/selinux/DESTDIR/usr/lib -o dispol
/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so: undefined reference to `yylex'
collect2: error: ld returned 1 exit status
According to flex documentation
(https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used
to provide an implementation for yywrap(). However every flex file now
uses "%option noyywrap", which makes -lfl no longer mandatory. Remove
this option from checkpolicy Makefiles.
Patch taken from https://patchwork.kernel.org/patch/9450549/
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../0001-checkpolicy-remove-lfl-from-LDLIBS.patch | 58 ++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch
new file mode 100644
index 0000000..c0b6de8
--- /dev/null
+++ b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch
@@ -0,0 +1,58 @@
+From 4d215a1e8111e14f6074f7abe2559800b6f4838c Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Sat, 20 May 2017 11:01:08 -0400
+Subject: [PATCH] checkpolicy: remove -lfl from LDLIBSlogin
+
+When building checkpolicy/test, the linker reports the following error:
+cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a
+-L/usr/src/selinux/DESTDIR/usr/lib -o dispol
+/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so:
+undefined reference to `yylex'
+collect2: error: ld returned 1 exit status
+
+According to flex documentation
+(https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used
+to provide an implementation for yywrap(). However every flex file now
+uses "%option noyywrap", which makes -lfl no longer mandatory. Remove
+this option from checkpolicy Makefiles.
+
+
+Backported from:
+https://patchwork.kernel.org/patch/9450549/
+
+Original author: Nicolas Iooss <nicolas.iooss@m4x.org>
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ Makefile | 2 +-
+ test/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 53a3074..875cf00 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \
+ CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o
+ CHECKMODOBJS = $(CHECKOBJS) checkmodule.o
+
+-LDLIBS=$(LIBDIR)/libsepol.a -lfl
++LDLIBS=$(LIBDIR)/libsepol.a
+
+ GENERATED=lex.yy.c y.tab.c y.tab.h
+
+diff --git a/test/Makefile b/test/Makefile
+index c2367e1..e7bd717 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include
+ CFLAGS ?= -g -Wall -W -Werror -O2 -pipe
+ override CFLAGS += -I$(INCLUDEDIR)
+
+-LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR)
++LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR)
+
+ all: dispol dismod
+
+--
+2.9.3
+
^ permalink raw reply related
* [Buildroot] [git commit branch/next] checkpolicy: add patch to fix flex related build failure
From: Thomas Petazzoni @ 2017-05-23 13:50 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=b869760f11f148a06027e63c0d0bbccb55a217f3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
When building checkpolicy/test, the linker reports the following error:
cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a -L/usr/src/selinux/DESTDIR/usr/lib -o dispol
/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so: undefined reference to `yylex'
collect2: error: ld returned 1 exit status
According to flex documentation
(https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used
to provide an implementation for yywrap(). However every flex file now
uses "%option noyywrap", which makes -lfl no longer mandatory. Remove
this option from checkpolicy Makefiles.
Patch taken from https://patchwork.kernel.org/patch/9450549/
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../0001-checkpolicy-remove-lfl-from-LDLIBS.patch | 58 ++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch
new file mode 100644
index 0000000..c0b6de8
--- /dev/null
+++ b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch
@@ -0,0 +1,58 @@
+From 4d215a1e8111e14f6074f7abe2559800b6f4838c Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Sat, 20 May 2017 11:01:08 -0400
+Subject: [PATCH] checkpolicy: remove -lfl from LDLIBSlogin
+
+When building checkpolicy/test, the linker reports the following error:
+cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a
+-L/usr/src/selinux/DESTDIR/usr/lib -o dispol
+/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so:
+undefined reference to `yylex'
+collect2: error: ld returned 1 exit status
+
+According to flex documentation
+(https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used
+to provide an implementation for yywrap(). However every flex file now
+uses "%option noyywrap", which makes -lfl no longer mandatory. Remove
+this option from checkpolicy Makefiles.
+
+
+Backported from:
+https://patchwork.kernel.org/patch/9450549/
+
+Original author: Nicolas Iooss <nicolas.iooss@m4x.org>
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ Makefile | 2 +-
+ test/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 53a3074..875cf00 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \
+ CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o
+ CHECKMODOBJS = $(CHECKOBJS) checkmodule.o
+
+-LDLIBS=$(LIBDIR)/libsepol.a -lfl
++LDLIBS=$(LIBDIR)/libsepol.a
+
+ GENERATED=lex.yy.c y.tab.c y.tab.h
+
+diff --git a/test/Makefile b/test/Makefile
+index c2367e1..e7bd717 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include
+ CFLAGS ?= -g -Wall -W -Werror -O2 -pipe
+ override CFLAGS += -I$(INCLUDEDIR)
+
+-LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR)
++LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR)
+
+ all: dispol dismod
+
+--
+2.9.3
+
^ permalink raw reply related
* [Buildroot] [git commit] flex: only prevent the flex binary to be built for target, not for host
From: Thomas Petazzoni @ 2017-05-23 13:48 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=41ee484bafe402cfadcf1d480b7c8b44bf206af1
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We do want to build the flex binary when building host-flex since it's
needed as a build dependency for other packages.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...ntation.patch => 0001-flex-disable-documentation.patch} | 14 +-------------
package/flex/flex.mk | 5 +++++
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch b/package/flex/0001-flex-disable-documentation.patch
similarity index 55%
rename from package/flex/0001-flex-disable-flex-binary-and-documentation.patch
rename to package/flex/0001-flex-disable-documentation.patch
index d035ef4..68bec12 100644
--- a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch
+++ b/package/flex/0001-flex-disable-documentation.patch
@@ -1,4 +1,4 @@
-flex: prevent flex binary to be built
+flex: disable documentation
Since we prevent the flex binary to be built, we also need to prevent
the documentation to be built, otherwise it will fail like this:
@@ -21,15 +21,3 @@ diff -rup a/Makefile.in b/Makefile.in
examples \
po \
tests \
-diff -rup a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in 2017-05-06 15:49:09.000000000 +0100
-+++ b/src/Makefile.in 2017-05-10 14:35:01.918464036 +0100
-@@ -90,7 +90,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = flex$(EXEEXT)
-+bin_PROGRAMS =
- @ENABLE_BOOTSTRAP_TRUE at noinst_PROGRAMS = stage1flex$(EXEEXT)
- @CROSS_TRUE at am__append_1 = \
- @CROSS_TRUE@ ../lib/malloc.c \
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 81cbdc1..aa6c026 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -15,6 +15,11 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
# we don't have a host-gettext/libintl
HOST_FLEX_DEPENDENCIES = host-m4
+define FLEX_DISABLE_PROGRAM
+ $(SED) 's/^bin_PROGRAMS.*//' $(@D)/src/Makefile.in
+endef
+FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
+
# flex++ symlink is broken when flex binary is not installed
define FLEX_REMOVE_BROKEN_SYMLINK
rm -f $(TARGET_DIR)/usr/bin/flex++
^ permalink raw reply related
* [Buildroot] [git commit branch/next] flex: only prevent the flex binary to be built for target, not for host
From: Thomas Petazzoni @ 2017-05-23 13:48 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=41ee484bafe402cfadcf1d480b7c8b44bf206af1
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
We do want to build the flex binary when building host-flex since it's
needed as a build dependency for other packages.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...ntation.patch => 0001-flex-disable-documentation.patch} | 14 +-------------
package/flex/flex.mk | 5 +++++
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch b/package/flex/0001-flex-disable-documentation.patch
similarity index 55%
rename from package/flex/0001-flex-disable-flex-binary-and-documentation.patch
rename to package/flex/0001-flex-disable-documentation.patch
index d035ef4..68bec12 100644
--- a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch
+++ b/package/flex/0001-flex-disable-documentation.patch
@@ -1,4 +1,4 @@
-flex: prevent flex binary to be built
+flex: disable documentation
Since we prevent the flex binary to be built, we also need to prevent
the documentation to be built, otherwise it will fail like this:
@@ -21,15 +21,3 @@ diff -rup a/Makefile.in b/Makefile.in
examples \
po \
tests \
-diff -rup a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in 2017-05-06 15:49:09.000000000 +0100
-+++ b/src/Makefile.in 2017-05-10 14:35:01.918464036 +0100
-@@ -90,7 +90,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = flex$(EXEEXT)
-+bin_PROGRAMS =
- @ENABLE_BOOTSTRAP_TRUE at noinst_PROGRAMS = stage1flex$(EXEEXT)
- @CROSS_TRUE at am__append_1 = \
- @CROSS_TRUE@ ../lib/malloc.c \
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 81cbdc1..aa6c026 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -15,6 +15,11 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
# we don't have a host-gettext/libintl
HOST_FLEX_DEPENDENCIES = host-m4
+define FLEX_DISABLE_PROGRAM
+ $(SED) 's/^bin_PROGRAMS.*//' $(@D)/src/Makefile.in
+endef
+FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
+
# flex++ symlink is broken when flex binary is not installed
define FLEX_REMOVE_BROKEN_SYMLINK
rm -f $(TARGET_DIR)/usr/bin/flex++
^ permalink raw reply related
* [Buildroot] [PATCH next] flex: only prevent the flex binary to be built for target, not for host
From: Thomas Petazzoni @ 2017-05-23 13:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170523102201.65497-1-Vincent.Riera@imgtec.com>
Hello,
On Tue, 23 May 2017 11:22:01 +0100, Vicente Olivert Riera wrote:
> We do want to build the flex binary when building host-flex since it's
> needed as a build dependency for other packages.
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> ...ntation.patch => 0001-flex-disable-documentation.patch} | 14 +-------------
> package/flex/flex.mk | 5 +++++
> 2 files changed, 6 insertions(+), 13 deletions(-)
> rename package/flex/{0001-flex-disable-flex-binary-and-documentation.patch => 0001-flex-disable-documentation.patch} (55%)
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH] libepoxy: make EGL support optional
From: Thomas Petazzoni @ 2017-05-23 13:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495221760-2083-1-git-send-email-thomas.petazzoni@free-electrons.com>
Hello,
On Fri, 19 May 2017 21:22:40 +0200, Thomas Petazzoni wrote:
> This commit adds a patch to the libepoxy package to make the EGL
> support optional, which allows libepoxy to build with a pure OpenGL
> Mesa3D configuration (i.e without EGL/OpenGLES).
>
> Fixes:
>
> http://autobuild.buildroot.net/results/88774af2845e17cab021a72c8f3171fe30b3a1ff/
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> .../libepoxy/0002-Make-EGL-support-optional.patch | 200 +++++++++++++++++++++
> package/libepoxy/libepoxy.mk | 2 +
> 2 files changed, 202 insertions(+)
> create mode 100644 package/libepoxy/0002-Make-EGL-support-optional.patch
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] libepoxy: make EGL support optional
From: Thomas Petazzoni @ 2017-05-23 13:43 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=556434fb833f054da7bbabc531083951b1f28075
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This commit adds a patch to the libepoxy package to make the EGL
support optional, which allows libepoxy to build with a pure OpenGL
Mesa3D configuration (i.e without EGL/OpenGLES).
Fixes:
http://autobuild.buildroot.net/results/88774af2845e17cab021a72c8f3171fe30b3a1ff/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../libepoxy/0002-Make-EGL-support-optional.patch | 200 +++++++++++++++++++++
package/libepoxy/libepoxy.mk | 2 +
2 files changed, 202 insertions(+)
diff --git a/package/libepoxy/0002-Make-EGL-support-optional.patch b/package/libepoxy/0002-Make-EGL-support-optional.patch
new file mode 100644
index 0000000..b114bb2
--- /dev/null
+++ b/package/libepoxy/0002-Make-EGL-support-optional.patch
@@ -0,0 +1,200 @@
+From 0511fc56e7017209ad18d16551ccaad05de9486c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 8 May 2017 23:12:49 +0200
+Subject: [PATCH] Make EGL support optional
+
+It is perfectly possible to build Mesa3D with just OpenGL support, and
+use with GLX in X.org, without having EGL/OpenGLES support.
+
+However, libepoxy currently unconditionally requires EGL support in its
+configure.ac, which causes a build failure when Mesa3D only provides
+full OpenGL support:
+
+checking for EGL... no
+configure: error: Package requirements (egl) were not met:
+
+Package egl was not found in the pkg-config search path.
+Perhaps you should add the directory containing `egl.pc'
+to the PKG_CONFIG_PATH environment variable
+Package 'egl', required by 'world', not found
+
+This commit fixes that by:
+
+ - Adjusting the configure.ac to add a --{enable,disable}-egl option
+ handled in the exact same way as --{enable,disable}-glx
+
+ - Adjusting the meson build logic in the same way.
+
+ - Adjusting src/dispatch_common.h to define PLATFORM_HAS_EGL correctly,
+ which allows to not include any EGL related header file if EGL
+ support is not enabled.
+
+Submitted-upstream: https://github.com/anholt/libepoxy/pull/123
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 33 ++++++++++++++++++++++++++++-----
+ meson.build | 21 ++++++++++++++++++---
+ meson_options.txt | 5 +++++
+ src/dispatch_common.h | 8 ++++----
+ 4 files changed, 55 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 31b0985..2dbecd9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,11 +88,35 @@ AS_CASE([$enable_glx],
+ [AC_MSG_ERROR([Invalid value "$enable_glx" for option "--enable-glx"])]
+ ])
+
+-# The remaining platform specific API for GL/GLES are enabled
+-# depending on the platform we're building for
++AC_ARG_ENABLE([egl],
++ [AC_HELP_STRING([--enable-egl=@<:@auto,yes,no@:>@], [Enable EGL support @<:@default=auto@:>@])],
++ [enable_egl=$enableval],
++ [enable_egl=auto])
++
++AS_CASE([$enable_egl],
++ [auto], [
++ AS_CASE([$host_os],
++ [mingw*], [build_egl=no],
++ [darwin*], [build_egl=no],
++ [android*], [build_egl=no],
++ [build_egl=yes])
++ ],
++
++ [yes], [
++ build_egl=yes
++ ],
++
++ [no], [
++ build_egl=no
++ ],
++
++ [AC_MSG_ERROR([Invalid value "$enable_egl" for option "--enable-egl"])]
++])
++
++# The remaining platform specific API are enabled depending on the
++# platform we're building for
+ AS_CASE([$host_os],
+ [mingw*], [
+- build_egl=no
+ build_wgl=yes
+ has_znow=yes
+ # On windows, the DLL has to have all of its functions
+@@ -108,7 +132,6 @@ AS_CASE([$host_os],
+ ],
+
+ [darwin*], [
+- build_egl=no
+ build_wgl=no
+ build_apple=yes
+ has_znow=no
+@@ -116,7 +139,6 @@ AS_CASE([$host_os],
+ ],
+
+ [
+- build_egl=yes
+ build_wgl=no
+ has_znow=yes
+ # On platforms with dlopen, we load everything dynamically and
+@@ -131,6 +153,7 @@ AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
+ if test x$build_egl = xyes; then
+ PKG_CHECK_MODULES(EGL, [egl])
+ AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
++ AC_DEFINE(ENABLE_EGL, [1], [Whether EGL support is enabled])
+ fi
+
+ AM_CONDITIONAL(BUILD_GLX, test x$build_glx = xyes)
+diff --git a/meson.build b/meson.build
+index 5435f45..226152e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -51,26 +51,41 @@ elif enable_glx == 'no'
+ build_glx = false
+ endif
+
++enable_egl = get_option('enable-egl')
++if enable_egl == 'auto'
++ if host_system == 'windows'
++ build_egl = false
++ elif host_system == 'darwin'
++ build_egl = false
++ elif host_system == 'android'
++ build_egl = false
++ else
++ build_egl = true
++ endif
++elif enable_egl == 'yes'
++ build_egl = true
++elif enable_egl == 'no'
++ build_egl = false
++endif
++
+ # The remaining platform specific API for GL/GLES are enabled
+ # depending on the platform we're building for
+ if host_system == 'windows'
+- build_egl = false
+ build_apple = false
+ build_wgl = true
+ has_znow = true
+ elif host_system == 'darwin'
+- build_egl = false
+ build_apple = true
+ build_wgl = false
+ has_znow = false
+ else
+- build_egl = true
+ build_apple = false
+ build_wgl = false
+ has_znow = true
+ endif
+
+ conf.set10('ENABLE_GLX', build_glx)
++conf.set10('ENABLE_EGL', build_egl)
+
+ # Compiler flags, taken from the Xorg macros
+ if cc.get_id() == 'msvc'
+diff --git a/meson_options.txt b/meson_options.txt
+index 18932f5..244476a 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -6,3 +6,8 @@ option('enable-glx',
+ choices: [ 'auto', 'yes', 'no' ],
+ value: 'auto',
+ description: 'Enable GLX support')
++option('enable-egl',
++ type: 'combo',
++ choices: [ 'auto', 'yes', 'no' ],
++ value: 'auto',
++ description: 'Enable EGL support')
+diff --git a/src/dispatch_common.h b/src/dispatch_common.h
+index e3277f7..e16771f 100644
+--- a/src/dispatch_common.h
++++ b/src/dispatch_common.h
+@@ -24,19 +24,19 @@
+ #include "config.h"
+
+ #ifdef _WIN32
+-#define PLATFORM_HAS_EGL 0
++#define PLATFORM_HAS_EGL ENABLE_EGL
+ #define PLATFORM_HAS_GLX ENABLE_GLX
+ #define PLATFORM_HAS_WGL 1
+ #elif defined(__APPLE__)
+-#define PLATFORM_HAS_EGL 0
++#define PLATFORM_HAS_EGL ENABLE_EGL
+ #define PLATFORM_HAS_GLX ENABLE_GLX
+ #define PLATFORM_HAS_WGL 0
+ #elif defined(ANDROID)
+-#define PLATFORM_HAS_EGL 1
++#define PLATFORM_HAS_EGL ENABLE_EGL
+ #define PLATFORM_HAS_GLX 0
+ #define PLATFORM_HAS_WGL 0
+ #else
+-#define PLATFORM_HAS_EGL 1
++#define PLATFORM_HAS_EGL ENABLE_EGL
+ #define PLATFORM_HAS_GLX ENABLE_GLX
+ #define PLATFORM_HAS_WGL 0
+ #endif
+--
+2.7.4
+
diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk
index be8c55e..e72743d 100644
--- a/package/libepoxy/libepoxy.mk
+++ b/package/libepoxy/libepoxy.mk
@@ -12,6 +12,8 @@ LIBEPOXY_INSTALL_STAGING = YES
LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
LIBEPOXY_LICENSE = MIT
LIBEPOXY_LICENSE_FILES = COPYING
+# 0002-Make-EGL-support-optional.patch
+LIBEPOXY_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
LIBEPOXY_CONF_OPTS += --enable-egl
^ permalink raw reply related
* [Buildroot] [PATCH v2 1/3] boot/uboot: bump to version 2017.05
From: Thomas Petazzoni @ 2017-05-23 13:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495227075-3762-1-git-send-email-festevam@gmail.com>
Hello,
On Fri, 19 May 2017 17:51:13 -0300, Fabio Estevam wrote:
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> Changes since v1:
> - None
All three patches applied to next. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] imx6q-sabresd: Bump U-Boot and kernel versions
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=3525b970c0e5a5575b74dd1c6983f98ce6bcd3db
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Bump U-Boot to 2017.05 and kernel to 4.11.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/imx6q-sabresd_defconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/imx6q-sabresd_defconfig b/configs/imx6q-sabresd_defconfig
index cc37ecf..b26dc2a 100644
--- a/configs/imx6q-sabresd_defconfig
+++ b/configs/imx6q-sabresd_defconfig
@@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
# System
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
BR2_TARGET_UBOOT_FORMAT_IMX=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.1"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
^ permalink raw reply related
* [Buildroot] [git commit branch/next] imx6q-sabresd: Bump U-Boot and kernel versions
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=3525b970c0e5a5575b74dd1c6983f98ce6bcd3db
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Bump U-Boot to 2017.05 and kernel to 4.11.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/imx6q-sabresd_defconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configs/imx6q-sabresd_defconfig b/configs/imx6q-sabresd_defconfig
index cc37ecf..b26dc2a 100644
--- a/configs/imx6q-sabresd_defconfig
+++ b/configs/imx6q-sabresd_defconfig
@@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
# System
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
BR2_TARGET_UBOOT_FORMAT_IMX=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.1"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
^ permalink raw reply related
* [Buildroot] [git commit] uboot-tools: bump to version 2017.05
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=9a13517ebba08c0d9e88569fe20e165fa289b9f3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Bump to version 2017.05 and also remove the patches that have been
upstreamed.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../uboot-tools/0001-drop-configh-from-tools.patch | 44 ----------------------
...y-CFLAGS-on-invocation-of-libfdt-setup.py.patch | 36 ------------------
package/uboot-tools/uboot-tools.hash | 2 +-
package/uboot-tools/uboot-tools.mk | 2 +-
4 files changed, 2 insertions(+), 82 deletions(-)
diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch
deleted file mode 100644
index fbc9608..0000000
--- a/package/uboot-tools/0001-drop-configh-from-tools.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Tue, 4 Aug 2015 22:13:20 +0200
-Subject: [PATCH] drop configh from tools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We need to build u-boot tools without a board configuration for the target.
-fw_env just uses config.h to define the default environment of the created
-image, so it really isn't mandatory.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-[J??rg Krause: update for version 2015.07]
-Signed-off-by: J??rg Krause <joerg.krause@embedded.rocks>
----
- tools/env/fw_env.h | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
-index 57149e7..50049fe 100644
---- a/tools/env/fw_env.h
-+++ b/tools/env/fw_env.h
-@@ -8,17 +8,6 @@
- #include <aes.h>
- #include <stdint.h>
-
--/* Pull in the current config to define the default environment */
--#include <linux/kconfig.h>
--
--#ifndef __ASSEMBLY__
--#define __ASSEMBLY__ /* get only #defines from config.h */
--#include <config.h>
--#undef __ASSEMBLY__
--#else
--#include <config.h>
--#endif
--
- /*
- * To build the utility with the static configuration
- * comment out the next line.
---
-2.7.4
-
diff --git a/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch b/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
deleted file mode 100644
index ae01b33..0000000
--- a/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7807af13118eff3ac291bbaaf2159c7a441c0902 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 16 Mar 2017 11:21:58 -0700
-Subject: [PATCH] Pass empty CFLAGS on invocation of libfdt/setup.py
-
-When building u-boot tools in cross-build environment CFLAGS environment
-variable set up for target is taken into an account when building code
-for host. Make it empty on invocation of python.
-
-This fixes the following build errors when cross-compiling for xtensa:
-
- cc1: error: unrecognized command line option "-mlongcalls"
- cc1: error: unrecognized command line option "-mauto-litpools"
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
-Reviewed-by: Simon Glass <sjg@chromium.org>
----
- tools/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 1c840d7..f3de657 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -120,7 +120,7 @@ _libfdt.so-sharedobjs += $(LIBFDT_OBJS)
- libfdt:
-
- tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c
-- LDFLAGS="$(HOSTLDFLAGS)" python $(srctree)/lib/libfdt/setup.py \
-+ LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= python $(srctree)/lib/libfdt/setup.py \
- "$(_hostc_flags)" $^
- mv _libfdt.so $@
-
---
-2.1.4
-
diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash
index 9606d9f..e11d92f 100644
--- a/package/uboot-tools/uboot-tools.hash
+++ b/package/uboot-tools/uboot-tools.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2
+sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 352f53d..f6b1fc3 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UBOOT_TOOLS_VERSION = 2017.03
+UBOOT_TOOLS_VERSION = 2017.05
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
UBOOT_TOOLS_LICENSE = GPL-2.0+
^ permalink raw reply related
* [Buildroot] [git commit branch/next] uboot-tools: bump to version 2017.05
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=9a13517ebba08c0d9e88569fe20e165fa289b9f3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Bump to version 2017.05 and also remove the patches that have been
upstreamed.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../uboot-tools/0001-drop-configh-from-tools.patch | 44 ----------------------
...y-CFLAGS-on-invocation-of-libfdt-setup.py.patch | 36 ------------------
package/uboot-tools/uboot-tools.hash | 2 +-
package/uboot-tools/uboot-tools.mk | 2 +-
4 files changed, 2 insertions(+), 82 deletions(-)
diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch
deleted file mode 100644
index fbc9608..0000000
--- a/package/uboot-tools/0001-drop-configh-from-tools.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Tue, 4 Aug 2015 22:13:20 +0200
-Subject: [PATCH] drop configh from tools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We need to build u-boot tools without a board configuration for the target.
-fw_env just uses config.h to define the default environment of the created
-image, so it really isn't mandatory.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-[J??rg Krause: update for version 2015.07]
-Signed-off-by: J??rg Krause <joerg.krause@embedded.rocks>
----
- tools/env/fw_env.h | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
-index 57149e7..50049fe 100644
---- a/tools/env/fw_env.h
-+++ b/tools/env/fw_env.h
-@@ -8,17 +8,6 @@
- #include <aes.h>
- #include <stdint.h>
-
--/* Pull in the current config to define the default environment */
--#include <linux/kconfig.h>
--
--#ifndef __ASSEMBLY__
--#define __ASSEMBLY__ /* get only #defines from config.h */
--#include <config.h>
--#undef __ASSEMBLY__
--#else
--#include <config.h>
--#endif
--
- /*
- * To build the utility with the static configuration
- * comment out the next line.
---
-2.7.4
-
diff --git a/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch b/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
deleted file mode 100644
index ae01b33..0000000
--- a/package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7807af13118eff3ac291bbaaf2159c7a441c0902 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 16 Mar 2017 11:21:58 -0700
-Subject: [PATCH] Pass empty CFLAGS on invocation of libfdt/setup.py
-
-When building u-boot tools in cross-build environment CFLAGS environment
-variable set up for target is taken into an account when building code
-for host. Make it empty on invocation of python.
-
-This fixes the following build errors when cross-compiling for xtensa:
-
- cc1: error: unrecognized command line option "-mlongcalls"
- cc1: error: unrecognized command line option "-mauto-litpools"
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
-Reviewed-by: Simon Glass <sjg@chromium.org>
----
- tools/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 1c840d7..f3de657 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -120,7 +120,7 @@ _libfdt.so-sharedobjs += $(LIBFDT_OBJS)
- libfdt:
-
- tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c
-- LDFLAGS="$(HOSTLDFLAGS)" python $(srctree)/lib/libfdt/setup.py \
-+ LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= python $(srctree)/lib/libfdt/setup.py \
- "$(_hostc_flags)" $^
- mv _libfdt.so $@
-
---
-2.1.4
-
diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash
index 9606d9f..e11d92f 100644
--- a/package/uboot-tools/uboot-tools.hash
+++ b/package/uboot-tools/uboot-tools.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2
+sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 352f53d..f6b1fc3 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UBOOT_TOOLS_VERSION = 2017.03
+UBOOT_TOOLS_VERSION = 2017.05
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
UBOOT_TOOLS_LICENSE = GPL-2.0+
^ permalink raw reply related
* [Buildroot] [git commit] boot/uboot: bump to version 2017.05
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=d704045a144cc091083f1ab74fb429fe5e040ed0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/uboot/Config.in | 4 ++--
boot/uboot/uboot.hash | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 004f9c0..547822d 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -38,7 +38,7 @@ choice
Select the specific U-Boot version you want to use
config BR2_TARGET_UBOOT_LATEST_VERSION
- bool "2017.03"
+ bool "2017.05"
config BR2_TARGET_UBOOT_CUSTOM_VERSION
bool "Custom version"
@@ -86,7 +86,7 @@ endif
config BR2_TARGET_UBOOT_VERSION
string
- default "2017.03" if BR2_TARGET_UBOOT_LATEST_VERSION
+ default "2017.05" if BR2_TARGET_UBOOT_LATEST_VERSION
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
if BR2_TARGET_UBOOT_CUSTOM_VERSION
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
index 9606d9f..e11d92f 100644
--- a/boot/uboot/uboot.hash
+++ b/boot/uboot/uboot.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2
+sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2
^ permalink raw reply related
* [Buildroot] [git commit branch/next] boot/uboot: bump to version 2017.05
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=d704045a144cc091083f1ab74fb429fe5e040ed0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/uboot/Config.in | 4 ++--
boot/uboot/uboot.hash | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 004f9c0..547822d 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -38,7 +38,7 @@ choice
Select the specific U-Boot version you want to use
config BR2_TARGET_UBOOT_LATEST_VERSION
- bool "2017.03"
+ bool "2017.05"
config BR2_TARGET_UBOOT_CUSTOM_VERSION
bool "Custom version"
@@ -86,7 +86,7 @@ endif
config BR2_TARGET_UBOOT_VERSION
string
- default "2017.03" if BR2_TARGET_UBOOT_LATEST_VERSION
+ default "2017.05" if BR2_TARGET_UBOOT_LATEST_VERSION
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
if BR2_TARGET_UBOOT_CUSTOM_VERSION
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
index 9606d9f..e11d92f 100644
--- a/boot/uboot/uboot.hash
+++ b/boot/uboot/uboot.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2
+sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2
^ permalink raw reply related
* [Buildroot] [PATCH/next 3/9] package/c-icap: add optional support for openldap
From: Thomas Petazzoni @ 2017-05-23 13:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170521214124.20328-3-bernd.kuhls@t-online.de>
Hello,
On Sun, 21 May 2017 23:41:18 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/c-icap/c-icap.mk | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
Patches 3 to 9 applied to next. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/c-icap: add optional support for openssl
From: Thomas Petazzoni @ 2017-05-23 13:40 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=5c8cc5dadd7f587e22b9de02ffc1b0ad8679ae29
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Optional OpenSSL was added with version 0.5.1:
https://sourceforge.net/p/c-icap/news/2017/03/the-c-icap-051-is-released-/
https://sourceforge.net/p/c-icap/code/1253/#diff-5
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/c-icap/c-icap.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 82b2574..e57ecd0 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -54,6 +54,13 @@ else
C_ICAP_CONF_OPTS += --without-ldap
endif
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+C_ICAP_CONF_OPTS += --with-openssl
+C_ICAP_DEPENDENCIES += openssl
+else
+C_ICAP_CONF_OPTS += --without-openssl
+endif
+
ifeq ($(BR2_PACKAGE_PCRE),y)
C_ICAP_CONF_OPTS += --with-pcre
C_ICAP_DEPENDENCIES += pcre
^ permalink raw reply related
* [Buildroot] [git commit branch/next] package/c-icap: add optional support for openssl
From: Thomas Petazzoni @ 2017-05-23 13:40 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=5c8cc5dadd7f587e22b9de02ffc1b0ad8679ae29
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Optional OpenSSL was added with version 0.5.1:
https://sourceforge.net/p/c-icap/news/2017/03/the-c-icap-051-is-released-/
https://sourceforge.net/p/c-icap/code/1253/#diff-5
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/c-icap/c-icap.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 82b2574..e57ecd0 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -54,6 +54,13 @@ else
C_ICAP_CONF_OPTS += --without-ldap
endif
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+C_ICAP_CONF_OPTS += --with-openssl
+C_ICAP_DEPENDENCIES += openssl
+else
+C_ICAP_CONF_OPTS += --without-openssl
+endif
+
ifeq ($(BR2_PACKAGE_PCRE),y)
C_ICAP_CONF_OPTS += --with-pcre
C_ICAP_DEPENDENCIES += pcre
^ permalink raw reply related
* [Buildroot] [git commit] package/c-icap-modules: bump version to 0.4.5
From: Thomas Petazzoni @ 2017-05-23 13:40 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=80ab228959b67b2023d6db383e9aa0640e853b77
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>
---
package/c-icap-modules/c-icap-modules.hash | 4 ++--
package/c-icap-modules/c-icap-modules.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash
index 5df1449..a9fee87 100644
--- a/package/c-icap-modules/c-icap-modules.hash
+++ b/package/c-icap-modules/c-icap-modules.hash
@@ -1,3 +1,3 @@
# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/
-md5 5acd9487679ed47fbee00270d436718d c_icap_modules-0.4.2.tar.gz
-sha1 e5f4203980b732b9de165c1e83c4703734c3e0e2 c_icap_modules-0.4.2.tar.gz
+md5 1a7eaa7a34ff35c2440cf303f7b45f22 c_icap_modules-0.4.5.tar.gz
+sha1 515145e6d29413aff8543937504dc5c419043fd5 c_icap_modules-0.4.5.tar.gz
diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk
index 9daee58..d754378 100644
--- a/package/c-icap-modules/c-icap-modules.mk
+++ b/package/c-icap-modules/c-icap-modules.mk
@@ -4,7 +4,7 @@
#
################################################################################
-C_ICAP_MODULES_VERSION = 0.4.2
+C_ICAP_MODULES_VERSION = 0.4.5
C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap
C_ICAP_MODULES_LICENSE = GPL-2.0+
^ permalink raw reply related
* [Buildroot] [git commit branch/next] package/c-icap-modules: bump version to 0.4.5
From: Thomas Petazzoni @ 2017-05-23 13:40 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=80ab228959b67b2023d6db383e9aa0640e853b77
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/c-icap-modules/c-icap-modules.hash | 4 ++--
package/c-icap-modules/c-icap-modules.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash
index 5df1449..a9fee87 100644
--- a/package/c-icap-modules/c-icap-modules.hash
+++ b/package/c-icap-modules/c-icap-modules.hash
@@ -1,3 +1,3 @@
# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/
-md5 5acd9487679ed47fbee00270d436718d c_icap_modules-0.4.2.tar.gz
-sha1 e5f4203980b732b9de165c1e83c4703734c3e0e2 c_icap_modules-0.4.2.tar.gz
+md5 1a7eaa7a34ff35c2440cf303f7b45f22 c_icap_modules-0.4.5.tar.gz
+sha1 515145e6d29413aff8543937504dc5c419043fd5 c_icap_modules-0.4.5.tar.gz
diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk
index 9daee58..d754378 100644
--- a/package/c-icap-modules/c-icap-modules.mk
+++ b/package/c-icap-modules/c-icap-modules.mk
@@ -4,7 +4,7 @@
#
################################################################################
-C_ICAP_MODULES_VERSION = 0.4.2
+C_ICAP_MODULES_VERSION = 0.4.5
C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap
C_ICAP_MODULES_LICENSE = GPL-2.0+
^ permalink raw reply related
* [Buildroot] [git commit] package/c-icap: remove configure option process-mutexes
From: Thomas Petazzoni @ 2017-05-23 13:39 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=06afaf5b067a374fa9e91562d4d8a7ccd8c23ad5
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This option was removed in 2014:
https://sourceforge.net/p/c-icap/code/1102/#diff-3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/c-icap/c-icap.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index e32e0dc..82b2574 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -12,7 +12,6 @@ C_ICAP_LICENSE_FILES = COPYING
C_ICAP_INSTALL_STAGING = YES
C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
C_ICAP_CONF_OPTS = \
- --with-process-mutexes=posix \
--without-perl \
--enable-large-files \
--enable-ipv6
^ permalink raw reply related
* [Buildroot] [git commit branch/next] package/c-icap: remove configure option process-mutexes
From: Thomas Petazzoni @ 2017-05-23 13:39 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=06afaf5b067a374fa9e91562d4d8a7ccd8c23ad5
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
This option was removed in 2014:
https://sourceforge.net/p/c-icap/code/1102/#diff-3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/c-icap/c-icap.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index e32e0dc..82b2574 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -12,7 +12,6 @@ C_ICAP_LICENSE_FILES = COPYING
C_ICAP_INSTALL_STAGING = YES
C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
C_ICAP_CONF_OPTS = \
- --with-process-mutexes=posix \
--without-perl \
--enable-large-files \
--enable-ipv6
^ permalink raw reply related
* [Buildroot] [git commit] package/c-icap: add optional support for libmemcached
From: Thomas Petazzoni @ 2017-05-23 13:39 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=95359bb43c25568917b015895063f61db9fd79ef
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Support for libmemcached was added in 2014:
https://sourceforge.net/p/c-icap/code/1103/#diff-2
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/c-icap/c-icap.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 750b231..e32e0dc 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -41,6 +41,13 @@ else
C_ICAP_CONF_OPTS += --without-bzip2
endif
+ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y)
+C_ICAP_CONF_OPTS += --with-memcached
+C_ICAP_DEPENDENCIES += libmemcached
+else
+C_ICAP_CONF_OPTS += --without-memcached
+endif
+
ifeq ($(BR2_PACKAGE_OPENLDAP),y)
C_ICAP_CONF_OPTS += --with-ldap
C_ICAP_DEPENDENCIES += openldap
^ 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