Browse Source

add dependency

pull/64/head
Luigi Cruz 3 years ago
parent
commit
975cb05612
2 changed files with 4 additions and 4 deletions
  1. +1
    -1
      Dockerfile
  2. +3
    -3
      build.sh

+ 1
- 1
Dockerfile View File

@@ -8,7 +8,7 @@ RUN apt-get -y update && \
git vim parted \ git vim parted \
quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \ quilt coreutils qemu-user-static debootstrap zerofree zip dosfstools \
libarchive-tools libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\ libarchive-tools libcap2-bin rsync grep udev xz-utils curl xxd file kmod bc\
binfmt-support ca-certificates qemu-utils kpartx util-linux \
binfmt-support ca-certificates qemu-utils kpartx util-linux fdisk \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*


COPY . /pi-gen/ COPY . /pi-gen/


+ 3
- 3
build.sh View File

@@ -111,7 +111,7 @@ run_stage(){
STAGE_WORK_DIR="${WORK_DIR}/${STAGE}" STAGE_WORK_DIR="${WORK_DIR}/${STAGE}"
ROOTFS_DIR="${STAGE_WORK_DIR}"/rootfs ROOTFS_DIR="${STAGE_WORK_DIR}"/rootfs


if [ "${USE_QCOW2}" = "1" ]; then
if [ "${USE_QCOW2}" = "1" ]; then
if [ ! -f SKIP ]; then if [ ! -f SKIP ]; then
load_qimage load_qimage
fi fi
@@ -121,7 +121,7 @@ run_stage(){
unmount "${WORK_DIR}/${STAGE}" unmount "${WORK_DIR}/${STAGE}"
fi fi
fi fi
if [ ! -f SKIP_IMAGES ]; then if [ ! -f SKIP_IMAGES ]; then
if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ]; then
EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}" EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
@@ -265,7 +265,7 @@ source "${SCRIPT_DIR}/common"
source "${SCRIPT_DIR}/dependencies_check" source "${SCRIPT_DIR}/dependencies_check"


export NO_PRERUN_QCOW2="${NO_PRERUN_QCOW2:-1}" export NO_PRERUN_QCOW2="${NO_PRERUN_QCOW2:-1}"
export USE_QCOW2="${USE_QCOW2:-1}"
export USE_QCOW2="${USE_QCOW2:-0}"
export BASE_QCOW2_SIZE=${BASE_QCOW2_SIZE:-12G} export BASE_QCOW2_SIZE=${BASE_QCOW2_SIZE:-12G}
source "${SCRIPT_DIR}/qcow2_handling" source "${SCRIPT_DIR}/qcow2_handling"
if [ "${USE_QCOW2}" = "1" ]; then if [ "${USE_QCOW2}" = "1" ]; then


Loading…
Cancel
Save