zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add handling for the different name of the xz-utils tarball

Browse source
This commit is contained in:
Thomas Pegg 2011-01-08 00:17:08 +00:00
parent d8006a00f3
commit 4b54394ca1
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
LFS/master.sh
View file

@ -138,7 +138,10 @@ chapter5_Makefiles() {
# Remove the build directory(ies) except if the package build fails
# (so we can review config.cache, config.log, etc.)
if [ "$pkg_tarball" != "" ] ; then
LUSER_RemoveBuildDirs "$name"
case "${name}" in
*xz-utils) LUSER_RemoveBuildDirs "xz" ;;
*) LUSER_RemoveBuildDirs "$name" ;;
esac
fi
# Include a touch of the target name so make can check
@ -262,7 +265,10 @@ chapter6_Makefiles() {
# Write installed files log and remove the build directory(ies)
# except if the package build fails.
if [ "$pkg_tarball" != "" ] ; then
CHROOT_wrt_RemoveBuildDirs "$name"
case "${name}" in
*xz-utils) CHROOT_wrt_RemoveBuildDirs "xz" ;;
*) CHROOT_wrt_RemoveBuildDirs "$name" ;;
esac
if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
CHROOT_wrt_LogNewFiles "$name"
fi

2
common/libs/func_wrt_Makefile
View file

@ -90,6 +90,8 @@ get_package_tarball_name() { #
;;
expect) echo $(grep "^expect" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
*) echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
esac