From 686425a6343590993f1592d30a957833ac8ac1e5 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 12 Feb 2020 09:37:27 -0800 Subject: [PATCH] Enable building buildd artifacts with an ext4 image target --- live-build/buildd/hooks/00-mirror.binary | 2 +- live-build/buildd/hooks/01-policy-rc-d.binary | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/live-build/buildd/hooks/00-mirror.binary b/live-build/buildd/hooks/00-mirror.binary index 7f3cdba4..a6722e0b 100755 --- a/live-build/buildd/hooks/00-mirror.binary +++ b/live-build/buildd/hooks/00-mirror.binary @@ -9,4 +9,4 @@ set -e # /var/lib/apt/lists/ has suitable cached Packages files; this speeds up # builds on buildds. sed -i "s,${LB_PARENT_MIRROR_BINARY},${LB_MIRROR_BINARY},g" \ - binary/etc/apt/sources.list + chroot/etc/apt/sources.list diff --git a/live-build/buildd/hooks/01-policy-rc-d.binary b/live-build/buildd/hooks/01-policy-rc-d.binary index d827875f..bdfaf52d 100755 --- a/live-build/buildd/hooks/01-policy-rc-d.binary +++ b/live-build/buildd/hooks/01-policy-rc-d.binary @@ -6,8 +6,8 @@ set -e # installed, but that doesn't work because live-build has already installed # a dummy one at that point. The simplest approach is to repair the # situation by putting it in place here. -if [ -L binary/etc/alternatives/policy-rc.d ] && \ - [ ! -e binary/usr/sbin/policy-rc.d ] && \ - [ ! -L binary/usr/sbin/policy-rc.d ]; then - ln -s /etc/alternatives/policy-rc.d binary/usr/sbin/policy-rc.d +if [ -L chroot/etc/alternatives/policy-rc.d ] && \ + [ ! -e chroot/usr/sbin/policy-rc.d ] && \ + [ ! -L chroot/usr/sbin/policy-rc.d ]; then + ln -s /etc/alternatives/policy-rc.d chroot/usr/sbin/policy-rc.d fi