Skip to content

Commit 1d02721

Browse files
committed
Do apt-get -f install when failed
1 parent 6087c7e commit 1d02721

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Makefile.uboot.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ $(UBOOT_PACKAGE): u-boot-package $(UBOOT_LOADER)
6464
--deb-priority optional --category admin \
6565
--force \
6666
--depends debsums \
67+
--depends mtd-utils \
6768
--deb-compression bzip2 \
6869
--deb-field "Multi-Arch: foreign" \
6970
--after-install u-boot-package/scripts/postinst.deb \

rootfs/make_rootfs.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ do_chroot() {
152152

153153
do_install() {
154154
FILE=$(basename "$1")
155-
cp "$1" "$DEST/$(basename "$1")"
155+
cp "$1" "$DEST/$FILE"
156156
yes | do_chroot dpkg -i "$FILE"
157-
do_chroot rm "$FILE"
157+
rm -f "$DEST/$FILE"
158158
}
159159

160160
# Run stuff in new system.
@@ -199,7 +199,7 @@ apt-get -y install dosfstools curl xz-utils iw rfkill wpasupplicant openssh-serv
199199
nano git build-essential vim jq wget ca-certificates software-properties-common dirmngr \
200200
gdisk parted figlet htop fake-hwclock usbutils sysstat fping iperf3 iozone3 ntp \
201201
network-manager psmisc flash-kernel u-boot-tools ifupdown resolvconf \
202-
net-tools mtd-utils rsync
202+
net-tools mtd-utils rsync device-tree-compiler debsums
203203
if [[ "$DISTRIB" == "debian" ]]; then
204204
apt-get -y install firmware-realtek
205205
elif [[ "$DISTRIB" == "ubuntu" ]]; then

0 commit comments

Comments
 (0)