diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-02-06 02:47:59 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-06 02:47:59 +0000 |
commit | 28ae043187520daaa291ce8fc068dae9aee40334 (patch) | |
tree | 0477f64bd4758019adeb4604a0598bbbc268339c /packages | |
parent | 409650382870711fda497f6d31e590f254a67f59 (diff) | |
parent | a56f5680381313b9a12a3ba133c5cb7a2154aa67 (diff) |
merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
and a99a1b40b0c3079093094218ed369481d70fecd4
Diffstat (limited to 'packages')
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/checkroot.sh | 12 | ||||
-rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb | 2 | ||||
-rw-r--r-- | packages/setpwc/files/makefile.diff | 12 | ||||
-rw-r--r-- | packages/setpwc/setpwc_1.1.bb | 19 | ||||
-rw-r--r-- | packages/slugos-init/files/functions | 2 | ||||
-rw-r--r-- | packages/slugos-init/files/leds | 5 | ||||
-rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 |
7 files changed, 47 insertions, 7 deletions
diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh index a26b9ffa37..c70855ee43 100644 --- a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh @@ -4,6 +4,7 @@ # Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl # +. /etc/default/functions . /etc/default/rcS # @@ -133,8 +134,15 @@ else # Start a single user shell on the console if single_user_ok then - sulogin $CONSOLE - reboot -f + sulogin -t 600 $CONSOLE + # if this exits with SIGALRM (which happens to be 142) the + # timeout happened, do not, then, reboot! + if test $? -ne 142 + then + reboot -f + else + echo "/etc/init.d/checkroot.sh: sulogin timeout, continuing boot" + fi else echo "/etc/init.d/checkroot.sh: fsck failed, continuing boot" fi diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 3219f8883f..df89fd161b 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -11,7 +11,7 @@ RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.7" +PR := "${PR}.8" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/setpwc/files/makefile.diff b/packages/setpwc/files/makefile.diff new file mode 100644 index 0000000000..e129db7b56 --- /dev/null +++ b/packages/setpwc/files/makefile.diff @@ -0,0 +1,12 @@ +--- setpwc-1.1/Makefile.orig 2006-02-06 03:25:11.000000000 +0100 ++++ setpwc-1.1/Makefile 2006-02-06 03:25:27.000000000 +0100 +@@ -22,9 +22,6 @@ + + setpwc: $(OBJS) + $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o setpwc +- strip setpwc +- # +- # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html + + install: setpwc + cp setpwc /usr/bin diff --git a/packages/setpwc/setpwc_1.1.bb b/packages/setpwc/setpwc_1.1.bb new file mode 100644 index 0000000000..120ba463bf --- /dev/null +++ b/packages/setpwc/setpwc_1.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Set various aspects of Philips (and compatible) WebCams." +SECTION = "console" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +HOMEPAGE = "http://www.vanheusden.com/setpwc/" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.vanheusden.com/setpwc/setpwc-${PV}.tgz \ + file://makefile.diff;patch=1" + +inherit autotools + +INHIBIT_AUTO_STAGE = "1" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/setpwc ${D}${bindir}/setpwc +} diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions index df74aea717..78dcf816b3 100644 --- a/packages/slugos-init/files/functions +++ b/packages/slugos-init/files/functions @@ -35,7 +35,7 @@ single_user_ok() { test "$SULOGIN" = yes -o "$SULOGIN" = ok || case "$(machine)" in ixdp*|avila|loft) - return 0;; + test "$SULOGIN" != never;; *) return 1;; esac } diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds index 227ed78ff4..433467b96f 100644 --- a/packages/slugos-init/files/leds +++ b/packages/slugos-init/files/leds @@ -169,7 +169,8 @@ sysled(){ # # beep {arguments} # emit a beep -# does nothing if there is no beep executable +# does nothing if there is no beep executable, is very +# quiet in the presence of errors beep(){ local arg arg= @@ -177,7 +178,7 @@ beep(){ if test -x /bin/beep then test -c /dev/buzzer && arg="-e /dev/buzzer" - /bin/beep $arg "$@" + /bin/beep $arg "$@" 2>/dev/null fi return 0 } diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index d8376ef2da..ed183b9278 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r55" +PR = "r56" SRC_URI = "file://boot/flash \ file://boot/disk \ |