moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

base-chroot: add tzdata

Browse source 
Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
This commit is contained in:
Đoàn Trần Công Danh 2021-06-09 18:31:28 +07:00 • committed by Đoàn Trần Công Danh
parent 00225cc2d5
commit fb4838a591
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/xbps-src/shutils/chroot.sh
View file

@ -109,15 +109,7 @@ chroot_prepare() {
# Some software expects /etc/localtime to be a symbolic link it can read to
# determine the name of the time zone, so set up the expected link
# structure.
if [ -f /usr/share/zoneinfo/UTC ]; then
tzfile=/usr/share/zoneinfo/UTC
mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
else
# Should never happen.
msg_warn "No local timezone configuration file created.\n"
fi
ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
for f in dev sys tmp proc host boot; do
[ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f