diff options
| author | Peter Jones <pjones@redhat.com> | 2005-04-13 19:41:19 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2005-04-13 19:41:19 +0000 |
| commit | 64a35efcfdc963eb683cc917adb4823c145ee1c7 (patch) | |
| tree | c27f37a8b6599e979b53f9d65dba29fd55fd0e21 /scripts | |
| parent | 7dc3eae1c347eb81f7b0eecad0847a65bd70dd9e (diff) | |
Don't bother with our anti-nptl hack
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/upd-instroot | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 1e648d383..f15fd9eab 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -9,15 +9,6 @@ if [ "$1" == "--debug" ]; then shift fi -# XXX gross hack -# This is really "allow use of nptl if it's the default" -if [ "$1" == "--nptl" ]; then - NPTL="1" - shift -else - NPTL="0" -fi - if [ "$1" == "--comp" ]; then COMPONENT=$2 shift; shift @@ -255,25 +246,7 @@ fi # KEEPFILE=/tmp/keepfile.$$ -# XXX gross hack, until we're sure NPTL anaconda builds work, which is -# highly suspect today. -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_ - # get it, not to make sure we do... - EXPR="" -fi - -sed -e "$EXPR" > $KEEPFILE <<EOF -$LIBDIR/libc[-.]* -$LIBDIR/libm[-.]* -$LIBDIR/libpthread* -$LIBDIR/librt[-.]* -EOF - -cat >> $KEEPFILE <<EOF +cat > $KEEPFILE <<EOF boot/efi/EFI/redhat/elilo.efi bin/ash bin/fdisk* @@ -288,6 +261,10 @@ etc/selinux/targeted/policy/policy.* etc/selinux/targeted/contexts/files/file_contexts etc/security/selinux/policy.* etc/security/selinux/file_contexts +$LIBDIR/libc[-.]* +$LIBDIR/libm[-.]* +$LIBDIR/libpthread* +$LIBDIR/librt[-.]* $LIBDIR/ld*.so* $LIBDIR/libblkid* $LIBDIR/libcom_err* |