diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-11-20 18:42:10 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-11-20 18:42:10 +0000 |
| commit | 40db52ebaaaedccc6cec92b8eda148359c7df1e3 (patch) | |
| tree | 6b4b513690e14630acbf46e9f06e7e121a23b1ba | |
| parent | 197d81ed63a9bc2986bda66cbf8289d22a000ee4 (diff) | |
| download | anaconda-40db52ebaaaedccc6cec92b8eda148359c7df1e3.tar.gz anaconda-40db52ebaaaedccc6cec92b8eda148359c7df1e3.tar.xz anaconda-40db52ebaaaedccc6cec92b8eda148359c7df1e3.zip | |
2006-11-20 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version
* scripts/mk-images.x86_64: More xen -> xenU fixing
* scripts/mk-images.i386: The same
* Makefile: fix build target
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | anaconda.spec | 4 | ||||
| -rw-r--r-- | scripts/mk-images.i386 | 2 | ||||
| -rw-r--r-- | scripts/mk-images.x86_64 | 2 |
5 files changed, 10 insertions, 5 deletions
@@ -1,5 +1,10 @@ 2006-11-20 Jeremy Katz <katzj@redhat.com> + * anaconda.spec: Bump version + * scripts/mk-images.x86_64: More xen -> xenU fixing + * scripts/mk-images.i386: The same + * Makefile: fix build target + * anaconda.spec: Bump version. * scripts/mk-images (foundakernel): Fix for xenU kernel @@ -103,7 +103,7 @@ build: src @mkdir /tmp/anaconda cd /tmp/anaconda ; cvs co common ; cd common ; ./cvs-import.sh -b RHEL-4 $(SRPMDIR)/anaconda-$(VERSION)-$(RELEASE).src.rpm @rm -rf /tmp/anaconda - brew build $(COLLECTION) 'cvs://cvs.devel.redhat.com/cvs/dist?rpms/anaconda/RHEL-4/anaconda#$(CVSTAG)' + brew build $(COLLECTION) 'cvs://cvs.devel.redhat.com/cvs/dist?rpms/anaconda/RHEL-4#$(CVSTAG)' create-snapshot: @rm -rf /tmp/anaconda diff --git a/anaconda.spec b/anaconda.spec index e674e8500..60d1f16ed 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ ExcludeArch: ppc64 Name: anaconda -Version: 10.1.1.51 +Version: 10.1.1.52 Release: 1 License: GPL Summary: Graphical system installer @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog -* Mon Nov 20 2006 Jeremy Katz <katzj@redhat.com> - 10.1.1.51-1 +* Mon Nov 20 2006 Jeremy Katz <katzj@redhat.com> - 10.1.1.52-1 - Fix /bin/echo symlink (dlehman, #178781) - Add audit-libs (dlehman, #203391) - Improve handling of local stage2 with URL installs (dlehman, #189262) diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index e194225e8..cc5188d86 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -117,7 +117,7 @@ makeBootImages() { # FIXME: this is so that we can switch back and forth. if we want both # on the CD, then more needs to be done, esp for things like isolinux.cfg # Right now, last one wins - if [ "$kerneltag" != "xen" ]; then + if [ "$kerneltag" != "xenU" ]; then echo "Building $KERNELARCH initrd-everything.img" makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \ --pcmcia \ diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64 index b2f7ab802..fd03557ee 100644 --- a/scripts/mk-images.x86_64 +++ b/scripts/mk-images.x86_64 @@ -94,7 +94,7 @@ PCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"` mkdir -p $TOPDESTPATH/images/pxeboot makeBootImages() { - if [ "$kerneltag" != "xen" ]; then + if [ "$kerneltag" != "xenU" ]; then echo "Building initrd-everything.img" makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \ --pcmcia \ |