RPi: Move toward generated MotD
Fixes arch_rpi_image_prepare#14
This commit is contained in:
parent
d6a2088d60
commit
6d2d640f64
|
@ -9,3 +9,4 @@ tmp/*
|
||||||
piratebox/piratebox/bin/miniircd.py
|
piratebox/piratebox/bin/miniircd.py
|
||||||
piratebox/piratebox/www/Shared
|
piratebox/piratebox/www/Shared
|
||||||
piratebox/piratebox/www/cgi-bin/data.pso
|
piratebox/piratebox/www/cgi-bin/data.pso
|
||||||
|
piratebox/piratebox/rpi/motd.txt
|
||||||
|
|
15
Makefile
15
Makefile
|
@ -7,6 +7,7 @@ PB_SRC_FOLDER=$(PB_FOLDER)/$(PB_FOLDER)
|
||||||
PACKAGE_NAME=$(NAME)_$(VERSION)
|
PACKAGE_NAME=$(NAME)_$(VERSION)
|
||||||
PACKAGE=$(PACKAGE_NAME).tar.gz
|
PACKAGE=$(PACKAGE_NAME).tar.gz
|
||||||
VERSION_FILE=$(PB_FOLDER)/$(PB_FOLDER)/version
|
VERSION_FILE=$(PB_FOLDER)/$(PB_FOLDER)/version
|
||||||
|
MOTD=$(PB_FOLDER)/$(PB_FOLDER)/rpi/motd.txt
|
||||||
|
|
||||||
IMAGE_FILE=piratebox_ws_1.1_img.gz
|
IMAGE_FILE=piratebox_ws_1.1_img.gz
|
||||||
TGZ_IMAGE_FILE=piratebox_ws_1.1_img.tar.gz
|
TGZ_IMAGE_FILE=piratebox_ws_1.1_img.tar.gz
|
||||||
|
@ -32,16 +33,18 @@ $(IRC_TARGET_SERVER):
|
||||||
git clone $(IRC_GITHUB_ULR) $(IRC_WORK_FOLDER)
|
git clone $(IRC_GITHUB_ULR) $(IRC_WORK_FOLDER)
|
||||||
cp $(IRC_SRC_SERVER) $(IRC_TARGET_SERVER)
|
cp $(IRC_SRC_SERVER) $(IRC_TARGET_SERVER)
|
||||||
|
|
||||||
$(VERSION):
|
$(MOTD):
|
||||||
|
sed -e 's|##version##|$(VERSION)|' rpi.motd-template.txt > $@
|
||||||
|
|
||||||
|
$(VERSION):
|
||||||
echo "$(PACKAGE_NAME)" > $(VERSION_FILE)
|
echo "$(PACKAGE_NAME)" > $(VERSION_FILE)
|
||||||
echo `git status -sb --porcelain` >> $(VERSION_FILE)
|
echo `git status -sb --porcelain` >> $(VERSION_FILE)
|
||||||
echo ` git log -1 --oneline` >> $(VERSION_FILE)
|
echo ` git log -1 --oneline` >> $(VERSION_FILE)
|
||||||
|
|
||||||
$(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION)
|
$(PACKAGE): $(IRC_TARGET_SERVER) $(VERSION) $(MOTD)
|
||||||
tar czf $@ $(PB_FOLDER)
|
tar czf $@ $(PB_FOLDER)
|
||||||
|
|
||||||
|
$(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER) $(MOTD)
|
||||||
$(IMAGE_FILE): $(IRC_TARGET_SERVER) $(VERSION) $(SRC_IMAGE_UNPACKED) $(OPENWRT_CONFIG_FOLDER) $(OPENWRT_BIN_FOLDER)
|
|
||||||
mkdir -p $(MOUNT_POINT)
|
mkdir -p $(MOUNT_POINT)
|
||||||
echo "#### Mounting image-file"
|
echo "#### Mounting image-file"
|
||||||
sudo mount -o loop,rw,sync $(SRC_IMAGE_UNPACKED) $(MOUNT_POINT)
|
sudo mount -o loop,rw,sync $(SRC_IMAGE_UNPACKED) $(MOUNT_POINT)
|
||||||
|
@ -93,7 +96,7 @@ clean: cleanimage
|
||||||
rm -fr $(IRC_WORK_FOLDER)
|
rm -fr $(IRC_WORK_FOLDER)
|
||||||
rm -f $(IRC_TARGET_SERVER)
|
rm -f $(IRC_TARGET_SERVER)
|
||||||
rm -f $(PACKAGE)
|
rm -f $(PACKAGE)
|
||||||
rm -f $(VERSION_FILE)
|
rm -f $(VERSION_FILE) $(MOTD)
|
||||||
|
|
||||||
cleanimage:
|
cleanimage:
|
||||||
- rm -f $(TGZ_IMAGE_FILE)
|
- rm -f $(TGZ_IMAGE_FILE)
|
||||||
|
|
|
@ -5,8 +5,8 @@ ____________________.__ __ __________
|
||||||
|____|_ /|____| |__||__| (____ /__| \___ >______ /\____/__/\_ \
|
|____|_ /|____| |__||__| (____ /__| \___ >______ /\____/__/\_ \
|
||||||
\/ \/ \/ \/ \/
|
\/ \/ \/ \/ \/
|
||||||
|
|
||||||
Website: http://piratebox.cc PirateBox Version: 1.1.3
|
Website: http://piratebox.cc PirateBox Version: ##version##
|
||||||
Forum: http://forum.piratebox.cc RPi Image Version: 1.1.3-1
|
Forum: http://forum.piratebox.cc Build date: 00-00-0000
|
||||||
IRC: #piratebox irc.freenode.net Be open -- Share freely!
|
IRC: #piratebox irc.freenode.net Be open -- Share freely!
|
||||||
|
|
||||||
First Steps After Flashing
|
First Steps After Flashing
|
Loading…
Reference in New Issue