소스 검색

qemu support

Bob Mottram 9 년 전
부모
커밋
1ac5bfe548
4개의 변경된 파일39개의 추가작업 그리고 5개의 파일을 삭제
  1. 4
    5
      src/freedombone-image
  2. 5
    0
      src/freedombone-image-customise
  3. 5
    0
      src/freedombone-image-make
  4. 25
    0
      src/freedombone-image-makefile

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

154
 rm $CURR_DIR/${PROJECT_NAME}*.img
154
 rm $CURR_DIR/${PROJECT_NAME}*.img
155
 rm $CURR_DIR/${PROJECT_NAME}*.sig
155
 rm $CURR_DIR/${PROJECT_NAME}*.sig
156
 rm $CURR_DIR/${PROJECT_NAME}*.vdi
156
 rm $CURR_DIR/${PROJECT_NAME}*.vdi
157
+rm $CURR_DIR/${PROJECT_NAME}*.qcow2
157
 
158
 
158
 if [ -d $BUILD_DIR ]; then
159
 if [ -d $BUILD_DIR ]; then
159
     rm -rf $BUILD_DIR
160
     rm -rf $BUILD_DIR
166
 fi
167
 fi
167
 
168
 
168
 cp -r /etc/${PROJECT_NAME}/* $BUILD_DIR
169
 cp -r /etc/${PROJECT_NAME}/* $BUILD_DIR
170
+rm -rf $BUILD_DIR/vendor
169
 chown -R $CURR_USER:$CURR_USER $BUILD_DIR
171
 chown -R $CURR_USER:$CURR_USER $BUILD_DIR
170
 cd $BUILD_DIR
172
 cd $BUILD_DIR
171
 
173
 
194
 mv build/${PROJECT_NAME}*.img ${CURR_DIR}
196
 mv build/${PROJECT_NAME}*.img ${CURR_DIR}
195
 mv build/${PROJECT_NAME}*.sig ${CURR_DIR}
197
 mv build/${PROJECT_NAME}*.sig ${CURR_DIR}
196
 mv build/${PROJECT_NAME}*.vdi ${CURR_DIR}
198
 mv build/${PROJECT_NAME}*.vdi ${CURR_DIR}
199
+mv build/${PROJECT_NAME}*.qcow2 ${CURR_DIR}
197
 rm -rf ${BUILD_DIR}
200
 rm -rf ${BUILD_DIR}
198
 
201
 
199
 cd ${CURR_DIR}
202
 cd ${CURR_DIR}
200
-#if [[ $IMAGE_TYPE == "virtualbox"* ]]; then
201
-#    imgfiles=(${PROJECT_NAME}*.img)
202
-#    VBoxManage convertdd ${imgfiles[0]} ${imgfiles[0]}.vdi
203
-#fi
204
 
203
 
205
 clear
204
 clear
206
 echo "
205
 echo "
212
 
211
 
213
     Password: $PASSWORD
212
     Password: $PASSWORD
214
 "
213
 "
215
-ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.bz2 ${PROJECT_NAME}*.vdi
214
+ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.bz2 ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
216
 
215
 
217
 # record the default login credentials for later use
216
 # record the default login credentials for later use
218
 echo "Username: $USERNAME
217
 echo "Username: $USERNAME

+ 5
- 0
src/freedombone-image-customise 파일 보기

223
         echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
223
         echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
224
             >> /etc/init.d/rc.local
224
             >> /etc/init.d/rc.local
225
         ;;
225
         ;;
226
+    qemu)
227
+        # hide irrelevant console keyboard messages.
228
+        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
229
+            >> /etc/init.d/rc.local
230
+        ;;
226
 esac
231
 esac
227
 
232
 
228
 set_apt_sources $BUILD_MIRROR
233
 set_apt_sources $BUILD_MIRROR

+ 5
- 0
src/freedombone-image-make 파일 보기

90
  --grub \
90
  --grub \
91
  --roottype btrfs \
91
  --roottype btrfs \
92
 "   ;;
92
 "   ;;
93
+    qemu)
94
+    extra_opts="\
95
+ --grub \
96
+ --roottype btrfs \
97
+"   ;;
93
     all)
98
     all)
94
     extra_opts="\
99
     extra_opts="\
95
  --grub \
100
  --grub \

+ 25
- 0
src/freedombone-image-makefile 파일 보기

164
 	VBoxManage modifyvm $(VM_NAME) --hda none
164
 	VBoxManage modifyvm $(VM_NAME) --hda none
165
 	VBoxManage unregistervm $(VM_NAME) --delete
165
 	VBoxManage unregistervm $(VM_NAME) --delete
166
 
166
 
167
+# build a qemu image
168
+qemu: qemu-i386
169
+
170
+qemu-i386: prep
171
+	$(eval ARCHITECTURE = i386)
172
+	$(eval MACHINE = qemu)
173
+	$(MAKE_IMAGE)
174
+	# Convert image to qemu format
175
+	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
176
+	$(TAR) $(ARCHIVE) $(NAME).qcow2
177
+	@echo ""
178
+	$(SIGN)
179
+	@echo "Build complete."
180
+
181
+qemu-amd64: prep
182
+	$(eval ARCHITECTURE = amd64)
183
+	$(eval MACHINE = qemu)
184
+	$(MAKE_IMAGE)
185
+	# Convert image to qemu format
186
+	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
187
+	$(TAR) $(ARCHIVE) $(NAME).qcow2
188
+	@echo ""
189
+	$(SIGN)
190
+	@echo "Build complete."
191
+
167
 vendor/vmdebootstrap/vmdebootstrap: vendor-patches/vmdebootstrap/*.patch
192
 vendor/vmdebootstrap/vmdebootstrap: vendor-patches/vmdebootstrap/*.patch
168
 	freedombone-image-vmdebootstrap
193
 	freedombone-image-vmdebootstrap
169
 
194