image name
This commit is contained in:
parent
ca24a885d2
commit
70d801241f
|
@ -50,7 +50,7 @@ VMDEBOOTSTRAP_REPO=git://git.liw.fi/vmdebootstrap
|
||||||
VMDEBOOTSTRAP_VERSION=0.8
|
VMDEBOOTSTRAP_VERSION=0.8
|
||||||
MAKEFILE=${PROJECT_NAME}-image-makefile
|
MAKEFILE=${PROJECT_NAME}-image-makefile
|
||||||
IMAGE_SIZE=4G
|
IMAGE_SIZE=4G
|
||||||
IMAGE_TYPE='full'
|
IMAGE_NAME='full'
|
||||||
|
|
||||||
USERNAME=$(echo $USER)
|
USERNAME=$(echo $USER)
|
||||||
PASSWORD=
|
PASSWORD=
|
||||||
|
@ -260,11 +260,11 @@ chown -R $CURR_USER:$CURR_USER $BUILD_DIR
|
||||||
cd $BUILD_DIR
|
cd $BUILD_DIR
|
||||||
|
|
||||||
if [[ $MINIMAL_INSTALL == "yes" ]]; then
|
if [[ $MINIMAL_INSTALL == "yes" ]]; then
|
||||||
IMAGE_TYPE='min'
|
IMAGE_NAME='min'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $ONION_ONLY != "no" ]]; then
|
if [[ $ONION_ONLY != "no" ]]; then
|
||||||
IMAGE_TYPE='onion'
|
IMAGE_NAME='onion'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $BUILD_DIR
|
cd $BUILD_DIR
|
||||||
|
@ -283,7 +283,7 @@ make $IMAGE_TYPE \
|
||||||
MINIMAL_INSTALL="$MINIMAL_INSTALL" \
|
MINIMAL_INSTALL="$MINIMAL_INSTALL" \
|
||||||
SSH_PORT="$SSH_PORT" \
|
SSH_PORT="$SSH_PORT" \
|
||||||
ONION_ONLY="$ONION_ONLY" \
|
ONION_ONLY="$ONION_ONLY" \
|
||||||
IMAGE_TYPE="$IMAGE_TYPE"
|
IMAGE_NAME="$IMAGE_NAME"
|
||||||
|
|
||||||
if [ ! "$?" = "0" ]; then
|
if [ ! "$?" = "0" ]; then
|
||||||
echo $'Build failed'
|
echo $'Build failed'
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
MIRROR ?= http://httpredir.debian.org/debian
|
MIRROR ?= http://httpredir.debian.org/debian
|
||||||
BUILD_MIRROR ?= http://httpredir.debian.org/debian
|
BUILD_MIRROR ?= http://httpredir.debian.org/debian
|
||||||
IMAGE_SIZE ?= 8G
|
IMAGE_SIZE ?= 8G
|
||||||
IMAGE_TYPE ?= 'full'
|
IMAGE_NAME ?= 'full'
|
||||||
SUITE ?= jessie
|
SUITE ?= jessie
|
||||||
# include source packages in image?
|
# include source packages in image?
|
||||||
SOURCE ?= false
|
SOURCE ?= false
|
||||||
|
@ -38,7 +38,7 @@ SOURCE ?= false
|
||||||
# yes no
|
# yes no
|
||||||
BUILD = $(MACHINE)-$(ARCHITECTURE)
|
BUILD = $(MACHINE)-$(ARCHITECTURE)
|
||||||
TODAY := $(shell date +%Y-%m-%d)
|
TODAY := $(shell date +%Y-%m-%d)
|
||||||
NAME = build/$(PROJECT_NAME)-$(IMAGE_TYPE)-$(TODAY)_$(BUILD)
|
NAME = build/$(PROJECT_NAME)-$(IMAGE_NAME)-$(TODAY)_$(BUILD)
|
||||||
IMAGE = $(NAME).img
|
IMAGE = $(NAME).img
|
||||||
ARCHIVE = $(NAME).tar.bz2
|
ARCHIVE = $(NAME).tar.bz2
|
||||||
SIGNATURE = $(ARCHIVE).sig
|
SIGNATURE = $(ARCHIVE).sig
|
||||||
|
|
Loading…
Reference in New Issue