Skip to content

Commit 10e10b4

Browse files
bru7usbru7us
committed
Added kernel dependency Makefiles for all ARCHs. Updated LIRC to depend on correct cross version based on ARCH/kernel. LIRC UI Wizard now has a text box and displays all availble drivers in the package. Added abort case to spk/lirc for unsupported ARCHs.
1 parent 977ed73 commit 10e10b4

File tree

32 files changed

+293
-48
lines changed

32 files changed

+293
-48
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ distrib
22
packages
33
native/*/work*
44
cross/*/work*
5+
kernel/*/work*
56
spk/*/work*
67
toolchains/*/work*
78
local.mk

‎cross/lirc-0.8.7/Makefile

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
PKG_NAME = lirc
2+
PKG_VERS = 0.8.7
3+
PKG_EXT = tar.bz2
4+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
5+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/0.8.7
6+
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
7+
MOD_DIR = /lib/modules
8+
9+
REQ_KERNEL = 1
10+
11+
HOMEPAGE = http://www.lirc.org/
12+
COMMENT = LIRC daemon decodes infrared signals and provides them on a Unix domain socket
13+
LICENSE =
14+
15+
GNU_CONFIGURE = 1
16+
CONFIGURE_ARGS = --with-transmitter --with-driver=all --with-moduledir=$(MOD_DIR) --enable-sandboxed --with-kerneldir=$(KERNEL_DIR)
17+
18+
POST_CONFIGURE_TARGET = lirc_kill_drivers
19+
INSTALL_TARGET = lirc_custom_install
20+
21+
# These drivers would not make and are likely un-needed anyway
22+
KILL_DRIVERS = lirc_wpc8769l
23+
24+
# i2c functions not availble in ppc854x kernel configuration
25+
ifeq ($(ARCH),ppc854x)
26+
KILL_DRIVERS += lirc_i2c
27+
endif
28+
29+
include ../../mk/spksrc.cross-cc.mk
30+
31+
.PHONY: lirc_custom_install lirc_kill_drivers
32+
lirc_custom_install:
33+
$(RUN) $(MAKE) install DESTDIR=$(STAGING_INSTALL_PREFIX) prefix=""
34+
lirc_kill_drivers:
35+
@for DRIVER in $(KILL_DRIVERS); do \
36+
echo -e ".PHONY: all install\nall:\ninstall:\n" > $(WORK_DIR)/$(PKG_DIR)/drivers/$$DRIVER/Makefile; \
37+
done

‎cross/lirc/PLIST ‎cross/lirc-0.8.7/PLIST

+1-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@ rsc:lib/liblirc_client.la
1313
lnk:lib/liblirc_client.so
1414
lnk:lib/liblirc_client.so.0
1515
lib:lib/liblirc_client.so.0.2.1
16-
rsc:lib/modules/lirc_atiusb.ko
17-
rsc:lib/modules/lirc_dev.ko
18-
rsc:lib/modules/lirc_i2c.ko
19-
rsc:lib/modules/lirc_mceusb.ko
20-
rsc:lib/modules/lirc_parallel.ko
21-
rsc:lib/modules/lirc_serial.ko
22-
rsc:lib/modules/lirc_ttusbir.ko
16+
rsc:lib/modules/*
2317
bin:sbin/lircd
2418
bin:sbin/lircmd
2519
rsc:share/man/man1/ircat.1

‎cross/lirc/Makefile ‎cross/lirc-0.9.0/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PKG_NAME = lirc
2-
PKG_VERS = 0.8.7
2+
PKG_VERS = 0.9.0
33
PKG_EXT = tar.bz2
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
5-
PKG_DIST_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/0.8.7
5+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(PKG_VERS)
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
77
MOD_DIR = /lib/modules
88

@@ -13,9 +13,9 @@ COMMENT = LIRC daemon decodes infrared signals and provides them on a Unix doma
1313
LICENSE =
1414

1515
GNU_CONFIGURE = 1
16-
CONFIGURE_ARGS = --with-transmitter --with-driver=all --with-moduledir=$(MOD_DIR) --enable-sandboxed --with-kerneldir=$(KERNEL_DIR)
16+
CONFIGURE_ARGS = --with-transmitter --with-driver=userspace --with-moduledir=$(MOD_DIR) --enable-sandboxed --with-kerneldir=$(KERNEL_DIR)
1717

18-
POST_CONFIGURE_TARGET = lirc_kill_wpc8769l
18+
#POST_CONFIGURE_TARGET = lirc_kill_wpc8769l
1919
INSTALL_TARGET = lirc_custom_install
2020

2121
include ../../mk/spksrc.cross-cc.mk

‎cross/lirc/PLIST.alldrivers ‎cross/lirc-0.9.0/PLIST

-16
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,6 @@ rsc:lib/liblirc_client.la
1313
lnk:lib/liblirc_client.so
1414
lnk:lib/liblirc_client.so.0
1515
lib:lib/liblirc_client.so.0.2.1
16-
rsc:lib/modules/lirc_atiusb.ko
17-
rsc:lib/modules/lirc_bt829.ko
18-
rsc:lib/modules/lirc_dev.ko
19-
rsc:lib/modules/lirc_ene0100.ko
20-
rsc:lib/modules/lirc_i2c.ko
21-
rsc:lib/modules/lirc_igorplugusb.ko
22-
rsc:lib/modules/lirc_imon.ko
23-
rsc:lib/modules/lirc_it87.ko
24-
rsc:lib/modules/lirc_ite8709.ko
25-
rsc:lib/modules/lirc_mceusb.ko
26-
rsc:lib/modules/lirc_parallel.ko
27-
rsc:lib/modules/lirc_sasem.ko
28-
rsc:lib/modules/lirc_serial.ko
29-
rsc:lib/modules/lirc_sir.ko
30-
rsc:lib/modules/lirc_streamzap.ko
31-
rsc:lib/modules/lirc_ttusbir.ko
3216
bin:sbin/lircd
3317
bin:sbin/lircmd
3418
rsc:share/man/man1/ircat.1

‎kernel/syno-88f5281/Makefile

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
PKG_NAME = synogpl
2+
PKG_BRANCH = 1628
3+
PKG_ARCH = 5281
4+
PKG_EXT = tbz
5+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
6+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/1594branch
7+
PKG_EXTRACT = source/linux-2.6.15
8+
SYNO_CONFIG = 88f5281-config
9+
BASE_ARCH = arm
10+
11+
KERNEL_ENV = $(TC_ENV) LDFLAGS=""
12+
13+
HOMEPAGE = http://www.synology.com/
14+
15+
include ../../mk/spksrc.kernel-modules.mk

‎kernel/syno-88f5281/digests

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
synogpl-1628-5281.tbz SHA1 8bd5c1ccca3360ef257b0f1b741b8bed7e3f1ba0
2+
synogpl-1628-5281.tbz MD5 e412cd4c8c473eb28a08d1e148d2a728

‎kernel/syno-bromolow/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ PKG_EXTRACT = source/linux-3.x
88
SYNO_CONFIG = synoconfigs/$(ARCH)
99
BASE_ARCH = x86
1010

11+
TC = syno-$(ARCH)-x64
12+
1113
HOMEPAGE = http://www.synology.com/
1214

1315
include ../../mk/spksrc.kernel-modules.mk

‎kernel/syno-cedarview/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ PKG_EXTRACT = source/linux-3.x
88
SYNO_CONFIG = synoconfigs/$(ARCH)
99
BASE_ARCH = x86
1010

11+
TC = syno-$(ARCH)-x64
12+
1113
HOMEPAGE = http://www.synology.com/
1214

1315
include ../../mk/spksrc.kernel-modules.mk

‎kernel/syno-powerpc/Makefile

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
PKG_NAME = synogpl
2+
PKG_BRANCH = 2636
3+
PKG_ARCH = ppc
4+
PKG_EXT = tbz
5+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
6+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
7+
PKG_EXTRACT = source/uclinux2422/linux-2.4.x
8+
SYNO_CONFIG = powerpc-config
9+
BASE_ARCH = ppc
10+
11+
HOMEPAGE = http://www.synology.com/
12+
13+
POST_EXTRACT_TARGET = copy_powerpc_makefile
14+
PRE_COMPILE_TARGET = kernel_make_oldconfig
15+
16+
include ../../mk/spksrc.kernel-modules.mk
17+
18+
.PHONY: copy_powerpc_makefile kernel_make_oldconfig
19+
20+
copy_powerpc_makefile:
21+
cp $(KERNEL_DIR)/Makefile.powerpc $(KERNEL_DIR)/Makefile
22+
23+
kernel_make_oldconfig:
24+
$(RUN) $(MAKE) oldconfig
25+
$(RUN) $(MAKE) dep

‎kernel/syno-powerpc/digests

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
synogpl-2636-ppc.tbz SHA1 f7576a3c6264c75b6e174245a85d09363850098e
2+
synogpl-2636-ppc.tbz MD5 2ed1be71aa0d0264486246bf988cd0b9

‎kernel/syno-ppc824x/Makefile

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
PKG_NAME = synogpl
2+
PKG_BRANCH = 2636
3+
PKG_ARCH = 824x
4+
PKG_EXT = tbz
5+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
6+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
7+
PKG_EXTRACT = source/linux-2.6.24
8+
SYNO_CONFIG = synoconfigs/$(ARCH)
9+
BASE_ARCH = ppc
10+
11+
KERNEL_ENV = $(TC_ENV) LDFLAGS=""
12+
13+
HOMEPAGE = http://www.synology.com/
14+
15+
include ../../mk/spksrc.kernel-modules.mk

‎kernel/syno-ppc824x/digests

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
synogpl-2636-824x.tbz SHA1 7b7f4e3869eaa9dcf1eb6488b873f7073bcf7d52
2+
synogpl-2636-824x.tbz MD5 06d04e39d5fead0b5b5fe54b57b3c083

‎kernel/syno-ppc853x/Makefile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
PKG_NAME = synogpl
2+
PKG_BRANCH = 2636
3+
PKG_ARCH = 853x
4+
PKG_EXT = tbz
5+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
6+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
7+
PKG_EXTRACT = source/linux-2.6.32
8+
SYNO_CONFIG = synoconfigs/ppc8533
9+
BASE_ARCH = powerpc
10+
11+
HOMEPAGE = http://www.synology.com/
12+
13+
PRE_COMPILE_TARGET = kernel_ppc_premake
14+
15+
include ../../mk/spksrc.kernel-modules.mk
16+
17+
.PHONY: kernel_ppc_premake
18+
19+
kernel_ppc_premake:
20+
$(RUN) $(MAKE) LDFLAGS="" arch/powerpc/lib/crtsavres.o

‎kernel/syno-ppc853x/digests

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
synogpl-2636-853x.tbz SHA1 214ea735fc1c0a5731ff8bf492bb9df189e8613b
2+
synogpl-2636-853x.tbz MD5 75a0b9c5bb54f6b4ca5c4ca4423a5d17

‎kernel/syno-ppc854x/Makefile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
PKG_NAME = synogpl
2+
PKG_BRANCH = 2198
3+
PKG_ARCH = 854x
4+
PKG_EXT = tbz
5+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
6+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
7+
PKG_EXTRACT = source/linux-2.6.32
8+
SYNO_CONFIG = synoconfigs/$(ARCH)
9+
BASE_ARCH = powerpc
10+
11+
HOMEPAGE = http://www.synology.com/
12+
13+
PRE_COMPILE_TARGET = kernel_ppc_premake
14+
15+
include ../../mk/spksrc.kernel-modules.mk
16+
17+
.PHONY: kernel_ppc_premake
18+
19+
kernel_ppc_premake:
20+
$(RUN) $(MAKE) LDFLAGS="" arch/powerpc/lib/crtsavres.o

‎kernel/syno-ppc854x/digests

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
synogpl-2198-854x.tbz SHA1 8a657878d682209ac77f95ffdd0ac68f18d5d57f
2+
synogpl-2198-854x.tbz MD5 eccf54c4a3179e10e4a6acd5ed52d652

‎kernel/syno-qoriq/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ BASE_ARCH = powerpc
1010

1111
HOMEPAGE = http://www.synology.com/
1212

13-
PRE_COMPILE_TARGET = fix_qoriq_kernel
13+
PRE_COMPILE_TARGET = kernel_ppc_premake
1414

1515
include ../../mk/spksrc.kernel-modules.mk
1616

17-
.PHONY: fix_qoriq_kernel
17+
.PHONY: kernel_ppc_premake
1818

19-
fix_qoriq_kernel:
19+
kernel_ppc_premake:
2020
$(RUN) $(MAKE) LDFLAGS="" arch/powerpc/lib/crtsavres.o

‎kernel/syno-x86/Makefile

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
PKG_NAME = synogpl
2+
PKG_BRANCH = 2636
3+
PKG_ARCH = x64
4+
PKG_EXT = tbz
5+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_BRANCH)-$(PKG_ARCH).$(PKG_EXT)
6+
PKG_DIST_SITE = http://downloads.sourceforge.net/project/dsgpl/Synology%20NAS%20GPL%20Source/$(PKG_BRANCH)branch
7+
PKG_EXTRACT = source/linux-3.x
8+
SYNO_CONFIG = synoconfigs/x86_64
9+
BASE_ARCH = x86
10+
11+
TC = syno-$(ARCH)-x64
12+
13+
HOMEPAGE = http://www.synology.com/
14+
15+
include ../../mk/spksrc.kernel-modules.mk

‎kernel/syno-x86/digests

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
synogpl-2636-x64.tbz SHA1 c2e2a4810c0d0da8b88d58b7133e69ef9df6689d
2+
synogpl-2636-x64.tbz MD5 66e346494be0ea5105f5075998dad01d

‎mk/spksrc.kernel-modules.mk

+7-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ COPY_TARGET = kernel_null_target
1818
include ../../mk/spksrc.cross-env.mk
1919
#####
2020

21-
RUN = cd $(KERNEL_DIR) && env LDFLAGS=""
21+
KERNEL_ENV ?=
22+
KERNEL_ENV += PATH=$$PATH
23+
24+
RUN = cd $(KERNEL_DIR) && env -i $(KERNEL_ENV)
2225
MSG = echo "===> "
2326

2427
.PHONY: kernel_module_compile_target kernel_extract_target kernel_null_target
@@ -38,8 +41,8 @@ configure: patch
3841
@$(MSG) "Configuring depended kernel source"
3942
cp $(KERNEL_DIR)/$(SYNO_CONFIG) $(KERNEL_DIR)/.config
4043
# Update the Makefile
41-
sed -i -r 's,^ARCH\t+.+,ARCH\t= $(BASE_ARCH),' $(KERNEL_DIR)/Makefile
42-
sed -i -r 's,^CROSS_COMPILE\t+.+,CROSS_COMPILE\t= $(TC_PATH)$(TC_PREFIX),' $(KERNEL_DIR)/Makefile
44+
sed -i -r 's,^ARCH\s*.+,ARCH\t= $(BASE_ARCH),' $(KERNEL_DIR)/Makefile
45+
sed -i -r 's,^CROSS_COMPILE\s*.+,CROSS_COMPILE\t= $(TC_PATH)$(TC_PREFIX),' $(KERNEL_DIR)/Makefile
4346
test -e $(WORK_DIR)/$(KERNEL_DIR)/arch/$(ARCH) || ln -sf $(BASE_ARCH) $(KERNEL_DIR)/arch/$(ARCH)
4447

4548
compile: configure
@@ -65,7 +68,7 @@ $(DIGESTS_FILE):
6568
done
6669

6770
kernel_module_compile_target:
68-
$(RUN) $(MAKE) LDFLAGS="" modules
71+
$(RUN) $(MAKE) modules
6972

7073
kernel_extract_target:
7174
mkdir -p $(KERNEL_DIR)

‎spk/lirc/Makefile

+25-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
SPK_NAME = lirc
2-
SPK_VERS = 0.8.7
2+
SPK_VERS = 0.9.0
33
SPK_REV = 1
44
SPK_ICON = src/lirc.png
55

6-
DEPENDS = cross/$(SPK_NAME)
6+
# Abort for ARCHs that won't compile LIRC cleanly
7+
ifeq ($(findstring $(ARCH),powerpc 88f5281),$(ARCH))
8+
PRE_DEPEND_TARGET = lirc_abort
9+
ABORT_MSG = "Sorry, this package does not support the $(ARCH) architecture."
10+
endif
11+
12+
# Use older LIRC build for ARCHs with kernel < 2.6.36
13+
ifneq ($(findstring $(ARCH),x86 bromolow cedarview),$(ARCH))
14+
SPK_VERS = 0.8.7
15+
endif
16+
17+
DEPENDS = cross/$(SPK_NAME)-$(SPK_VERS)
718

8-
MAINTAINER = Dave Russell
19+
MAINTAINER = SynoCommunity
920
DESCRIPTION = LIRC daemon decodes infrared signals and provides them on a Unix domain socket
1021
RELOAD_UI = no
1122
DISPLAY_NAME = LIRC
@@ -25,17 +36,22 @@ POST_STRIP_TARGET = lirc_extra_install
2536

2637
include ../../mk/spksrc.spk.mk
2738

28-
.PHONY: lirc_extra_install
39+
.PHONY: lirc_extra_install lirc_abort
2940
lirc_extra_install:
3041
install -m 755 -d $(STAGING_DIR)/var
3142
install -m 755 -d $(STAGING_DIR)/var/log
3243
install -m 755 -d $(STAGING_DIR)/etc/lirc/scripts
3344
install -m 755 src/send_ir.sh $(STAGING_DIR)/etc/lirc/scripts/send_ir.sh
3445
install -m 644 src/lircrc $(STAGING_DIR)/etc/lirc/lircrc
3546
install -m 644 src/lircd.conf $(STAGING_DIR)/etc/lirc/lircd.conf
36-
install src/install_uifile.tmpl $(WIZARDS_DIR)/install_uifile
3747
cp -R $(WORK_DIR)/$(SPK_NAME)-$(SPK_VERS)/remotes $(STAGING_DIR)/
38-
for DRIVER in `ls $(STAGING_DIR)/lib/modules | grep -v lirc_dev.ko | awk -F'_' '{print $$2}' | awk -F'.' '{print $$1}'`; do \
39-
sed -i "s/@keys@/\"key\": \"lirc_driver_$${DRIVER}\",\n \"desc\": \"$${DRIVER}\"\n }, {\n@keys@/" $(WIZARDS_DIR)/install_uifile; \
40-
done; \
41-
sed -i 's/@keys@//' $(WIZARDS_DIR)/install_uifile
48+
install src/install_uifile.tmpl $(WIZARDS_DIR)/install_uifile
49+
@for DRIVER in `ls $(STAGING_DIR)/lib/modules | grep -v lirc_dev.ko | awk -F'_' '{print $$2}' | awk -F'.' '{print $$1}'`; do \
50+
# DSM UI only shows 6 radio buttons on a screen, so reverting to non-preferred textbox \
51+
#sed -i "s/@keys@/\"key\": \"lirc_driver_$${DRIVER}\",\n \"desc\": \"$${DRIVER}\"\n }, {\n@keys@/" $(WIZARDS_DIR)/install_uifile; \
52+
sed -i "s/@keys@/ $${DRIVER}@keys@/" $(WIZARDS_DIR)/install_uifile; \
53+
done;
54+
@sed -i 's/@keys@//' $(WIZARDS_DIR)/install_uifile
55+
lirc_abort:
56+
@$(MSG) ABORTING: $(ABORT_MSG)
57+
@exit 1

‎spk/lirc/src/install_uifile.tmpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[{
22
"step_title": "Configuration",
33
"items": [{
4-
"type": "singleselect",
5-
"desc": "Choose driver to install",
4+
"type": "textfield",
5+
"desc": "Choose driver to install from the following list. The input must be exact and is case sensitive:@keys@ none",
66
"subitems": [{
7-
@keys@"key": "lirc_driver_none",
8-
"desc": "none"
7+
"key": "lirc_driver_selected",
8+
"desc": "Driver:"
99
}]
1010
}]
1111
}]

‎spk/lirc/src/install_uifile.tmpl.singleselect

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[{
2+
"step_title": "Configuration",
3+
"items": [{
4+
"type": "singleselect",
5+
"desc": "Choose driver to install",
6+
"subitems": [{
7+
@keys@"key": "lirc_driver_none",
8+
"desc": "none"
9+
}]
10+
}]
11+
}]

‎spk/lirc/src/installer.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ postinst ()
3232

3333
# Set up the driver module selected during installation wizard
3434
for DRIVER in `ls ${INSTALL_DIR}/lib/modules | grep -v lirc_dev.ko | awk -F'_' '{print \$2}' | awk -F'.' '{print \$1}'`; do
35-
if [ "$(eval echo \$lirc_driver_${DRIVER})" = "true" ]; then
35+
# put this line back if we go back to the singleselect in install_uifile
36+
#if [ "$(eval echo \$lirc_driver_${DRIVER})" = "true" ]; then
37+
if [ "${lirc_driver_selected}" = "${DRIVER}" ]; then
3638
sed -i "s/@driver@/${DRIVER}/g" ${SSS}
3739
sed -i "s/#insmod/insmod/g" ${SSS}
3840
sed -i "s/#rmmod/rmmod/g" ${SSS}

0 commit comments

Comments
 (0)