summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-06-14 04:39:14 +0000
committerJeremy Katz <katzj@redhat.com>2006-06-14 04:39:14 +0000
commit188f8e811b6da1e53aae48f9066d6279a70f9396 (patch)
treea1b3ac29b189e402f5c3187b8f013ae85262bf08
parentbae7082c4024e57090288b6a2b0caebf9e24bc86 (diff)
downloadanaconda-188f8e811b6da1e53aae48f9066d6279a70f9396.tar.gz
anaconda-188f8e811b6da1e53aae48f9066d6279a70f9396.tar.xz
anaconda-188f8e811b6da1e53aae48f9066d6279a70f9396.zip
2006-06-14 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version. * scripts/mk-images: More trying to fix s390...
-rw-r--r--ChangeLog2
-rw-r--r--anaconda.spec5
-rwxr-xr-xscripts/mk-images2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e67961e65..b0abf625b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* anaconda.spec: Bump version.
+ * scripts/mk-images: More trying to fix s390...
+
* yuminstall.py (YumBackend.getBestKernelByArch): New xen kernel
package naming.
diff --git a/anaconda.spec b/anaconda.spec
index a9935c0f8..b4c821793 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 11.1.0.35
+Version: 11.1.0.36
Release: 1
License: GPL
Summary: Graphical system installer
@@ -97,8 +97,9 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
-* Wed Jun 14 2006 Jeremy Katz <katzj@redhat.com> - 11.1.0.35-1
+* Wed Jun 14 2006 Jeremy Katz <katzj@redhat.com> - 11.1.0.36-1
- new xen kernel names
+- more trying to fix s390
* Tue Jun 13 2006 David Cantrell <dcantrell@redhat.com> - 11.1.0.34-1
- Fix logging segfaults in loader on x86_64
diff --git a/scripts/mk-images b/scripts/mk-images
index 297e16431..ebb423a71 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -497,7 +497,7 @@ EOF
done
if [ -e $IMGPATH/lib/ld64.so* ]; then cp -df $IMGPATH/lib/ld64.so.* $MBD_DIR/lib/ ; fi
- if [ -e $IMGPATH/lib/ld-*.so* ]; then cp -df $IMGPATH/lib/ld-*.so* $MBD_DIR/lib/ ; fi
+ if [ -e $IMGPATH/lib/ld-*.so ]; then cp -df $IMGPATH/lib/ld-*.so $MBD_DIR/lib/ ; fi
if [ -e $IMGPATH/lib64/ld64.so* ]; then cp -df $IMGPATH/lib64/ld64.so.* $MBD_DIR/lib/ ; fi
mkdir -p $MBD_DIR/usr/$LIBDIR