Hi, (2011-03-21 20:39 +0000), Ben Hutchings wrote: > On Sun, 2011-03-20 at 13:18 +0000, Ben Hutchings wrote: >>>> Why does this patch add a new config file rather than referring to >>>> powerpc/config and powerpc/config.powerpc64? >>> >>> Well, I used the same files as powerpc port for the time being. >>> I think that the same file should be indicated if it is necessary to >>> be managed as the same one for easiness. >>> And I also think that a different file should be indicated if the >>> possibility to be managed as another file is left. >>> This may be likely to discuss it. >> >> It would still be possible to override config options. But I think >> ppc64/powerpc64 should be the same as powerpc/powerpc64. (Just as >> amd64/amd64 is the same as i386/amd64, and sparc64/sparc64 is the same >> as sparc/sparc64.) > > Please try the attached patch. This avoids the duplication of config > files or rules in debian/rules.real. It also uses the flavour name > 'powerpc64' rather than 'ppc64', matching the name used on powerpc. > This should make any future multiarch transition for powerpc users a > little smoother.
Thanks for your patch. I tried it, and I confirmed it to be no problem. I attach the full patch that I tried. Regards, -- Hiroyuki Yamamoto A75D B285 7050 4BF9 AEDA 91AC 3A10 59C6 5203 04DC
diff -Nurd linux-2.6-2.6.38.orig/debian/changelog linux-2.6-2.6.38/debian/changelog --- linux-2.6-2.6.38.orig/debian/changelog 2011-03-21 13:58:53.000000000 +0900 +++ linux-2.6-2.6.38/debian/changelog 2011-03-21 14:41:14.000000000 +0900 @@ -1,3 +1,9 @@ +linux-2.6 (2.6.38-1+ppc64~1) UNRELEASED; urgency=low + + * Apply ppc64 patch. + + -- Hiroyuki Yamamoto <[email protected]> Mon, 21 Mar 2011 14:40:37 +0900 + linux-2.6 (2.6.38-1) unstable; urgency=low * New upstream release: http://kernelnewbies.org/Linux_2_6_38 diff -Nurd linux-2.6-2.6.38.orig/debian/config/defines linux-2.6-2.6.38/debian/config/defines --- linux-2.6-2.6.38.orig/debian/config/defines 2011-03-21 13:58:53.000000000 +0900 +++ linux-2.6-2.6.38/debian/config/defines 2011-03-21 14:30:03.000000000 +0900 @@ -13,6 +13,7 @@ mips mipsel powerpc + ppc64 s390 sh4 sparc diff -Nurd linux-2.6-2.6.38.orig/debian/config/ppc64/defines linux-2.6-2.6.38/debian/config/ppc64/defines --- linux-2.6-2.6.38.orig/debian/config/ppc64/defines 1970-01-01 09:00:00.000000000 +0900 +++ linux-2.6-2.6.38/debian/config/ppc64/defines 2011-03-21 14:29:15.000000000 +0900 @@ -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 diff -Nurd linux-2.6-2.6.38.orig/debian/control linux-2.6-2.6.38/debian/control --- linux-2.6-2.6.38.orig/debian/control 2011-03-21 13:58:53.000000000 +0900 +++ linux-2.6-2.6.38/debian/control 2011-03-18 00:20:51.000000000 +0900 @@ -4,13 +4,13 @@ Maintainer: Debian Kernel Team <[email protected]> Uploaders: Bastian Blank <[email protected]>, Frederik Schüler <[email protected]>, maximilian attems <[email protected]>, Ben Hutchings <[email protected]> Standards-Version: 3.9.1 -Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, libdw-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, libnewt-dev, python-support, gcc-4.4 [alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64], binutils-hppa64 [hppa], gcc-4.4-hppa64 [hppa] +Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, libdw-dev, binutils-dev, asciidoc, xmlto, libperl-dev, python-dev, libnewt-dev, python-support, gcc-4.4 [alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh4 sparc sparc64], binutils-hppa64 [hppa], gcc-4.4-hppa64 [hppa] Build-Depends-Indep: bzip2 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/ Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log Package: linux-tools-2.6.38 -Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64 +Architecture: alpha amd64 armel hppa i386 powerpc ppc64 s390 sh4 sparc sparc64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends} Recommends: linux-base (>= 2.6.32-16) Suggests: linux-doc-2.6.38 @@ -87,7 +87,7 @@ data. Package: linux-libc-dev -Architecture: alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64 +Architecture: alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh4 sparc sparc64 Section: devel Provides: linux-kernel-headers Depends: ${misc:Depends} @@ -99,7 +99,7 @@ libraries. Package: linux-headers-2.6.38-1-all -Architecture: alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64 +Architecture: alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh4 sparc sparc64 Depends: linux-headers-2.6.38-1-all-${kernel:Arch} (= ${binary:Version}), ${misc:Depends} Description: All header files for Linux 2.6.38 (meta-package) This package depends against all architecture-specific kernel header files @@ -115,7 +115,7 @@ kernel modules. Package: linux-headers-2.6.38-1-common -Architecture: alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc s390 sh4 sparc sparc64 +Architecture: alpha amd64 armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh4 sparc sparc64 Depends: ${misc:Depends} Description: Common header files for Linux 2.6.38-1 This package provides the architecture-specific common kernel header files @@ -1058,6 +1058,37 @@ modules that load into the kernel provided by the linux-image-2.6.38-1-powerpc64 package. +Package: linux-headers-2.6.38-1-all-ppc64 +Architecture: ppc64 +Depends: ${misc:Depends}, linux-headers-2.6.38-1-ppc64 (= ${binary:Version}) +Description: All header files for Linux 2.6.38 (meta-package) + This package depends against all architecture-specific kernel header files + for Linux kernel version 2.6.38, generally used for building out-of-tree + kernel modules. + +Package: linux-image-2.6.38-1-ppc64 +Architecture: ppc64 +Provides: linux-image, linux-image-2.6, linux-modules-2.6.38-1-ppc64 +Pre-Depends: debconf | debconf-2.0 +Depends: module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}, initramfs-tools (>= 0.55) [ppc64] | linux-initramfs-tool [ppc64] +Recommends: firmware-linux-free (>= 3~) +Suggests: linux-doc-2.6.38, mkvmlinuz [ppc64] +Breaks: initramfs-tools (<< 0.55) +Description: Linux 2.6.38 for 64-bit PowerPC + The Linux kernel 2.6.38 and modules for use on 64-bit PowerPC. + +Package: linux-headers-2.6.38-1-ppc64 +Architecture: ppc64 +Provides: linux-headers, linux-headers-2.6 +Depends: linux-headers-2.6.38-1-common (= ${binary:Version}), linux-kbuild-2.6.38, ${misc:Depends}, gcc-4.4 +Description: Header files for Linux 2.6.38-1-ppc64 + This package provides the architecture-specific kernel header files for + Linux kernel 2.6.38-1-ppc64, generally used for building out-of-tree + kernel modules. These files are going to be installed into + /usr/src/linux-headers-2.6.38-1-ppc64, and can be used for building + modules that load into the kernel provided by the + linux-image-2.6.38-1-ppc64 package. + Package: linux-headers-2.6.38-1-all-s390 Architecture: s390 Depends: ${misc:Depends}, linux-headers-2.6.38-1-s390x (= ${binary:Version}) diff -Nurd linux-2.6-2.6.38.orig/debian/control.md5sum linux-2.6-2.6.38/debian/control.md5sum --- linux-2.6-2.6.38.orig/debian/control.md5sum 2011-03-21 13:58:53.000000000 +0900 +++ linux-2.6-2.6.38/debian/control.md5sum 2011-03-21 14:41:54.000000000 +0900 @@ -1,5 +1,5 @@ 055bd99b5dcb4c573f7f624ed04c8b12 debian/bin/gencontrol.py -710c51ce2b6c5500f1d92563b02b8590 debian/changelog +b05eab6eef309df09dae99cce51c16c4 debian/changelog fa44fa435120c604ba57814566c0c8ab debian/templates/control.headers.arch.in 12ceda954a0cff12aca80df095dd1948 debian/templates/control.headers.featureset.in d4937b66c1a8e107e99bde2b182d7ed8 debian/templates/control.headers.in @@ -18,7 +18,7 @@ 1cb81b60bfe6b79fd6613ae102fe7217 debian/templates/image.xen.postrm.in 3ad85bca8ade992de90953d5c846c9e9 debian/templates/image.xen.prerm.in 1d87fd5e64519abc355138c891c4d55a debian/templates/patch.apply.in -ce76d48f59ce35599d83921a0563bd46 debian/config/defines +99c1a1618398a17e2104c466abf8fa3f debian/config/defines 7805244237b17ec0c1e068c364136ee1 debian/config/alpha/defines 4e6da0631dea74dacc659e8136910b35 debian/config/amd64/defines 56159d7b3f3807abc43f3c89f03587bd debian/config/armel/defines @@ -29,6 +29,7 @@ 7a4302200c744edabddb13806f96348d debian/config/mips/defines 868ce415d9aa9ad94327bd1170243101 debian/config/mipsel/defines bb45d54589d72a396db94210bac6d021 debian/config/powerpc/defines +6d54fe2812efefe29d145a98dd6d9894 debian/config/ppc64/defines 74952c29fa964a1ccee61bde39cae5ef debian/config/s390/defines 4f654b0507024e4483289a749a17d8cb debian/config/sh4/defines 1c43428cadb9eab47cee4e1efec554ff debian/config/sparc64/defines diff -Nurd linux-2.6-2.6.38.orig/debian/rules.gen linux-2.6-2.6.38/debian/rules.gen --- linux-2.6-2.6.38.orig/debian/rules.gen 2011-03-21 13:58:53.000000000 +0900 +++ linux-2.6-2.6.38/debian/rules.gen 2011-03-21 15:24:44.000000000 +0900 @@ -1,5 +1,5 @@ .NOTPARALLEL: -binary-arch: binary-arch_alpha binary-arch_amd64 binary-arch_armel binary-arch_hppa binary-arch_i386 binary-arch_ia64 binary-arch_m68k binary-arch_mips binary-arch_mipsel binary-arch_powerpc binary-arch_s390 binary-arch_sh4 binary-arch_sparc binary-arch_sparc64 +binary-arch: binary-arch_alpha binary-arch_amd64 binary-arch_armel binary-arch_hppa binary-arch_i386 binary-arch_ia64 binary-arch_m68k binary-arch_mips binary-arch_mipsel binary-arch_powerpc binary-arch_ppc64 binary-arch_s390 binary-arch_sh4 binary-arch_sparc binary-arch_sparc64 binary-arch_alpha: binary-arch_alpha_none binary-arch_alpha_real binary-arch_alpha_none: binary-arch_alpha_none_alpha-generic binary-arch_alpha_none_alpha-legacy binary-arch_alpha_none_alpha-smp binary-arch_alpha_none_real binary-arch_alpha_none_alpha-generic: binary-arch_alpha_none_alpha-generic_real @@ -183,6 +183,15 @@ $(MAKE) -f debian/rules.real binary-arch-featureset ABINAME='-1' ARCH='powerpc' FEATURESET='none' KERNEL_ARCH='powerpc' LOCALVERSION_HEADERS='' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' binary-arch_powerpc_real:: $(MAKE) -f debian/rules.real binary-arch-arch ABINAME='-1' ARCH='powerpc' KERNEL_ARCH='powerpc' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +binary-arch_ppc64: binary-arch_ppc64_none binary-arch_ppc64_real +binary-arch_ppc64_none: binary-arch_ppc64_none_ppc64 binary-arch_ppc64_none_real +binary-arch_ppc64_none_ppc64: binary-arch_ppc64_none_ppc64_real +binary-arch_ppc64_none_ppc64_real:: + $(MAKE) -f debian/rules.real binary-arch-flavour ABINAME='-1' ARCH='ppc64' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='ppc64' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/powerpc/config debian/config/powerpc/config.powerpc64' KERNEL_ARCH='powerpc' LOCALVERSION='-ppc64' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-ppc64' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +binary-arch_ppc64_none_real:: + $(MAKE) -f debian/rules.real binary-arch-featureset ABINAME='-1' ARCH='ppc64' FEATURESET='none' KERNEL_ARCH='powerpc' LOCALVERSION_HEADERS='' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +binary-arch_ppc64_real:: + $(MAKE) -f debian/rules.real binary-arch-arch ABINAME='-1' ARCH='ppc64' KERNEL_ARCH='powerpc' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' binary-arch_s390: binary-arch_s390_none binary-arch_s390_real binary-arch_s390_none: binary-arch_s390_none_real binary-arch_s390_none_s390x binary-arch_s390_none_s390x-tape binary-arch_s390_none_real:: @@ -233,7 +242,7 @@ $(MAKE) -f debian/rules.real binary-arch-arch ABINAME='-1' ARCH='sparc' KERNEL_ARCH='sparc' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' binary-indep:: $(MAKE) -f debian/rules.real binary-indep ABINAME='-1' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' -build: build_alpha build_amd64 build_armel build_hppa build_i386 build_ia64 build_m68k build_mips build_mipsel build_powerpc build_s390 build_sh4 build_sparc build_sparc64 +build: build_alpha build_amd64 build_armel build_hppa build_i386 build_ia64 build_m68k build_mips build_mipsel build_powerpc build_ppc64 build_s390 build_sh4 build_sparc build_sparc64 build_alpha: build_alpha_none build_alpha_real build_alpha_none: build_alpha_none_alpha-generic build_alpha_none_alpha-legacy build_alpha_none_alpha-smp build_alpha_none_real build_alpha_none_alpha-generic: build_alpha_none_alpha-generic_real @@ -397,6 +406,13 @@ $(MAKE) -f debian/rules.real build ABINAME='-1' ARCH='powerpc' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='powerpc' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/powerpc/config debian/config/powerpc/config.powerpc' KERNEL_ARCH='powerpc' LOCALVERSION='-powerpc' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-powerpc' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' build_powerpc_none_real: build_powerpc_real: +build_ppc64: build_ppc64_none build_ppc64_real +build_ppc64_none: build_ppc64_none_ppc64 build_ppc64_none_real +build_ppc64_none_ppc64: build_ppc64_none_ppc64_real +build_ppc64_none_ppc64_real:: + $(MAKE) -f debian/rules.real build ABINAME='-1' ARCH='ppc64' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='ppc64' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/powerpc/config debian/config/powerpc/config.powerpc64' KERNEL_ARCH='powerpc' LOCALVERSION='-ppc64' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-ppc64' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +build_ppc64_none_real: +build_ppc64_real: build_s390: build_s390_none build_s390_real build_s390_none: build_s390_none_real build_s390_none_s390x build_s390_none_s390x-tape build_s390_none_real: @@ -437,7 +453,7 @@ build_sparc_none_sparc64_real:: $(MAKE) -f debian/rules.real build ABINAME='-1' ARCH='sparc' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='sparc64' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/sparc/config debian/config/sparc/config.sparc64' KERNEL_ARCH='sparc' LOCALVERSION='-sparc64' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-sparc64' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' build_sparc_real: -setup: setup_alpha setup_amd64 setup_armel setup_hppa setup_i386 setup_ia64 setup_m68k setup_mips setup_mipsel setup_powerpc setup_s390 setup_sh4 setup_sparc setup_sparc64 +setup: setup_alpha setup_amd64 setup_armel setup_hppa setup_i386 setup_ia64 setup_m68k setup_mips setup_mipsel setup_powerpc setup_ppc64 setup_s390 setup_sh4 setup_sparc setup_sparc64 setup_alpha: setup_alpha_none setup_alpha_real setup_alpha_none: setup_alpha_none_alpha-generic setup_alpha_none_alpha-legacy setup_alpha_none_alpha-smp setup_alpha_none_real setup_alpha_none_alpha-generic: setup_alpha_none_alpha-generic_real @@ -601,6 +617,13 @@ $(MAKE) -f debian/rules.real setup-flavour ABINAME='-1' ARCH='powerpc' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='powerpc' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/powerpc/config debian/config/powerpc/config.powerpc' KERNEL_ARCH='powerpc' LOCALVERSION='-powerpc' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-powerpc' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' setup_powerpc_none_real: setup_powerpc_real: +setup_ppc64: setup_ppc64_none setup_ppc64_real +setup_ppc64_none: setup_ppc64_none_ppc64 setup_ppc64_none_real +setup_ppc64_none_ppc64: setup_ppc64_none_ppc64_real +setup_ppc64_none_ppc64_real:: + $(MAKE) -f debian/rules.real setup-flavour ABINAME='-1' ARCH='ppc64' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='ppc64' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/powerpc/config debian/config/powerpc/config.powerpc64' KERNEL_ARCH='powerpc' LOCALVERSION='-ppc64' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-ppc64' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +setup_ppc64_none_real: +setup_ppc64_real: setup_s390: setup_s390_none setup_s390_real setup_s390_none: setup_s390_none_real setup_s390_none_s390x setup_s390_none_s390x-tape setup_s390_none_real: @@ -641,7 +664,7 @@ setup_sparc_none_sparc64_real:: $(MAKE) -f debian/rules.real setup-flavour ABINAME='-1' ARCH='sparc' COMPILER='gcc-4.4' FEATURESET='none' FLAVOUR='sparc64' INITRD_CMD='update-initramfs' KCONFIG='debian/config/config debian/config/sparc/config debian/config/sparc/config.sparc64' KERNEL_ARCH='sparc' LOCALVERSION='-sparc64' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-sparc64' MAJOR='2.6' MODULES='True' SOURCEVERSION='2.6.38-1' TYPE='plain' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' setup_sparc_real: -source: source_alpha source_amd64 source_armel source_hppa source_i386 source_ia64 source_m68k source_mips source_mipsel source_powerpc source_s390 source_sh4 source_sparc source_sparc64 +source: source_alpha source_amd64 source_armel source_hppa source_i386 source_ia64 source_m68k source_mips source_mipsel source_powerpc source_ppc64 source_s390 source_sh4 source_sparc source_sparc64 source_alpha: source_alpha_none source_alpha_real source_alpha_none: source_alpha_none_alpha-generic source_alpha_none_alpha-legacy source_alpha_none_alpha-smp source_alpha_none_real source_alpha_none_alpha-generic: source_alpha_none_alpha-generic_real @@ -784,6 +807,14 @@ $(MAKE) -f debian/rules.real source-featureset ABINAME='-1' ARCH='powerpc' FEATURESET='none' KERNEL_ARCH='powerpc' LOCALVERSION_HEADERS='' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' source_powerpc_real:: $(MAKE) -f debian/rules.real source-arch ABINAME='-1' ARCH='powerpc' KERNEL_ARCH='powerpc' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +source_ppc64: source_ppc64_none source_ppc64_real +source_ppc64_none: source_ppc64_none_ppc64 source_ppc64_none_real +source_ppc64_none_ppc64: source_ppc64_none_ppc64_real +source_ppc64_none_ppc64_real: +source_ppc64_none_real:: + $(MAKE) -f debian/rules.real source-featureset ABINAME='-1' ARCH='ppc64' FEATURESET='none' KERNEL_ARCH='powerpc' LOCALVERSION_HEADERS='' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' +source_ppc64_real:: + $(MAKE) -f debian/rules.real source-arch ABINAME='-1' ARCH='ppc64' KERNEL_ARCH='powerpc' MAJOR='2.6' SOURCEVERSION='2.6.38-1' UPSTREAMVERSION='2.6.38' VERSION='2.6.38' source_s390: source_s390_none source_s390_real source_s390_none: source_s390_none_real source_s390_none_s390x source_s390_none_s390x-tape source_s390_none_real:: diff -Nurd linux-2.6-2.6.38.orig/debian/rules.real linux-2.6-2.6.38/debian/rules.real --- linux-2.6-2.6.38.orig/debian/rules.real 2011-03-21 13:58:53.000000000 +0900 +++ linux-2.6-2.6.38/debian/rules.real 2011-03-21 14:36:30.000000000 +0900 @@ -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 \
