From dc275754a6114eae4c5ebac59ce441db45a4080a Mon Sep 17 00:00:00 2001 From: Matthias Strubel Date: Fri, 30 Jun 2017 09:11:10 +0200 Subject: [PATCH] Erase Whitespace --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index dc29532..ce3a644 100644 --- a/Makefile +++ b/Makefile @@ -27,18 +27,18 @@ IRC_TARGET_SERVER=$(PB_SRC_FOLDER)/bin/miniircd.py .DEFAULT_GOAL = package -$(IRC_TARGET_SERVER): +$(IRC_TARGET_SERVER): mkdir -p $(WORKFOLDER) git clone $(IRC_GITHUB_ULR) $(IRC_WORK_FOLDER) cp $(IRC_SRC_SERVER) $(IRC_TARGET_SERVER) -$(VERSION): +$(VERSION): echo "$(PACKAGE_NAME)" > $(VERSION_FILE) echo `git status -sb --porcelain` >> $(VERSION_FILE) echo ` git log -1 --oneline` >> $(VERSION_FILE) $(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION) - tar czf $@ $(PB_FOLDER) + tar czf $@ $(PB_FOLDER) $(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER) @@ -46,9 +46,9 @@ $(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_C echo "#### Mounting image-file" sudo mount -o loop,rw,sync $(SRC_IMAGE_UNPACKED) $(MOUNT_POINT) echo "#### Copy content to image file" - sudo cp -vr $(PB_SRC_FOLDER)/* $(MOUNT_POINT) + sudo cp -vr $(PB_SRC_FOLDER)/* $(MOUNT_POINT) echo "#### Copy customizatiosns to image file" - sudo cp -rv $(OPENWRT_FOLDER)/* $(MOUNT_POINT)/ + sudo cp -rv $(OPENWRT_FOLDER)/* $(MOUNT_POINT)/ echo "#### Umount Image file" sudo umount $(MOUNT_POINT) gzip -rc $(SRC_IMAGE_UNPACKED) > $(IMAGE_FILE) @@ -57,13 +57,13 @@ $(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_C $(OPENWRT_CONFIG_FOLDER): mkdir -p $@ cp -rv $(PB_SRC_FOLDER)/conf/* $@ - sed 's:OPENWRT="no":OPENWRT="yes":' -i $@/piratebox.conf - sed 's:DO_IFCONFIG="yes":DO_IFCONFIG="no":' -i $@/piratebox.conf - sed 's:IPV6_ENABLE="no":IPV6_ENABLE="yes":' -i $@/ipv6.conf - sed 's:IPV6_ADVERT="radvd":IPV6_ADVERT="none":' -i $@/ipv6.conf - sed 's:USE_APN="yes":USE_APN="no":' -i $@/piratebox.conf - sed 's:DNSMASQ_INTERFACE="wlan0":DNSMASQ_INTERFACE="br-lan":' -i $@/piratebox.conf - sed 's:192.168.77:192.168.1:g' -i $@/piratebox.conf + sed 's:OPENWRT="no":OPENWRT="yes":' -i $@/piratebox.conf + sed 's:DO_IFCONFIG="yes":DO_IFCONFIG="no":' -i $@/piratebox.conf + sed 's:IPV6_ENABLE="no":IPV6_ENABLE="yes":' -i $@/ipv6.conf + sed 's:IPV6_ADVERT="radvd":IPV6_ADVERT="none":' -i $@/ipv6.conf + sed 's:USE_APN="yes":USE_APN="no":' -i $@/piratebox.conf + sed 's:DNSMASQ_INTERFACE="wlan0":DNSMASQ_INTERFACE="br-lan":' -i $@/piratebox.conf + sed 's:192.168.77:192.168.1:g' -i $@/piratebox.conf sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i $@/piratebox.conf sed 's:DROOPY_CHMOD:#DROOPY_CHMOD:' -i $@/piratebox.conf sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i $@/piratebox.conf @@ -78,7 +78,7 @@ $(OPENWRT_BIN_FOLDER): sed "s:libc.so.6:libc.so.0:" -i $@/droopy $(TGZ_IMAGE_FILE): - tar czf $(TGZ_IMAGE_FILE) $(SRC_IMAGE_UNPACKED) + tar czf $(TGZ_IMAGE_FILE) $(SRC_IMAGE_UNPACKED) $(SRC_IMAGE_UNPACKED): @@ -89,7 +89,7 @@ package: $(PACKAGE) all: package shortimage -clean: cleanimage +clean: cleanimage rm -fr $(WORKFOLDER) rm -fr $(IRC_WORK_FOLDER) rm -f $(IRC_TARGET_SERVER)