diff options
| author | Peter Jones <pjones@redhat.com> | 2005-04-06 03:37:37 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2005-04-06 03:37:37 +0000 |
| commit | 89235f9e4bb491d5c72348f87e8b67d1503c1c9d (patch) | |
| tree | 40a6e50b56fc9a32fa5ab8f3c4ca42a31492d0c6 /scripts | |
| parent | 452522e6ac21d26bbdc75fac7870834284949cd4 (diff) | |
| download | anaconda-89235f9e4bb491d5c72348f87e8b67d1503c1c9d.tar.gz anaconda-89235f9e4bb491d5c72348f87e8b67d1503c1c9d.tar.xz anaconda-89235f9e4bb491d5c72348f87e8b67d1503c1c9d.zip | |
- test for obsoletes/linuxthreads/ in the output from the packages,
not on the build fs
- fixup the paths so they don't go to obsoletes/linuxthreads/ in the
output tree
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/upd-instroot | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 6a9281f91..801d6cc21 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -93,6 +93,15 @@ expandPackageSet() { TZDATA=$n fi rpm2cpio $n | (cd $PKGDEST; cpio -E $KEEPFILES --quiet -iumd) + ( cd $PKGDEST/$LIBDIR + if [ -d obsolete/linuxthreads/ ]; then + for x in obsolete/linuxthreads/*-* ; do + lib_base=$(basename $x | cut -d- -f1) + rm -f ./$lib_base* + mv -f obsolete/linuxthreads/$lib_base* . + done + rmdir obsolete/linuxthreads obsolete + fi ) [ -n "$DEBUG" ] && echo -ne "\rExpanding packages..." "$(basename $n | sed 's/./ /g')" done } @@ -247,8 +256,8 @@ KEEPFILE=/tmp/keepfile.$$ # XXX gross hack, until we're sure NPTL anaconda builds work, which is # highly suspect today. -if [ "$NPTL" = "0" -a -d /lib/obsolete/linuxthreads/ ]; then - EXPR="s,$LIBDIR/,$LIBDIR/obsolete/linuxthreads/," +if [ "$NPTL" = "0" ]; then + EXPR="p; s,$LIBDIR/,$LIBDIR/obsolete/linuxthreads/," else # this won't get us NPTL if we've got a glibc that doesn't put it # in /lib directly, but really this hack is to make sure we _don't_ |