using relative patch_dir

This commit is contained in:
Manfred Touron 2014-10-21 10:42:59 +00:00
parent 6781a00c43
commit 2768e5b442
2 changed files with 2 additions and 3 deletions

View File

@ -7,7 +7,6 @@ DISTRIB="archlinux"
ARCH=${ARCH:-"armhf"}
TARGET=${TARGET:-"rootfs-target"}
CLEAN_PATHS="/root/.bash_history /root/.history /etc/resolv.conf /etc/hostname /etc/ssh/*_key* /var/log/bootstrap.log"
PATCHES_DIR=patches # without trailing slash
PKGS_INCLUDE=${PKGS_INCLUDE:-"ca-certificates,cron,curl,iptables,iputils-ping,isc-dhcp-client,less,man-db,nano,nbd-client,net-tools,ntp,ntpdate,rsyslog,ssh,sudo,wget,whiptail,xnbd-client"}
# MIRROR=${MIRROR:-"http://mirror.cloud.online.net/ubuntu-ports/"}
VERSION=${VERSION:-"latest"}
@ -33,7 +32,7 @@ patch_image() {
sudo cp /etc/resolv.conf $TARGET/run/systemd/resolve/resolv.conf
# FIXME: patch_target $PATCHES_DIR
# FIXME: patch_target archlinux-latest/patches
# FIXME: locales
# - do_in_target locale-gen en_US.UTF-8

View File

@ -47,7 +47,7 @@ secondstage() {
}
patch_target() {
patches_dir=$1
patches_dir=../$1
for file in $(find "$patches_dir" -type f | sed -n "s|^$patches_dir/||p"); do
sudo mkdir -p "$TARGET/$(dirname $file)"
sudo cp "$patches_dir/$file" "$TARGET/$file"