[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-51-g7d0042cfb
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2019-05-10 15:58:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7d0042cfb712bbf24e7f51231ce973dfddafcabb (commit)
via 088a225f2f7e69a88989185b0a514b659742aa5a (commit)
from c69e2705eebb37ee152b0ce68686ca022af6408f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7d0042cfb712bbf24e7f51231ce973dfddafcabb
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri May 10 17:29:06 2019 +0200
[BUILDROOT] apf51_defconfig: update for BR2019.02
commit 088a225f2f7e69a88989185b0a514b659742aa5a
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri May 10 17:21:40 2019 +0200
[BUILDROOT] 2019.02: fixes libopenssl build with uclibc
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 32 +++++++++-------------
...armadeus-fixes-uclibc-build-with-ucontext.patch | 17 ++++++++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 1 +
3 files changed, 31 insertions(+), 19 deletions(-)
create mode 100644 patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 9d58e4c04..f11324fa4 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -9,13 +9,10 @@ BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.19.8"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_PTHREAD_DEBUG=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
BR2_TARGET_OPTIMIZATION="-Os -pipe"
BR2_TARGET_GENERIC_HOSTNAME="apf51"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
@@ -29,6 +26,16 @@ BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_FPGA_FIRMWARE=y
@@ -50,13 +57,11 @@ BR2_PACKAGE_FBV=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
BR2_PACKAGE_DBUS=y
-BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBXML2=y
-BR2_PACKAGE_BLUEZ3_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_NTP=y
@@ -65,16 +70,15 @@ BR2_PACKAGE_PPPD=y
BR2_PACKAGE_RPCBIND=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
BR2_PACKAGE_NANO=y
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
@@ -86,13 +90,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
BR2_TARGET_UBOOT_ENVIMAGE=y
BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
diff --git a/patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch b/patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
new file mode 100644
index 000000000..41bc00080
--- /dev/null
+++ b/patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
@@ -0,0 +1,17 @@
+Doesn't work with uclibc either... Even when it declare to have ucontext...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/libopenssl/libopenssl.mk
+===================================================================
+--- buildroot.orig/package/libopenssl/libopenssl.mk
++++ buildroot/package/libopenssl/libopenssl.mk
+@@ -45,7 +45,7 @@ endif
+ ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+ LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC
+ endif
+-ifeq ($(BR2_TOOLCHAIN_HAS_UCONTEXT),)
++ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+ LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC
+ endif
+
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 2f4595949..e1badf18d 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -56,6 +56,7 @@ rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
+rm -rf buildroot/package/libopenssl/libopenssl.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
hooks/post-receive
--
armadeus
|