summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-06-15 15:42:37 +0000
committerJeremy Katz <katzj@redhat.com>2006-06-15 15:42:37 +0000
commit3df489b35ecb3ac177330a58e4a549215f6d03cd (patch)
tree752d224ef104f38f80903862429d2664cfe003fa
parentd2e33c42957dcfc243085a131cc4ff9cd529205e (diff)
downloadanaconda-3df489b35ecb3ac177330a58e4a549215f6d03cd.tar.gz
anaconda-3df489b35ecb3ac177330a58e4a549215f6d03cd.tar.xz
anaconda-3df489b35ecb3ac177330a58e4a549215f6d03cd.zip
2006-06-15 Jeremy Katz <katzj@redhat.com>
* scripts/pkgorder: Make sure all kernel packages are in pkgorder. We don't really want kernel-devel on the last CD anyway.
-rw-r--r--ChangeLog5
-rwxr-xr-xscripts/pkgorder5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cb3f271fe..4cda0bf3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-06-15 Jeremy Katz <katzj@redhat.com>
+ * scripts/pkgorder: Make sure all kernel packages are in
+ pkgorder. We don't really want kernel-devel on the last CD anyway.
+
+2006-06-15 Jeremy Katz <katzj@redhat.com>
+
* anaconda.spec (BuildPreReq): We need the newer kudzu to
avoid segfaults in the loader, not explicitly at runtime
(Version): Bump
diff --git a/scripts/pkgorder b/scripts/pkgorder
index c31567b28..6f3c50c6b 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -149,9 +149,8 @@ if __name__ == "__main__":
if arch == "i386":
arch = "i686"
- for pattern in ["kernel-[0-9]*", "kernel-smp-[0-9]*",
- "kernel-xen*", "kernel-PAE-[0-9]*", "kernel-kdump-[0-9]*"]:
- printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, pattern))
+ # print out kernel related packages first
+ printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "kernel-*"))
testpath = "/tmp/pkgorder-%d" %(os.getpid(),)
os.system("mkdir -p %s/var/lib/rpm" %(testpath,))