mirror of https://github.com/OpenIPC/firmware.git
				
				
				
			revert trailing spaces in patches.
							parent
							
								
									681a6e271a
								
							
						
					
					
						commit
						d7724afcd1
					
				|  | @ -2,9 +2,9 @@ | |||
| +++ b/Makefile	2021-12-18 12:07:01.433235328 +0200
 | ||||
| @@ -2055,6 +2056,7 @@
 | ||||
|  else | ||||
| 
 | ||||
|   | ||||
|  export CONFIG_RTL8188EU = m | ||||
| +EXTRA_CFLAGS += -DCONFIG_AP_MODE -DCONFIG_RTW_HOSTAPD_ACS -DCONFIG_RTW_MESH
 | ||||
| 
 | ||||
|   | ||||
|  all: modules | ||||
| 
 | ||||
|   | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| --- a/Makefile	2022-01-23 16:37:12.818897741 +0300
 | ||||
| +++ b/Makefile	2022-01-23 16:37:49.374948068 +0300
 | ||||
| @@ -22,8 +22,8 @@
 | ||||
| 
 | ||||
|   | ||||
|  ########################## WIFI IC ############################ | ||||
|  CONFIG_RTL8812A = y | ||||
| -CONFIG_RTL8821A = y
 | ||||
|  | @ -14,9 +14,9 @@ | |||
| @@ -178,7 +178,7 @@
 | ||||
|  HCI_NAME = usb | ||||
|  endif | ||||
| 
 | ||||
|   | ||||
| -ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
 | ||||
| +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n)
 | ||||
| 
 | ||||
|   | ||||
|  EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" | ||||
|  ifeq ($(CONFIG_USB_HCI), y) | ||||
|  |  | |||
|  | @ -3,12 +3,12 @@ | |||
| @@ -16,7 +16,7 @@
 | ||||
|  # You should have received a copy of the GNU General Public License | ||||
|  # along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
|   | ||||
| -CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/var/www/.well-known/acme-challenge}"
 | ||||
| +CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/tmp/.well-known/acme-challenge}"
 | ||||
|  ARGS=5 | ||||
|  E_BADARGS=85 | ||||
| 
 | ||||
|   | ||||
| @@ -36,6 +36,7 @@ case "$METHOD" in
 | ||||
|      "begin") | ||||
|          case "$TYPE" in | ||||
|  |  | |||
|  | @ -1,13 +1,13 @@ | |||
| --- a/Makefile.in	2008-01-08 01:35:55.000000000 +0300
 | ||||
| +++ b/Makefile.in	2021-05-07 22:18:22.310801557 +0300
 | ||||
| @@ -74,27 +74,27 @@
 | ||||
| 
 | ||||
|   | ||||
|  distclean: clean | ||||
|  	rm -f $(CONFIGURE_FILES) | ||||
| -	rm -f `cat vtun.drivers`
 | ||||
| -	rm -f `cat vtun.drivers`	
 | ||||
| +	rm -f `cat vtun.drivers`
 | ||||
| 
 | ||||
|  install_man: | ||||
|   | ||||
|  install_man:  | ||||
| -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
 | ||||
| -	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
 | ||||
| -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
 | ||||
|  | @ -16,17 +16,17 @@ | |||
| +	$(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
 | ||||
| +	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
 | ||||
| +	$(INSTALL) -m 644 $vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
 | ||||
|  	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 | ||||
|  	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 | ||||
| 
 | ||||
|  install_config: | ||||
|  	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8  | ||||
|  	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8  | ||||
|   | ||||
|  install_config:  | ||||
| -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
 | ||||
| +	$(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
 | ||||
|  	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \ | ||||
| -	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
 | ||||
| +	  $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \
 | ||||
|  	fi | ||||
| 
 | ||||
|   | ||||
| -install: vtund install_config install_man
 | ||||
| -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
 | ||||
| -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
 | ||||
|  | @ -39,5 +39,5 @@ | |||
| +	$(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
 | ||||
| +	$(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
 | ||||
| +	$(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
 | ||||
| 
 | ||||
|   | ||||
|  # DO NOT DELETE THIS LINE -- make depend depends on it. | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| --- a/linkfd.c	2008-01-08 00:35:43.000000000 +0200
 | ||||
| +++ b/linkfd.c	2021-12-21 20:08:27.197338347 +0300
 | ||||
| @@ -264,6 +264,7 @@
 | ||||
|  		 break; | ||||
|  		 break;	 | ||||
|  	      } | ||||
|  	      /* Send ECHO request */ | ||||
| +	      vtun_syslog(LOG_INFO,"Session %s sending ping", lfd_host->host);
 | ||||
|  |  | |||
|  | @ -6,11 +6,11 @@ | |||
| -COMMIT ?= $(shell git rev-parse HEAD)
 | ||||
| -VERSION ?= $(shell $(PYTHON) ./version.py $(shell git show -s --format="%ct" $(shell git rev-parse HEAD)) $(shell git rev-parse --abbrev-ref HEAD))
 | ||||
| +VERSION ?= $(shell git rev-parse HEAD)
 | ||||
| 
 | ||||
|   | ||||
| -export VERSION COMMIT
 | ||||
| +LDFLAGS := -lrt -lpcap -lsodium
 | ||||
| +CFLAGS := -Wall -O2 -DWFB_VERSION='"$(VERSION)"'
 | ||||
| 
 | ||||
|   | ||||
| -_LDFLAGS := $(LDFLAGS) -lrt -lpcap -lsodium
 | ||||
| -_CFLAGS := $(CFLAGS) -Wall -O2 -DWFB_VERSION='"$(VERSION)-$(shell /bin/bash -c '_tmp=$(COMMIT); echo $${_tmp::8}')"'
 | ||||
| -
 | ||||
|  | @ -25,23 +25,23 @@ | |||
| -gs.key: wfb_keygen
 | ||||
| -	@if ! [ -f gs.key ]; then ./wfb_keygen; fi
 | ||||
| +all: wfb_rx wfb_tx wfb_keygen
 | ||||
| 
 | ||||
|   | ||||
|  src/%.o: src/%.c src/*.h | ||||
| -	$(CC) $(_CFLAGS) -std=gnu99 -c -o $@ $<
 | ||||
| +	$(CC) $(CFLAGS) -std=gnu99 -c -o $@ $<
 | ||||
| 
 | ||||
|   | ||||
|  src/%.o: src/%.cpp src/*.hpp src/*.h | ||||
| -	$(CXX) $(_CFLAGS) -std=gnu++11 -c -o $@ $<
 | ||||
| +	$(CXX) $(CFLAGS) -std=gnu++11 -c -o $@ $<
 | ||||
| 
 | ||||
|   | ||||
|  wfb_rx: src/rx.o src/radiotap.o src/fec.o src/wifibroadcast.o | ||||
| -	$(CXX) -o $@ $^ $(_LDFLAGS)
 | ||||
| +	$(CXX) -o $@ $^ $(LDFLAGS)
 | ||||
| 
 | ||||
|   | ||||
|  wfb_tx: src/tx.o src/fec.o src/wifibroadcast.o | ||||
| -	$(CXX) -o $@ $^ $(_LDFLAGS)
 | ||||
| +	$(CXX) -o $@ $^ $(LDFLAGS)
 | ||||
| 
 | ||||
|   | ||||
|  wfb_keygen: src/keygen.o | ||||
| -	$(CC) -o $@ $^ $(_LDFLAGS)
 | ||||
| -
 | ||||
|  | @ -63,7 +63,7 @@ | |||
| -	$(PYTHON) ./setup.py bdist --plat-name linux-$(ARCH)
 | ||||
| -	rm -rf wifibroadcast.egg-info/
 | ||||
| +	$(CC) -o $@ $^ $(LDFLAGS)
 | ||||
| 
 | ||||
|   | ||||
|  clean: | ||||
| -	rm -rf env wfb_rx wfb_tx wfb_keygen dist deb_dist build wifibroadcast.egg-info _trial_temp *~ src/*.o
 | ||||
| -
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue