diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-06-20 14:54:59 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-06-20 14:54:59 +0000 |
| commit | 8cae55768ad359977d9a27f97d81ba99f45ded73 (patch) | |
| tree | 530bcefb9ad34b302468103296a9cba0b3a27364 | |
| parent | 01f44fee5c8a794b4da524f21cbe59017f154278 (diff) | |
| download | anaconda-8cae55768ad359977d9a27f97d81ba99f45ded73.tar.gz anaconda-8cae55768ad359977d9a27f97d81ba99f45ded73.tar.xz anaconda-8cae55768ad359977d9a27f97d81ba99f45ded73.zip | |
* loader2/Makefile: Cram a new linker path in to loader so that we can
find libnss_* stuff in stage1.
* scripts/mk-images (makeinitrd): Copy in libnss_dns* and libnss_files*
to the stage1 image.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | loader2/Makefile | 5 | ||||
| -rwxr-xr-x | scripts/mk-images | 7 |
3 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2006-06-20 David Cantrell <dcantrell@redhat.com> + + * loader2/Makefile: Cram a new linker path in to loader so that we can + find libnss_* stuff in stage1. + + * scripts/mk-images (makeinitrd): Copy in libnss_dns* and libnss_files* + to the stage1 image. + 2006-06-20 Jeremy Katz <katzj@redhat.com> * yuminstall.py (AnacondaYum._run): Translate the error diff --git a/loader2/Makefile b/loader2/Makefile index 973282174..03489786d 100644 --- a/loader2/Makefile +++ b/loader2/Makefile @@ -45,6 +45,9 @@ else HWLIBS += -lpci endif +# NSS linker flags +NSSFLAGS = -Wl,-rpath-link,/nss + CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"' STATIC = -static REALCC=gcc @@ -124,7 +127,7 @@ loader-net.o: loader.c $(CC) -DINCLUDE_NETWORK $(CFLAGS) -o $@ -c $< loader: loader.o $(OBJS) $(NETOBJS) - $(CC) -g $(STATIC) -o $@ $^ -lpopt \ + $(CC) -g $(STATIC) $(NSSFLAGS) -o $@ $^ -lpopt \ $(HWLIBS) $(ISYSLIB) $(GUNZIP) $(UNICODELIB) \ -lresolv $(NEWTLIB) $(SLANGLIB) $(DMLIB) $(GLIB) $(DHCP) -lm diff --git a/scripts/mk-images b/scripts/mk-images index 70beaa344..ed5c1a55f 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -580,6 +580,13 @@ makeinitrd() { mkdir -p $MBD_DIR/var/run mkdir -p $MBD_DIR/var/lock/rpm + # copy in name service switch stuff + mkdir -p $MBD_DIR/nss + cp -a $IMGPATH/$LIBDIR/libnss_dns* $MBD_DIR/nss + cp -a $IMGPATH/$LIBDIR/libnss_files* $MBD_DIR/nss + strip $MBD_DIR/nss/libnss_dns-*.*.*.so + strip $MBD_DIR/nss/libnss_files-*.*.*.so + if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then mkdir -p $MBD_DIR/dev/iseries fi |