fluxbox: Add mult-machine support for geometry defaults

diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita
similarity index 100%
rename from packages/fluxbox/fluxbox-gpe/apps.gpe
rename to 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 (file)
index 0000000..d7a0a83
--- /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 ca0afea..f6e03ed 100644 (file)
--- 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 50c5d6c..0d962ca 100644 (file)
--- 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