* [Buildroot] [PATCH 2/3] uboot-tools: bump to version 2017.05
From: Fabio Estevam @ 2017-05-19 20:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495226958-3630-1-git-send-email-festevam@gmail.com>
Bump to version 2017.05 and also remove the patches that have been
upstreamed.
Signed-off-by: Fabio Estevam <festevam@gmail.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(-)
delete mode 100644 package/uboot-tools/0001-drop-configh-from-tools.patch
delete mode 100644 package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
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+
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH 3/3] imx6q-sabresd: Bump U-Boot and kernel versions
From: Fabio Estevam @ 2017-05-19 20:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495226958-3630-1-git-send-email-festevam@gmail.com>
Bump U-Boot to 2016.05 and kernel to 4.11.
Signed-off-by: Fabio Estevam <festevam@gmail.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"
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH v2 1/3] boot/uboot: bump to version 2017.05
From: Fabio Estevam @ 2017-05-19 20:51 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v1:
- None
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
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH v2 2/3] uboot-tools: bump to version 2017.05
From: Fabio Estevam @ 2017-05-19 20:51 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495227075-3762-1-git-send-email-festevam@gmail.com>
Bump to version 2017.05 and also remove the patches that have been
upstreamed.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v1:
- None
.../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(-)
delete mode 100644 package/uboot-tools/0001-drop-configh-from-tools.patch
delete mode 100644 package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
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+
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH v2 3/3] imx6q-sabresd: Bump U-Boot and kernel versions
From: Fabio Estevam @ 2017-05-19 20:51 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495227075-3762-1-git-send-email-festevam@gmail.com>
Bump U-Boot to 2017.05 and kernel to 4.11.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v1:
- Fix typo in commit log: 2017.05
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"
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] fetchmail: gettext is not mandatory
From: Thomas Petazzoni @ 2017-05-19 21:04 UTC (permalink / raw)
To: buildroot
Even when locales are enabled, gettext is not mandatory to build
fetchmail, i.e the following defconfig builds fine:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.02-1096-g54a5333.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
BR2_PACKAGE_FETCHMAIL=y
However, if gettext provides libintl, it gets used. Therefore this
commit moves gettext from a mandatory dependency to an optional
dependency.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/fetchmail/Config.in | 1 -
package/fetchmail/fetchmail.mk | 8 ++++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in
index 1e829a0..7c14176 100644
--- a/package/fetchmail/Config.in
+++ b/package/fetchmail/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_FETCHMAIL
select BR2_PACKAGE_CA_CERTIFICATES
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
Fetchmail - the mail-retrieval daemon
Client daemon to move mail from POP and IMAP to your local computer
diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk
index 2c3786f..49ce0d3 100644
--- a/package/fetchmail/fetchmail.mk
+++ b/package/fetchmail/fetchmail.mk
@@ -20,8 +20,12 @@ FETCHMAIL_CONF_OPTS = \
FETCHMAIL_DEPENDENCIES = \
ca-certificates \
- openssl \
- $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+ openssl
+
+# libintl is an optional dependency
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+FETCHMAIL_DEPENDENCIES += gettext
+endif
# fetchmailconf.py script is not (yet) python3-compliant.
# Prevent the pyc-compilation with python-3 from failing by removing this
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] fetchmail: adjust zlib handling
From: Thomas Petazzoni @ 2017-05-19 21:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1495227881-1899-1-git-send-email-thomas.petazzoni@free-electrons.com>
fetchmail itself does not need zlib, there is no reference to it in its
source, so the "select BR2_PACKAGE_ZLIB" is not necessary. Moreover,
"zlib" was not added to FETCHMAIL_DEPENDENCIES (but was anyway in the
dependency chain through openssl).
In addition, LIBS="-lz" is only needed in static linking configurations,
to help fetchmail's configure script find OpenSSL (it doesn't use
pkg-config unfortunately).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/fetchmail/Config.in | 1 -
package/fetchmail/fetchmail.mk | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in
index 7c14176..62f4f84 100644
--- a/package/fetchmail/Config.in
+++ b/package/fetchmail/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_FETCHMAIL
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_CA_CERTIFICATES
select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_ZLIB
help
Fetchmail - the mail-retrieval daemon
Client daemon to move mail from POP and IMAP to your local computer
diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk
index 49ce0d3..164b2f8 100644
--- a/package/fetchmail/fetchmail.mk
+++ b/package/fetchmail/fetchmail.mk
@@ -13,7 +13,11 @@ FETCHMAIL_LICENSE_FILES = COPYING
FETCHMAIL_AUTORECONF = YES
FETCHMAIL_GETTEXTIZE = YES
+# needed to help fetchmail detecting the availability of openssl,
+# because it doesn't use pkg-config
+ifeq ($(BR2_STATIC_LIBS),y)
FETCHMAIL_CONF_ENV += LIBS="-lz"
+endif
FETCHMAIL_CONF_OPTS = \
--with-ssl=$(STAGING_DIR)/usr
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH] grep: gettext is not mandatory
From: Thomas Petazzoni @ 2017-05-19 21:31 UTC (permalink / raw)
To: buildroot
Even when locales are enabled, gettext is not mandatory to build
grep, i.e the following defconfig builds fine:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.02-1096-g54a5333.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
BR2_PACKAGE_GETTEXT=y
BR2_PACKAGE_GREP=y
However, if gettext provides libintl, it gets used. Therefore this
commit moves gettext from a mandatory dependency to an optional
dependency.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/grep/Config.in | 1 -
package/grep/grep.mk | 6 +++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/grep/Config.in b/package/grep/Config.in
index 6427650..5b0471b 100644
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GREP
bool "grep"
depends on BR2_USE_WCHAR
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
The GNU regular expression matcher.
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 92a915c..5101dda 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -11,7 +11,11 @@ GREP_LICENSE = GPL-3.0+
GREP_LICENSE_FILES = COPYING
GREP_CONF_OPTS = --disable-perl-regexp \
$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
-GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+
+# Can use libintl if available
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+GREP_DEPENDENCIES += gettext
+endif
# link with iconv if enabled
ifeq ($(BR2_PACKAGE_LIBICONV),y)
--
2.7.4
^ permalink raw reply related
* [Buildroot] [autobuild.buildroot.net] Build results for 2017-05-19
From: Thomas Petazzoni @ 2017-05-20 6:30 UTC (permalink / raw)
To: buildroot
Hello,
Build statistics for 2017-05-19
================================
successes : 258
failures : 20
timeouts : 1
TOTAL : 279
Classification of failures by reason
====================================
ffmpeg-3.3.1 | 5
mplayer-1.3.0 | 4
libepoxy-1.4.1 | 2
openocd-0.10.0 | 2
icu-58.2 | 1
make[2]: *** [all] Terminated | 1
mpd-0.20.6 | 1
qt5base-5.8.0 | 1
sngrep-v1.4.2 | 1
taskd-1.1.0 | 1
upmpdcli-1.2.12 | 1
zmqpp-4.1.2 | 1
Detail of failures
===================
arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/ac891286a493b4f78d04834951e1526c35375dc4 |
arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/4075ea2edf9451406f237dd11e6c3eb174492c9a |
arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/e39639f0e52476891ef3de154f88deede8ad28a2 |
arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/d1ca2c75227435e450055c72af0756451a2c6c09 |
arm | ffmpeg-3.3.1 | NOK | http://autobuild.buildroot.net/results/5c863764ade2009b44b035be3c364b9746e78df8 |
bfin | icu-58.2 | NOK | http://autobuild.buildroot.net/results/4c6d144957f789041006cac50c420767def1f5b4 | ORPH
mips64el | libepoxy-1.4.1 | NOK | http://autobuild.buildroot.net/results/7f949f1371c8ad8175f57509c68ebb3dec760122 |
powerpc64le | libepoxy-1.4.1 | NOK | http://autobuild.buildroot.net/results/80fd9c012c314d9aa6e44e00768b6bc0ec831d04 |
aarch64 | make[2]: *** [all] Terminated | TIM | http://autobuild.buildroot.net/results/ad335187f34510f026bca9bb1fe74fa3b55dea2c |
microblazeel | mpd-0.20.6 | NOK | http://autobuild.buildroot.net/results/f0020911e8e06b4dd077747d8ceb3d04421513c1 |
i686 | mplayer-1.3.0 | NOK | http://autobuild.buildroot.net/results/00442a96602ffa5182a63432a148dd82b5891c9c |
i686 | mplayer-1.3.0 | NOK | http://autobuild.buildroot.net/results/4a010f1c01d7ff52abb4f5c9a77dbcf88cb095b9 |
i686 | mplayer-1.3.0 | NOK | http://autobuild.buildroot.net/results/d563739b47b20ce83c5f675a8af767cc172aa5a8 |
i686 | mplayer-1.3.0 | NOK | http://autobuild.buildroot.net/results/ff635118810a225a285367486dbd8d1ea0794bee |
m68k | openocd-0.10.0 | NOK | http://autobuild.buildroot.net/results/4ec479167a83e8e947621c37b774880ae6846313 | ORPH
m68k | openocd-0.10.0 | NOK | http://autobuild.buildroot.net/results/2bbac16327a581df9508899ff0cc191317d4dbb9 | ORPH
sparc | qt5base-5.8.0 | NOK | http://autobuild.buildroot.net/results/2e0c137e571878747635fbce591a755ec224f79c |
arm | sngrep-v1.4.2 | NOK | http://autobuild.buildroot.net/results/f7fb42d3742f6f01000a0d181e0c785640284405 |
arm | taskd-1.1.0 | NOK | http://autobuild.buildroot.net/results/0dbe59da53ecdc24ecb5336ee268bb68762a5dc2 |
m68k | upmpdcli-1.2.12 | NOK | http://autobuild.buildroot.net/results/37e7542bc929ac6c834905cd0245da5ce2006537 |
or1k | zmqpp-4.1.2 | NOK | http://autobuild.buildroot.net/results/8c887caff96337d8c94ef7f01ffca7b711b681bd |
--
http://autobuild.buildroot.net
^ permalink raw reply
* [Buildroot] [autobuild.buildroot.net] Build results for 2017-05-18
From: Peter Seiderer @ 2017-05-20 7:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170519203958.GA3259@scaer>
On Fri, 19 May 2017 22:39:58 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
Hello Yann,
> Thomas, Peter (S), All,
>
> On 2017-05-19 21:44 +0200, Thomas Petazzoni spake thusly:
> > > sparc | qt5base-5.8.0 | NOK | http://autobuild.buildroot.net/results/995656a6f9fff594af6b10297253788683a0098f |
> > This would be fixed by:
> > https://patchwork.ozlabs.org/patch/763762/
> > https://patchwork.ozlabs.org/patch/763763/
> > I was hoping to get some review/feedback from Peter Seiderer on this.
> > Peter, could you have a look?
>
> I am afraid that I may have to withdraw my patches.
>
> I was looking again at this build failure, and we can see that, prior to
> checking for atomicfptr, it already tests for libatomic:
>
> Checking for 64 bit atomics...
> [...]
> > atomic64.cpp:(.text+0x28): undefined reference to `__atomic_exchange_8'
> > atomic64.cpp:(.text+0x48): undefined reference to `__atomic_compare_exchange_8'
> [...]
> test config.corelib.tests.atomic64 FAILED
> Checking for 64 bit atomics in libatomic...
> [...]
> [...]/sparc-linux-g++ [...] -Wl,-O1 -o atomic64 atomic64.o -lrt -lpthread -ldl -latomic
> => source accepted.
> test config.corelib.libraries.libatomic succeeded
>
> But then it forgets to link with it when it looks for atomicfptr:
>
> [...]/sparc-linux-g++ [...] -Wl,-O1 -o atomicfptr atomicfptr.o -lrt -lpthread -ldl
> > atomicfptr.o: In function `test(std::atomic<void (*)(int)> volatile&)':
> > atomicfptr.cpp:(.text+0x4c): undefined reference to `__atomic_compare_exchange_4'
>
> So, in my opinion, the real and correct fix would be to have the
> atomicfptr test actually use the result of the previous libatomic test.
>
Yes, this would be the 'perfect' solution, but...
> I've had a (rather quick) look, and I have no idea on how to do this...
> Peter (Seiderer), we'd need some help on this...
Did play around a little bit hacking src/corelib/configure.json and
config.tests/common/atomicfptr/atomicfptr.pro but no success so far...
So I think your patches look like the best workaround so far...
Regards,
Peter
>
> Regards,
> Yann E. MORIN.
>
^ permalink raw reply
* [Buildroot] [Bug 9886] New: Build fails with "unexpected EOF while looking for matching `"'" if PATH contains a newline
From: bugzilla at busybox.net @ 2017-05-20 7:38 UTC (permalink / raw)
To: buildroot
https://bugs.busybox.net/show_bug.cgi?id=9886
Bug ID: 9886
Summary: Build fails with "unexpected EOF while looking for
matching `"'" if PATH contains a newline
Product: buildroot
Version: unspecified
Hardware: All
OS: Linux
Status: NEW
Severity: normal
Priority: P5
Component: Other
Assignee: unassigned at buildroot.uclibc.org
Reporter: ciro.santilli at gmail.com
CC: buildroot at uclibc.org
Target Milestone: ---
I know newlines in PATH are bad, but we shouldn't punish unsuspecting users
with unhelpful error messages because of it :-)
Reproduce:
git checkout 4d1c2c82e8945a5847d636458f3825c55529835b
make qemu_x86_64_defconfig
PATH="$PATH:"$'\n'":lalala" make
Gives:
>>> host-lzip 1.18 Downloading
/bin/bash: -c: line 0: unexpected EOF while looking for matching `"'
/bin/bash: -c: line 1: syntax error: unexpected end of file
package/pkg-generic.mk:139: recipe for target
'/data/git/buildroot/output/build/host-lzip-1.18/.stamp_downloaded' failed
make[1]: ***
[/data/git/buildroot/output/build/host-lzip-1.18/.stamp_downloaded] Error 1
Makefile:79: recipe for target '_all' failed
make: *** [_all] Error 2
--
You are receiving this mail because:
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [PATCH] support/dependencies: check PATH does not carry a \n
From: Yann E. MORIN @ 2017-05-20 8:20 UTC (permalink / raw)
To: buildroot
... otherwise it fails spectacularly as soon as PATH is referenced in a
package rule (i.e. very soon, fortunately):
>>> host-lzip 1.18 Downloading
/bin/bash: -c: line 0: unexpected EOF while looking for matching `"'
/bin/bash: -c: line 1: syntax error: unexpected end of file
Fixes # 9886.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Ciro Santilli <ciro.santilli@gmail.com>
---
support/dependencies/dependencies.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 168d1960a1..925414cf18 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -29,6 +29,18 @@ if test -n "$LD_LIBRARY_PATH" ; then
fi
fi;
+# PATH should not contain a newline, otherwise it fails in spectacular ways
+# as soon as PATH is referenced in a package rule
+case "${PATH}" in
+(*"
+"*) printf "\n"
+ # Break the '\n' sequence, or a \n is printed (which is not what we want).
+ printf "Your PATH contains a newline (%sn) charater.\n" "\\"
+ printf "This doesn't work. Fix you PATH.\n"
+ exit 1
+ ;;
+esac
+
# sanity check for CWD in PATH. Having the current working directory
# in the PATH makes the toolchain build process break.
# try not to rely on egrep..
--
2.11.0
^ permalink raw reply related
* [Buildroot] [Bug 9886] Build fails with "unexpected EOF while looking for matching `"'" if PATH contains a newline
From: bugzilla at busybox.net @ 2017-05-20 8:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-9886-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=9886
Yann E. MORIN <yann.morin.1998@free.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Assignee|unassigned at buildroot.uclibc |yann.morin.1998 at free.fr
|.org |
Status|NEW |ASSIGNED
CC| |yann.morin.1998 at free.fr
--- Comment #1 from Yann E. MORIN <yann.morin.1998@free.fr> ---
Ciro,
Thanks for the report.
Indeed, having a \n in PATH is a bit stupid... :-/
I've sent a patch that detects that and fails early:
https://patchwork.ozlabs.org/patch/764947/
Regards,
Yann E. MORIN.
--
You are receiving this mail because:
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [Bug 9886] Build fails with "unexpected EOF while looking for matching `"'" if PATH contains a newline
From: bugzilla at busybox.net @ 2017-05-20 9:37 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-9886-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=9886
--- Comment #2 from Ciro Santilli <ciro.santilli@gmail.com> ---
The patch worked for me, thanks!
--
You are receiving this mail because:
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [autobuild.buildroot.net] Build results for 2017-05-18
From: Romain Naour @ 2017-05-20 10:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170519214454.08c259df@free-electrons.com>
Hi Thomas,
Le 19/05/2017 ? 21:44, Thomas Petazzoni a ?crit :
> Hello,
>
[...]
>
>> microblazeel | taskd-1.1.0 | NOK | http://autobuild.buildroot.net/results/b8c18a2cc5e7170695c273e8017a4771096167b6 |
>
> Issue when linking against gnutls, itself linked against libunistring.
> Romain and I have already identified an issue in gnutls .pc file while
> investigating a ffmpeg build failure. It might be the same issue here.
>
Indeed, see ffmpeg build issue [1].
gnutls.pc contain the full path to libunistring library which trigger an issue
when compiling with "gcc -c" (Compile and assemble, but do not link). When
compiling with "gcc -c", a full path is not accepted, while -lfoo is.
gnutls.pc for static libraries build:
Libs.private: -lintl -lgmp [...]sysroot/usr/lib/libunistring.a
gnutls.pc for shared libraries build:
Libs.private: -lgmp [...]/sysroot/usr/lib/libunistring.so
That's because gnutls use AC_LIB_HAVE_LINKFLAGS [2] witch return the full
library path in LIBUNISTRING. If LTLIBUNISTRING is used in gnutls.pc.in then the
issue is "fixed":
Libs.private: -lintl -lgmp -lunistring
But it's probably a hack...
We don't have a problem with zlib since gnutls build system use zlib.pc thanks
to pkg-config (otherwise we have the same issue with zlib...).
For LIBINTL the AM_GNU_GETTEXT macro is used and return LIBINTL='-lintl'.
GMP_LIBS is set from LIBGNUTLS_HOOKS (m4/hooks.m4) which use AC_CHECK_LIB and
return -lgmp.
The remaining libraries LIBSOCKET, LIBNSL, LIBPTHREAD, LIB_SELECT, TSS_LIBS and
LIBIDN2_LIBS are empty.
We can't use PKG_CHECK_MODULES for libunistring since it doesn't provide a .pc
file. The remaining solution is AC_CHECK_LIB() instead of AC_LIB_HAVE_LINKFLAGS,
it could work since libunistring doesn't link with other libraries (-lunistring
is enough). But we have to do an "invasive" change in the build system.
So I would suggest s/LIBUNISTRING/LTLIBUNISTRING/ in gnutls.pc.
Also having a full path is a .pc file is a problem for relocatable SDK [3] if
you move your HOST_DIR (which contain the STAGING_DIR).
Best regards,
Romain
[1]
http://autobuild.buildroot.net/results/6cf/6cf90177a444882ad37017bccf41dea6bf752d31/ffmpeg-3.3.1/config.log
[2]
https://www.gnu.org/software/gnulib/manual/html_node/Searching-for-Libraries.html
[3] http://lists.busybox.net/pipermail/buildroot/2017-March/187695.html
>
> Best regards,
>
> Thomas
>
^ permalink raw reply
* [Buildroot] [RFC] package/gnutls: Don't use a full library path in gnutls.pc
From: Romain Naour @ 2017-05-20 10:40 UTC (permalink / raw)
To: buildroot
Reported upstream [1].
Fixes:
[ffmpeg] http://autobuild.buildroot.net/results/6cf/6cf90177a444882ad37017bccf41dea6bf752d31
[taskd] http://autobuild.buildroot.net/results/b8c18a2cc5e7170695c273e8017a4771096167b6
[1] https://gitlab.com/gnutls/gnutls/issues/203
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...use-LTLIBUNISTRING-instead-of-LIBUNISTRIN.patch | 72 ++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 package/gnutls/0001-gnutils.pc-use-LTLIBUNISTRING-instead-of-LIBUNISTRIN.patch
diff --git a/package/gnutls/0001-gnutils.pc-use-LTLIBUNISTRING-instead-of-LIBUNISTRIN.patch b/package/gnutls/0001-gnutils.pc-use-LTLIBUNISTRING-instead-of-LIBUNISTRIN.patch
new file mode 100644
index 0000000..d171932
--- /dev/null
+++ b/package/gnutls/0001-gnutils.pc-use-LTLIBUNISTRING-instead-of-LIBUNISTRIN.patch
@@ -0,0 +1,72 @@
+From c029ca6fdcde628b1631d6e09a07116169f27ef4 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 19 May 2017 21:39:07 +0200
+Subject: [PATCH] gnutils.pc: use LTLIBUNISTRING instead of LIBUNISTRING.
+
+gnutls.pc contain the full path to libunistring library which trigger
+an issue when compiling with "gcc -c" (Compile and assemble, but do not
+link). When compiling with "gcc -c", a full path is not accepted, while
+-lfoo is.
+
+gnutls.pc for static libraries build:
+Libs.private: -lintl -lgmp [...]sysroot/usr/lib/libunistring.a
+
+gnutls.pc for shared libraries build:
+Libs.private: -lgmp [...]/sysroot/usr/lib/libunistring.so
+
+That's because gnutls use AC_LIB_HAVE_LINKFLAGS [2] witch return the
+full library path in LIBUNISTRING. If LTLIBUNISTRING is used in
+gnutls.pc.in then the issue is "fixed":
+
+Libs.private: -lintl -lgmp -lunistring
+
+But it's probably a hack...
+
+We don't have a problem with zlib since gnutls build system use zlib.pc
+thanks to pkg-config (otherwise we have the same issue with zlib...).
+
+For LIBINTL the AM_GNU_GETTEXT macro is used and return
+LIBINTL='-lintl'.
+GMP_LIBS is set from LIBGNUTLS_HOOKS (m4/hooks.m4) which use
+AC_CHECK_LIB and return -lgmp.
+
+The remaining libraries LIBSOCKET, LIBNSL, LIBPTHREAD, LIB_SELECT,
+TSS_LIBS and LIBIDN2_LIBS are empty.
+
+We can't use PKG_CHECK_MODULES for libunistring since it doesn't
+provide a .pc file. The remaining solution is AC_CHECK_LIB() instead of
+AC_LIB_HAVE_LINKFLAGS, it could work since libunistring doesn't link
+with other libraries (-lunistring is enough). But we have to do an
+"invasive" change in the build system.
+
+Reported upstream [4].
+
+Fixes:
+[ffmpeg] http://autobuild.buildroot.net/results/6cf/6cf90177a444882ad37017bccf41dea6bf752d31
+[taskd] http://autobuild.buildroot.net/results/b8c18a2cc5e7170695c273e8017a4771096167b6
+
+[1] http://autobuild.buildroot.net/results/6cf/6cf90177a444882ad37017bccf41dea6bf752d31/ffmpeg-3.3.1/config.log
+[2] https://www.gnu.org/software/gnulib/manual/html_node/Searching-for-Libraries.html
+[3] http://lists.busybox.net/pipermail/buildroot/2017-March/187695.html
+[4] https://gitlab.com/gnutls/gnutls/issues/203
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ lib/gnutls.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
+index f656d12..0ca3558 100644
+--- a/lib/gnutls.pc.in
++++ b/lib/gnutls.pc.in
+@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
+ URL: http://www.gnutls.org/
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@
++Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ @LIBIDN2_LIBS@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+--
+2.9.4
+
--
2.9.4
^ permalink raw reply related
* [Buildroot] [PATCH] orangepi: add basic support for orangepi-zero board
From: Sergey Matyukevich @ 2017-05-20 13:31 UTC (permalink / raw)
To: buildroot
Board support package includes the following components:
- mainline kernel v4.11
- mainline u-boot v2017.03
- extra kernel config options and dts patches to enable SPI NOR and spidev
More details about this board are available here:
- http://linux-sunxi.org/Orange_Pi_Zero
Note that at the moment networking is not supported right out of the box.
Ethernet submission to mainline kernel is a work in progress, see the
latest dwmac-sun8i branches at https://github.com/montjoie/linux
On-board SDIO WiFi chip XR819 is supported by off-the-tree wireless
driver available at https://github.com/fifteenhex/xradio
Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
board/orangepi/orangepi-zero/boot.cmd | 8 +++++
board/orangepi/orangepi-zero/genimage.cfg | 36 +++++++++++++++++++
| 17 +++++++++
...orange-pi-zero-interrupt-triggering-xr819.patch | 32 +++++++++++++++++
...002-ARM-dts-orange-pi-zero-enable-spi-nor.patch | 42 ++++++++++++++++++++++
...0003-ARM-dts-orange-pi-zero-enable-spidev.patch | 42 ++++++++++++++++++++++
board/orangepi/orangepi-zero/post-build.sh | 1 +
board/orangepi/orangepi-zero/post-image.sh | 1 +
board/orangepi/orangepi-zero/readme.txt | 29 +++++++++++++++
configs/orangepi_zero_defconfig | 42 ++++++++++++++++++++++
10 files changed, 250 insertions(+)
create mode 100644 board/orangepi/orangepi-zero/boot.cmd
create mode 100644 board/orangepi/orangepi-zero/genimage.cfg
create mode 100644 board/orangepi/orangepi-zero/linux-extras.config
create mode 100644 board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
create mode 100644 board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
create mode 100644 board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
create mode 120000 board/orangepi/orangepi-zero/post-build.sh
create mode 120000 board/orangepi/orangepi-zero/post-image.sh
create mode 100644 board/orangepi/orangepi-zero/readme.txt
create mode 100644 configs/orangepi_zero_defconfig
diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd
new file mode 100644
index 000000000..44f0885ff
--- /dev/null
+++ b/board/orangepi/orangepi-zero/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg
new file mode 100644
index 000000000..bc8601cbb
--- /dev/null
+++ b/board/orangepi/orangepi-zero/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the OrangePi PC
+#
+image boot.vfat {
+ vfat {
+ files = {
+ "zImage",
+ "sun8i-h2-plus-orangepi-zero.dtb",
+ "boot.scr"
+ }
+ }
+ size = 10M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "u-boot-sunxi-with-spl.bin"
+ offset = 8192
+ size = 1040384 # 1MB - 8192
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ size = 512M
+ }
+}
--git a/board/orangepi/orangepi-zero/linux-extras.config b/board/orangepi/orangepi-zero/linux-extras.config
new file mode 100644
index 000000000..fe00af5ef
--- /dev/null
+++ b/board/orangepi/orangepi-zero/linux-extras.config
@@ -0,0 +1,17 @@
+# spidev
+CONFIG_SPI_SPIDEV=y
+
+# spi nor
+CONFIG_MTD=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_M25P80=y
+
+# wireless core
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_CFG80211_WEXT=y
+
+# wireless drivers
+CONFIG_WLAN=y
diff --git a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
new file mode 100644
index 000000000..0101e137e
--- /dev/null
+++ b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
@@ -0,0 +1,32 @@
+From d06068f474e029bbde7348108c509cc63d6aa196 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Fri, 19 May 2017 23:39:48 +0300
+Subject: [PATCH 1/2] ARM: dts: orange-pi-zero: interrupt triggering for XR819
+ WiFi chip
+
+Specify interrupt triggering for XR819 SDIO WiFi chip
+on orange-pi-zero board.
+
+For more details see: http://linux-sunxi.org/Wifi#Allwinner
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index b7ca916d871d..6510d22deed3 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -125,6 +125,8 @@
+ */
+ xr819: sdio_wifi at 1 {
+ reg = <1>;
++ interrupt-parent = <&pio>;
++ interrupts = <6 10 IRQ_TYPE_EDGE_RISING>;
+ };
+ };
+
+--
+2.11.0
+
diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
new file mode 100644
index 000000000..0fb9f4bc8
--- /dev/null
+++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
@@ -0,0 +1,42 @@
+From f6ea4149cb1093a32a574a12496cbdbf3adbff93 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Sat, 20 May 2017 11:24:26 +0300
+Subject: [PATCH 2/2] ARM: dts: orange-pi-zero: enable SPI NOR
+
+Enable SPI NOR on orange-pi-zero board.
+
+For more information see:
+- http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index 6510d22deed3..119f529e6d22 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -160,3 +160,19 @@
+ /* USB VBUS is always on */
+ status = "okay";
+ };
++
++&spi0 {
++ status = "okay";
++
++ flash at 0 {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "mxicy,mx25l1606e", "winbond,w25q128";
++ reg = <0>;
++ spi-max-frequency = <40000000>;
++
++ partition at 00000000 {
++ reg = <0x00000000 0x200000>; /* 2Mb */
++ };
++ };
++};
+--
+2.11.0
+
diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
new file mode 100644
index 000000000..d29c406b6
--- /dev/null
+++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
@@ -0,0 +1,42 @@
+From 5487218257a40c24aa0960f323ccfbd3793ab560 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Sat, 20 May 2017 15:36:51 +0300
+Subject: [PATCH 3/3] ARM: dts: orange-pi-zero: enable spidev
+
+On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port.
+This patch enables spidev driver for SPI1.
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index 119f529e6d22..da83d92201df 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -59,6 +59,7 @@
+ serial0 = &uart0;
+ /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
+ ethernet1 = &xr819;
++ spi1 = &spi1;
+ };
+
+ chosen {
+@@ -176,3 +177,13 @@
+ };
+ };
+ };
++
++&spi1 {
++ status = "okay";
++
++ spidev at 0 {
++ compatible = "rohm,dh2228fv";
++ reg = <0>;
++ spi-max-frequency = <10000000>;
++ };
++};
+--
+2.11.0
+
diff --git a/board/orangepi/orangepi-zero/post-build.sh b/board/orangepi/orangepi-zero/post-build.sh
new file mode 120000
index 000000000..cd7f11645
--- /dev/null
+++ b/board/orangepi/orangepi-zero/post-build.sh
@@ -0,0 +1 @@
+../post-build.sh
\ No newline at end of file
diff --git a/board/orangepi/orangepi-zero/post-image.sh b/board/orangepi/orangepi-zero/post-image.sh
new file mode 120000
index 000000000..ae6294fa3
--- /dev/null
+++ b/board/orangepi/orangepi-zero/post-image.sh
@@ -0,0 +1 @@
+../post-image.sh
\ No newline at end of file
diff --git a/board/orangepi/orangepi-zero/readme.txt b/board/orangepi/orangepi-zero/readme.txt
new file mode 100644
index 000000000..1afdbb784
--- /dev/null
+++ b/board/orangepi/orangepi-zero/readme.txt
@@ -0,0 +1,29 @@
+OrangePi Zero
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the OrangePi Zero. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+ $ make orangepi_zero_defconfig
+
+Compile everything and build the SD card image:
+
+ $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+ $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
new file mode 100644
index 000000000..e023af448
--- /dev/null
+++ b/configs/orangepi_zero_defconfig
@@ -0,0 +1,42 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-zero/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-zero/post-image.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.03"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+
+# wireless support
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+
+# spi flash support
+BR2_PACKAGE_MTD=y
--
2.11.0
^ permalink raw reply related
* [Buildroot] [for-next,2/3] package/gcc: add support for gcc 7
From: Theodore Ateba @ 2017-05-20 13:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170513113732.8154-2-romain.naour@gmail.com>
Tested-by: Theodore Ateba, tf.ateba at gmail.com
To test ggc7 I made the following tasks:
1) Build test:
- Build a Buildroot toolchain with gcc7.1.0 and uClibc-ng.1.0.24 and a
distribution for Beaglebone Black board on x86_64 PC.
- I had an conflict when applying the patch
http://patchwork.ozlabs.org/patch/761980/ , it was resolve by making the
following modification in the patch: ararc-2017.03-rc1 by arc-2017.03-rc2
2) Run time test on the BleagleBone Black:
- I made an sdCard with the generated image and boot the linux
distribution on the target board.
- I also made an hello world program, compile it with the cross-tool
chain generated with buuildroot.
- Run the hello world program on the Beaglebone black board.
I have also add the configuration used when testing the patch.
Thanks.
On 05/13/2017 01:37 PM, Romain Naour wrote:
> Remove upstream patches:
>
> 831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
>
> 870-xtensa-Fix-PR-target-78118.patch
>
> 871-xtensa-Fix-PR-target-78603.patch
>
> 890-fix-m68k-compile.patch:
> https://github.com/gcc-mirror/gcc/commit/1701058da920d27de87dc82e8d327b8ca930e997
>
> 892-libgcc-mkmap-symver-support-skip_underscore.patch:
> https://github.com/gcc-mirror/gcc/commit/6c8f362e1f17cce05131eb8ff53963d64bc69484
>
> 893-libgcc-config-bfin-use-the-generic-linker-version-in.patch:
> https://github.com/gcc-mirror/gcc/commit/966d046c08ba50fc988ac614f84f2d49c1546e28
>
> 894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch:
> https://github.com/gcc-mirror/gcc/commit/397d0e43abb943f1fe57801220e7e46bc6636c7c
>
> 895-bfin-define-REENTRANT.patch:
> https://github.com/gcc-mirror/gcc/commit/da89a4dcdf75bc3134f73520535c949bbbb0c845
>
> 940-uclinux-enable-threads.patch:
> https://github.com/gcc-mirror/gcc/commit/b9ce54109ec78d18f6123a1e54aae1293bede716
>
> 941-mips-Add-support-for-mips-r6-musl.patch:
> https://github.com/gcc-mirror/gcc/commit/83717065090bb8b954556d1216dd9dc397dc0243
>
> Remove obsolete patches:
>
> 301-missing-execinfo_h.patch: boehm-gc removed from gcc sources:
> https://github.com/gcc-mirror/gcc/commit/baf71228766058f5541d929891237d394376c975
>
> 830-arm_unbreak_armv4t.patch: SUBTARGET_CPU_DEFAULT removed:
> https://github.com/gcc-mirror/gcc/commit/ff3caa3ade14a42d5ab7e81cbd3605fe15aa998d
>
> Add a new patch to allow to build gcc 7.1 without extracting gcc/testsuite
> directory.
>
> This new gcc version require a kernel patch [1] to avoid a build issue with
> ____ilog2_NaN symbol. The following kernel version contain contain already
> this patch :
> 4.11, 4.10.6, 4.9.18, 4.4.57, 3.18.50 and 3.12.73.
>
> To build a toolchain based on gcc 7 and uClibc-ng 1.0.24, the patch [2] is
> required to avoid a build issue due to missing aligned_alloc() definition.
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=474c90156c8dcc2fa815e6716cc9394d7930cb9c
> [2] https://cgit.openadk.org/cgi/cgit/uclibc-ng.git/commit/?id=5b0f49037e8ea8500b05c8f31ee88529ccac4cee
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Waldemar Brodkorb <wbx@openadk.org>
> ---
>
> Build tested with glibc, musl and uClibc-ng.
>
> Runtime tested with uClibc-ng (1.0.24) on x86_64 PC target.
> ---
> package/gcc/7.1.0/0100-uclibc-conf.patch | 29 ++++++
> package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch | 45 +++++++++
> .../7.1.0/0860-cilk-fix-build-without-wchar.patch | 64 ++++++++++++
> package/gcc/7.1.0/0891-fix-m68k-uclinux.patch | 30 ++++++
> package/gcc/7.1.0/0900-remove-selftests.patch | 111 +++++++++++++++++++++
> package/gcc/Config.in.host | 11 ++
> package/gcc/gcc.hash | 2 +
> toolchain/toolchain-common.in | 5 +
> 8 files changed, 297 insertions(+)
> create mode 100644 package/gcc/7.1.0/0100-uclibc-conf.patch
> create mode 100644 package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch
> create mode 100644 package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch
> create mode 100644 package/gcc/7.1.0/0891-fix-m68k-uclinux.patch
> create mode 100644 package/gcc/7.1.0/0900-remove-selftests.patch
>
> diff --git a/package/gcc/7.1.0/0100-uclibc-conf.patch b/package/gcc/7.1.0/0100-uclibc-conf.patch
> new file mode 100644
> index 0000000..d354baf
> --- /dev/null
> +++ b/package/gcc/7.1.0/0100-uclibc-conf.patch
> @@ -0,0 +1,29 @@
> +From 326b880b20e5f8187dbda736b4c4c662cbfb00ca Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +Date: Tue, 2 May 2017 22:36:15 +0200
> +Subject: [PATCH] uclibc-conf
> +
> +[Romain: convert to git patch]
> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +---
> + contrib/regression/objs-gcc.sh | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
> +index 60b0497..6dc7ead 100755
> +--- a/contrib/regression/objs-gcc.sh
> ++++ b/contrib/regression/objs-gcc.sh
> +@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ]
> + then
> + make all-gdb all-dejagnu all-ld || exit 1
> + make install-gdb install-dejagnu install-ld || exit 1
> ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
> ++ then
> ++ make all-gdb all-dejagnu all-ld || exit 1
> ++ make install-gdb install-dejagnu install-ld || exit 1
> + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
> + make bootstrap || exit 1
> + make install || exit 1
> +--
> +2.9.3
> +
> diff --git a/package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch b/package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch
> new file mode 100644
> index 0000000..63880dd
> --- /dev/null
> +++ b/package/gcc/7.1.0/0810-arm-softfloat-libgcc.patch
> @@ -0,0 +1,45 @@
> +From 420a304ac0daa29d66da6ed5b0b49fc4c482d522 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +Date: Tue, 2 May 2017 22:46:18 +0200
> +Subject: [PATCH] arm softfloat libgcc
> +
> +[Romain: convert to git patch]
> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +---
> + gcc/config/arm/linux-elf.h | 2 +-
> + libgcc/config/arm/t-linux | 7 ++++++-
> + 2 files changed, 7 insertions(+), 2 deletions(-)
> +
> +diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
> +index 3d62367..dad0b97 100644
> +--- a/gcc/config/arm/linux-elf.h
> ++++ b/gcc/config/arm/linux-elf.h
> +@@ -58,7 +58,7 @@
> + %{shared:-lc} \
> + %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
> +
> +-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
> ++#define LIBGCC_SPEC "-lgcc"
> +
> + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
> +
> +diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux
> +index 3d520de..e7bc042 100644
> +--- a/libgcc/config/arm/t-linux
> ++++ b/libgcc/config/arm/t-linux
> +@@ -1,6 +1,11 @@
> + LIB1ASMSRC = arm/lib1funcs.S
> + LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
> +- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3
> ++ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
> ++ _arm_addsubdf3 _arm_addsubsf3 \
> ++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
> ++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
> ++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
> ++ _arm_fixsfsi _arm_fixunssfsi
> +
> + # Just for these, we omit the frame pointer since it makes such a big
> + # difference.
> +--
> +2.9.3
> +
> diff --git a/package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch b/package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch
> new file mode 100644
> index 0000000..61ab01c
> --- /dev/null
> +++ b/package/gcc/7.1.0/0860-cilk-fix-build-without-wchar.patch
> @@ -0,0 +1,64 @@
> +From 714739e69ead1d9823233af40645277f6d4633ea Mon Sep 17 00:00:00 2001
> +From: Peter Korsgaard <peter@korsgaard.com>
> +Date: Tue, 2 May 2017 23:21:46 +0200
> +Subject: [PATCH] cilk: fix build without wchar
> +
> +When building against uClibc with wchar support disabled, WCHAR_MIN and
> +WCHAR_MAX are not defined leading to compilation errors.
> +
> +Fix it by only including the wchar code if available.
> +
> +Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> +[Romain: convert to git patch]
> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +---
> + libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++
> + 1 file changed, 8 insertions(+)
> +
> +diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h
> +index 641aa82..4f8e010 100644
> +--- a/libcilkrts/include/cilk/reducer_min_max.h
> ++++ b/libcilkrts/include/cilk/reducer_min_max.h
> +@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C
> + CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN)
> + CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0)
> + CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN)
> ++#ifdef WCHAR_MIN
> + CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN)
> ++#endif
> + CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN)
> + CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0)
> + CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN)
> +@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN)
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0)
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN)
> ++#ifdef WCHAR_MIN
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN)
> ++#endif
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN)
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0)
> + CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN)
> +@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C
> + CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX)
> + CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX)
> + CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX)
> ++#ifdef WCHAR_MAX
> + CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX)
> ++#endif
> + CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX)
> + CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX)
> + CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX)
> +@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX)
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX)
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX)
> ++#ifdef WCHAR_MAX
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX)
> ++#endif
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX)
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX)
> + CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX)
> +--
> +2.9.3
> +
> diff --git a/package/gcc/7.1.0/0891-fix-m68k-uclinux.patch b/package/gcc/7.1.0/0891-fix-m68k-uclinux.patch
> new file mode 100644
> index 0000000..e84fd92
> --- /dev/null
> +++ b/package/gcc/7.1.0/0891-fix-m68k-uclinux.patch
> @@ -0,0 +1,30 @@
> +From c2773170a1b0e2728f71f2275a99fd177ba2cef4 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +Date: Tue, 2 May 2017 23:25:17 +0200
> +Subject: [PATCH] fix m68k uclinux avoids internal compiler error while
> + compiling linux-atomic.c See here:
> + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
> +
> +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> +[Romain: convert to git patch]
> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +---
> + libgcc/config.host | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/libgcc/config.host b/libgcc/config.host
> +index b279a64..04fe183 100644
> +--- a/libgcc/config.host
> ++++ b/libgcc/config.host
> +@@ -820,7 +820,7 @@ m68k*-*-netbsdelf*)
> + m68k*-*-openbsd*)
> + ;;
> + m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc
> +- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
> ++ tmake_file="$tmake_file m68k/t-floatlib"
> + md_unwind_header=m68k/linux-unwind.h
> + ;;
> + m68k-*-linux*) # Motorola m68k's running GNU/Linux
> +--
> +2.9.3
> +
> diff --git a/package/gcc/7.1.0/0900-remove-selftests.patch b/package/gcc/7.1.0/0900-remove-selftests.patch
> new file mode 100644
> index 0000000..a3bc7a5
> --- /dev/null
> +++ b/package/gcc/7.1.0/0900-remove-selftests.patch
> @@ -0,0 +1,111 @@
> +From 63f0917d90eb83d267dc517fdfb6523a74b1917c Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +Date: Wed, 3 May 2017 00:37:06 +0200
> +Subject: [PATCH] remove selftests
> +
> +When the gcc archive is extracted by the gcc.mk, the gcc/testsuite
> +is excluded:
> +
> +HOST_GCC_EXCLUDES = \
> + libjava/* libgo/* \
> + gcc/testsuite/* libstdc++-v3/testsuite/*
> +
> +The new Makefile target from the "Selftest framework" [1] added a dependency
> +on the gcc/testsuite/Makefile.
> +Revert partially the commit [1] to allow building gcc without selftest.
> +
> +[1] https://github.com/gcc-mirror/gcc/commit/99b4f3a2d5bf2c137de9731e27b483eb6b462fd9
> +
> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +---
> + gcc/Makefile.in | 46 +++++-----------------------------------------
> + 1 file changed, 5 insertions(+), 41 deletions(-)
> +
> +diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> +index 74d1912..652a554 100644
> +--- a/gcc/Makefile.in
> ++++ b/gcc/Makefile.in
> +@@ -1581,14 +1581,13 @@ OBJS = \
> + OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \
> + edit-context.o \
> + pretty-print.o intl.o \
> +- vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \
> +- selftest.o
> ++ vec.o input.o version.o hash-table.o ggc-none.o memory-block.o
> +
> + # Objects in libcommon-target.a, used by drivers and by the core
> + # compiler and containing target-dependent code.
> + OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \
> + opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \
> +- hash-table.o file-find.o spellcheck.o selftest.o
> ++ hash-table.o file-find.o spellcheck.o
> +
> + # This lists all host objects for the front ends.
> + ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
> +@@ -1865,10 +1864,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc
> + quickstrap: all
> + cd $(toplevel_builddir) && $(MAKE) all-target-libgcc
> +
> +-all.internal: start.encap rest.encap doc selftest
> ++all.internal: start.encap rest.encap doc
> + # This is what to compile if making a cross-compiler.
> + all.cross: native gcc-cross$(exeext) cpp$(exeext) specs \
> +- libgcc-support lang.all.cross doc selftest @GENINSRC@ srcextra
> ++ libgcc-support lang.all.cross doc @GENINSRC@ srcextra
> + # This is what must be made before installing GCC and converting libraries.
> + start.encap: native xgcc$(exeext) cpp$(exeext) specs \
> + libgcc-support lang.start.encap @GENINSRC@ srcextra
> +@@ -1888,41 +1887,6 @@ endif
> + # This does the things that can't be done on the host machine.
> + rest.cross: specs
> +
> +-# GCC's selftests.
> +-# Specify a dummy input file to placate the driver.
> +-# Specify -nostdinc to work around missing WIND_BASE environment variable
> +-# required for *-wrs-vxworks-* targets.
> +-# Specify -o /dev/null so the output of -S is discarded. More importantly
> +-# It does not try to create a file with the name "null.s" on POSIX and
> +-# "nul.s" on Windows. Because on Windows "nul" is a reserved file name.
> +-# Specify the path to gcc/testsuite/selftests within the srcdir
> +-# as an argument to -fself-test.
> +-SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -o /dev/null \
> +- -fself-test=$(srcdir)/testsuite/selftests
> +-
> +-# Run the selftests during the build once we have a driver and a cc1,
> +-# so that self-test failures are caught as early as possible.
> +-# Use "s-selftest" to ensure that we only run the selftests if the
> +-# driver, cc1, or selftest data change.
> +-.PHONY: selftest
> +-selftest: s-selftest
> +-s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs \
> +- $(srcdir)/testsuite/selftests
> +- $(GCC_FOR_TARGET) $(SELFTEST_FLAGS)
> +- $(STAMP) $@
> +-
> +-# Convenience method for running selftests under gdb:
> +-.PHONY: selftest-gdb
> +-selftest-gdb: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs
> +- $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \
> +- -wrapper gdb,--args
> +-
> +-# Convenience method for running selftests under valgrind:
> +-.PHONY: selftest-valgrind
> +-selftest-valgrind: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs
> +- $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \
> +- -wrapper valgrind,--leak-check=full
> +-
> + # Recompile all the language-independent object files.
> + # This is used only if the user explicitly asks for it.
> + compilations: $(BACKEND)
> +@@ -2076,7 +2040,7 @@ gcc-nm.c: gcc-ar.c
> + cp $^ $@
> +
> + COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \
> +- collect-utils.o file-find.o hash-table.o selftest.o
> ++ collect-utils.o file-find.o hash-table.o
> + COLLECT2_LIBS = @COLLECT2_LIBS@
> + collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS)
> + # Don't try modifying collect2 (aka ld) in place--it might be linking this.
> +--
> +2.9.3
> +
> diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
> index 4bcb23e..f1c2faf 100644
> --- a/package/gcc/Config.in.host
> +++ b/package/gcc/Config.in.host
> @@ -87,6 +87,16 @@ config BR2_GCC_VERSION_6_X
> depends on !BR2_mips_m6250 && !BR2_mips_p6600
> select BR2_TOOLCHAIN_GCC_AT_LEAST_6
>
> +config BR2_GCC_VERSION_7_X
> + bool "gcc 7.x"
> + # Broken or unsupported architectures
> + depends on !BR2_arc
> + depends on !BR2_microblaze
> + depends on !BR2_or1k
> + # Unsupported MIPS cores
> + depends on !BR2_mips_m6250 && !BR2_mips_p6600
> + select BR2_TOOLCHAIN_GCC_AT_LEAST_7
> +
> endchoice
>
> # Indicates if GCC for architecture supports --with-{arch,cpu,..} to
> @@ -106,6 +116,7 @@ config BR2_GCC_VERSION
> default "4.9.4" if BR2_GCC_VERSION_4_9_X
> default "5.4.0" if BR2_GCC_VERSION_5_X
> default "6.3.0" if BR2_GCC_VERSION_6_X
> + default "7.1.0" if BR2_GCC_VERSION_7_X
> default "arc-2017.03-rc1" if BR2_GCC_VERSION_ARC
> default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
>
> diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
> index 052a825..7255d12 100644
> --- a/package/gcc/gcc.hash
> +++ b/package/gcc/gcc.hash
> @@ -10,6 +10,8 @@ sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683
> sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b gcc-5.4.0.tar.bz2
> # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum
> sha512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 gcc-6.3.0.tar.bz2
> +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.1.0/sha512.sum
> +sha512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec gcc-7.1.0.tar.bz2
>
> # Locally calculated (fetched from Github)
> sha512 e4fe5a179b8feabf932a8a6f4794ff6907b868a65487412d855a4b3671aa24ec8544a44f3b63e69ea2c12fcd4d8028d0619d40bf016ee7c1a5b5a99aa9315ef3 gcc-arc-2017.03-rc1.tar.gz
> diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
> index 76c0e7c..d670f44 100644
> --- a/toolchain/toolchain-common.in
> +++ b/toolchain/toolchain-common.in
> @@ -320,10 +320,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_6
> bool
> select BR2_TOOLCHAIN_GCC_AT_LEAST_5
>
> +config BR2_TOOLCHAIN_GCC_AT_LEAST_7
> + bool
> + select BR2_TOOLCHAIN_GCC_AT_LEAST_6
> +
> # This order guarantees that the highest version is set, as kconfig
> # stops affecting a value on the first matching default.
> config BR2_TOOLCHAIN_GCC_AT_LEAST
> string
> + default "7" if BR2_TOOLCHAIN_GCC_AT_LEAST_7
> default "6" if BR2_TOOLCHAIN_GCC_AT_LEAST_6
> default "5" if BR2_TOOLCHAIN_GCC_AT_LEAST_5
> default "4.9" if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170520/ec8bce05/attachment.html>
-------------- next part --------------
BR2_arm=y
BR2_cortex_a8=y
BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
BR2_GCC_VERSION_7_X=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="adde2ca9f86797071f6e7b2b9e779fa5e4a8f3cd"
BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk"
BR2_PACKAGE_DROPBEAR=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm"
BR2_TARGET_UBOOT_NEEDS_DTC=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin"
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="MLO"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
^ permalink raw reply
* [Buildroot] [git commit branch/next] lxc: set libcap as an optional dependency
From: Thomas Petazzoni @ 2017-05-20 14:17 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=5f16c203185011548bf6dd036e344521a46e0307
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/lxc/Config.in | 1 -
package/lxc/lxc.hash | 1 +
package/lxc/lxc.mk | 13 ++++++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index c5c75ea..22aa813 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_LXC
# build system forcefully builds a shared library
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call
- select BR2_PACKAGE_LIBCAP
help
Linux Containers (LXC), provides the ability to group and isolate
of a set of processes in a jail by virtualizing and accounting the
diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash
index 086b139..801759a 100644
--- a/package/lxc/lxc.hash
+++ b/package/lxc/lxc.hash
@@ -1,2 +1,3 @@
# Locally calculated
sha256 0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494 lxc-2.0.8.tar.gz
+sha256 c79443c5db7e7defd53992d120cad2bc8afc2ff363b1e84ec31bc2b95ec5ca44 bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index 4ba6d9f..8a200e7 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -8,9 +8,13 @@ LXC_VERSION = 2.0.8
LXC_SITE = https://linuxcontainers.org/downloads/lxc
LXC_LICENSE = LGPL-2.1+
LXC_LICENSE_FILES = COPYING
-LXC_DEPENDENCIES = libcap host-pkgconf
+LXC_DEPENDENCIES = host-pkgconf
LXC_INSTALL_STAGING = YES
+# This patch fixes compilation without capabilities
+LXC_PATCH = \
+ https://github.com/lxc/lxc/commit/bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
+
LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
--disable-python --disable-werror \
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
@@ -22,6 +26,13 @@ else
LXC_CONF_OPTS += --disable-gnutls
endif
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+LXC_CONF_OPTS += --enable-capabilities
+LXC_DEPENDENCIES += libcap
+else
+LXC_CONF_OPTS += --disable-capabilities
+endif
+
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
LXC_CONF_OPTS += --enable-seccomp
LXC_DEPENDENCIES += libseccomp
^ permalink raw reply related
* [Buildroot] [git commit] lxc: set libcap as an optional dependency
From: Thomas Petazzoni @ 2017-05-20 14:17 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=5f16c203185011548bf6dd036e344521a46e0307
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/lxc/Config.in | 1 -
package/lxc/lxc.hash | 1 +
package/lxc/lxc.mk | 13 ++++++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index c5c75ea..22aa813 100644
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_LXC
# build system forcefully builds a shared library
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call
- select BR2_PACKAGE_LIBCAP
help
Linux Containers (LXC), provides the ability to group and isolate
of a set of processes in a jail by virtualizing and accounting the
diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash
index 086b139..801759a 100644
--- a/package/lxc/lxc.hash
+++ b/package/lxc/lxc.hash
@@ -1,2 +1,3 @@
# Locally calculated
sha256 0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494 lxc-2.0.8.tar.gz
+sha256 c79443c5db7e7defd53992d120cad2bc8afc2ff363b1e84ec31bc2b95ec5ca44 bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index 4ba6d9f..8a200e7 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -8,9 +8,13 @@ LXC_VERSION = 2.0.8
LXC_SITE = https://linuxcontainers.org/downloads/lxc
LXC_LICENSE = LGPL-2.1+
LXC_LICENSE_FILES = COPYING
-LXC_DEPENDENCIES = libcap host-pkgconf
+LXC_DEPENDENCIES = host-pkgconf
LXC_INSTALL_STAGING = YES
+# This patch fixes compilation without capabilities
+LXC_PATCH = \
+ https://github.com/lxc/lxc/commit/bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
+
LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
--disable-python --disable-werror \
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
@@ -22,6 +26,13 @@ else
LXC_CONF_OPTS += --disable-gnutls
endif
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+LXC_CONF_OPTS += --enable-capabilities
+LXC_DEPENDENCIES += libcap
+else
+LXC_CONF_OPTS += --disable-capabilities
+endif
+
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
LXC_CONF_OPTS += --enable-seccomp
LXC_DEPENDENCIES += libseccomp
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] linux-headers: bump 4.{4, 9, 10, 11}.x series
From: Peter Korsgaard @ 2017-05-20 15:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
| 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 014ae70b5..0c53416d9 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -227,8 +227,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "3.10.105" if BR2_KERNEL_HEADERS_3_10
default "3.12.74" if BR2_KERNEL_HEADERS_3_12
default "4.1.39" if BR2_KERNEL_HEADERS_4_1
- default "4.4.68" if BR2_KERNEL_HEADERS_4_4
- default "4.9.28" if BR2_KERNEL_HEADERS_4_9
- default "4.10.16" if BR2_KERNEL_HEADERS_4_10
- default "4.11.1" if BR2_KERNEL_HEADERS_4_11
+ default "4.4.69" if BR2_KERNEL_HEADERS_4_4
+ default "4.9.29" if BR2_KERNEL_HEADERS_4_9
+ default "4.10.17" if BR2_KERNEL_HEADERS_4_10
+ default "4.11.2" if BR2_KERNEL_HEADERS_4_11
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] linux: bump default version to 4.11.2
From: Peter Korsgaard @ 2017-05-20 15:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170520151007.15764-1-peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
linux/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 41545f778..9c4d1c846 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -26,7 +26,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
- bool "Latest version (4.11.1)"
+ bool "Latest version (4.11.2)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (v4.4.55-cip3)"
@@ -116,7 +116,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "4.11.1" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "4.11.2" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.55-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH] dropbear: security bump to version 2017.75
From: Peter Korsgaard @ 2017-05-20 15:15 UTC (permalink / raw)
To: buildroot
Fixes:
- CVE-2017-9078: A double-free in the server could be triggered by an
authenticated user if dropbear is running with -a (Allow connections to
forwarded ports from any host) This could potentially allow arbitrary code
execution as root by an authenticated user. Affects versions 2013.56 to
2016.74. Thanks to Mark Shepard for reporting the crash.
- CVE-2017-9079: Dropbear parsed authorized_keys as root, even if it were a
symlink. The fix is to switch to user permissions when opening
authorized_keys.
A user could symlink their ~/.ssh/authorized_keys to a root-owned file
they couldn't normally read. If they managed to get that file to contain
valid authorized_keys with command= options it might be possible to read
other contents of that file. This information disclosure is to an already
authenticated user. Thanks to Jann Horn of Google Project Zero for
reporting this.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/dropbear/dropbear.hash | 2 +-
package/dropbear/dropbear.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
index 88f3e6ed5..98776e717 100644
--- a/package/dropbear/dropbear.hash
+++ b/package/dropbear/dropbear.hash
@@ -1,2 +1,2 @@
# From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
-sha256 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891 dropbear-2016.74.tar.bz2
+sha256 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c dropbear-2017.75.tar.bz2
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index a4e227215..bf7f99d97 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DROPBEAR_VERSION = 2016.74
+DROPBEAR_VERSION = 2017.75
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] flex: remove disable-flex-binary-and-doc patch.
From: Adam Duskett @ 2017-05-20 15:17 UTC (permalink / raw)
To: buildroot
Currently the flex makefile blindly links flex++ to flex in
host/usr/bin, but because of the patch
0001-flex-disable-flex-binary-and-documentation.patch, this binary no
longer exists, so it's a invalid simlink to begin with.
Furthermore, host-checkpolicy requires host/usr/bin/flex to be present,
and will fail with a "host/usr/bin/flex: Command not found" error.
The patch itself says:
"Since we prevent the flex binary to be built, we also need to prevent
the documentation to be built, otherwise it will fail"
Since the flex binary needs to be built, this patch is no longer necessary.
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
...lex-disable-flex-binary-and-documentation.patch | 35 ----------------------
1 file changed, 35 deletions(-)
delete mode 100644 package/flex/0001-flex-disable-flex-binary-and-documentation.patch
diff --git a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch b/package/flex/0001-flex-disable-flex-binary-and-documentation.patch
deleted file mode 100644
index d035ef4..0000000
--- a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-flex: prevent flex binary to be built
-
-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:
-
-Making all in doc
-make[2]: Entering directory '/br/output/build/flex-2.6.4/doc'
-make[2]: *** No rule to make target '../src/flex', needed by 'flex.1'.
-Stop.
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
-diff -rup a/Makefile.in b/Makefile.in
---- a/Makefile.in 2017-05-06 15:49:09.000000000 +0100
-+++ b/Makefile.in 2017-05-10 14:35:20.152794902 +0100
-@@ -450,7 +450,6 @@ EXTRA_DIST = \
-
- SUBDIRS = \
- src \
-- doc \
- 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 \
--
2.9.3
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] checkpolicy: remove -lfl from LDLIBS patch.
From: Adam Duskett @ 2017-05-20 15:22 UTC (permalink / raw)
To: buildroot
from: https://patchwork.kernel.org/patch/9450549/
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.
The patch is slightly modified to remove the /checkpolicy path.
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
.../0001-checkpolicy-remove-lfl-from-LDLIBS.patch | 58 ++++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch
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
+
--
2.9.3
^ 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