[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-698-gbf65ff6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-698-gbf65ff6
|
From: Julien B a. A. <ar...@us...> - 2015-04-14 15:45:49
|
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 bf65ff6e0b4488bc52b2400a4d1810084099f205 (commit)
from f6d76ce1c20457bdb146a0d730751f4607d7a397 (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 bf65ff6e0b4488bc52b2400a4d1810084099f205
Author: Julien Boibessot <jul...@ar...>
Date: Tue Apr 14 17:44:42 2015 +0200
[BUILDROOT] APF6legacy: add a config to build a mediacenter with kodi
-----------------------------------------------------------------------
Summary of changes:
...xenomai_defconfig => apf6mediacenter_defconfig} | 24 +++---
.../armadeus/apf6/apf6legacy-linux-3.10.config | 1 +
...35-armadeus-kodi-fixes-install-with-glibc.patch | 29 +++++++
...-armadeus-kodi-use-imx-vpu-when-available.patch | 44 +++++++++++
...ling-gconv-libs-with-multi-arch-toolchain.patch | 80 ++++++++++++++++++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 3 +
6 files changed, 169 insertions(+), 12 deletions(-)
copy buildroot/configs/{apf6xenomai_defconfig => apf6mediacenter_defconfig} (80%)
create mode 100644 patches/buildroot/2015.02/035-armadeus-kodi-fixes-install-with-glibc.patch
create mode 100644 patches/buildroot/2015.02/036-armadeus-kodi-use-imx-vpu-when-available.patch
create mode 100644 patches/buildroot/2015.02/037-buildroot-toolchain-fix-installing-gconv-libs-with-multi-arch-toolchain.patch
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6mediacenter_defconfig
similarity index 80%
copy from buildroot/configs/apf6xenomai_defconfig
copy to buildroot/configs/apf6mediacenter_defconfig
index 0a66c83..90a91de 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -22,25 +22,23 @@ BR2_CPU_NAME="imx6"
BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.32"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/wandboard-org/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="wandboard_imx_3.10.31_1.1.0_beta2"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/3.10.mx6_legacy"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf6xenomai-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf6legacy-linux-3.10.config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-wandboard imx6dl-apf6dev imx6q-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev imx6q-wandboard imx6dl-wandboard"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
-BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.10.32-arm-7.patch"
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_LTRACE=y
-BR2_PACKAGE_RAMSMP=y
-BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_KODI=y
+BR2_PACKAGE_KODI_LIBNFS=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -54,14 +52,17 @@ BR2_PACKAGE_FBV=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
+BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31=y
+BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_USBUTILS=y
BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_LIBFSLVPUWRAP=y
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -72,7 +73,6 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_XENOMAI_VERSION="2.6.3"
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index 51b987b..4af03b7 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -225,6 +225,7 @@ CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_IMX_SGTL5000=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_HDMI=y
+CONFIG_HID_MULTITOUCH=y
CONFIG_USB=y
CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
diff --git a/patches/buildroot/2015.02/035-armadeus-kodi-fixes-install-with-glibc.patch b/patches/buildroot/2015.02/035-armadeus-kodi-fixes-install-with-glibc.patch
new file mode 100644
index 0000000..1c8100a
--- /dev/null
+++ b/patches/buildroot/2015.02/035-armadeus-kodi-fixes-install-with-glibc.patch
@@ -0,0 +1,29 @@
+From 48a717343deabbf9aa8b09f0c2b6944bcb5a81d9 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Mon, 09 Mar 2015 12:38:38 +0000
+Subject: package/kodi: enable gconv libraries on glibc configurations
+
+When a glibc toolchain is used, Kodi really requires the gconv
+libraries to be installed, otherwise no text is rendered in the GUI.
+
+[Thomas: slightly improve commit message.]
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Reviewed-by: "Yann E. MORIN" <yan...@fr...>
+Tested-by: "Maxime Hadjinlian" <max...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+diff --git a/package/kodi/Config.in b/package/kodi/Config.in
+index a0cbb18..88d1109 100644
+--- a/package/kodi/Config.in
++++ b/package/kodi/Config.in
+@@ -91,6 +91,7 @@ menuconfig BR2_PACKAGE_KODI
+ select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver
+ select BR2_PACKAGE_YAJL
+ select BR2_PACKAGE_ZLIB
++ select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
+ depends on BR2_INET_IPV6
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+--
+cgit v0.9.1
diff --git a/patches/buildroot/2015.02/036-armadeus-kodi-use-imx-vpu-when-available.patch b/patches/buildroot/2015.02/036-armadeus-kodi-use-imx-vpu-when-available.patch
new file mode 100644
index 0000000..d4132c6
--- /dev/null
+++ b/patches/buildroot/2015.02/036-armadeus-kodi-use-imx-vpu-when-available.patch
@@ -0,0 +1,44 @@
+From 5287358ff33ec4920a677a58152ad040151b843f Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Wed, 04 Mar 2015 18:37:22 +0000
+Subject: package/kodi: Use i.MX VPU (video codec) when available
+
+Tested on i.MX6.
+
+[Thomas: drop comment in Config.in help text, hard to maintain for all
+platforms.]
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+---
+diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
+index 0a6fe7c..f40fc31 100644
+--- a/package/kodi/kodi.mk
++++ b/package/kodi/kodi.mk
+@@ -61,6 +61,11 @@ KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads
+ LIBS="-lvcos -lvchostif"
+ endif
+
++ifeq ($(BR2_PACKAGE_LIBFSLVPUWRAP),y)
++KODI_DEPENDENCIES += libfslvpuwrap
++KODI_CONF_OPTS += --enable-codec=imxvpu
++endif
++
+ ifeq ($(BR2_PACKAGE_LIBCAP),y)
+ KODI_CONF_OPTS += --enable-libcap
+ KODI_DEPENDENCIES += libcap
+diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
+index ba36f7c..3c878c9 100644
+--- a/package/openswan/openswan.mk
++++ b/package/openswan/openswan.mk
+@@ -11,7 +11,7 @@ OPENSWAN_LICENSE_FILES = COPYING LICENSE
+
+ OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
+ OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
+- USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \
++ USERCOMPILE="$(TARGET_CFLAGS)" INC_USRLOCAL=/usr \
+ USE_KLIPS=false USE_MAST=false USE_NM=false
+
+ ifeq ($(BR2_PACKAGE_LIBCURL),y)
+--
+cgit v0.9.1
diff --git a/patches/buildroot/2015.02/037-buildroot-toolchain-fix-installing-gconv-libs-with-multi-arch-toolchain.patch b/patches/buildroot/2015.02/037-buildroot-toolchain-fix-installing-gconv-libs-with-multi-arch-toolchain.patch
new file mode 100644
index 0000000..02faee7
--- /dev/null
+++ b/patches/buildroot/2015.02/037-buildroot-toolchain-fix-installing-gconv-libs-with-multi-arch-toolchain.patch
@@ -0,0 +1,80 @@
+For a multi-arch toolchain, gconv modules are in a sub-directory named
+after the machine gcc targets. This is the case, for example, for the
+Linaro ARM 2014.09 toolchain, which has the gconv modules in (relative
+to the sysroot):
+ /usr/lib/arm-linux-gnueabihf/gconv
+
+while the Sourcery CodeBench ARM 2014.05 (non-multi-arch) has them in:
+ /usr/lib/gconv
+
+So, to catter for both cases, search both paths. We want to favour the
+machine-specific gconv modules over potentially existing "generic" ones,
+so we first search that (if it exists) and fallback to looking in the
+generic location.
+
+Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+
+---
+Changes v2 -> v3:
+ - use TOOLCHAIN_EXTERNAL_PREFIX instead of computing it again
+
+Changes v1 -> v2:
+ - also handle the case where the gconv modules list is specified
+
+---
+Notes: I'm not too happy about the use of "gcc -dumpmachine", but
+that's the only solution I found that worked on my use-case. I tried
+duplicating the ARCH_SUBDIR trick from toolchain-external, but that
+did not work...
+
+diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk
+index 3f9900b..0a35909 100644
+--- a/toolchain/toolchain.mk
++++ b/toolchain/toolchain.mk
+@@ -17,28 +17,38 @@ endif
+ ifeq ($(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY),y)
+ GCONV_LIBS = $(call qstrip,$(BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST))
+ define COPY_GCONV_LIBS
+- $(Q)if [ -z "$(GCONV_LIBS)" ]; then \
+- $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/gconv/gconv-modules \
+- $(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
+- $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/gconv/*.so \
++ $(Q)found_gconv=no; \
++ for d in $(TOOLCHAIN_EXTERNAL_PREFIX) ''; do \
++ [ -d "$(STAGING_DIR)/usr/lib/$${d}/gconv" ] || continue; \
++ found_gconv=yes; \
++ break; \
++ done; \
++ if [ "$${found_gconv}" = "no" ]; then \
++ printf "Unable to find gconv modules\n" >&2; \
++ exit 1; \
++ fi; \
++ if [ -z "$(GCONV_LIBS)" ]; then \
++ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
++ $(TARGET_DIR)/usr/lib/gconv/gconv-modules && \
++ $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \
+ $(TARGET_DIR)/usr/lib/gconv \
+ || exit 1; \
+ else \
+ for l in $(GCONV_LIBS); do \
+- $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/gconv/$${l}.so \
++ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \
+ $(TARGET_DIR)/usr/lib/gconv/$${l}.so \
+ || exit 1; \
+- $(TARGET_READELF) -d $(STAGING_DIR)/usr/lib/gconv/$${l}.so |\
++ $(TARGET_READELF) -d $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so |\
+ sort -u |\
+ sed -e '/.*(NEEDED).*\[\(.*\.so\)\]$$/!d; s//\1/;' |\
+ while read lib; do \
+- $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/gconv/$${lib} \
++ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${lib} \
+ $(TARGET_DIR)/usr/lib/gconv/$${lib} \
+ || exit 1; \
+ done; \
+ done; \
+ ./support/scripts/expunge-gconv-modules "$(GCONV_LIBS)" \
+- <$(STAGING_DIR)/usr/lib/gconv/gconv-modules \
++ <$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \
+ >$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \
+ fi
+ endef
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index ea37d99..de30f16 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -69,6 +69,8 @@ rm -rf buildroot/package/imx-usb-loader/Config.in.host
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
+rm -rf buildroot/package/kodi/Config.in
+rm -rf buildroot/package/kodi/kodi.mk
rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/linux-headers/Config.in.host
@@ -84,6 +86,7 @@ rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_
rm -rf buildroot/package/nss-pam-ldapd/Config.in
rm -rf buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash
rm -rf buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk
+rm -rf buildroot/package/openswan/openswan.mk
rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
rm -rf buildroot/package/pci_debug/Config.in
hooks/post-receive
--
armadeus
|