소스 검색

image name

Bob Mottram 9 년 전
부모
커밋
70d801241f
2개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 4
    4
      src/freedombone-image
  2. 2
    2
      src/freedombone-image-makefile

+ 4
- 4
src/freedombone-image 파일 보기

50
 VMDEBOOTSTRAP_VERSION=0.8
50
 VMDEBOOTSTRAP_VERSION=0.8
51
 MAKEFILE=${PROJECT_NAME}-image-makefile
51
 MAKEFILE=${PROJECT_NAME}-image-makefile
52
 IMAGE_SIZE=4G
52
 IMAGE_SIZE=4G
53
-IMAGE_TYPE='full'
53
+IMAGE_NAME='full'
54
 
54
 
55
 USERNAME=$(echo $USER)
55
 USERNAME=$(echo $USER)
56
 PASSWORD=
56
 PASSWORD=
260
 cd $BUILD_DIR
260
 cd $BUILD_DIR
261
 
261
 
262
 if [[ $MINIMAL_INSTALL == "yes" ]]; then
262
 if [[ $MINIMAL_INSTALL == "yes" ]]; then
263
-    IMAGE_TYPE='min'
263
+    IMAGE_NAME='min'
264
 fi
264
 fi
265
 
265
 
266
 if [[ $ONION_ONLY != "no" ]]; then
266
 if [[ $ONION_ONLY != "no" ]]; then
267
-    IMAGE_TYPE='onion'
267
+    IMAGE_NAME='onion'
268
 fi
268
 fi
269
 
269
 
270
 cd $BUILD_DIR
270
 cd $BUILD_DIR
283
     MINIMAL_INSTALL="$MINIMAL_INSTALL" \
283
     MINIMAL_INSTALL="$MINIMAL_INSTALL" \
284
     SSH_PORT="$SSH_PORT" \
284
     SSH_PORT="$SSH_PORT" \
285
     ONION_ONLY="$ONION_ONLY" \
285
     ONION_ONLY="$ONION_ONLY" \
286
-    IMAGE_TYPE="$IMAGE_TYPE"
286
+    IMAGE_NAME="$IMAGE_NAME"
287
 
287
 
288
 if [ ! "$?" = "0" ]; then
288
 if [ ! "$?" = "0" ]; then
289
     echo $'Build failed'
289
     echo $'Build failed'

+ 2
- 2
src/freedombone-image-makefile 파일 보기

30
 MIRROR ?= http://httpredir.debian.org/debian
30
 MIRROR ?= http://httpredir.debian.org/debian
31
 BUILD_MIRROR ?= http://httpredir.debian.org/debian
31
 BUILD_MIRROR ?= http://httpredir.debian.org/debian
32
 IMAGE_SIZE ?= 8G
32
 IMAGE_SIZE ?= 8G
33
-IMAGE_TYPE ?= 'full'
33
+IMAGE_NAME ?= 'full'
34
 SUITE ?= jessie
34
 SUITE ?= jessie
35
 # include source packages in image?
35
 # include source packages in image?
36
 SOURCE ?= false
36
 SOURCE ?= false
38
 # yes no
38
 # yes no
39
 BUILD = $(MACHINE)-$(ARCHITECTURE)
39
 BUILD = $(MACHINE)-$(ARCHITECTURE)
40
 TODAY := $(shell date +%Y-%m-%d)
40
 TODAY := $(shell date +%Y-%m-%d)
41
-NAME = build/$(PROJECT_NAME)-$(IMAGE_TYPE)-$(TODAY)_$(BUILD)
41
+NAME = build/$(PROJECT_NAME)-$(IMAGE_NAME)-$(TODAY)_$(BUILD)
42
 IMAGE = $(NAME).img
42
 IMAGE = $(NAME).img
43
 ARCHIVE = $(NAME).tar.bz2
43
 ARCHIVE = $(NAME).tar.bz2
44
 SIGNATURE = $(ARCHIVE).sig
44
 SIGNATURE = $(ARCHIVE).sig