Author: waldi
Date: Wed Feb 20 22:40:09 2008
New Revision: 10618
Log:
* debian/changelog: Update.
* debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch: Remove.
* debian/patches/series/1~experimental.1: Update.
* debian/rules.real: Use new wrapper install support.
Removed:
dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
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 Wed Feb 20 22:40:09 2008
@@ -50,6 +50,7 @@
- Broadcom NetXtremeII 10Gb support
* Disable now broken drivers:
- Broadcom NetXtremeII 10Gb support
+ * [powerpc] Use new wrapper install support.
-- Gordon Farquharson <[EMAIL PROTECTED]> Thu, 14 Feb 2008 00:25:23 -0700
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Wed Feb
20 22:40:09 2008
@@ -3,7 +3,6 @@
+ debian/doc-build-parallel.patch
+ debian/scripts-kconfig-reportoldconfig.patch
+ debian/powerpc-mkvmlinuz-support-ppc.patch
-#+ debian/powerpc-mkvmlinuz-support-powerpc.patch
+ debian/drivers-ata-ata_piix-postpone-pata.patch
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 Wed Feb 20 22:40:09 2008
@@ -399,15 +399,18 @@
install-image_m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(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)
ifeq ($(KERNEL_ARCH),ppc)
# TODO: GNA
$(MAKE_CLEAN) -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \
-
INSTALL_MKVMLINUZ='$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
+ INSTALL_MKVMLINUZ='$(WRAPPER_INSTALL_DIR)'
else
- $(MAKE_CLEAN) -C '$(DIR)' mkvmlinuz_support_install \
-
INSTALL_MKVMLINUZ='$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(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:
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
