Re: Preparing 2.6.16-7, Call for discussion on SECCOMP and HZ_250

[Sven Luther <sven.luther@wanadoo.fr>]

On Wed, Apr 12, 2006 at 04:44:33PM +0200, Frederik Schueler wrote:
> Hello,
> 
> I would like to schedule the upload of 2.6.16-7, containing 2.6.16.3 and
> 2.6.16.4, for tomorrow Apr. 13th.

I have adapted the mkvmlinuz patch to the ARCH=ppc to ARCH=powerpc and
unification with powerpc64 transition.

As a result, we can enable mkvmlinuz in kernel-package for both powerpc and
powerpc64, but there was one change which is needed.

In the previous, more hacky way of doing this, the make
mkvmlinuz_support_install had to be done in the arch/ppc/boot directory, while
with the new neater patch it has to be done in the toplevel.

These two issues impose a smallish patch to kernel-package, but which i need
to discuss with Manoj, hopefully later today, to find the best solution on how
to solve this issue :

  ruleset/arches/powerpc.mk:

# 32bit generic powerpc subarches.
ifneq (,$(findstring $(KPKG_SUBARCH), powerpc powerpc32 ppc ppc32))
  KPKG_SUBARCH:=powerpc
  NEED_IMAGE_POST_PROCESSING = YES
  IMAGE_POST_PROCESS_TARGET := mkvmlinuz_support_install
  IMAGE_POST_PROCESS_DIR    := arch/$(KERNEL_ARCH)/boot
  # INSTALL_MKVMLINUZ_PATH = /usr/lib/kernel-image-${version}
  INSTALL_MKVMLINUZ_PATH = /usr/lib/$(INT_STEM)-image-${version}
  target := zImage
  loaderdep=mkvmlinuz
endif

  ruleset/targets/image.mk:

ifeq ($(strip $(NEED_IMAGE_POST_PROCESSING)),YES)
        if grep $(IMAGE_POST_PROCESS_TARGET) $(IMAGE_POST_PROCESS_DIR)/Makefile 2>&1 >/dev/null; then \
            $(MAKE) INSTALL_MKVMLINUZ=$(TMPTOP)$(INSTALL_MKVMLINUZ_PATH) \
            ARCH=$(KERNEL_ARCH) -C $(IMAGE_POST_PROCESS_DIR) $(IMAGE_POST_PROCESS_TARGET);  \
        fi
endif

The first need to be activated for ppc64 and powerpc64, while the second needs
to remove the -C $(IMAGE_POST_PROCESS_DIR) argument for post 2.6.15 kernels. I
don't know, but i believe the best would be to make KERNEL_ARCH_VERSION
available to image.mk, if it is not already, and conditionally remove the -C
$(IMAGE_POST_PROCESS_DIR) optiuon then.

Another cleaner way, would be to fully move the internal if ... fi expression
into powerpc.mk, and have a real generic post-processing call in image.mk.

Something like :

ifeq ($(strip $(NEED_IMAGE_POST_PROCESSING)),YES)
	$(DO_IMAGE_POST_PROCESSING)
endif

And then in powerpc.mk :

  NEED_IMAGE_POST_PROCESSING = YES
  IMAGE_POST_PROCESS_TARGET := mkvmlinuz_support_install
  IMAGE_POST_PROCESS_DIR    := arch/$(KERNEL_ARCH)/boot
  INSTALL_MKVMLINUZ_PATH = /usr/lib/$(INT_STEM)-image-${version}
  DO_IMAGE_POST_PROCESSING =
    if grep $(IMAGE_POST_PROCESS_TARGET) $(IMAGE_POST_PROCESS_DIR)/Makefile 2>&1 >/dev/null; then \
      if [ "$(KERNEL_ARCH_VERSION" = "post-2.6.15" ]; then \
        $(MAKE) INSTALL_MKVMLINUZ=$(TMPTOP)$(INSTALL_MKVMLINUZ_PATH) \
          ARCH=$(KERNEL_ARCH) $(IMAGE_POST_PROCESS_TARGET);  \
      else \
        $(MAKE) INSTALL_MKVMLINUZ=$(TMPTOP)$(INSTALL_MKVMLINUZ_PATH) \
          ARCH=$(KERNEL_ARCH) -C $(IMAGE_POST_PROCESS_DIR) $(IMAGE_POST_PROCESS_TARGET);  \
      fi \
    fi

but i am not sure if this is easily possible or not.

Manoj, what do you think ? 

Friendly,

Sven Luther