[kernel] r12819 - in dists/trunk/linux-2.6/debian: . config/arm config/armel config/mips config/mipsel
Martin Michlmayr
tbm at alioth.debian.org
Mon Feb 16 22:13:32 UTC 2009
Author: tbm
Date: Mon Feb 16 22:04:48 2009
New Revision: 12819
Log:
Migrate arm, armel, mips and mipsel away from kernel-package.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/arm/defines
dists/trunk/linux-2.6/debian/config/armel/defines
dists/trunk/linux-2.6/debian/config/mips/defines
dists/trunk/linux-2.6/debian/config/mipsel/defines
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Feb 16 22:04:48 2009
@@ -80,6 +80,7 @@
fit in flash.
* [arm/orion5x] Unset FIXED_PHY to work around a clash with fixed
mdio bus and mv643xx_eth.
+ * Migrate arm, armel, mips and mipsel away from kernel-package.
[ Ian Campbell ]
* [x86]: Enable Xen guest support in amd64 flavour. (closes: #495590)
Modified: dists/trunk/linux-2.6/debian/config/arm/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/defines (original)
+++ dists/trunk/linux-2.6/debian/config/arm/defines Mon Feb 16 22:04:48 2009
@@ -8,7 +8,6 @@
[image]
suggests: fdutils
-type: kernel-package
[footbridge_image]
suggests: nwutil
Modified: dists/trunk/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/defines (original)
+++ dists/trunk/linux-2.6/debian/config/armel/defines Mon Feb 16 22:04:48 2009
@@ -8,7 +8,6 @@
[image]
suggests: fdutils
-type: kernel-package
[iop32x_base]
class: IOP32x
Modified: dists/trunk/linux-2.6/debian/config/mips/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/defines (original)
+++ dists/trunk/linux-2.6/debian/config/mips/defines Mon Feb 16 22:04:48 2009
@@ -10,7 +10,6 @@
[image]
initramfs: false
-type: kernel-package
[r4k-ip22_base]
class: SGI IP22
Modified: dists/trunk/linux-2.6/debian/config/mipsel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/defines (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/defines Mon Feb 16 22:04:48 2009
@@ -9,7 +9,6 @@
[image]
initramfs: false
-type: kernel-package
[r5k-cobalt_base]
class: Cobalt
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Mon Feb 16 22:04:48 2009
@@ -404,6 +404,10 @@
PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
+$(MAKE_SELF) install-base
+install-image_arm_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_armel_$(FEATURESET)_$(FLAVOUR)_plain_image:
+ install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+
install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \
install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
@@ -411,6 +415,12 @@
install-image_m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_image:
+ install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+
+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:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
@@ -426,8 +436,12 @@
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES
endif
+install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
+install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
+install-image_mips_$(FEATURESET)_r4k-ip22_plain_templates: ARG_BOOTLOADER = arcboot
+install-image_mips_$(FEATURESET)_r5k-ip32_plain_templates: ARG_BOOTLOADER = arcboot
install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
More information about the Kernel-svn-changes
mailing list