[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-71-ga4ab627d9
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2019-05-28 16:05:10
|
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 a4ab627d93c41a52a47b096e5f7f0545eb390982 (commit)
from def208cf4e83c63f88bdc0b500a9f933ecc34a50 (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 a4ab627d93c41a52a47b096e5f7f0545eb390982
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue May 28 18:04:44 2019 +0200
[BUILD] Makes ./scripts/quiltify.sh partially work when BR2_EXTERNAL is used
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index b9e5bcd60..6cecc24ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,7 +82,12 @@ ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
ifneq ($(BR2_LINUX_KERNEL_PATCH),)
TEMP_LINUX_PATCH_DIR = $(shell echo $(BR2_LINUX_KERNEL_PATCH) | rev | cut -d " " -f 1 | rev)
-ARMADEUS_LINUX_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_LINUX_PATCH_DIR))
+IS_ABSOLUTE_PATH = $(shell if [ -d $(TEMP_LINUX_PATCH_DIR) ]; then echo "yes"; fi)
+ ifeq ($(IS_ABSOLUTE_PATH),)
+ ARMADEUS_LINUX_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_LINUX_PATCH_DIR))
+ else # yes:
+ ARMADEUS_LINUX_PATCH_DIR = $(shell echo $(TEMP_LINUX_PATCH_DIR))
+ endif
else
ARMADEUS_LINUX_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/linux/$(ARMADEUS_LINUX_VERSION)
endif
hooks/post-receive
--
armadeus
|