kopia lustrzana https://github.com/cyoung/stratux
Resolve conflicts.
rodzic
77ecb0d6ad
commit
e3d348a0fa
6
Makefile
6
Makefile
|
@ -39,19 +39,13 @@ install:
|
|||
cp -f gen_gdl90 /usr/bin/gen_gdl90
|
||||
chmod 755 /usr/bin/gen_gdl90
|
||||
cp image/10-stratux.rules /etc/udev/rules.d/10-stratux.rules
|
||||
<<<<<<< HEAD
|
||||
cp image/99-uavionix.rules /etc/udev/rules.d/99-uavionix.rules
|
||||
chmod 755 /etc/init.d/stratux
|
||||
ln -sf /etc/init.d/stratux /etc/rc2.d/S01stratux
|
||||
ln -sf /etc/init.d/stratux /etc/rc6.d/K01stratux
|
||||
=======
|
||||
rm -f /etc/init.d/stratux
|
||||
cp __lib__systemd__system__stratux.service /lib/systemd/system/stratux.service
|
||||
cp __root__stratux-pre-start.sh /root/stratux-pre-start.sh
|
||||
chmod 644 /lib/systemd/system/stratux.service
|
||||
chmod 744 /root/stratux-pre-start.sh
|
||||
ln -fs /lib/systemd/system/stratux.service /etc/systemd/system/multi-user.target.wants/stratux.service
|
||||
>>>>>>> origin/master
|
||||
make www
|
||||
cp -f dump1090/dump1090 /usr/bin/
|
||||
|
||||
|
|
|
@ -53,14 +53,13 @@ cp -f interfaces mnt/etc/network/interfaces
|
|||
#custom hostapd start script
|
||||
cp stratux-wifi.sh mnt/usr/sbin/
|
||||
chmod 755 mnt/usr/sbin/stratux-wifi.sh
|
||||
<<<<<<< HEAD
|
||||
|
||||
#ping udev
|
||||
cp -f 99-uavionix.rules mnt/etc/udev/rules.d
|
||||
=======
|
||||
|
||||
#fan/temp control script
|
||||
cp fancontrol.py mnt/usr/bin/
|
||||
chmod 755 mnt/usr/bin/fancontrol.py
|
||||
>>>>>>> origin/master
|
||||
|
||||
#isc-dhcp-server config
|
||||
cp -f isc-dhcp-server mnt/etc/default/isc-dhcp-server
|
||||
|
|
|
@ -30,12 +30,9 @@ cp image/modules.txt work/bin/
|
|||
cp image/stxAliases.txt work/bin/
|
||||
cp image/hostapd_manager.sh work/bin/
|
||||
cp image/10-stratux.rules work/bin/
|
||||
<<<<<<< HEAD
|
||||
cp image/99-uavionix.rules work/bin/
|
||||
=======
|
||||
cp image/motd work/bin/
|
||||
cp image/fancontrol.py work/bin/
|
||||
>>>>>>> origin/master
|
||||
|
||||
#TODO: librtlsdr.
|
||||
cd work/
|
||||
|
|
Ładowanie…
Reference in New Issue