diff options
-rw-r--r-- | classes/rootfs_ipk.bbclass | 8 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/bootmisc.sh | 57 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/halt | 31 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/reboot | 17 | ||||
-rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie.inc | 6 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie/fix-nomax.patch | 0 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie_1.2.0.bb | 5 | ||||
-rw-r--r-- | packages/meta/opie-image.bb | 6 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar/akita/qpe.conf | 19 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf | 1 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar/spitz/qpe.conf | 19 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar/tosa/qpe.conf | 3 |
13 files changed, 163 insertions, 11 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index e42704b5ae..7ed8342b1e 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -124,7 +124,11 @@ zap_root_password () { mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd } -# export the zap_root_password -EXPORT_FUNCTIONS zap_root_password +create_etc_timestamp() { + date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp +} + +# export the zap_root_password and create_etc_timestamp +EXPORT_FUNCTIONS zap_root_password create_etc_timestamp addtask rootfs before do_build after do_install diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index e69de29bb2..bd8a0721f1 100644 --- a/packages/initscripts/initscripts-1.0/bootmisc.sh +++ b/packages/initscripts/initscripts-1.0/bootmisc.sh @@ -0,0 +1,57 @@ +# +# bootmisc.sh Miscellaneous things to be done during bootup. +# + +. /etc/default/rcS +# +# Put a nologin file in /etc to prevent people from logging in before +# system startup is complete. +# +if test "$DELAYLOGIN" = yes +then + echo "System bootup in progress - please wait" > /etc/nologin + cp /etc/nologin /etc/nologin.boot +fi + +# +# Set pseudo-terminal access permissions. +# +if ( ! grep -q devfs /proc/mounts ) && test -c /dev/ttyp0 +then + chmod 666 /dev/tty[p-za-e][0-9a-f] + chown root:tty /dev/tty[p-za-e][0-9a-f] +fi + +# +# Update /etc/motd. +# +if test "$EDITMOTD" != no +then + uname -a > /etc/motd.tmp + sed 1d /etc/motd >> /etc/motd.tmp + mv /etc/motd.tmp /etc/motd +fi + +# +# This is as good a place as any for a sanity check +# /tmp should be a symlink to /var/tmp to cut down on the number +# of mounted ramdisks. +if test ! -L /tmp && test -d /var/tmp +then + rm -rf /tmp + ln -sf /var/tmp tmp +fi + +# +# Update dynamic library cache +# +/sbin/ldconfig + +# +# Recover the time, if there is a time file +# +if test -e /etc/timestamp +then + date -s `cat /etc/timestamp` +fi +: exit 0 diff --git a/packages/initscripts/initscripts-1.0/halt b/packages/initscripts/initscripts-1.0/halt index e69de29bb2..aa1769606a 100644 --- a/packages/initscripts/initscripts-1.0/halt +++ b/packages/initscripts/initscripts-1.0/halt @@ -0,0 +1,31 @@ +#! /bin/sh +# +# halt Execute the halt command. +# +# Version: @(#)halt 2.84-2 07-Jan-2002 miquels@cistron.nl +# + +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 + /etc/init.d/ups-monitor poweroff +fi + +# Don't shut down drives if we're using RAID. +hddown="-h" +if grep -qs '^md.*active' /proc/mdstat +then + hddown="" +fi + +halt -d -f -i -p $hddown + +: exit 0 diff --git a/packages/initscripts/initscripts-1.0/reboot b/packages/initscripts/initscripts-1.0/reboot index e69de29bb2..7f95255bd9 100644 --- a/packages/initscripts/initscripts-1.0/reboot +++ b/packages/initscripts/initscripts-1.0/reboot @@ -0,0 +1,17 @@ +#! /bin/sh +# +# reboot Execute the reboot command. +# +# Version: @(#)reboot 2.75 22-Jun-1998 miquels@cistron.nl +# + +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.bb b/packages/initscripts/initscripts_1.0.bb index d5e9b5ee30..4d10dcf399 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 = "r37" +PR = "r38" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 59057b5896..127f97dc31 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -16,8 +16,10 @@ EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" # EXTRA_QMAKEVARS_POST = "DESTDIR=" CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" -CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " -CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED " +CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED " do_compile_prepend_ramses () { ln -s custom-ramses.h custom.h diff --git a/packages/libqpe/libqpe-opie/fix-nomax.patch b/packages/libqpe/libqpe-opie/fix-nomax.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libqpe/libqpe-opie/fix-nomax.patch diff --git a/packages/libqpe/libqpe-opie_1.2.0.bb b/packages/libqpe/libqpe-opie_1.2.0.bb index f16bdff7a8..2affdef28c 100644 --- a/packages/libqpe/libqpe-opie_1.2.0.bb +++ b/packages/libqpe/libqpe-opie_1.2.0.bb @@ -1,7 +1,8 @@ include ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -PR = "r0" +PR = "r1" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ + file://fix-nomax.patch;patch=1" diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index fa90bfed5c..7a4e13ab84 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -5,7 +5,7 @@ FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${ FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" -PR = "r10" +PR = "r11" include opie-collections.inc @@ -70,8 +70,8 @@ merge_feeds() { } -# zap the root password -#IMAGE_POSTPROCESS_COMMAND = "zap_root_password" +# create a timestamp of the build date +IMAGE_POSTPROCESS_COMMAND_openzaurus = "create_etc_timestamp" # merge feed-sources into ipkg.conf IMAGE_PREPROCESS_COMMAND = "merge_feeds" diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf index e69de29bb2..d20889067a 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf @@ -0,0 +1,19 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 24 +BigIconSize = 48 +FontFamily = smoothsans +FontStyle = Regular +FontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf index fa0b406de7..d20889067a 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf @@ -14,5 +14,6 @@ Highlight = #52719c HighlightedText = #ffffff Style = libphasestyle.so Text = #000000 +TabStyle = 1 [InputMethod] current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf index e69de29bb2..d20889067a 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf @@ -0,0 +1,19 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 24 +BigIconSize = 48 +FontFamily = smoothsans +FontStyle = Regular +FontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf index dae45c2bbe..d20889067a 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf @@ -4,7 +4,7 @@ SmallIconSize = 24 BigIconSize = 48 FontFamily = smoothsans FontStyle = Regular -FontSize = 12 +FontSize = 14 Background = #d5d0de Base = #ffffff Button = #e3e3e3 @@ -14,5 +14,6 @@ Highlight = #52719c HighlightedText = #ffffff Style = libphasestyle.so Text = #000000 +TabStyle = 1 [InputMethod] current = Multikey |