Skip to content

Commit

Permalink
Move to CMake build system - modprobe.d blacklists installation
Browse files Browse the repository at this point in the history
  • Loading branch information
jiri-pinkava committed Nov 20, 2022
1 parent 530cc2b commit f4f14ea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
7 changes: 2 additions & 5 deletions Makefile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,23 @@ 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
/usr/sbin/adduser --quiet --system --ingroup radio recordings
/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
Expand Down
7 changes: 2 additions & 5 deletions Makefile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,23 @@ 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
/usr/sbin/adduser --quiet --system --ingroup radio recordings
/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
Expand Down

0 comments on commit f4f14ea

Please sign in to comment.