diff options
| author | Peter Jones <pjones@redhat.com> | 2008-04-08 14:17:12 -0400 |
|---|---|---|
| committer | Peter Jones <root@pjones5.install.boston.redhat.com> | 2008-04-08 14:17:12 -0400 |
| commit | 6956d76e2eaf35190bcfbdccf3436d513c40f9cc (patch) | |
| tree | 6018d12cf36e7617855a9af09f6dc1090095748d /scripts | |
| parent | db33f0fa48e3ce70dae068c4290341b8bd9545ec (diff) | |
| parent | 891326198cdaf43624df822bddee5a0fa741a6a4 (diff) | |
| download | anaconda-6956d76e2eaf35190bcfbdccf3436d513c40f9cc.tar.gz anaconda-6956d76e2eaf35190bcfbdccf3436d513c40f9cc.tar.xz anaconda-6956d76e2eaf35190bcfbdccf3436d513c40f9cc.zip | |
Merge branch 'master' of git+ssh://git.fedoraproject.org/git/hosted/anaconda
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 13 | ||||
| -rw-r--r-- | scripts/splittree.py | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index fa1629166..8cdc7221a 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -312,11 +312,11 @@ makemoduletree() { done # clean up leftover cruft - find $MMB_DIR/lib/modules -type d -exec rmdir -f {} \; 2>/dev/null + find -H $MMB_DIR/lib/modules -type d -exec rmdir -f {} \; 2>/dev/null $MODLIST --modinfo-file $MODINFO --ignore-missing --modinfo \ $MMB_MODULESET > $MMB_DIR/lib/modules/module-info # compress modules - find $MMB_DIR/lib/modules -type f -name *.ko -exec gzip -9 {} \; + find -H $MMB_DIR/lib/modules -type f -name *.ko -exec gzip -9 {} \; rundepmod $MMB_DIR rm -f $MMB_DIR/lib/modules/*/modules.*map rm -f $MMB_DIR/lib/modules/*/{build,source} @@ -786,8 +786,13 @@ for KERNELARCH in $arches; do if [ "${kernelvers}" = "kernel-xen" ]; then kerneltag="xen" ; fi - vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/vmlinuz | head -n 1) - version=${vmlinuz##/boot/vmlinuz-} + if [ "$BUILDARCH" = "ia64" ]; then + vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/efi/EFI/redhat/vmlinuz | head -n 1) + version=${vmlinuz##/boot/efi/EFI/redhat/vmlinuz-} + else + vmlinuz=$(rpm --nodigest --nosignature -qpl $kpackage |grep ^/boot/vmlinuz | head -n 1) + version=${vmlinuz##/boot/vmlinuz-} + fi arch=$(rpm --nodigest --nosignature --qf '%{ARCH}\n' -qp $kpackage) rpm2cpio $kpackage | (cd $KERNELROOT; cpio --quiet -iumd) diff --git a/scripts/splittree.py b/scripts/splittree.py index 03323d24b..1f4ae5a50 100644 --- a/scripts/splittree.py +++ b/scripts/splittree.py @@ -362,6 +362,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc. srpm_disc_list = self.src_list # create a list of [[size, srpm]] for srpm in os.listdir("%s" % self.src_dir): + if not srpm.endswith('.rpm'): + continue srpm_size = self.getSize("%s/%s" % (self.src_dir, srpm), blocksize=1) srpm_list.append([srpm_size, srpm]) |