Skip to content

Commit

Permalink
v9.4
Browse files Browse the repository at this point in the history
- DietPi-Build | Remove non-functional Trixie armhf workaround for time_t transition: It does not work, since there are still/again hard dependencies on both versions of some packages. We need to wait until all this has settled.
  • Loading branch information
MichaIng committed Apr 28, 2024
1 parent 7cdb014 commit 406ddb3
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions .build/images/dietpi-build
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,6 @@ G_EXEC mount -o X-mount.mkdir -t tmpfs tmpfs rootfs/var/lib/apt/lists
G_EXEC mount -o X-mount.mkdir -t tmpfs tmpfs rootfs/var/log
packages='apt,bash-completion,bzip2,ca-certificates,cron,curl,fdisk,gnupg,htop,iputils-ping,locales,nano,p7zip,parted,procps,psmisc,sudo,systemd-sysv,tzdata,udev,unzip,wget,whiptail,'
[[ $HW_MODEL == 75 ]] && packages+='iproute2' || packages+='console-setup,dropbear,ethtool,fake-hwclock,ifupdown,isc-dhcp-client,kmod,rfkill,systemd-timesyncd,usbutils'
# Workaround for failing build on ARMv6/7 Trixie systems due to conflicting libssl3 and libssl3t64 dependencies
(( $HW_ARCH < 3 && $DISTRO > 7 )) && packages+=',libssl3t64'
#G_EXEC_POST_FUNC(){ [[ $exit_code == 0 ]] || cat rootfs/debootstrap/debootstrap.log; }
G_EXEC_OUTPUT=1 G_EXEC mmdebstrap --skip=check/empty --variant=minbase --include="$packages" --arch="$parch" --keyring="$keyring" "$distro" ./rootfs "$repo"
G_EXEC umount rootfs/dev rootfs/run rootfs/var/cache/apt rootfs/var/lib/apt/lists rootfs/var/log
Expand Down

0 comments on commit 406ddb3

Please sign in to comment.