[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-204-g283bddb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-204-g283bddb
|
From: jscheer <js...@us...> - 2014-04-01 08:46:25
|
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 283bddb1f9822417cefb04f0b900fb156831d70c (commit)
from b43eb89e1839424b28a6573b7241eee25f86dfc8 (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 283bddb1f9822417cefb04f0b900fb156831d70c
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Apr 1 10:45:39 2014 +0200
[BUILDROOT] Optimize and enhance Marble package patch.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2013.11/188-marble-add_package.patch | 295 ++++++++------------
1 files changed, 122 insertions(+), 173 deletions(-)
diff --git a/patches/buildroot/2013.11/188-marble-add_package.patch b/patches/buildroot/2013.11/188-marble-add_package.patch
index e90148f..1994e67 100644
--- a/patches/buildroot/2013.11/188-marble-add_package.patch
+++ b/patches/buildroot/2013.11/188-marble-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2014-02-19 15:09:12.000000000 +0100
-+++ buildroot/package/Config.in 2014-02-20 14:32:01.000000000 +0100
+--- buildroot.orig/package/Config.in 2014-03-31 16:03:47.000000000 +0200
++++ buildroot/package/Config.in 2014-04-01 10:40:37.000000000 +0200
@@ -214,8 +214,9 @@
source "package/sdl_water/Config.in"
@@ -20,8 +20,8 @@ Index: buildroot/package/Config.in
Index: buildroot/package/marble/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/Config.in 2014-02-20 14:29:22.000000000 +0100
-@@ -0,0 +1,145 @@
++++ buildroot/package/marble/Config.in 2014-04-01 10:30:52.000000000 +0200
+@@ -0,0 +1,133 @@
+comment "Marble needs Qt to be installed"
+ depends on !BR2_PACKAGE_QT
+
@@ -33,30 +33,24 @@ Index: buildroot/package/marble/Config.in
+ select BR2_PACKAGE_QT_WEBKIT
+ select BR2_PACKAGE_QT_XML
+ help
-+ Compile & install KDE Marble for
-+ geolocalization applications.
++ Marble is a virtual globe and world atlas.
++ It can also be used as a library for geolocalization applications.
++
++ http://marble.kde.org/
+
+if BR2_PACKAGE_MARBLE
+
+config BR2_PACKAGE_MARBLE_BINARY
-+ bool "Marble binary"
-+ help
-+ Install Marble binary on target
++ bool "Install Marble binary"
+
+config BR2_PACKAGE_MARBLE_AUDIO
-+ bool "Audio files"
-+ help
-+ Install audio files on target
++ bool "Install audio files"
+
+config BR2_PACKAGE_MARBLE_BITMAPS
-+ bool "Bitmaps"
-+ help
-+ Install bitmaps on target
++ bool "Install bitmaps"
+
+config BR2_PACKAGE_MARBLE_FLAGS
-+ bool "Flags"
-+ help
-+ Install flags on target
++ bool "Install country flags"
+
+menu "Maps"
+
@@ -65,67 +59,67 @@ Index: buildroot/package/marble/Config.in
+config BR2_PACKAGE_MARBLE_BLUEMARBLE
+ bool "Bluemarble"
+ help
-+ Install Bluemarble map on target
++ Install Bluemarble map
+
+config BR2_PACKAGE_MARBLE_CITYLIGHTS
+ bool "Citylights"
+ help
-+ Install Citylights map on target
++ Install Citylights map
+
+config BR2_PACKAGE_MARBLE_CLOUDS
+ bool "Clouds"
+ help
-+ Install Clouds map on target
++ Install Clouds map
+
+config BR2_PACKAGE_MARBLE_HILLSHADING
+ bool "Hillshading"
+ help
-+ Install Hillshading map on target
++ Install Hillshading map
+
+config BR2_PACKAGE_MARBLE_OPENSTREETMAP
+ bool "OpenStreetMap"
+ help
-+ Install Openstreetmap map on target
++ Install Openstreetmap map
+
+config BR2_PACKAGE_MARBLE_PLAIN
+ bool "Plain"
+ help
-+ Install Plain map on target
++ Install Plain map
+
+config BR2_PACKAGE_MARBLE_PRECIP_DEC
+ bool "December precipitations"
+ help
-+ Install December precipitation map on target
++ Install December precipitation map
+
+config BR2_PACKAGE_MARBLE_PRECIP_JULY
+ bool "July precipitations"
+ help
-+ Install July precipitation map on target
++ Install July precipitation map
+
+config BR2_PACKAGE_MARBLE_SCHAGEN
+ bool "Schagen 1689"
+ help
-+ Install Schagen 1689 map on target
++ Install Schagen 1689 map
+
+config BR2_PACKAGE_MARBLE_SRTM
+ bool "SRTM"
+ help
-+ Install SRTM map on target
++ Install SRTM map
+
+config BR2_PACKAGE_MARBLE_SRTM2
+ bool "SRTM 2"
+ help
-+ Install SRTM 2 map on target
++ Install SRTM 2 map
+
+config BR2_PACKAGE_MARBLE_TEMP_DEC
+ bool "December temperatures"
+ help
-+ Install December temperature map on target
++ Install December temperature map
+
+config BR2_PACKAGE_MARBLE_TEMP_JULY
+ bool "July temperatures"
+ help
-+ Install July temperature map on target
++ Install July temperature map
+
+endmenu #Earth maps
+
@@ -134,278 +128,233 @@ Index: buildroot/package/marble/Config.in
+config BR2_PACKAGE_MARBLE_CLEMENTINE
+ bool "Clementine"
+ help
-+ Install Clementine map on target
++ Install Clementine map
+
+endmenu #Moon maps
+
+endmenu #Maps
+
+config BR2_PACKAGE_MARBLE_MWDBII
-+ bool "MWDBII files"
++ bool "Install MWDBII files"
+ help
-+ Install MWDBII files on target
++ Vector data files from Microworld II Database
+
+config BR2_PACKAGE_MARBLE_PLACEMARKS
-+ bool "Placemarks"
++ bool "Install placemarks"
+ help
-+ Install placemarks on target
++ Placemarks for remarkable points on maps or geometry placemarks
+
+config BR2_PACKAGE_MARBLE_STARS
-+ bool "Stars"
-+ help
-+ Install star data on target
++ bool "Install stars data"
+
+config BR2_PACKAGE_MARBLE_SVG
-+ bool "SVG files"
-+ help
-+ Install SVG files on target
++ bool "Install SVG files"
+
+config BR2_PACKAGE_MARBLE_WEATHER
-+ bool "Weather data"
-+ help
-+ Install weather data on target
++ bool "Install weather data"
+
+endif #BR2_PACKAGE_MARBLE
+
Index: buildroot/package/marble/marble.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/marble.mk 2014-02-20 13:44:28.000000000 +0100
-@@ -0,0 +1,238 @@
++++ buildroot/package/marble/marble.mk 2014-03-31 17:54:11.000000000 +0200
+@@ -0,0 +1,199 @@
+#############################################################
+#
+# KDE Marble
+#
+#############################################################
-+MARBLE_VERSION = 88ba87c90195dede8594375b2f81c9d926db3924
++MARBLE_VERSION = 0299004157ce00cf901b6113c4ac14fa0c323c00
+MARBLE_SOURCE = marble-$(MARBLE_VERSION)-source.tar.gz
+MARBLE_SITE = git://anongit.kde.org/marble.git
-+MARBLE_SITE_METHOD = git
+
+MARBLE_DEPENDENCIES = qt
+
+MARBLE_CONF_OPT += -DQTONLY=ON
+MARBLE_CONF_OPT += -DTILES_AT_COMPILETIME=OFF
+
-+define MARBLE_CONFIGURE_CMDS
-+ (cd $(@D) && \
-+ rm -f CMakeCache.txt && \
-+ $(HOST_DIR)/usr/bin/cmake $(@D) \
-+ -DCMAKE_TOOLCHAIN_FILE="$(BASE_DIR)/host/usr/share/buildroot/toolchainfile.cmake" \
-+ $(MARBLE_CONF_OPT) \
-+ )
-+endef
-+
-+define MARBLE_BUILD_CMDS
-+ $(MAKE) -C $(@D)
-+endef
-+
+MARBLE_INSTALL_STAGING = YES
+
+define MARBLE_CLEAN_TARGET_INSTALL
-+ rm -rf $(TARGET_DIR)/usr/local/share/marble/data/*
-+ rm -rf $(TARGET_DIR)/usr/local/include/marble
-+ rm -rf $(TARGET_DIR)/usr/local/bin/marble
-+endef
-+
-+define MARBLE_INSTALL_BINARY
-+ cp -rf $(STAGING_DIR)/usr/local/bin/marble $(TARGET_DIR)/usr/local/bin
-+endef
-+
-+define MARBLE_INSTALL_AUDIO_FILES
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/audio $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_BITMAPS
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/bitmaps $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_FLAGS
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/flags $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_BLUEMARBLE_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/bluemarble $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_CITYLIGHTS_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/citylights $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_CLOUDS_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/clouds $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ rm -rf $(TARGET_DIR)/usr/share/marble/data/*
++ rm -rf $(TARGET_DIR)/usr/include/marble
++ rm -rf $(TARGET_DIR)/usr/bin/marble
+endef
-+
-+define MARBLE_INSTALL_HILLSHADING_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/hillshading $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_OPENSTREETMAP_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_PLAIN_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/plain $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_PRECIP_DEC_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/precip-dec $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_PRECIP_JULY_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/precip-july $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_SCHAGEN_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/schagen1689 $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_SRTM_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/srtm $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_SRTM2_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/srtm2 $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_TEMP_DEC_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/temp-dec $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_TEMP_JULY_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/temp-july $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_CLEMENTINE_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/moon
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/moon/clementine $(TARGET_DIR)/usr/local/share/marble/data/maps/moon
-+endef
-+
-+define MARBLE_INSTALL_MWDBII_FILES
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/mwdbii $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_PLACEMARKS
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/placemarks $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_STARS_DATA
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/stars $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_SVG
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/svg $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_WEATHER_DATA
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/weather $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_CLEAN_TARGET_INSTALL
+
+ifeq ($(BR2_PACKAGE_MARBLE_BINARY),y)
++define MARBLE_INSTALL_BINARY
++ cp -rf $(STAGING_DIR)/usr/bin/marble $(TARGET_DIR)/usr/bin
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BINARY
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_AUDIO),y)
++define MARBLE_INSTALL_AUDIO_FILES
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/audio $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_AUDIO_FILES
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_BITMAPS),y)
++define MARBLE_INSTALL_BITMAPS
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/bitmaps $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BITMAPS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_FLAGS),y)
++define MARBLE_INSTALL_FLAGS
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/flags $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_FLAGS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_BLUEMARBLE),y)
++define MARBLE_INSTALL_BLUEMARBLE_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/bluemarble $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BLUEMARBLE_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CITYLIGHTS),y)
++define MARBLE_INSTALL_CITYLIGHTS_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/citylights $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CITYLIGHTS_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CLOUDS),y)
++define MARBLE_INSTALL_CLOUDS_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/clouds $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLOUDS_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_HILLSHADING),y)
++define MARBLE_INSTALL_HILLSHADING_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/hillshading $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_HILLSHADING_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_OPENSTREETMAP),y)
++define MARBLE_INSTALL_OPENSTREETMAP_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_OPENSTREETMAP_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PLAIN),y)
++define MARBLE_INSTALL_PLAIN_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/plain $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLAIN_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_DEC),y)
++define MARBLE_INSTALL_PRECIP_DEC_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/precip-dec $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_DEC_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_JULY),y)
++define MARBLE_INSTALL_PRECIP_JULY_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/precip-july $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_JULY_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SCHAGEN),y)
++define MARBLE_INSTALL_SCHAGEN_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/schagen1689 $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SCHAGEN_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SRTM),y)
++define MARBLE_INSTALL_SRTM_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/srtm $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SRTM2),y)
++define MARBLE_INSTALL_SRTM2_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/srtm2 $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM2_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_TEMP_DEC),y)
++define MARBLE_INSTALL_TEMP_DEC_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/temp-dec $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_DEC_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_TEMP_JULY),y)
++define MARBLE_INSTALL_TEMP_JULY_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/temp-july $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_JULY_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CLEMENTINE),y)
++define MARBLE_INSTALL_CLEMENTINE_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/moon
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/moon/clementine $(TARGET_DIR)/usr/share/marble/data/maps/moon
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLEMENTINE_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_MWDBII),y)
++define MARBLE_INSTALL_MWDBII_FILES
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/mwdbii $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_MWDBII_FILES
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PLACEMARKS),y)
++define MARBLE_INSTALL_PLACEMARKS
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/placemarks $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLACEMARKS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_STARS),y)
++define MARBLE_INSTALL_STARS_DATA
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/stars $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_STARS_DATA
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SVG),y)
++define MARBLE_INSTALL_SVG
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/svg $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SVG
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_WEATHER),y)
++define MARBLE_INSTALL_WEATHER_DATA
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/weather $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_WEATHER_DATA
+endif
+
hooks/post-receive
--
armadeus
|
