diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-02-08 20:16:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-08 20:16:30 +0000 |
| commit | f699ef3604f2af3f321eeaa55d984d9421f83a10 (patch) | |
| tree | 06418bd2b6fbce08cc2bf150d0829cc34c639ec7 | |
| parent | d0436ce94dfa44ff4f566c9778d510cbee7d626b (diff) | |
| parent | f58b9f0b800a7862e2e58692fa8e249fa1dcbc81 (diff) | |
merge of 0877d014862bebd39f00cd33f5c60eafefbbc306
and 66c4a96409f67476191a2635d4577125b7dafa40
| -rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/checkroot.sh | 14 | ||||
| -rw-r--r-- | packages/libao/libao-alsa_0.8.6.bb | 27 | ||||
| -rw-r--r-- | packages/lirc/lirc-modules_0.8.0.bb | 3 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 2 |
4 files changed, 41 insertions, 5 deletions
diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh index be640fd254..3943f13427 100644 --- a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh @@ -134,10 +134,18 @@ else # Start a single user shell on the console if single_user_ok then - sulogin -t 300 $CONSOLE - # assume the system is ok now... + 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 - echo "... continuing boot" fi else echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb new file mode 100644 index 0000000000..4df98e1cca --- /dev/null +++ b/packages/libao/libao-alsa_0.8.6.bb @@ -0,0 +1,27 @@ +LICENSE = "GPL" +DESCRIPTION = "A cross platform audio library. This is the ALSA plugin." +HOMEPAGE = "http://www.xiph.org/ao/" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>" +DEPENDS = "alsa-lib libao" +RDEPENDS = "libao2 (>=${PV})" +PR = "r1" + +SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" +S = "${WORKDIR}/libao-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-esd --disable-esdtest \ + --disable-oss \ + --enable-alsa09 --enable-alsa09-mmap \ + --disable-arts --disable-nas" + +do_stage() { + oe_libinstall -so -C src libao ${STAGING_LIBDIR} +} + +PACKAGES = "libao-alsa-plugin libao-alsa-plugin-dev" +FILES_libao-alsa-plugin= "${libdir}/ao/plugins-2/libalsa*.so" +FILES_libao-alsa-plugin-dev += "${libdir}/ao/plugins-2/libalsa*.la" diff --git a/packages/lirc/lirc-modules_0.8.0.bb b/packages/lirc/lirc-modules_0.8.0.bb index f9fbe00b2e..f4411c76a5 100644 --- a/packages/lirc/lirc-modules_0.8.0.bb +++ b/packages/lirc/lirc-modules_0.8.0.bb @@ -1,7 +1,8 @@ DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls. This package contains the lirc kernel modules." SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +MAINTAINER_nslu2 = "Matthias Goebl <matthias.goebl@goebl.net>" LICENSE = "GPL" DEPENDS = "virtual/kernel fakeroot-native setserial" RDEPENDS_nslu2 = "setserial" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index bdbca58509..64f021a938 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -134,7 +134,6 @@ SLUGOS_PACKAGES = "\ samba \ sane-backends \ sed \ - setpwc \ ssmtp \ strace \ streamripper \ @@ -168,6 +167,7 @@ SLUGOS_BROKEN_PACKAGES = "\ icecast \ irssi \ pvrusb2-mci \ + setpwc \ watchdog \ memtester \ " |