kotovalexarian/raspberrypi-build
Archived
1
0
Fork 0
Code Activity

Add global variable "KEYS_DIR"

Browse source
This commit is contained in:
Braiden Vasco 2017-07-06 23:49:19 +00:00
parent 0d14a2c7f5
commit c414830e38
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.sh
View file

@ -8,6 +8,7 @@ export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export DEPLOY_DIR="$BASE_DIR/deploy" export DEPLOY_DIR="$BASE_DIR/deploy"
export ROOTFS_DIR="$BASE_DIR/rootfs" export ROOTFS_DIR="$BASE_DIR/rootfs"
export MOUNT_DIR="$BASE_DIR/mnt" export MOUNT_DIR="$BASE_DIR/mnt"
export KEYS_DIR="$BASE_DIR/keys"
export FILES_DIR="$BASE_DIR/files" export FILES_DIR="$BASE_DIR/files"
export IMG_DATE="$(date +%Y-%m-%d)" export IMG_DATE="$(date +%Y-%m-%d)"
@ -159,7 +160,7 @@ if [ ! -d "$ROOTFS_DIR" ]; then
capsh --drop=cap_setfcap -- -c "$BOOTSTRAP_CMD \ capsh --drop=cap_setfcap -- -c "$BOOTSTRAP_CMD \
--components=main,contrib,non-free \ --components=main,contrib,non-free \
--arch armhf \ --arch armhf \
--keyring ./keys/raspberrypi.gpg \ --keyring $KEYS_DIR/raspberrypi.gpg \
jessie \ jessie \
$ROOTFS_DIR \ $ROOTFS_DIR \
http://mirrordirector.raspbian.org/raspbian/" || rmdir "$ROOTFS_DIR/debootstrap/" http://mirrordirector.raspbian.org/raspbian/" || rmdir "$ROOTFS_DIR/debootstrap/"
@ -195,7 +196,7 @@ ln -nsf /proc/mounts "$ROOTFS_DIR/etc/mtab"
# #
apply_file 644 '/etc/apt/sources.list' apply_file 644 '/etc/apt/sources.list'
on_chroot apt-key add - < keys/raspberrypi.gpg.asc on_chroot apt-key add - < "$KEYS_DIR/raspberrypi.gpg.asc"
apply_file 644 '/etc/apt/preferences.d/raspberrypi-kernel-and-bootloader' apply_file 644 '/etc/apt/preferences.d/raspberrypi-kernel-and-bootloader'