Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 14 years ago
parent
commit
7838fca047
3 changed files with 5 additions and 5 deletions
  1. 4 4
      package/pkgmaker
  2. 1 0
      target/Config.in
  3. 0 1
      target/lemote/files/etc/inittab

+ 4 - 4
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
 }
 

+ 1 - 0
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

+ 0 - 1
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