Re: [PATCH 2/3] Include kernel-bootwrapper in PACKAGES on ppc and ppc64.

[Dennis Gregorovic <dgregor redhat com>]

On Tue, 2009-09-22 at 13:02 -1000, David Cantrell wrote: 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On Tue, 22 Sep 2009, Chris Lumens wrote:
> 
> >> diff --git a/scripts/upd-instroot b/scripts/upd-instroot
> >> index 03202b0..56b5095 100755
> >> --- a/scripts/upd-instroot
> >> +++ b/scripts/upd-instroot
> >> @@ -229,7 +229,7 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
> >>  fi
> >>
> >>  if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
> >> -    PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
> >> +    PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils kernel-bootwrapper"
> >>  fi
> >>
> >>  #
> >
> > I assume this is only for the /usr/sbin/wrapper binary that we're
> > already including in KEEPFILES.  However if all the stuff in
> > /usr/lib/kernel-wrapper is also required for wrapper to work, it's going
> > to need to be listed in KEEPFILES as well.  We don't include stuff in
> > /usr/lib unless it's explicitly mentioned or a program we do include
> > links against it, and I'm betting the latter isn't happening here.
> 
> Not sure what's going on here, CC'ing dgregor to get his input.

The previous patch wasn't fully tested.  I just tested the attached
patch and it worked as expected.

Cheers
-- Dennis

diff -ur anaconda-12.27/scripts/mk-images.ppc anaconda-12.27-dg/scripts/mk-images.ppc
--- anaconda-12.27/scripts/mk-images.ppc	2009-09-09 14:14:32.000000000 -0400
+++ anaconda-12.27-dg/scripts/mk-images.ppc	2009-09-22 21:05:49.522570000 -0400
@@ -48,11 +48,11 @@
 		rm -f $TOPDESTPATH/ppc/ppc64/zImage.lds
 		popd
         echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo
-	elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib/kernel-wrapper/wrapper.a ]; then
+	elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib64/kernel-wrapper/wrapper.a ]; then
 		mkdir -p $TOPDESTPATH/images/netboot
 		$IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc64.img	\
 					  -i $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz	\
-					  -D $IMGPATH/usr/lib/kernel-wrapper		\
+					  -D $IMGPATH/usr/lib64/kernel-wrapper		\
 					     $TOPDESTPATH/ppc/ppc64/vmlinuz
 		rmdir $TOPDESTPATH/images/netboot || :
 		echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo
diff -ur anaconda-12.27/scripts/upd-instroot anaconda-12.27-dg/scripts/upd-instroot
--- anaconda-12.27/scripts/upd-instroot	2009-09-21 23:19:09.000000000 -0400
+++ anaconda-12.27-dg/scripts/upd-instroot	2009-09-22 21:05:39.605392000 -0400
@@ -229,7 +229,7 @@
 fi
 
 if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
-    PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
+    PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils kernel-bootwrapper"
 fi
 
 #
@@ -461,6 +461,7 @@
 usr/$LIBDIR/gtk-2.0/*/loaders/*xpm*
 usr/$LIBDIR/gtk-2.0/immodules
 usr/$LIBDIR/hal
+usr/$LIBDIR/kernel-wrapper/*
 usr/$LIBDIR/libuser/*
 usr/$LIBDIR/pango
 usr/$LIBDIR/python?.?