summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-07-03 02:37:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-03 02:37:00 +0000
commit602af584cc98ccfa10ca30cd850ec0ac92fe8ac0 (patch)
treedb7a77a46c84ff3792973105f3745000464158b0
parent085c69220f3ab2f01fb840407815e56523544c8f (diff)
fluxbox: Add mult-machine support for geometry defaults
-rw-r--r--packages/fluxbox/fluxbox-gpe/apps.gpe.akita (renamed from packages/fluxbox/fluxbox-gpe/apps.gpe)0
-rw-r--r--packages/fluxbox/fluxbox-gpe/apps.gpe.default7
-rw-r--r--packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session14
-rw-r--r--packages/fluxbox/fluxbox-gpe_1.0rc.bb8
4 files changed, 23 insertions, 6 deletions
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
index 7aca442752..7aca442752 100644
--- a/packages/fluxbox/fluxbox-gpe/apps.gpe
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox-gpe/apps.gpe.default
new file mode 100644
index 0000000000..d7a0a83f22
--- /dev/null
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.default
@@ -0,0 +1,7 @@
+[app] (title=Panel 0)
+ [Deco] {NONE}
+ [Sticky] {yes}
+[end]
+[app] (title=Panel 1)
+ [Deco] {NONE}
+[end]
diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
index ca0afea35d..f6e03ede7e 100644
--- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
+++ b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session
@@ -4,10 +4,20 @@
#
# Install "apps" file with defaults for GPE usage
-if test -e /usr/share/fluxbox/apps.gpe
+
+MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`"
+
+case $MACHINE in
+*Akita | *Spitz | *Borzoi | *Terrier)
+ APPS="apps.gpe.akita";;
+*)
+ APPS="apps.gpe.default";;
+esac
+
+if test -e /usr/share/fluxbox/$APPS
then
mkdir -p $HOME/.fluxbox
- test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/apps.gpe $HOME/.fluxbox/apps
+ test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps
fi
diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb
index 50c5d6ce1d..0d962ca6f5 100644
--- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb
+++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb
@@ -13,14 +13,14 @@ RCONFLICTS = "fluxbox"
######################################################################################
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/fluxbox-${PV}"
######################################################################################
SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \
file://gpe-init.patch;patch=1\
- file://apps.gpe \
+ file://apps.gpe.* \
file://style.gpe-default \
file://fluxbox-gpe-session \
file://fluxbox-gpe.session"
@@ -37,7 +37,7 @@ FILES_${PN} = "/usr/bin \
/usr/share/fluxbox/init \
/usr/share/fluxbox/keys \
/usr/share/fluxbox/menu \
- /usr/share/fluxbox/apps.gpe \
+ /usr/share/fluxbox/apps.gpe* \
/usr/share/fluxbox/session \
/usr/share/fluxbox/styles/gpe-default"
@@ -59,7 +59,7 @@ do_install_append() {
install -d ${D}/usr/share/fluxbox
install -d ${D}/usr/share/fluxbox/styles
- install -m 0644 ${WORKDIR}/apps.gpe ${D}/usr/share/fluxbox
+ install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin