ソースを参照

Genericise in case the project name later changes

Bob Mottram 9 年 前
コミット
2f74d5865c
共有3 個のファイルを変更した26 個の追加23 個の削除を含む
  1. 11
    9
      src/freedombone-image
  2. 9
    8
      src/freedombone-image-make
  3. 6
    6
      src/freedombone-image-makefile

+ 11
- 9
src/freedombone-image ファイルの表示

33
 BUILD_DIR=~/.tmp_freedombone_build
33
 BUILD_DIR=~/.tmp_freedombone_build
34
 VMDEBOOTSTRAP_REPO=git://git.liw.fi/vmdebootstrap
34
 VMDEBOOTSTRAP_REPO=git://git.liw.fi/vmdebootstrap
35
 VMDEBOOTSTRAP_VERSION=0.8
35
 VMDEBOOTSTRAP_VERSION=0.8
36
-MAKEFILE=freedombone-image-makefile
36
+PROJECT_NAME=freedombone
37
+MAKEFILE=${PROJECT_NAME}-image-makefile
37
 
38
 
38
 USERNAME=$(echo $USER)
39
 USERNAME=$(echo $USER)
39
-PASSWORD='freedombone'
40
+PASSWORD="${PROJECT_NAME}"
40
 
41
 
41
 # IP address of the router (gateway)
42
 # IP address of the router (gateway)
42
 ROUTER_IP_ADDRESS="192.168.1.254"
43
 ROUTER_IP_ADDRESS="192.168.1.254"
111
     cp /usr/bin/$MAKEFILE $BUILD_DIR/Makefile
112
     cp /usr/bin/$MAKEFILE $BUILD_DIR/Makefile
112
 fi
113
 fi
113
 
114
 
114
-cp -r /etc/freedombone/* $BUILD_DIR
115
+cp -r /etc/${PROJECT_NAME}/* $BUILD_DIR
115
 cd $BUILD_DIR
116
 cd $BUILD_DIR
116
 
117
 
117
 rm -rf vendor
118
 rm -rf vendor
136
     ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \
137
     ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \
137
     BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
138
     BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
138
     NAMESERVER1="$NAMESERVER1" \
139
     NAMESERVER1="$NAMESERVER1" \
139
-    NAMESERVER2="$NAMESERVER2"
140
+    NAMESERVER2="$NAMESERVER2" \
141
+	PROJECT_NAME="$PROJECT_NAME"
140
 
142
 
141
 shopt -s nullglob
143
 shopt -s nullglob
142
-imgfiles=(build/freedombone*.img)
144
+imgfiles=(build/${PROJECT_NAME}*.img)
143
 if [ ${#imgfiles[@]} -eq 0 ]; then
145
 if [ ${#imgfiles[@]} -eq 0 ]; then
144
 	echo 'Image was not created'
146
 	echo 'Image was not created'
145
 	rm -rf $BUILD_DIR
147
 	rm -rf $BUILD_DIR
146
 	exit 1
148
 	exit 1
147
 fi
149
 fi
148
 
150
 
149
-mv build/freedombone*.bz2 $CURR_DIR
150
-mv build/freedombone*.img $CURR_DIR
151
-mv build/freedombone*.sig $CURR_DIR
151
+mv build/${PROJECT_NAME}*.bz2 $CURR_DIR
152
+mv build/${PROJECT_NAME}*.img $CURR_DIR
153
+mv build/${PROJECT_NAME}*.sig $CURR_DIR
152
 rm -rf $BUILD_DIR
154
 rm -rf $BUILD_DIR
153
 
155
 
154
 clear
156
 clear
155
 echo '
157
 echo '
156
 Image was created
158
 Image was created
157
 '
159
 '
158
-ls -lh freedombone*.img freedombone*.sig freedombone*.bz2
160
+ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.bz2
159
 
161
 
160
 exit 0
162
 exit 0

+ 9
- 8
src/freedombone-image-make ファイルの表示

31
 export BOX_IP_ADDRESS
31
 export BOX_IP_ADDRESS
32
 export NAMESERVER1
32
 export NAMESERVER1
33
 export NAMESERVER2
33
 export NAMESERVER2
34
+export PROJECT_NAME
34
 
35
 
35
 # Locate vmdebootstrap program fetched in Makefile
36
 # Locate vmdebootstrap program fetched in Makefile
36
 basedir=`pwd`
37
 basedir=`pwd`
55
 # Packages needed for XFCE desktop environment
56
 # Packages needed for XFCE desktop environment
56
 xfce_pkgs="task-xfce-desktop iceweasel ca-certificates"
57
 xfce_pkgs="task-xfce-desktop iceweasel ca-certificates"
57
 
58
 
58
-echo Building $MACHINE Freedombone for $ARCHITECTURE.
59
+echo Building $MACHINE $PROJECT_NAME for $ARCHITECTURE.
59
 
60
 
60
 case "$MACHINE" in
61
 case "$MACHINE" in
61
     beaglebone)
62
     beaglebone)
101
 done
102
 done
102
 
103
 
103
 # Make sure file is owned by current user, not root
104
 # Make sure file is owned by current user, not root
104
-touch $(dirname $IMAGE)/freedombone.log
105
+touch $(dirname $IMAGE)/${PROJECT_NAME}.log
105
 
106
 
106
 if [ -x vendor/vmdebootstrap/vmdebootstrap ] ; then
107
 if [ -x vendor/vmdebootstrap/vmdebootstrap ] ; then
107
     VMDEBOOTSTRAP=vendor/vmdebootstrap/vmdebootstrap
108
     VMDEBOOTSTRAP=vendor/vmdebootstrap/vmdebootstrap
110
 fi
111
 fi
111
 
112
 
112
 echo 'Making customised customisation script'
113
 echo 'Making customised customisation script'
113
-TEMP_CUSTOMISE=/etc/freedombone/image-customise
114
-if [ -f /usr/local/bin/freedombone-image-customise ]; then
115
-    sudo cp /usr/local/bin/freedombone-image-customise $TEMP_CUSTOMISE
114
+TEMP_CUSTOMISE=/etc/${PROJECT_NAME}/image-customise
115
+if [ -f /usr/local/bin/${PROJECT_NAME}-image-customise ]; then
116
+    sudo cp /usr/local/bin/${PROJECT_NAME}-image-customise $TEMP_CUSTOMISE
116
 else
117
 else
117
-    sudo cp /usr/bin/freedombone-image-customise $TEMP_CUSTOMISE
118
+    sudo cp /usr/bin/${PROJECT_NAME}-image-customise $TEMP_CUSTOMISE
118
 fi
119
 fi
119
 sudo sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE
120
 sudo sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE
120
 sudo sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE
121
 sudo sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE
134
     SOURCE="$SOURCE" \
135
     SOURCE="$SOURCE" \
135
     CUSTOM_SETUP="$CUSTOM_SETUP" \
136
     CUSTOM_SETUP="$CUSTOM_SETUP" \
136
     $VMDEBOOTSTRAP \
137
     $VMDEBOOTSTRAP \
137
-    --log $(dirname $IMAGE)/freedombone.log \
138
+    --log $(dirname $IMAGE)/${PROJECT_NAME}.log \
138
     --log-level debug \
139
     --log-level debug \
139
     --size $IMAGE_SIZE \
140
     --size $IMAGE_SIZE \
140
     --image $IMAGE.img \
141
     --image $IMAGE.img \
141
-    --hostname freedombone \
142
+    --hostname ${PROJECT_NAME} \
142
     --verbose \
143
     --verbose \
143
     --mirror $BUILD_MIRROR \
144
     --mirror $BUILD_MIRROR \
144
     --customize "$TEMP_CUSTOMISE" \
145
     --customize "$TEMP_CUSTOMISE" \

+ 6
- 6
src/freedombone-image-makefile ファイルの表示

1
 #!/usr/bin/make
1
 #!/usr/bin/make
2
 #
2
 #
3
-# A debian image builder, based upon freedom-maker
3
+# A debian image builder, based upon freedom-maker Makefile
4
 #
4
 #
5
 # This program is free software: you can redistribute it and/or modify
5
 # This program is free software: you can redistribute it and/or modify
6
 # it under the terms of the GNU General Public License as published by
6
 # it under the terms of the GNU General Public License as published by
26
 # yes no
26
 # yes no
27
 BUILD = $(MACHINE)-$(ARCHITECTURE)
27
 BUILD = $(MACHINE)-$(ARCHITECTURE)
28
 TODAY := $(shell date +%Y-%m-%d)
28
 TODAY := $(shell date +%Y-%m-%d)
29
-NAME = build/freedombone-$(TODAY)_$(BUILD)
29
+NAME = build/$(PROJECT_NAME)-$(TODAY)_$(BUILD)
30
 IMAGE = $(NAME).img
30
 IMAGE = $(NAME).img
31
 ARCHIVE = $(NAME).tar.bz2
31
 ARCHIVE = $(NAME).tar.bz2
32
 SIGNATURE = $(ARCHIVE).sig
32
 SIGNATURE = $(ARCHIVE).sig
39
 TEST_FIRSTRUN_WAIT_TIME = 120 # seconds
39
 TEST_FIRSTRUN_WAIT_TIME = 120 # seconds
40
 
40
 
41
 USERNAME ?= $(echo $USER)
41
 USERNAME ?= $(echo $USER)
42
-PASSWORD ?= 'freedombone'
42
+PASSWORD ?= $(PROJECT_NAME)
43
 
43
 
44
 # IP address of the router (gateway)
44
 # IP address of the router (gateway)
45
 ROUTER_IP_ADDRESS ?= "192.168.1.254"
45
 ROUTER_IP_ADDRESS ?= "192.168.1.254"
64
     NAMESERVER1=$(NAMESERVER1) \
64
     NAMESERVER1=$(NAMESERVER1) \
65
     NAMESERVER2=$(NAMESERVER2) \
65
     NAMESERVER2=$(NAMESERVER2) \
66
     CUSTOM_SETUP=$(CUSTOM_SETUP) \
66
     CUSTOM_SETUP=$(CUSTOM_SETUP) \
67
-    IMAGE_SIZE=$(IMAGE_SIZE) taskset 0x01 freedombone-image-make $(NAME)
67
+    IMAGE_SIZE=$(IMAGE_SIZE) taskset 0x01 $(PROJECT_NAME)-image-make $(NAME)
68
 
68
 
69
 # build Beaglebone SD card image
69
 # build Beaglebone SD card image
70
 beaglebone: prep
70
 beaglebone: prep
134
 test: test-virtualbox
134
 test: test-virtualbox
135
 
135
 
136
 test-virtualbox: virtualbox
136
 test-virtualbox: virtualbox
137
-	$(eval VM_NAME = freedom-maker-test)
137
+	$(eval VM_NAME = $(PROJECT_NAME)-test)
138
 	VBoxManage createvm --name $(VM_NAME) --ostype "Debian" --register
138
 	VBoxManage createvm --name $(VM_NAME) --ostype "Debian" --register
139
 	VBoxManage storagectl $(VM_NAME) --name "SATA Controller" --add sata \
139
 	VBoxManage storagectl $(VM_NAME) --name "SATA Controller" --add sata \
140
 		 --controller IntelAHCI
140
 		 --controller IntelAHCI
160
 	mkdir -p build
160
 	mkdir -p build
161
 
161
 
162
 clean:
162
 clean:
163
-	-rm -f build/freedombone.log
163
+	-rm -f build/$(PROJECT_NAME).log
164
 
164
 
165
 distclean: clean
165
 distclean: clean
166
 	sudo rm -rf build
166
 	sudo rm -rf build