diff options
| author | Peter Jones <pjones@redhat.com> | 2009-03-02 21:01:33 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@vroomfondel.internal.datastacks.com> | 2009-03-02 21:48:19 -0500 |
| commit | b531db124bdc18c87ea8a3f82edb9efe0a41a725 (patch) | |
| tree | 730e3ac4c28203f36d5ed6a546f8ee096f213fa2 /scripts | |
| parent | d00ef216099104c03c400f56fb21e19089df4a7d (diff) | |
Redo how artwork package is discovered.
Basically revert c5fcb418, but use ${brandpkgname}-logos instead of
system-logos, so we don't have to rely on it being noarch.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mk-images.efi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi index e3c1f47ee..5f13edaa3 100644 --- a/scripts/mk-images.efi +++ b/scripts/mk-images.efi @@ -157,8 +157,13 @@ prepareEfiTree() { mv $MBD_BOOTTREE_TMP/EFI/boot/grub.efi $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.efi mv $MBD_BOOTTREE_TMP/EFI/boot/grub.conf $MBD_BOOTTREE_TMP/EFI/boot/boot${efiarch}.conf - yumdownloader -c $yumconf ${brandpkgname}-logos - rpm2cpio ${brandpkgname}-logos.noarch.rpm | (cd $KERNELROOT; cpio --quiet -iumd) + artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1) + if [ -z "$artpkg" ]; then + argpkg="generic-logos" + fi + + yumdownloader -c ${yumconf} ${artpkg} + rpm2cpio ${artpkg} | (cd $KERNELROOT; cpio --quiet -iumd) cp $KERNELROOT/boot/grub/splash.xpm.gz $MBD_BOOTTREE_TMP/EFI/boot/splash.xpm.gz } |