[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-27-gae30d17
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-10-30 12:50:42
|
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 ae30d17226e9f4db4dcf7ef2d5a34b5155f0686c (commit)
from 9134e4b50311a1a933383372790353b465034102 (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 ae30d17226e9f4db4dcf7ef2d5a34b5155f0686c
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 30 13:53:16 2012 +0100
[BUILROOT] fix PPS package .mk files to support new and legacy BR version
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/pps/pps.mk | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/buildroot/package/armadeus/pps/pps.mk b/buildroot/package/armadeus/pps/pps.mk
index 037da6b..1b00545 100644
--- a/buildroot/package/armadeus/pps/pps.mk
+++ b/buildroot/package/armadeus/pps/pps.mk
@@ -6,7 +6,11 @@
PPS_VERSION = 1.1
PPS_SITE = $(TOPDIR)/../target/pps
+ifeq ($(generic-package), )
PPS_SITE_METHOD = copy
+else
+PPS_SITE_METHOD = local
+endif
PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/
@@ -43,4 +47,9 @@ define PPS_UNINSTALL_TARGET_CMDS
rm -rf $(PPS_WWW_TARGET_DIR)/www
endef
+ifeq ($(generic-package), )
+$(eval $(call GENTARGETS))
+else
$(eval $(generic-package))
+endif
+
hooks/post-receive
--
armadeus
|