diff options
Diffstat (limited to 'packages')
| -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.default | 7 | ||||
| -rw-r--r-- | packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session | 14 | ||||
| -rw-r--r-- | packages/fluxbox/fluxbox-gpe_1.0rc.bb | 8 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/halt | 6 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/reboot | 6 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/save-rtc.sh | 16 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 8 |
8 files changed, 45 insertions, 20 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 diff --git a/packages/initscripts/initscripts-1.0/halt b/packages/initscripts/initscripts-1.0/halt index aa1769606a..d8cab222ca 100755 --- a/packages/initscripts/initscripts-1.0/halt +++ b/packages/initscripts/initscripts-1.0/halt @@ -7,12 +7,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Update the timestamp, if there is already one -if test -e /etc/timestamp -then - date +%2m%2d%2H%2M%Y > /etc/timestamp -fi - # See if we need to cut the power. if test -x /etc/init.d/ups-monitor then diff --git a/packages/initscripts/initscripts-1.0/reboot b/packages/initscripts/initscripts-1.0/reboot index 7f95255bd9..56278199be 100755 --- a/packages/initscripts/initscripts-1.0/reboot +++ b/packages/initscripts/initscripts-1.0/reboot @@ -7,11 +7,5 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Update the timestamp, if there is one -if test -e /etc/timestamp -then - date +%2m%2d%2H%2M%Y > /etc/timestamp -fi - echo -n "Rebooting... " reboot -d -f -i diff --git a/packages/initscripts/initscripts-1.0/save-rtc.sh b/packages/initscripts/initscripts-1.0/save-rtc.sh new file mode 100644 index 0000000000..d06aa6d569 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/save-rtc.sh @@ -0,0 +1,16 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: save-rtc.sh +# Date: 03-Jul-06 + + +# Update the timestamp, if there is already one +if test -e /etc/timestamp +then + echo "Will restore RCT from /etc/timestamp on next boot" + echo "Delete that file to disable this feature." + date +%2m%2d%2H%2M%Y > /etc/timestamp +fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index eebfbca7bf..0d14403a36 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r73" +PR = "r74" SRC_URI = "file://halt \ file://ramdisk \ @@ -31,7 +31,8 @@ SRC_URI = "file://halt \ file://sysfs.sh \ file://device_table.txt \ file://populate-volatile.sh \ - file://volatiles " + file://volatiles \ + file://save-rtc.sh" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" @@ -82,6 +83,7 @@ do_install () { install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -119,6 +121,8 @@ do_install () { ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh |