diff --git a/CMakeLists.txt b/CMakeLists.txt index 4eb3f471..b29aa952 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,4 +274,5 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") ) install(FILES aprsfeed.rotate DESTINATION "${SYSCONFDIR}/logrotate.d") + install(FILES airspy-blacklist.conf DESTINATION "${SYSCONFDIR}/modprobe.d") endif() diff --git a/Makefile.debug b/Makefile.debug index 78a38cbc..cc7161d2 100644 --- a/Makefile.debug +++ b/Makefile.debug @@ -17,18 +17,16 @@ VARDIR=/var/lib/ka9q-radio AIRSPY_FILES= -BLACKLIST=airspy-blacklist.conf - SRC=attr.c audio.c avahi.c ax25.c bandplan.c config.c decimate.c decode_status.c dump.c fcd.c filter.c fm.c \ iir.c linear.c main.c misc.c modes.c morse.c radio.c \ radio_status.c multicast.c osc.c hid-libusb.c rtcp.c \ status.c wfm.c attr.h ax25.h bandplan.h conf.h config.h decimate.h \ fcd.h fcdhidcmd.h filter.h hidapi.h iir.h misc.h morse.h multicast.h osc.h radio.h status.h -all: depend $(AIRSPY_FILES) $(BLACKLIST) 98-sockbuf.conf start-ka9q-horus.sh +all: depend $(AIRSPY_FILES) 98-sockbuf.conf start-ka9q-horus.sh # Don't overwrite existing config files in /etc/radio -install: ) $(AIRSPY_FILES) $(BLACKLIST) 98-sockbuf.conf start-ka9q-horus.sh +install: ) $(AIRSPY_FILES) 98-sockbuf.conf start-ka9q-horus.sh /usr/sbin/adduser --quiet --system --group radio /usr/sbin/adduser --quiet --system --ingroup radio airspy /usr/sbin/adduser --quiet --system --ingroup radio funcube @@ -36,7 +34,6 @@ install: ) $(AIRSPY_FILES) $(BLACKLIST) 98-sockbuf.conf start-ka9q-horus.sh /usr/sbin/adduser --quiet --system --ingroup radio aprsfeed install -o root -m 0755 -D --target-directory=/etc/sysctl.d 98-sockbuf.conf install -o root -m 0755 -D --target-directory=$(DAEMONDIR) start-ka9q-horus.sh - install -o root -m 0644 -D --target-directory=/etc/modprobe.d $(BLACKLIST) mkdir -p /etc/fftw /etc/radio $(VARDIR) /etc/radio/airspyd.conf.d chgrp radio $(VARDIR) /etc/radio /etc/fftw chmod g+ws $(VARDIR) /etc/radio /etc/fftw diff --git a/Makefile.linux b/Makefile.linux index 348d4a21..6d12e4dd 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -12,18 +12,16 @@ VARDIR=/var/lib/ka9q-radio AIRSPY_FILES= -BLACKLIST=airspy-blacklist.conf - SRC=attr.c audio.c avahi.c ax25.c bandplan.c config.c decimate.c decode_status.c dump.c fcd.c filter.c fm.c \ iir.c linear.c main.c misc.c modes.c morse.c radio.c \ radio_status.c multicast.c osc.c hid-libusb.c rtcp.c \ status.c wfm.c attr.h ax25.h bandplan.h conf.h config.h decimate.h \ fcd.h fcdhidcmd.h filter.h hidapi.h iir.h misc.h morse.h multicast.h osc.h radio.h status.h -all: depend $(AIRSPY_FILES) $(BLACKLIST) 98-sockbuf.conf start-ka9q-horus.sh +all: depend $(AIRSPY_FILES) 98-sockbuf.conf start-ka9q-horus.sh # Don't overwrite existing config files in /etc/radio -install: $(AIRSPY_FILES) $(BLACKLIST) 98-sockbuf.conf start-ka9q-horus.sh +install: $(AIRSPY_FILES) 98-sockbuf.conf start-ka9q-horus.sh /usr/sbin/adduser --quiet --system --group radio /usr/sbin/adduser --quiet --system --ingroup radio airspy /usr/sbin/adduser --quiet --system --ingroup radio funcube @@ -31,7 +29,6 @@ install: $(AIRSPY_FILES) $(BLACKLIST) 98-sockbuf.conf start-ka9q-horus.sh /usr/sbin/adduser --quiet --system --ingroup radio aprsfeed install -o root -m 0755 -D --target-directory=/etc/sysctl.d 98-sockbuf.conf install -o root -m 0755 -D --target-directory=$(DAEMONDIR) start-ka9q-horus.sh - install -o root -m 0644 -D --target-directory=/etc/modprobe.d $(BLACKLIST) mkdir -p /etc/fftw /etc/radio $(VARDIR) /etc/radio/airspyd.conf.d chgrp radio $(VARDIR) /etc/radio /etc/fftw chmod g+ws $(VARDIR) /etc/radio /etc/fftw