[oe-commits] Koen Kooi : e-wm config angstrom: add support for more flavours
git version control
git at git.openembedded.org
Wed Jun 17 17:52:45 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: fb03df419a2bbea318b00655957d4f9e4b49c4ab
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fb03df419a2bbea318b00655957d4f9e4b49c4ab
Author: Koen Kooi <koen at openembedded.org>
Date: Wed Jun 17 19:44:30 2009 +0200
e-wm config angstrom: add support for more flavours
* also automagically package flavours
---
recipes/angstrom/e-wm-config-angstrom.bb | 32 ++++++++++---------
.../{ => configs/angstrom-widescreen}/e.src | 0
.../{ => configs/angstrom-widescreen}/icon.png | Bin 4645 -> 4645 bytes
.../angstrom-widescreen}/module.battery.src | 0
.../angstrom-widescreen}/module.cpufreq.src | 0
.../angstrom-widescreen}/module.dropshadow.src | 0
.../angstrom-widescreen}/module.fileman.src | 0
.../angstrom-widescreen}/module.ibar.src | 0
.../angstrom-widescreen}/module.ibox.src | 0
.../angstrom-widescreen}/module.pager.src | 0
.../angstrom-widescreen}/module.places.src | 0
.../angstrom-widescreen}/module.temperature.src | 0
.../angstrom-widescreen}/profile.desktop | 0
.../{ => configs/angstrom}/e.src | 0
.../{ => configs/angstrom}/icon.png | Bin 4645 -> 4645 bytes
.../{ => configs/angstrom}/module.battery.src | 0
.../{ => configs/angstrom}/module.cpufreq.src | 0
.../{ => configs/angstrom}/module.dropshadow.src | 0
.../{ => configs/angstrom}/module.fileman.src | 0
.../{ => configs/angstrom}/module.ibar.src | 0
.../{ => configs/angstrom}/module.ibox.src | 0
.../{ => configs/angstrom}/module.pager.src | 0
.../{ => configs/angstrom}/module.places.src | 0
.../{ => configs/angstrom}/module.temperature.src | 0
.../{ => configs/angstrom}/profile.desktop | 0
25 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/recipes/angstrom/e-wm-config-angstrom.bb b/recipes/angstrom/e-wm-config-angstrom.bb
index 04c35be..8b92b8c 100644
--- a/recipes/angstrom/e-wm-config-angstrom.bb
+++ b/recipes/angstrom/e-wm-config-angstrom.bb
@@ -7,16 +7,9 @@ RRECOMMENDS_${PN} = "places"
PR = "r8"
SRC_URI = " \
- file://e.src \
- file://icon.png \
- file://*.src \
- file://profile.desktop \
+ file://configs \
"
-S = "${WORKDIR}/angstrom"
-
-do_configure() {
- cp ${WORKDIR}/*.src ${WORKDIR}/*.desktop ${WORKDIR}/*.png ${S}/
-}
+S = "${WORKDIR}/configs"
# [09:16:17] * koen mumbles something about binary config file
# [09:16:19] <raster> eet -d e.cfg config e.src
@@ -25,20 +18,29 @@ do_configure() {
# [09:17:12] <raster> will re-encode
do_compile() {
+rm ${S}/patches -rf
+for dir in ${S}/* ; do
+ cd $dir
for i in *.src ; do
eet -e $(echo $i | sed s:src:cfg:g) config $i 1
done
+done
}
do_install() {
- install -d ${D}${datadir}/enlightenment/data/config/angstrom/
+ for i in ${WORKDIR}/configs/* ; do
+ install -d ${D}${datadir}/enlightenment/data/config/$(basename $i)/
- install -m 0644 ${S}/*.cfg ${D}${datadir}/enlightenment/data/config/angstrom/
- install -m 0644 ${S}/*.desktop ${D}${datadir}/enlightenment/data/config/angstrom/
- install -m 0644 ${S}/*.png ${D}${datadir}/enlightenment/data/config/angstrom/
+ install -m 0644 ${S}/$(basename $i)/*.cfg ${D}${datadir}/enlightenment/data/config/$(basename $i)/
+ install -m 0644 ${S}/$(basename $i)/*.desktop ${D}${datadir}/enlightenment/data/config/$(basename $i)/
+ install -m 0644 ${S}/$(basename $i)/*.png ${D}${datadir}/enlightenment/data/config/$(basename $i)/
+ done
}
-FILES_${PN} = "${datadir}/enlightenment"
+python populate_packages_prepend () {
+ angstrom_e_dir = bb.data.expand('${datadir}/enlightenment/data/config', d)
+ do_split_packages(d, angstrom_e_dir, '(.*)', 'e-wm-config-%s', 'E17 window manager %s config', extra_depends='', allow_links=True, allow_dirs=True)
+}
-PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH = "all"
diff --git a/recipes/angstrom/e-wm-config-angstrom/e.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/e.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/e.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/e.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/icon.png b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/icon.png
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/icon.png
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/icon.png
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.battery.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.battery.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.battery.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.battery.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.cpufreq.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.cpufreq.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.cpufreq.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.cpufreq.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.dropshadow.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.dropshadow.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.dropshadow.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.dropshadow.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.fileman.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.fileman.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.fileman.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.fileman.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.ibar.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.ibar.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.ibar.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.ibar.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.ibox.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.ibox.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.ibox.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.ibox.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.pager.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.pager.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.pager.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.pager.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.places.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.places.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.places.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.places.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.temperature.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.temperature.src
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/module.temperature.src
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/module.temperature.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/profile.desktop b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/profile.desktop
similarity index 100%
copy from recipes/angstrom/e-wm-config-angstrom/profile.desktop
copy to recipes/angstrom/e-wm-config-angstrom/configs/angstrom-widescreen/profile.desktop
diff --git a/recipes/angstrom/e-wm-config-angstrom/e.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/e.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/e.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/e.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/icon.png b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/icon.png
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/icon.png
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/icon.png
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.battery.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.battery.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.battery.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.battery.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.cpufreq.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.cpufreq.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.cpufreq.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.cpufreq.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.dropshadow.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.dropshadow.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.dropshadow.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.dropshadow.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.fileman.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.fileman.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.fileman.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.fileman.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.ibar.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.ibar.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.ibar.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.ibar.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.ibox.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.ibox.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.ibox.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.ibox.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.pager.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.pager.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.pager.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.pager.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.places.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.places.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.places.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.places.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/module.temperature.src b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.temperature.src
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/module.temperature.src
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/module.temperature.src
diff --git a/recipes/angstrom/e-wm-config-angstrom/profile.desktop b/recipes/angstrom/e-wm-config-angstrom/configs/angstrom/profile.desktop
similarity index 100%
rename from recipes/angstrom/e-wm-config-angstrom/profile.desktop
rename to recipes/angstrom/e-wm-config-angstrom/configs/angstrom/profile.desktop
More information about the Openembedded-commits
mailing list