On Mon, Mar 11, 2002 at 05:13:06PM +0100, Stefan Gybas wrote:
> On Mon, Mar 11, 2002 at 03:37:32PM +0000, Phil Blundell wrote:
>
> > That shouldn't be a problem. If the pre-existing definitions in
> > /etc/terminfo weren't being found, that's just a bug.
>
> It is a problem because the build fails otherwise:
>
> find: usr/share/terminfo: No such file or directory
> ln: `/var/tmp/boot-floppies/root-tmp-28204/etc/terminfo/a/.': cannot
> overwrite directory
> E: ./rootdisk.sh abort
>
> I don't think this is worth fixing since the canonicalising step doesn't
> make a lot of sense on s390.
Could you please try the following patch?
Matt
Index: rootdisk.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/rootdisk.sh,v
retrieving revision 1.352
diff -u -r1.352 rootdisk.sh
--- rootdisk.sh 2002/03/11 15:13:44 1.352
+++ rootdisk.sh 2002/03/11 17:02:19
@@ -502,27 +502,24 @@
done
done
-if [ "$arch" != "s390" ]; then
+# clean up multiple terminfo locations
+info "canonicalising terminfo directories"
- # clean up multiple terminfo locations
- info "canonicalising terminfo directories"
-
- termdirs="usr/lib/terminfo usr/share/terminfo"
- if [ -e $R/etc/terminfo ]; then
- mv $R/etc/terminfo $R/etc/terminfo.1
- termdirs="$termdirs etc/terminfo.1"
- fi
+termdirs="usr/lib/terminfo usr/share/terminfo"
+if [ -e $R/etc/terminfo ]; then
+ mv $R/etc/terminfo $R/etc/terminfo.1
+ termdirs="$termdirs etc/terminfo.1"
+fi
- mkdir $R/etc/terminfo
- for term in $(cd $R; find $termdirs -type f); do
- baseterm=$(echo $term | sed 's:.*/::')
- termdir=$(echo $baseterm | sed 's:\(.\).*:\1:')
+mkdir $R/etc/terminfo
+for term in $(cd $R; find $termdirs -type f); do
+ baseterm=$(echo $term | sed 's:.*/::')
+ termdir=$(echo $baseterm | sed 's:\(.\).*:\1:')
+ if [ ! -e $R/etc/terminfo/$termdir ]; then
ln -s . $R/etc/terminfo/$termdir
- mv $R/$term $R/etc/terminfo/$baseterm
- done
- rm -rf $R/usr/lib/terminfo $R/usr/share/terminfo $R/etc/terminfo.1
- rmdir $R/usr/share || true
-fi
+ fi
+ mv $R/$term $R/etc/terminfo/$baseterm
+done
# tweak for Japanese
if [ "$LINGUA" = "ja" ] ; then
Attachment:
pgpOtM0xWKh88.pgp
Description: PGP signature