On Thu, 2011-05-12 at 12:36 -0400, Will Woods wrote: > Add the m2crypto package, which is required by subscription-manager. > (It will get pulled in automatically since its contents all go under > usr/$LIBDIR/python?.?/ - no need to update KEEPFILE). > > Also add usr/lib/python?.?/site-packages/*rhsm* and > usr/$LIBDIR/python?.?/site-packages/encodings to the stage2 image so > subscription-manager's product-id plugin will work properly. Looks reasonable to me. Testing will tell, as is often the case with upd-instroot. Dave > --- > scripts/upd-instroot | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/upd-instroot b/scripts/upd-instroot > index fecddfb..199050d 100755 > --- a/scripts/upd-instroot > +++ b/scripts/upd-instroot > @@ -124,7 +124,7 @@ PACKAGES="glibc glibc-common setup openssl python python-libs newt slang libseli > libselinux-python nss udev keyutils-libs nspr python-iniparse > cryptsetup-luks e4fsprogs fipscheck fipscheck-lib libdrm libmlx4 > subscription-manager python-dmidecode python-ethtool > - python-rhsm python-simplejson PyXML virt-what" > + python-rhsm python-simplejson PyXML m2crypto" > > if [ $ARCH = i386 -o $ARCH = x86_64 ]; then > PACKAGES="$PACKAGES pcmciautils" > @@ -482,6 +482,7 @@ usr/lib/python?.?/site-packages/pirut/* > usr/lib/python?.?/site-packages/pykickstart/* > usr/lib/python?.?/site-packages/rhpxl/* > usr/lib/python?.?/site-packages/instnum.* > +usr/lib/python?.?/site-packages/*rhsm* > usr/lib/rpm/macros > usr/lib/rpm/rpmpopt > usr/lib/rpm/rpmrc > @@ -1335,7 +1336,6 @@ find $DESTGR -type f -name '*.so' |xargs strip -g > # some python stuff we don't need for stage2 > rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/distutils/ > rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/lib-dynload/japanese > -rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/encodings/ > rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/compiler/ > rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/email/test/ > rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/curses/ _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
