summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/fluxbox/fluxbox-gpe/apps.gpe57
-rw-r--r--packages/linux/linux-jlime-arm_2.6.17.bb4
-rw-r--r--packages/watchdog/files/.mtn2git_empty0
-rw-r--r--packages/watchdog/files/mkinstalldirs.patch17
-rw-r--r--packages/watchdog/watchdog_5.2.bb5
5 files changed, 80 insertions, 3 deletions
diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe
new file mode 100644
index 0000000000..7aca442752
--- /dev/null
+++ b/packages/fluxbox/fluxbox-gpe/apps.gpe
@@ -0,0 +1,57 @@
+[app] (title=Panel 0)
+ [Deco] {NONE}
+ [Sticky] {yes}
+[end]
+[app] (title=Panel 1)
+ [Deco] {NONE}
+[end]
+[app] (title=rxvt)
+ [Dimensions] {635 440}
+[end]
+[app] (title=x-terminal-emulator)
+ [Dimensions] {635 440}
+[end]
+[app] (abiword)
+ [Dimensions] {635 440}
+ [Sticky] {no}
+[end]
+[app] (gpe-filemanager)
+ [Dimensions] {635 440}
+ [Sticky] {yes}
+[end]
+[app] (gpe-info)
+ [Dimensions] {424 336}
+[end]
+[app] (gpe-edit)
+ [Dimensions] {635 440}
+[end]
+[app] (gpe-calculator)
+ [Dimensions] {266 321}
+[end]
+[app] (main)
+ [Dimensions] {635 440}
+[end]
+[app] (Gnumeric)
+ [Dimensions] {635 440}
+[end]
+[app] (gpdf)
+ [Dimensions] {635 440}
+[end]
+[app] (main_window)
+ [Dimensions] {635 440}
+[end]
+[app] (gaim)
+ [Dimensions] {635 440}
+[end]
+[app] (gpe-calendar)
+ [Dimensions] {380 343}
+[end]
+[app] (gpe-mini-browser)
+ [Dimensions] {635 440}
+[end]
+[app] (figment)
+ [Dimensions] {635 440}
+[end]
+[app] (gpe-sketchbook)
+ [Dimensions] {471 314}
+[end]
diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb
index 33de458f4f..0f67a7c2be 100644
--- a/packages/linux/linux-jlime-arm_2.6.17.bb
+++ b/packages/linux/linux-jlime-arm_2.6.17.bb
@@ -11,8 +11,8 @@ SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \
file://Cpu-Sa1110-Jornada720.patch;patch=0 \
file://Kconfig-Arch-Jornada720.patch;patch=0 \
- file://Kconfig-Keyboard-Jornada720.patch;patch=0 \
- file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \
+ file://Kconfig-Keyboard-Jornada720.patch;patch=0\
+ file://Kconfig-Touchscreen-Jornada720.patch;patch=0
file://Kconfig-Video-Jornada720.patch;patch=0 \
file://Mach-Sa1100-Jornada720.patch;patch=0 \
file://Makefile-Keyboard-Jornada720.patch;patch=0 \
diff --git a/packages/watchdog/files/.mtn2git_empty b/packages/watchdog/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/watchdog/files/.mtn2git_empty
diff --git a/packages/watchdog/files/mkinstalldirs.patch b/packages/watchdog/files/mkinstalldirs.patch
new file mode 100644
index 0000000000..468f269965
--- /dev/null
+++ b/packages/watchdog/files/mkinstalldirs.patch
@@ -0,0 +1,17 @@
+---
+ watchdog-5.2/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: watchdog-5.2/Makefile.am
+===================================================================
+--- watchdog-5.2.orig/Makefile.am
++++ watchdog-5.2/Makefile.am
+@@ -15,7 +15,7 @@
+ echo "NOT installing $(CONFIG_FILENAME) - exists already"; \
+ else \
+ echo "installing $(CONFIG_FILENAME)"; \
+- mkinstalldirs `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \
++ $(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \
+ $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \
+ fi
+
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
index fc3509466a..12f41b6ee7 100644
--- a/packages/watchdog/watchdog_5.2.bb
+++ b/packages/watchdog/watchdog_5.2.bb
@@ -1,9 +1,12 @@
DESCRIPTION = "Software watchdog"
MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-PR = "r2"
+PR = "r3"
LICENSE = "GPL"
SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz"
+
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
+
FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog"
#CONFFILES = "${sysconfdir}/watchdog.conf"