diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-15 12:13:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-15 12:13:34 +0200 |
| commit | 7838fca0479a0d4affcb245ec042ead7ae1d7b3b (patch) | |
| tree | ff32b1e640b09ef868ebd9e5f0653ac8dc4d7a27 | |
| parent | 90048caaa77bd293a08a87a98d6382cecf2432f0 (diff) | |
| parent | 6d8e63945568aaba9634ee14901c4f95078c4e2b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/pkgmaker | 8 | ||||
| -rw-r--r-- | target/Config.in | 1 | ||||
| -rw-r--r-- | target/lemote/files/etc/inittab | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/package/pkgmaker b/package/pkgmaker index f4d8355ef..e9e0abff5 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -303,22 +303,22 @@ EOF done # return good if given file exists and is non-empty -function non_empty_file() { +non_empty_file() { [[ -f "$1" ]] || return 1 [[ -n "$(cat "$1")" ]] || return 1 return 0 } # print the verbose section name for a given section tag -function lookup_section_string() { +lookup_section_string() { str="$(grep ^$1\ sections.lst | cut -d ' ' -f '2-')" [[ -n $str ]] && { echo $str; return; } echo $1 } # print the first prompt's first word's value in a given Config.in file -function get_first_prompt() { - prompt="$(grep -m 1 "prompt " $1 | sed -n 's/.*"\([^ \.]*\)[ \.].*"/\1/p')" +get_first_prompt() { + prompt="$(grep "prompt " $1 |head -1| sed -n 's/.*"\([^ \.]*\)[ \.].*"/\1/p')" [[ -n $prompt ]] && echo $prompt } diff --git a/target/Config.in b/target/Config.in index 98e9f179a..9db5efed1 100644 --- a/target/Config.in +++ b/target/Config.in @@ -293,6 +293,7 @@ config ADK_LINUX_MIPS64_LEMOTE select ADK_KPACKAGE_KMOD_MAC80211 select ADK_KPACKAGE_KMOD_SND select ADK_KPACKAGE_KMOD_SND_CS5535AUDIO + select ADK_KPACKAGE_KMOD_SND_OSSEMUL help Lemote Subnotebook. http://www.lemote.com/english/index.html diff --git a/target/lemote/files/etc/inittab b/target/lemote/files/etc/inittab index 6e32240bd..cedbc93ff 100644 --- a/target/lemote/files/etc/inittab +++ b/target/lemote/files/etc/inittab @@ -6,5 +6,4 @@ tty3::respawn:/sbin/getty -i -L tty3 115200 vt100 tty4::respawn:/sbin/getty -i -L tty4 115200 vt100 tty5::respawn:/sbin/getty -i -L tty5 115200 vt100 tty6::respawn:/sbin/getty -i -L tty6 115200 vt100 -tty7::respawn:/sbin/getty -i -L tty7 115200 vt100 tty11::respawn:/sbin/logread -f |