From 24aafc936fe96583fe8f1029fa5258500961e4f6 Mon Sep 17 00:00:00 2001 From: cvh Date: Fri, 27 Apr 2018 10:38:46 +0200 Subject: [PATCH 1/3] remove mkimage dependency for WC & WP --- projects/WeTek_Core/options | 3 --- projects/WeTek_Play/options | 3 --- 2 files changed, 6 deletions(-) diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options index e1444b733c..829bf2ddc4 100644 --- a/projects/WeTek_Core/options +++ b/projects/WeTek_Core/options @@ -134,9 +134,6 @@ # build with installer (yes / no) INSTALLER_SUPPORT="no" - # extra build dependeices - EXTRA_DEPS="mkimage" - # kernel image name KERNEL_NAME="kernel.img" diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options index 49c64b3b29..6434f24cbe 100644 --- a/projects/WeTek_Play/options +++ b/projects/WeTek_Play/options @@ -131,8 +131,5 @@ # build with installer (yes / no) INSTALLER_SUPPORT="no" - # extra build dependeices - EXTRA_DEPS="mkimage" - # kernel image name KERNEL_NAME="kernel.img" From 45dd79bff40562a6bd86a01c678885bbcdc76669 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 27 Apr 2018 15:09:10 +0200 Subject: [PATCH 2/3] u-boot-tools-aml: move to packages/tools Signed-off-by: Matthias Reichl --- .../tools}/u-boot-tools-aml/config/fw_env.config | 0 .../packages => packages/tools}/u-boot-tools-aml/package.mk | 0 .../patches/u-boot-tools-0001-dummy_defconfig.patch | 0 .../patches/u-boot-tools-0002-allow-multiple-entries.patch | 0 .../patches/u-boot-tools-0003-nand_env-hack.patch | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {projects/Amlogic/packages => packages/tools}/u-boot-tools-aml/config/fw_env.config (100%) rename {projects/Amlogic/packages => packages/tools}/u-boot-tools-aml/package.mk (100%) rename {projects/Amlogic/packages => packages/tools}/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch (100%) rename {projects/Amlogic/packages => packages/tools}/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch (100%) rename {projects/Amlogic/packages => packages/tools}/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch (100%) diff --git a/projects/Amlogic/packages/u-boot-tools-aml/config/fw_env.config b/packages/tools/u-boot-tools-aml/config/fw_env.config similarity index 100% rename from projects/Amlogic/packages/u-boot-tools-aml/config/fw_env.config rename to packages/tools/u-boot-tools-aml/config/fw_env.config diff --git a/projects/Amlogic/packages/u-boot-tools-aml/package.mk b/packages/tools/u-boot-tools-aml/package.mk similarity index 100% rename from projects/Amlogic/packages/u-boot-tools-aml/package.mk rename to packages/tools/u-boot-tools-aml/package.mk diff --git a/projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch b/packages/tools/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch similarity index 100% rename from projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch rename to packages/tools/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch diff --git a/projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch b/packages/tools/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch similarity index 100% rename from projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch rename to packages/tools/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch diff --git a/projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch b/packages/tools/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch similarity index 100% rename from projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch rename to packages/tools/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch From ca01ed96a2137c86c1fab42e43be95b801f4d4b6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 27 Apr 2018 15:09:48 +0200 Subject: [PATCH 3/3] linux (amlogic-3.10): add dependency on u-boot-tools-aml:host Linux kernel build needs mkimage in toolchain Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2d253d569d..40ab4d406d 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -37,7 +37,7 @@ case "$LINUX" in PKG_SHA256="df34b086993fd3552efae92d84d28990a61a1ca79a8703a4b64241ab80e3b6db" PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="linux-amlogic-$PKG_VERSION" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET aml-dtbtools:host u-boot-tools-aml:host" PKG_BUILD_PERF="no" ;; amlogic-3.14)