[kernel] r17096 - in dists/sid/linux-2.6/debian: . config config/ppc64

[Ben Hutchings]

Author: benh
Date: Mon Mar 21 13:04:30 2011
New Revision: 17096

Log:
Add configuration for Debian architecture ppc64 (Closes: #618976)

Added:
   dists/sid/linux-2.6/debian/config/ppc64/
   dists/sid/linux-2.6/debian/config/ppc64/defines
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/rules.real

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Mar 21 03:19:03 2011	(r17095)
+++ dists/sid/linux-2.6/debian/changelog	Mon Mar 21 13:04:30 2011	(r17096)
@@ -5,6 +5,8 @@
   * rt2800usb: Disable powersaving by default (Closes: #618930)
   * b43: Enable B43_PHY_N (Closes: #619070)
   * net/wireless: Enable RTL8192CE as module (Closes: #619051)
+  * Add configuration for Debian architecture ppc64, matching the
+    powerpc/powerpc64 flavour (Closes: #618976)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 19 Mar 2011 05:17:42 +0000
 

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Mon Mar 21 03:19:03 2011	(r17095)
+++ dists/sid/linux-2.6/debian/config/defines	Mon Mar 21 13:04:30 2011	(r17096)
@@ -13,6 +13,7 @@
  mips
  mipsel
  powerpc
+ ppc64
  s390
  sh4
  sparc

Added: dists/sid/linux-2.6/debian/config/ppc64/defines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/config/ppc64/defines	Mon Mar 21 13:04:30 2011	(r17096)
@@ -0,0 +1,14 @@
+[base]
+flavours:
+ powerpc64
+kernel-arch: powerpc
+
+[image]
+configs: powerpc/config
+suggests: mkvmlinuz
+
+[powerpc64_description]
+hardware: 64-bit PowerPC
+
+[powerpc64_image]
+configs: powerpc/config.powerpc64

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Mon Mar 21 03:19:03 2011	(r17095)
+++ dists/sid/linux-2.6/debian/rules.real	Mon Mar 21 13:04:30 2011	(r17096)
@@ -39,7 +39,7 @@
 #
 binary-arch-arch: install-headers_$(ARCH)
 binary-arch-arch: install-libc-dev_$(ARCH)
-ifneq ($(filter alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64,$(ARCH)),)
+ifneq ($(filter alpha amd64 armel hppa i386 powerpc ppc64 s390 sh4 sparc sparc64,$(ARCH)),)
   binary-arch-arch: install-tools_$(ARCH)
 endif
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
@@ -255,7 +255,7 @@
 	cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR)
 	cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s $(DIR)/arch/$(KERNEL_ARCH)/kernel
 
-ifeq ($(ARCH),powerpc)
+ifneq ($(filter powerpc ppc64,$(ARCH)),)
 	if [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o ]; then \
 		mkdir $(DIR)/arch/$(KERNEL_ARCH)/lib; \
 		cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o $(DIR)/arch/$(KERNEL_ARCH)/lib; \
@@ -385,13 +385,15 @@
 install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image:
+ifneq ($(filter powerpc ppc64,$(ARCH)),)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 	+$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \
 	  WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \
 	  WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \
 	  WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)'
+endif
 
 install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
@@ -404,7 +406,8 @@
 install-image_hppa_$(FEATURESET)_$(FLAVOUR)_plain_templates \
 install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates \
 install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates \
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
+install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates \
+install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
 	for i in $(wildcard debian/templates/temp.image.plain/*); do \