- add xen kernel/initrd links for compat

- add xen kernel/initrd links for compat

OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=852
This commit is contained in:
2015-12-17 12:13:28 +00:00
committed by Git OBS Bridge
parent f7bc3007e8
commit 59d228f766
4 changed files with 14 additions and 38 deletions

View File

@@ -2,6 +2,7 @@
Thu Dec 17 09:40:15 UTC 2015 - snwint@suse.com
- adjust module config
- add xen kernel/initrd links for compat
- 14.211
-------------------------------------------------------------------

View File

@@ -31,16 +31,8 @@
%define with_shim 1
%bcond_without sbl
%bcond_without vnc
%ifarch x86_64 %ix86
%bcond_without xen
%else
%bcond_with xen
%endif
%ifarch x86_64
%bcond_without xenkmp
%else
%bcond_with xenkmp
%endif
%bcond_with xen
%bcond_with xenkmp
%if %theme == SLES
ExcludeArch: %ix86
@@ -456,15 +448,10 @@ make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=%theme
ln -s %theme %{buildroot}/usr/lib/install-initrd/branding
install -d -m 755 %{buildroot}/usr/sbin
install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin
%ifarch %ix86
%if %{with xen}
# xenpae compat gefrickel (bnc #397065)
for i in %{buildroot}/branding/*/CD1/boot/i386/initrd-xen ; do
[ -f "$i" ] && ln -s initrd-xen ${i}pae
done
for i in %{buildroot}/CD1/boot/i386/vmlinuz-xen ; do
[ -f "$i" ] && ln -s vmlinuz-xen ${i}pae
done
%ifarch x86_64
%if %{without xen}
ln -s loader/initrd %{buildroot}/branding/%theme/CD1/boot/x86_64/initrd-xen
ln -s loader/linux %{buildroot}/CD1/boot/x86_64/vmlinux-xen
%endif
%endif
# get rid of /usr/lib/rpm/brp-strip-debug

View File

@@ -2,6 +2,7 @@
Thu Dec 17 09:40:15 UTC 2015 - snwint@suse.com
- adjust module config
- add xen kernel/initrd links for compat
- 14.211
-------------------------------------------------------------------

View File

@@ -31,16 +31,8 @@
%define with_shim 1
%bcond_without sbl
%bcond_without vnc
%ifarch x86_64 %ix86
%bcond_without xen
%else
%bcond_with xen
%endif
%ifarch x86_64
%bcond_without xenkmp
%else
%bcond_with xenkmp
%endif
%bcond_with xen
%bcond_with xenkmp
%if %theme == SLES
ExcludeArch: %ix86
@@ -456,15 +448,10 @@ make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=%theme
ln -s %theme %{buildroot}/usr/lib/install-initrd/branding
install -d -m 755 %{buildroot}/usr/sbin
install -m 755 etc/mkinstallinitrd %{buildroot}/usr/sbin
%ifarch %ix86
%if %{with xen}
# xenpae compat gefrickel (bnc #397065)
for i in %{buildroot}/branding/*/CD1/boot/i386/initrd-xen ; do
[ -f "$i" ] && ln -s initrd-xen ${i}pae
done
for i in %{buildroot}/CD1/boot/i386/vmlinuz-xen ; do
[ -f "$i" ] && ln -s vmlinuz-xen ${i}pae
done
%ifarch x86_64
%if %{without xen}
ln -s loader/initrd %{buildroot}/branding/%theme/CD1/boot/x86_64/initrd-xen
ln -s loader/linux %{buildroot}/CD1/boot/x86_64/vmlinux-xen
%endif
%endif
# get rid of /usr/lib/rpm/brp-strip-debug