From 9645720f45958f12e7b323b0b580b87dbd080243 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 18 May 2007 12:46:35 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/rules.real: Add mkvmlinuz support for powerpc. svn path=/dists/trunk/linux-2.6/; revision=8602 --- debian/changelog | 5 ++++- debian/rules.real | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64790db87..c050ab97f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,10 @@ linux-2.6 (2.6.21-3) UNRELEASED; urgency=low defining them is certainly a better option for getting user feedback than disabling the affected drivers. - -- Steve Langasek Thu, 17 May 2007 15:53:31 -0700 + [ Bastian Blank ] + * [powerpc] Readd mkvmlinuz support. + + -- Bastian Blank Fri, 18 May 2007 14:45:32 +0200 linux-2.6 (2.6.21-1) unstable; urgency=low diff --git a/debian/rules.real b/debian/rules.real index 7f10b2b9a..1701884fa 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -403,7 +403,7 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain: dh_installdirs 'boot' $(MAKE) -f debian/rules.real \ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_image \ - DIR='$(DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)' + DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)' ifeq ($(MODULES),True) cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR) cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION) @@ -427,6 +427,14 @@ install-image-m68k-$(SUBARCH)-$(FLAVOUR)-plain_image: install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image: install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION) +ifeq ($(KERNEL_ARCH),ppc) + # TODO: GNA + $(setup_env) make -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \ + INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION) +else + $(setup_env) make -C '$(DIR)' mkvmlinuz_support_install \ + INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION) +endif install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image: cp '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)