Re: [PATCH] Second part of the s390x xauth fix - copy the files to initrd (#516369)

David Cantrell <dcantrell@xxxxxxxxxx> · Wed, 12 Aug 2009 15:28:01 -1000 (HST)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wed, 12 Aug 2009, Steffen Maier wrote:

I'm wondering why we use cp for s390(x) but the remainder of the
function makeinitrd uses install or instbin.

Holdover from when it was originally written, most likely.

Maybe that's the reason the so-deps didn't get resolved?

Shouldn't that be all we need?:

-        cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
+        instbin $IMGPATH /usr/bin/xauth $MBD_DIR /sbin/xauth

David?

Yeah, as clumens already mentioned, for binaries we should use instbin() so
that dependencies are collected.


On 08/12/2009 10:33 AM, Martin Sivak wrote:
---
 scripts/mk-images |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 2a539a8..f61ab2b 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -573,6 +573,11 @@ makeinitrd() {
         cp $IMGPATH/$LIBDIR/libwrap*.so* $MBD_DIR/$LIBDIR/
         ln -s /tmp $MBD_DIR/var/state/xkb
         cp $IMGPATH/usr/bin/xauth $MBD_DIR/sbin/xauth
+        cp $IMGPATH/usr/$LIBDIR/libXau.so.* $MBD_DIR/$LIBDIR/
+        cp $IMGPATH/usr/$LIBDIR/libXext.so.* $MBD_DIR/$LIBDIR/
+        cp $IMGPATH/usr/$LIBDIR/libXmuu.so.* $MBD_DIR/$LIBDIR/
+        cp $IMGPATH/usr/$LIBDIR/libX11.so.* $MBD_DIR/$LIBDIR/
+        cp $IMGPATH/usr/$LIBDIR/libxcb.so.* $MBD_DIR/$LIBDIR/
         cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
     fi


Steffen

Linux on System z Development

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Erich Baier
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


- -- 
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEUEARECAAYFAkqDbCEACgkQ5hsjjIy1VkmK7QCg3PLVEGoGuZoggIcUZknQHlR1
rzUAl0W6q3vfVsixpNt4JqbWOxAU3PI=
=dfed
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list



