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

Fixed launchpad #474467 bug. 

Make xbps-base-chroot depend on bash and use it for the chroot
environment. Depending in host's bash wasn't a good idea...

--HG--
extra : convert_revision : dfff2287dec5c3fb64725e601f70fe4a2ab2db98
This commit is contained in:
Juan RP 2009-11-05 17:51:26 +01:00
parent d5c95e0fe2
commit 8c89fbd90b
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/bash/template
View File

@ -30,14 +30,12 @@ long_desc="
to sixty-four. In addition, most sh scripts can be run by Bash without to sixty-four. In addition, most sh scripts can be run by Bash without
modification." modification."
base_chroot=yes
essential=yes essential=yes
register_shell="/bin/bash" register_shell="/bin/bash"
Add_dependency full glibc Add_dependency run glibc
Add_dependency build ncurses Add_dependency build ncurses
Add_dependency build texinfo
Add_dependency build gettext
Add_dependency build bison
Add_dependency run ncurses-libs Add_dependency run ncurses-libs
Add_dependency run coreutils Add_dependency run coreutils

1
templates/ncurses/template
View File

@ -16,6 +16,7 @@ long_desc="
ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo. ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
Full manual pages are provided for the library and tools." Full manual pages are provided for the library and tools."
base_chroot=yes
subpackages="base devel libs term" subpackages="base devel libs term"
Add_dependency run glibc Add_dependency run glibc
Add_dependency run ncurses-libs Add_dependency run ncurses-libs

3
templates/xbps-base-chroot/template
View File

@ -1,6 +1,6 @@
# Template file for 'xbps-base-chroot' # Template file for 'xbps-base-chroot'
pkgname=xbps-base-chroot pkgname=xbps-base-chroot
version=0.11 version=0.12
build_style=meta-template build_style=meta-template
short_desc="xbps base packages for the chroot target" short_desc="xbps base packages for the chroot target"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -12,6 +12,7 @@ noarch=yes
base_chroot=yes base_chroot=yes
Add_dependency full xbps-base-files Add_dependency full xbps-base-files
Add_dependency full bash
Add_dependency full patch Add_dependency full patch
Add_dependency full make Add_dependency full make
Add_dependency full diffutils Add_dependency full diffutils

16
xbps-src/shutils/chroot.sh
View File

@ -87,17 +87,9 @@ ff02::3 ip6-allhosts
_EOF _EOF
cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc
# Create /bin/sh symlink to bash
cd $XBPS_MASTERDIR/bin && ln -sf bash sh
#
# Copy host shell, bash is prefered to avoid breakage in
# GNU autoconf scripts!
#
mkdir -p $XBPS_MASTERDIR/bin
if [ -x /bin/bash ]; then
cp -f /bin/bash $XBPS_MASTERDIR/bin/sh
elif [ -x /bin/sh ]; then
cp -f /bin/sh $XBPS_MASTERDIR/bin/sh
fi
touch $XBPS_MASTERDIR/.xbps_perms_done touch $XBPS_MASTERDIR/.xbps_perms_done
} }
@ -176,9 +168,9 @@ xbps_chroot_handler()
[ "$action" != "configure" -a "$action" != "build" -a \ [ "$action" != "configure" -a "$action" != "build" -a \
"$action" != "install" -a "$action" != "chroot" ] && return 1 "$action" != "install" -a "$action" != "chroot" ] && return 1
mount_chroot_fs
install_xbps_utils
create_busybox_links create_busybox_links
install_xbps_utils
mount_chroot_fs
if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then
echo -n "==> Preparing chroot on $XBPS_MASTERDIR... " echo -n "==> Preparing chroot on $XBPS_MASTERDIR... "