#10 remove bootwrapper subpackage (related #1566225)
Merged a year ago by jforbes. Opened a year ago by sharkcz.
rpms/ sharkcz/kernel bootwrapper  into  master

file modified
-22

@@ -95,8 +95,6 @@ 

  %define with_cross_headers   %{?_without_cross_headers:   0} %{?!_without_cross_headers:   1}

  # kernel-debuginfo

  %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}

- # kernel-bootwrapper (for creating zImages from kernel + initrd)

- %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}

  # Want to build a the vsdo directories installed

  %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}

  #

@@ -176,7 +174,6 @@ 

  %endif

  

  %if %{nopatches}

- %define with_bootwrapper 0

  %define variant -vanilla

  %endif

  

@@ -241,10 +238,8 @@ 

  %define all_arch_configs kernel-%{version}-*.config

  %endif

  

- # bootwrapper is only on ppc

  # sparse blows up on ppc

  %ifnarch %{power64}

- %define with_bootwrapper 0

  %define with_sparse 0

  %endif

  

@@ -683,13 +678,6 @@ 

  cross-glibc package.

  

  

- %package bootwrapper

- Summary: Boot wrapper files for generating combined kernel + initrd images

- Requires: gzip binutils

- %description bootwrapper

- Kernel-bootwrapper contains the wrapper code which makes bootable "zImage"

- files combining both kernel and initial ramdisk.

- 

  %package debuginfo-common-%{_target_cpu}

  Summary: Kernel source files used by %{name}-debuginfo packages

  Provides: installonlypkg(kernel)

@@ -1673,10 +1661,6 @@ 

  rm -rf $RPM_BUILD_ROOT/usr/tmp-headers

  %endif

  

- %if %{with_bootwrapper}

- make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts

- %endif

- 

  ###

  ### clean

  ###

@@ -1799,12 +1783,6 @@ 

  /usr/*-linux-gnu/include/*

  %endif

  

- %if %{with_bootwrapper}

- %files bootwrapper

- /usr/sbin/*

- %{_libdir}/kernel-wrapper

- %endif

- 

  # empty meta-package

  %files

  # This is %%{image_install_path} on an arch where that includes ELF files,

The bootwrapper stuff was used with the 32-bit PowerPC support, which we removed long time ago. See https://bugzilla.redhat.com/show_bug.cgi?id=1566225 for the details about the recent cleanups for ppc64/ppc64le (includes comps and lorax).

PS: this needs to go only to rawhide

Needs an Obsoletes too, likely in the kernel-core package ...

Commit 4a15958 fixes this pull-request

Pull-Request has been merged by jforbes

a year ago

Pull-Request has been merged by jforbes

a year ago