On Sun, 2011-03-20 at 13:18 +0000, Ben Hutchings wrote: > On Sun, 2011-03-20 at 13:21 +0900, Hiroyuki Yamamoto wrote: > > Hi, > > > > (2011年03月20日 12:22), Ben Hutchings wrote: > > >> > > >> Please support ppc64. > > > > > > Is 'ppc64' an official port yet? > > > > No, not 'official' port now. > > However, considerable parts of the environment for ppc64 port still > > remain in the packaging system. > > I didn't mean 'is it a release architecture'. Well, I found the answer: > <http://www.debian.org/ports/#unreleased> does list ppc64. > > > > 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. Ben. -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Index: debian/config/ppc64/defines
===================================================================
--- debian/config/ppc64/defines (revision 0)
+++ debian/config/ppc64/defines (revision 0)
@@ -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
Index: debian/config/defines
===================================================================
--- debian/config/defines (revision 17075)
+++ debian/config/defines (working copy)
@@ -13,6 +13,7 @@
mips
mipsel
powerpc
+ ppc64
s390
sh4
sparc
Index: debian/rules.real
===================================================================
--- debian/rules.real (revision 17070)
+++ debian/rules.real (working copy)
@@ -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 \
Attachment:
signature.asc
Description: This is a digitally signed message part