snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions 1 Activity

xbps-src/chroot.sh: copy xbps repo keys even with -N. 

To make @pullmoll happy
This commit is contained in:
Juan RP 2020-04-13 01:59:03 +02:00
parent 723385c2f0
commit 8ab6edc842
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/xbps-src/shutils/chroot.sh
View File

@ -285,15 +285,16 @@ chroot_sync_repodata() {
fi fi
fi fi
[ "$XBPS_SKIP_REMOTEREPOS" ] && return 0
# Copy xbps repository keys to the masterdir. # Copy xbps repository keys to the masterdir.
mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys
cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys
# Make sure to sync index for remote repositories. # Make sure to sync index for remote repositories.
msg_normal "xbps-src: updating repositories for host ($XBPS_MACHINE)...\n" if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
$XBPS_INSTALL_CMD $XBPS_INSTALL_ARGS -S msg_normal "xbps-src: updating repositories for host ($XBPS_MACHINE)...\n"
$XBPS_INSTALL_CMD $XBPS_INSTALL_ARGS -S
fi
if [ -n "$XBPS_CROSS_BUILD" ]; then if [ -n "$XBPS_CROSS_BUILD" ]; then
# Copy host keys to the target rootdir. # Copy host keys to the target rootdir.
@ -301,9 +302,11 @@ chroot_sync_repodata() {
cp $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \ cp $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
$XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys
# Make sure to sync index for remote repositories. # Make sure to sync index for remote repositories.
msg_normal "xbps-src: updating repositories for target ($XBPS_TARGET_MACHINE)...\n" if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
env -- XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE \ msg_normal "xbps-src: updating repositories for target ($XBPS_TARGET_MACHINE)...\n"
$XBPS_INSTALL_CMD $XBPS_INSTALL_ARGS -r $XBPS_MASTERDIR/$XBPS_CROSS_BASE -S env -- XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE \
$XBPS_INSTALL_CMD $XBPS_INSTALL_ARGS -r $XBPS_MASTERDIR/$XBPS_CROSS_BASE -S
fi
fi fi
return 0 return 0