git.annexia.org
/
febootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for 2.5.
[febootstrap.git]
/
febootstrap.sh
diff --git
a/febootstrap.sh
b/febootstrap.sh
index
91b4f55
..
6b46ed4
100755
(executable)
--- a/
febootstrap.sh
+++ b/
febootstrap.sh
@@
-82,7
+82,7
@@
mirror="$3"
# Architecture is currently always the same as the current arch. We
# cannot do --foreign builds. See discussion in the manpage.
# Architecture is currently always the same as the current arch. We
# cannot do --foreign builds. See discussion in the manpage.
-arch=$(
arch
)
+arch=$(
uname -m
)
case $arch in
i?86) arch=i386 ;;
esac
case $arch in
i?86) arch=i386 ;;
esac
@@
-170,6
+170,9
@@
export FAKECHROOT_EXCLUDE_PATH=/proc
# ignored.
export FAKECHROOT_CMD_SUBST=/sbin/ldconfig=/bin/true:/usr/sbin/glibc_post_upgrade.i686=/bin/true:/usr/sbin/glibc_post_upgrade.x86_64=/bin/true:/usr/sbin/build-locale-archive=/bin/true:/usr/sbin/libgcc_post_upgrade=/bin/true
# ignored.
export FAKECHROOT_CMD_SUBST=/sbin/ldconfig=/bin/true:/usr/sbin/glibc_post_upgrade.i686=/bin/true:/usr/sbin/glibc_post_upgrade.x86_64=/bin/true:/usr/sbin/build-locale-archive=/bin/true:/usr/sbin/libgcc_post_upgrade=/bin/true
+# Use the libraries inside the chroot.
+export LD_LIBRARY_PATH="$target"/usr/lib64:"$target"/usr/lib:"$target"/lib64:"$target"/usr/lib
+
# Make the device nodes inside the fake chroot.
# (Copied from mock/backend.py) Why isn't there a base package which
# creates these?
# Make the device nodes inside the fake chroot.
# (Copied from mock/backend.py) Why isn't there a base package which
# creates these?
@@
-237,5
+240,6
@@
fi
# Clean up the yum repository.
if [ "$clean" = "yes" ]; then
# Clean up the yum repository.
if [ "$clean" = "yes" ]; then
- rm -rf "$target"/var/cache/yum/febootstrap
+ febootstrap-run "$target" -- rm -rf /var/cache/yum/febootstrap
+ febootstrap-run "$target" -- rm -rf /var/cache/yum/febootstrap-updates
fi
fi