lirc: rework configuration, make build work again

(cherry-picked from commit c8db5d703af5484d6ee57ac153c352385bdd8898)

6 files changed, 127 insertions, 53 deletions

diff --git a/kernels/lirc/BUILD b/kernels/lirc/BUILD
index 5445c42f58..a7a91e7551 100755
--- a/kernels/lirc/BUILD
+++ b/kernels/lirc/BUILD
@@ -1,11 +1,8 @@
 # Remove their CFLAGS, but make sure only literal CFLAGS definition is gone.
 sedit 's|^CFLAGS="[^$]*"$|#\0|g' configure &&
-
-message "Custom configuration: $LIRCOPTS" &&
-OPTS="
-  $OPTS
-  $LIRCOPTS
-  --with-kerneldir=${INSTALL_ROOT}/usr/src/linux-$(get_kernel_version)
-  --with-moduledir=/lib/modules/$(get_kernel_version)/misc
-" &&
+if [[ "$LIRC_ALL" == y ]]; then
+  OPTS="$OPTS --with-driver=all"
+else
+  OPTS="$OPTS --with-driver=$LIRC_DRIVER"
+fi &&
 default_build
diff --git a/kernels/lirc/CONFIGURE b/kernels/lirc/CONFIGURE
new file mode 100755
index 0000000000..753185cafb
--- /dev/null
+++ b/kernels/lirc/CONFIGURE
@@ -0,0 +1,17 @@
+config_query LIRC_ALL "Compile all drivers instead of selecting from list (some may well not build)?" n &&
+if [[ "$LIRC_ALL" == n ]]; then
+  local drivers=$(<"$SCRIPT_DIRECTORY/drivers") &&
+  while true
+  do
+    message "${MESSAGE_COLOR}So, choose some drivers from this list:$DEFAULT_COLOR" &&
+    message $drivers &&
+    config_query_string LIRC_DRIVER "Your selection of _one_ entry:" serial &&
+    if list_find "$drivers" "$LIRC_DRIVER"; then
+      message "${MESSAGE_COLOR}OK, seems to be one of the options...$DEFAULT_COLOR"
+      break
+    else
+      message "${MESSAGE_COLOR}Hey, please select something from the list!$DEFAULT_COLOR"
+      persistent_remove LIRC_DRIVER
+    fi
+  done
+fi
diff --git a/kernels/lirc/HISTORY b/kernels/lirc/HISTORY
index 36ecc47606..4901d51e0b 100644
--- a/kernels/lirc/HISTORY
+++ b/kernels/lirc/HISTORY
@@ -1,6 +1,8 @@
 2008-08-23 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: update to 0.8.3
 	* DETAILS: update to CVS snapshot 20080823 (needed for kernel 2.6.26)
+	* CONFIGURE, BUILD, PRE_BUILD, *diff, drivers:
+	  New, simpler (and working) driver configuration, asking for one or all drivers.
 
 2007-08-20 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.8.2
diff --git a/kernels/lirc/PRE_BUILD b/kernels/lirc/PRE_BUILD
deleted file mode 100755
index ec97b79d79..0000000000
--- a/kernels/lirc/PRE_BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-default_pre_build &&
-  # patch setup to show less menue options
-  # and to skip menue if config is allready there
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/setup.diff &&
-if [[ -z "$LIRCOPTS" ]] ;  then
-  message "Executing setup..." &&
-  ./setup.sh &&
-
-  # Extract ./configure options from the generated script
-  # We need to make these OPTS a one-liner, otherwise bad things happen
-  LIRCOPTS="$(gawk '
-BEGIN {
-  opts = ""
-}
-/^--/ {
-  opts = opts " " $1
-}
-END {
-  print opts
-}
-' configure.sh)" &&
-  persistent_add LIRCOPTS
-fi
diff --git a/kernels/lirc/drivers b/kernels/lirc/drivers
new file mode 100755
index 0000000000..d2ac485b07
--- /dev/null
+++ b/kernels/lirc/drivers
@@ -0,0 +1,103 @@
+userspace
+accent
+act200l
+act220l
+adaptec
+alsa_usb
+animax
+asusdh
+atilibusb
+atiusb
+audio
+audio_alsa
+avermedia
+avermedia_vdomate
+avermedia98
+bestbuy
+bestbuy2
+breakoutbox
+bte
+bw6130
+caraca
+chronos
+cmdir
+commandir
+comX
+cph06x
+creative
+creative_infracd
+devinput
+digimatrix
+dsp
+dvico
+ea65
+exaudio
+flyvideo
+gvbctv5pci
+hauppauge
+hauppauge_dvb
+hercules_smarttv_stereo
+i2cuser
+igorplugusb
+iguanaIR
+imon
+imon_24g
+imon_knob
+imon_lcd
+imon_pad
+imon_rsc
+irdeo
+irdeo_remote
+irlink
+irman
+irreal
+it87
+knc_one
+kworld
+leadtek_0007
+leadtek_0010
+leadtek_pvr2000
+livedrive_midi
+livedrive_seq
+logitech
+lptX
+macmini
+mceusb
+mceusb2
+mediafocusI
+mouseremote
+mouseremote_ps2
+mp3anywhere
+mplay
+nslu2
+packard_bell
+parallel
+pcmak
+pcmak_usb
+pctv
+pixelview_bt878
+pixelview_pak
+pixelview_pro
+provideo
+realmagic
+remotemaster
+sa1100
+samsung
+sasem
+sb0540
+serial
+silitek
+sir
+slinke
+streamzap
+tekram
+tekram_bt829
+tira
+ttusbir
+tuxbox
+tvbox
+udp
+uirt2
+uirt2_raw
+usb_uirt_raw
+usbx
diff --git a/kernels/lirc/setup.diff b/kernels/lirc/setup.diff
deleted file mode 100644
index 9ff7c3623c..0000000000
--- a/kernels/lirc/setup.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.sh.old	2005-06-17 15:12:07.000000000 -0700
-+++ setup.sh	2005-06-17 15:15:09.000000000 -0700
-@@ -396,9 +396,7 @@
-            --menu "$MAIN_MENU_TEXT" 13 74 5 \
-              1 "Driver configuration ($SELECTED_DRIVER)" \
-              2 "Software configuration" \
--             3 "Save configuration & run configure" \
--             4 "Save configuration & exit" \
--             5 "Exit WITHOUT doing anything" 2>$TEMP
-+             3 "Save configuration" 2>$TEMP
- 
-     if test "$?" != "0"; then
-         {
-@@ -413,7 +411,6 @@
-         elif test "$1" = "3"; then
-             {
-             SaveConfig
--            CONFIGURE="yes"
-             }
-         elif test "$1" = "4"; then SaveConfig
-         elif test "$1" = "5"; then