[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-127-g2c6344f05
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-127-g2c6344f05
|
From: Julien B a. A. <ar...@us...> - 2019-09-18 13:51:57
|
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 2c6344f0509cecfb268c6f47e6f241be220cd93c (commit)
from 50091e5c278ce9c6adf1a239697f58fb41ec94af (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 2c6344f0509cecfb268c6f47e6f241be220cd93c
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 18 15:51:03 2019 +0200
[BUILD] Makes scripts/quiltify.sh work when using BR2_EXTERNAL. Only tested with U-Boot for now.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +--
Makefile.in | 6 ++--
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27preempt-rt_defconfig | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf27xenomai_defconfig | 2 +-
buildroot/configs/apf28_defconfig | 2 +-
buildroot/configs/apf28legacy_defconfig | 2 +-
buildroot/configs/apf28legacytest_defconfig | 2 +-
buildroot/configs/apf28test_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/apf6dawnsmalllinux_defconfig | 2 +-
buildroot/configs/apf6legacy-4.1_defconfig | 2 +-
buildroot/configs/apf6legacy-preempt-rt_defconfig | 2 +-
buildroot/configs/apf6legacy_defconfig | 2 +-
buildroot/configs/apf6mainline-4.19_defconfig | 2 +-
buildroot/configs/apf6mainline-4.9_defconfig | 2 +-
buildroot/configs/apf6mediacenter_defconfig | 2 +-
buildroot/configs/apf6test_defconfig | 2 +-
buildroot/configs/apf6xenomai_defconfig | 2 +-
buildroot/configs/pps51_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
scripts/quiltify.sh | 34 ++++++++++++-----------
25 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/Makefile b/Makefile
index 32613febe..8affdfda6 100644
--- a/Makefile
+++ b/Makefile
@@ -198,12 +198,12 @@ shell_env:
@echo ARMADEUS_BUILDROOT_VERSION=$(BUILDROOT_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BUILDROOT_PATCH_DIR=$(BUILDROOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
+ @echo "ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR)" >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_CONFIG=$(ARMADEUS_LINUX_CONFIG) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_VERSION=$(ARMADEUS_LINUX_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_MAIN_VERSION=$(ARMADEUS_LINUX_MAIN_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_U_BOOT_PATCH_DIR=$(ARMADEUS_U_BOOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
+ @echo "ARMADEUS_U_BOOT_PATCH_DIR=\"$(ARMADEUS_U_BOOT_PATCH_DIR)\"" >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_VERSION=$(ARMADEUS_U_BOOT_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_CUSTOM_VERSION=$(ARMADEUS_U_BOOT_CUSTOM_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_CONFIG=$(ARMADEUS_U_BOOT_CONFIG) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index ea99edd3a..b02a44d60 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,8 @@ BASE_DIR := $(patsubst %/,%,$(patsubst %.,%,$(O)))
BUILDROOT_CONFIG_DIR := $(BASE_DIR)
endif
+TOPDIR = $(BUILDROOT_DIR)
+
ifneq ($(BUILDROOT_DL_DIR),)
# To be removed with BR 2014.02
ARMADEUS_DL_DIR := $(BUILDROOT_DL_DIR)
@@ -100,8 +102,8 @@ endif
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
ifneq ($(BR2_TARGET_UBOOT_PATCH),"")
-TEMP_U_BOOT_PATCH_DIR = $(shell echo $(BR2_TARGET_UBOOT_PATCH) | rev | cut -d " " -f 1 | rev)
-ARMADEUS_U_BOOT_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_U_BOOT_PATCH_DIR))
+# PATCHES configured in defconfig:
+ARMADEUS_U_BOOT_PATCH_DIR:= $(shell echo $(BR2_TARGET_UBOOT_PATCH))
else
ARMADEUS_U_BOOT_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/u-boot/$(ARMADEUS_U_BOOT_VERSION)
endif
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index cd53e2a61..5b454ff3e 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -80,7 +80,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf27preempt-rt_defconfig b/buildroot/configs/apf27preempt-rt_defconfig
index 0f092cabe..86704ac46 100644
--- a/buildroot/configs/apf27preempt-rt_defconfig
+++ b/buildroot/configs/apf27preempt-rt_defconfig
@@ -87,7 +87,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 9a23b9311..ae6c38b50 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -169,7 +169,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 0f521d567..d4e55387b 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -86,7 +86,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index ed34b688e..715f38ed2 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -81,7 +81,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_SB=y
diff --git a/buildroot/configs/apf28legacy_defconfig b/buildroot/configs/apf28legacy_defconfig
index 0163a2ee4..725cc106f 100644
--- a/buildroot/configs/apf28legacy_defconfig
+++ b/buildroot/configs/apf28legacy_defconfig
@@ -84,7 +84,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_SB=y
BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf28legacytest_defconfig b/buildroot/configs/apf28legacytest_defconfig
index a41727304..d14fc3eda 100644
--- a/buildroot/configs/apf28legacytest_defconfig
+++ b/buildroot/configs/apf28legacytest_defconfig
@@ -157,7 +157,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_SB=y
BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 531791bd1..f259859c8 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -160,7 +160,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_SB=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index c6996058a..f8daa08c3 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -84,7 +84,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 3acd460e2..11e49db16 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -173,7 +173,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 9a8ee3e7a..77ec38e95 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -132,7 +132,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6dawnsmalllinux_defconfig b/buildroot/configs/apf6dawnsmalllinux_defconfig
index 280a29ea5..f7c148cbd 100644
--- a/buildroot/configs/apf6dawnsmalllinux_defconfig
+++ b/buildroot/configs/apf6dawnsmalllinux_defconfig
@@ -163,7 +163,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index b5709e691..6e2c87e21 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -174,7 +174,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6legacy-preempt-rt_defconfig b/buildroot/configs/apf6legacy-preempt-rt_defconfig
index 06c2ff513..e7fc44611 100644
--- a/buildroot/configs/apf6legacy-preempt-rt_defconfig
+++ b/buildroot/configs/apf6legacy-preempt-rt_defconfig
@@ -130,7 +130,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 6999c2d6e..02d77ab63 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -162,7 +162,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6mainline-4.19_defconfig b/buildroot/configs/apf6mainline-4.19_defconfig
index 6b090c19d..6f1505d63 100644
--- a/buildroot/configs/apf6mainline-4.19_defconfig
+++ b/buildroot/configs/apf6mainline-4.19_defconfig
@@ -155,7 +155,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6mainline-4.9_defconfig b/buildroot/configs/apf6mainline-4.9_defconfig
index f69689d65..23aceab4c 100644
--- a/buildroot/configs/apf6mainline-4.9_defconfig
+++ b/buildroot/configs/apf6mainline-4.9_defconfig
@@ -161,7 +161,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index 9f3bf2d3e..40d4715d1 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -107,7 +107,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index 2e21df9e2..463246dc5 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -156,7 +156,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 974c91e0d..766cc83e6 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -101,7 +101,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 4035f6dd8..41b02b7d0 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -96,7 +96,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf51"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.04"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.04"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(ARMADEUS_PATH)/apf51/apf51-u-boot-2014.04.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 3b442e584..12ea6edd2 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -81,7 +81,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf27"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2 "
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.04"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.04"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.04.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 846c763c3..88e4083e4 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -8,7 +8,7 @@ answer=""
ask_user_banner()
{
echo
- echo -e "--- "$1
+ echo -e "\033[1m--- $1 \033[0m"
}
# $1: thing to ask, $* possibilities. Will fill in "answer" variable.
@@ -178,29 +178,31 @@ fi
# Import patches
-if [ ! -d "$QUILT_TARGET_PATCH_DIR" ]; then
- echo "Patches dir ($QUILT_TARGET_PATCH_DIR) doesn't exist: exiting..."
- exit 1
-fi
-
pushd $QUILT_TARGET_DIR
if [ "$?" != 0 ]; then
echo "Please correct that ($QUILT_TARGET_DIR)"
exit 1
fi
mkdir patches
-if [ "$QUILT_PATCH_FILTER" != "" ]; then
- PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch | grep $QUILT_PATCH_FILTER`
- if [ "$PATCHES" == "" ]; then
- # No filtered patches, try normal ones
- PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
+PATCHES=""
+for PATCH_DIR in ${QUILT_TARGET_PATCH_DIR}; do
+ if [ ! -d "${PATCH_DIR}" ]; then
+ echo "Patches dir (${PATCH_DIR}) doesn't exist: exiting..."
+ exit 1
fi
-else
- PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
-fi
+ if [ "$QUILT_PATCH_FILTER" != "" ]; then
+ PATCHES=`ls -ar ${PATCH_DIR}/*.patch | grep $QUILT_PATCH_FILTER; echo ${PATCHES}`
+ if [ "${PATCHES}" == "" ]; then
+ # No filtered patches, try normal ones
+ PATCHES=`ls -ar ${PATCH_DIR}/*.patch; echo ${PATCHES}`
+ fi
+ else
+ PATCHES=`ls -ar ${PATCH_DIR}/*.patch; echo ${PATCHES}`
+ fi
+done
-for patch in $PATCHES; do
- echo ">>> Importing patch $patch"
+for patch in ${PATCHES}; do
+ echo -e "\033[1m>>> Importing patch:\033[0m $patch"
quilt import $patch
done
hooks/post-receive
--
armadeus
|